Fix TUI input queue handling during MCP startup - #35957
Merged
copyberry[bot] merged 1 commit intoJul 29, 2026
Merged
Conversation
## Why Pending MCP server startup can outlive an agent turn. Treating its shared running indicator as an active user turn prevents queued follow-ups and slash commands from advancing after the turn completes. ## What changed - Allow the input queue to drain while only MCP startup remains active. - Keep queued input blocked while a review, foreground shell command, or compaction is pending or running. - Resume queue draining after session-selection flows close. ## Testing Add TUI tests covering queued follow-ups, slash commands, reviews, shell commands, and compaction while MCP startup is pending. GitOrigin-RevId: f5684f61c32e3728ff71cf222f0486df637dc3a5
copyberry
Bot
force-pushed
the
copyberry/codex-internal-to-codex-oss/f5684f61c32e3728ff71cf222f0486df637dc3a5
branch
from
July 29, 2026 13:47
a7d4600 to
e189571
Compare
copyberry
Bot
deleted the
copyberry/codex-internal-to-codex-oss/f5684f61c32e3728ff71cf222f0486df637dc3a5
branch
July 29, 2026 13:48
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.
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.
Fix TUI input queue handling during MCP startup
Why
Pending MCP server startup can outlive an agent turn. Treating its shared
running indicator as an active user turn prevents queued follow-ups and slash
commands from advancing after the turn completes.
What changed
compaction is pending or running.
Testing
Add TUI tests covering queued follow-ups, slash commands, reviews, shell
commands, and compaction while MCP startup is pending.