fix: retry cancelled streamable-http MCP calls on isolated session#2683
Draft
elainegan-openai wants to merge 1 commit intomainfrom
Draft
fix: retry cancelled streamable-http MCP calls on isolated session#2683elainegan-openai wants to merge 1 commit intomainfrom
elainegan-openai wants to merge 1 commit intomainfrom
Conversation
Co-authored-by: Codex <noreply@openai.com>
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
call_toolonce on a fresh isolated session when the shared-session request is cancelled internallyWhy
The deeper issue appears to be in the shared streamable-http transport task group: one failed request can cancel sibling in-flight requests on the same session.
#2682serialized same-session requests as a blunt workaround, but that trades away same-server parallelism. This PR keeps the workaround narrow by only paying extra cost on the affected failure path.Validation
python -m ruff check src/agents/mcp/server.py tests/mcp/test_client_session_retries.pyuv run python -m pytest tests/mcp/test_client_session_retries.py -quv run python -m pytest tests/mcp/test_mcp_util.py -qmake typecheck