pakrym-oai 857e731478 [codex] Remove string-keyed MCP tool maps (#21454) ...

## Summary

This PR removes the synthetic `HashMap<String, ToolInfo>` keys from MCP
tool discovery. `McpConnectionManager::list_all_tools()` now returns
normalized `Vec<ToolInfo>`, and downstream code derives identity from
`ToolInfo::canonical_tool_name()`.

The motivation is to keep model-visible tool identity on
`ToolName`/`ToolInfo` instead of parallel string map keys, so future
namespace changes do not have to preserve otherwise-unused lookup keys.

## Changes

- Rename the MCP normalization path from `qualify_tools` to
`normalize_tools_for_model` and return tool values directly.
- Flow MCP tool lists through connectors, plugin injection, router/spec
building, code mode, and tool search as vectors/slices.
- Keep direct/deferred subtraction local to `mcp_tool_exposure`, using
`ToolName` values.
- Update tests to compare `ToolName` instances where MCP identity
matters.

## Validation

- `cargo test -p codex-mcp test_normalize_tools`
- `cargo test -p codex-core mcp_tool_exposure`
- `cargo test -p codex-core
direct_mcp_tools_register_namespaced_handlers`
- `cargo test -p codex-core
search_tool_registers_namespaced_mcp_tool_aliases`
- `just fix -p codex-mcp`
- `just fix -p codex-core`

857e731478 · 2026-05-07 10:16:10 -07:00

History

..

discoverable_tests.rs

[codex] Add OpenAI Developers to tool suggest allowlist (#21423)

2026-05-06 23:49:15 -04:00

discoverable.rs

Move plugin out of core. (#20348)

2026-04-30 14:26:14 -07:00

injection.rs

[codex] Remove string-keyed MCP tool maps (#21454)

2026-05-07 10:16:10 -07:00

mentions_tests.rs

Extract codex-core-skills crate (#15749)

2026-03-25 12:57:42 -07:00

mentions.rs

Move more connector logic into connectors crate (#18158)

2026-04-16 11:16:44 -07:00

mod.rs

Move plugin out of core. (#20348)

2026-04-30 14:26:14 -07:00

render_tests.rs

move plugin/skill instructions into dev msg and reorder (#14609)

2026-03-13 20:51:01 -07:00

render.rs

Split DeveloperInstructions into individual fragments. (#18813)

2026-04-21 10:22:36 -07:00

test_support.rs

Move plugin out of core. (#20348)

2026-04-30 14:26:14 -07:00