Fix MCPServer.call_tool return type#2569
Open
FU-max-boop wants to merge 2 commits intomodelcontextprotocol:mainfrom
Open
Fix MCPServer.call_tool return type#2569FU-max-boop wants to merge 2 commits intomodelcontextprotocol:mainfrom
FU-max-boop wants to merge 2 commits intomodelcontextprotocol:mainfrom
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 and Context
Closes #1251.
MCPServer.call_toolalways requests converted tool results from the tool manager, so its return annotation should match the actual converted shapes: content-only sequences, structured(content, structured_content)tuples, or directCallToolResultvalues. The previousdict[str, Any]return type also left an unreachable handler branch in_handle_call_tool.How Has This Been Tested?
python3 -m py_compile src/mcp/server/mcpserver/server.py tests/server/mcpserver/test_server.pygit diff --checkuv run --frozen --no-default-groups --with pytest --with inline-snapshot pytest -c /dev/null tests/server/mcpserver/test_server.py -k 'call_tool_direct_returns_structured_tuple or tool_structured_output_primitive'Breaking Changes
None. This is a type annotation and cleanup change with direct coverage for the runtime return shape.
Types of changes
Checklist
Additional context
I kept the scope limited to the incorrect direct
call_tooltype and the unreachable code path it created. I attempted the full project-styleuvdev-tool run locally, but dependency downloads for dev tooling stalled; the targeted regression test above passed.