fix(mcp): resolve toolsets from live registry - #9947
Merged
Merged
Conversation
13 tasks
19 tasks
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
Salvage of PR #9849 by @g-guthrie — cherry-picked onto current main.
Removes the dual-source-of-truth problem where MCP toolset state lived in both the tool registry and runtime-mutated
toolsets.TOOLSETS. Replaces_sync_mcp_toolsets()with a registry alias system — the registry is now the single authority for MCP tool membership.Changes
tools/registry.py— New_toolset_aliasesdict withregister_toolset_alias()/get_toolset_alias_target(). Auto-cleans aliases whenderegister()removes the last tool in a toolset.tools/mcp_tool.py—_sync_mcp_toolsets()deleted._register_server_tools()usesregistry.register_toolset_alias()instead ofcreate_custom_toolset()+ hermes-* injection.shutdown()now properly deregisters tools.toolsets.py—get_toolset()falls through to registry for names not in TOOLSETS.validate_toolset()checks registry aliases.resolve_toolset()returnssorted()for determinism.Follow-up (ours)
cli.pythat still referenced_sync_mcp_toolsets.Validation
Closes #9849