Clean up cancelled MCP elicitation requests - #35836
Merged
copyberry[bot] merged 1 commit intoJul 28, 2026
Merged
Conversation
## Why Cancelling an in-flight MCP elicitation could leave its response handler registered in the shared router. ## What changed - Remove an elicitation from the router when its pending request future is dropped. - Keep cleanup scoped to the cancelled request so other pending elicitations remain routable. ## Testing Added a test that cancels one of two pending elicitations, verifies the cancelled request can no longer be resolved, and confirms the other request still completes. GitOrigin-RevId: 9a10360459f0b39552d9d29a6e1b867c1f09e97d
copyberry
Bot
force-pushed
the
copyberry/codex-internal-to-codex-oss/9a10360459f0b39552d9d29a6e1b867c1f09e97d
branch
from
July 28, 2026 22:17
89a30f7 to
c550cb3
Compare
copyberry
Bot
deleted the
copyberry/codex-internal-to-codex-oss/9a10360459f0b39552d9d29a6e1b867c1f09e97d
branch
July 28, 2026 22:19
Athena-Noesis
had a problem deploying
to
issue-triage
July 28, 2026 22:28 — with 
GitHub Actions
Failure
GitHub Actions
Failure
Athena-Noesis
temporarily deployed
to
issue-triage
July 28, 2026 22:28 — with
GitHub Actions
Inactive
GitHub Actions
Inactive
Athena-Noesis
temporarily deployed
to
issue-triage
July 28, 2026 22:28 — with
GitHub Actions
Inactive
GitHub Actions
Inactive
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.
Clean up cancelled MCP elicitation requests
Why
Cancelling an in-flight MCP elicitation could leave its response handler registered in the shared router.
What changed
Testing
Added a test that cancels one of two pending elicitations, verifies the cancelled request can no longer be resolved, and confirms the other request still completes.