Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
This pull request fixes cancellation during parallel MCP server startup (
connect_in_parallel=True).Previously, cancelling
connect_all()cancelled the future the caller was awaiting but left the worker task runningserver.connect(). With the startup timeout disabled (connect_timeout_seconds=None), that worker could stay blocked inconnect()indefinitely.The worker task is now cancelled only while the caller's own connect command is active. The cancellation count is balanced afterwards so the worker can still process cleanup, and queued connect commands are skipped when their caller has already cancelled.
Cleanup still runs in the task that owns the connection. Cleanup shielding, cleanup wait deadlines, and public APIs are unchanged.
Test plan
codex review --base upstream/mainon the final diff; no actionable findings. Independent Station Claude code and wording reviews also completed.Issue number
N/A
Checks
.agents/skills/code-change-verification/scripts/run.sh/reviewbefore submitting this PR