[codex] Remove string-keyed MCP tool maps#21454
Open
pakrym-oai wants to merge 4 commits intomainfrom
Open
Conversation
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 0c1c82874c
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
sayan-oai
reviewed
May 7, 2026
| !mcp_tools.as_ref().is_some_and(|direct_tools| { | ||
| direct_tools | ||
| .iter() | ||
| .any(|direct_tool| direct_tool.canonical_tool_name() == tool_name) |
Collaborator
There was a problem hiding this comment.
nitpicky, do we care about n^2 here? we could use set
sayan-oai
approved these changes
May 7, 2026
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
2 participants
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
This PR removes the synthetic
HashMap<String, ToolInfo>keys from MCP tool discovery.McpConnectionManager::list_all_tools()now returns normalizedVec<ToolInfo>, and downstream code derives identity fromToolInfo::canonical_tool_name().The motivation is to keep model-visible tool identity on
ToolName/ToolInfoinstead of parallel string map keys, so future namespace changes do not have to preserve otherwise-unused lookup keys.Changes
qualify_toolstonormalize_tools_for_modeland return tool values directly.mcp_tool_exposure, usingToolNamevalues.ToolNameinstances where MCP identity matters.Validation
cargo test -p codex-mcp test_normalize_toolscargo test -p codex-core mcp_tool_exposurecargo test -p codex-core direct_mcp_tools_register_namespaced_handlerscargo test -p codex-core search_tool_registers_namespaced_mcp_tool_aliasesjust fix -p codex-mcpjust fix -p codex-core