fix(mcp): isolate structured tool output per request#504
Closed
cdayAI 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.
Motivation
MCPServerinstance field which is shared across concurrent HTTP requests, allowing a race where one request can read or overwrite another request'sstructuredContent(leak/wrong-goal responses).asyncio.to_thread()against a singleMCPServerinstance, so the per-call structured value must be request-local to be safe.Description
_structured_overridewith a request-localContextVarnamed_STRUCTURED_OVERRIDEso structured output is isolated to the current call. (_STRUCTURED_OVERRIDE: ContextVar[...]) inpackages/maverick-mcp/maverick_mcp/server.py.handle_tools_callto set theContextVartoNoneat call start, use the token toreset()it in afinallyblock, and read the request-local value with_STRUCTURED_OVERRIDE.get()when assemblingstructuredContent.maverick_startandmaverick_resumehandlers to write their structured result with_STRUCTURED_OVERRIDE.set({...})instead of writingself._structured_override.test_structured_override_is_request_localinpackages/maverick-mcp/tests/test_server.pywhich simulates two overlappingmaverick_startcalls and asserts each call receives matching text andstructuredContent.Testing
ruff checkand applied fixes; linter passed on the modified files.PYTHONPATH=packages/maverick-mcp:packages/maverick-core:packages/maverick-shield pytest packages/maverick-mcp/tests/test_server.pyand all tests passed:27 passed.pytest packages/maverick-mcp/tests/test_server.pyrun failed in this environment due to import path resolution, after settingPYTHONPATHthe full test suite passed.Codex Task