Skip to content

fix(mcp): clear stale thread interrupt before MCP discovery #10287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
AJV20 wants to merge 1 commit into from
Closed

fix(mcp): clear stale thread interrupt before MCP discovery #10287

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion tools/mcp_tool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2014,7 +2014,19 @@ async def _discover_all():

# Per-server timeouts are handled inside _discover_and_register_server.
# The outer timeout is generous: 120s total for parallel discovery.
_run_on_mcp_loop(_discover_all(), timeout=120)
#
# Temporarily clear the interrupt flag on the current thread so that MCP
# discovery is never cancelled by a stale interrupt from a prior agent
# session (executor threads get reused and may carry old interrupt state).
from tools.interrupt import is_interrupted as _is_interrupted, set_interrupt as _set_interrupt
_was_interrupted = _is_interrupted()
if _was_interrupted:
_set_interrupt(False)
try:
_run_on_mcp_loop(_discover_all(), timeout=120)
finally:
if _was_interrupted:
_set_interrupt(True)

# Log a summary so ACP callers get visibility into what was registered.
with _lock:
Expand Down