Fix cancelled review leaving MCP startup busy - #31189
Merged
Merged
Conversation
charliemarsh-oai
force-pushed
the
charlie/fix-review-cancelled-mcp-startup
branch
from
July 5, 2026 18:39
46d7f07 to
9118b1a
Compare
charliemarsh-oai
marked this pull request as ready for review
July 5, 2026 18:41
This was referenced Jul 6, 2026
pakrym-oai
approved these changes
Jul 6, 2026
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
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
Cancelling an inline review could leave the TUI stuck in MCP startup state, so subsequent
/reviewcommands were rejected as though another task were still running. Specifically, the child’s “Starting MCP servers” event was incorrectly forwarded to the parent TUI, so the parent was marking itself as busy.This keeps delegate-session MCP startup events inside the delegate instead of exposing them as parent-session state.
Reproduction
Here's the before -- notice that after I cancel the first review, I'm prevented from running
/reviewagain:Before.mov
And the after -- notice that after I cancel, I can immediately start a new
/review:after.mov