[v1.x] fix: make request responder completion idempotent#2949
Closed
fengjikui wants to merge 1 commit into
Closed
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.
Fixes #2416.
Summary
RequestResponder.respond()return without sending a second response when the responder has already completedRequestResponder.cancel()cancel the active scope but skip the cancellation error response if a normal response already completed the requestRoot cause
A cancellation notification can complete a responder and send the cancellation error before a late
respond()call reachesRequestResponder.respond(). The existing assertion then raisesAssertionError: Request already responded to, which can break the session even though one JSON-RPC response has already won the race.Validation
uv run --frozen pytest tests/shared/test_session.py -q --tb=short --maxfail=1uv run --frozen pyright src/mcp/shared/session.py tests/shared/test_session.pyuv run --frozen ruff check src/mcp/shared/session.py tests/shared/test_session.pyuv run --frozen ruff format --check src/mcp/shared/session.py tests/shared/test_session.pygit diff --checkPASS: no AssertionError; responses=1AI assistance was used to prepare this change; I reviewed and validated the final diff.