fix(tools): guard set_model_response as a reserved MCP tool name - #7149
Open
Sehastrajit-S wants to merge 1 commit into
Open
Sehastrajit-S wants to merge 1 commit into
Sehastrajit-S wants to merge 1 commit into
Conversation
|
Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA). View this failed invocation of the CLA check for more information. For the most up to date status, view the checks section at the bottom of the pull request. |
An MCP server exposing a tool literally named set_model_response could shadow the built-in SetModelResponseTool, since _RESERVED_TOOL_NAMES in mcp_tool.py never accounted for it. Add the dispatch name as a shared constant on SetModelResponseTool and register it in the reserved set, matching how the other framework-reserved names are handled.
Sehastrajit-S
force-pushed
the
fix-mcp-reserved-set-model-response
branch
from
September 17, 2026 01:56
6fd91db to
6ea82ee
Compare
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
1 participant
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
set_model_response, which would shadow the framework's built-inSetModelResponseToolsince_RESERVED_TOOL_NAMESinmcp_tool.pynever included it (unlikeadk_request_confirmation,adk_request_input,adk_request_credential, andtransfer_to_agent, which are all guarded).SET_MODEL_RESPONSE_FUNCTION_CALL_NAMEas a module-level constant onSetModelResponseTool, mirroring theREQUEST_*_FUNCTION_CALL_NAMEpattern infunctions.py, and uses it both for the tool's ownnameand in the MCP reserved-name guard.Fixes #7144
Test plan
test_init_reserved_nameparametrized test intest_mcp_tool.pycoveringset_model_response.pytest tests/unittests/tools/(2276 passed, 2 skipped)pre-commit run --fileson the changed files (ruff, isort, pyink, addlicense all pass)