Skip to content

armgit / codex

Public Imported from GitHub
0

Lightweight coding agent that runs in your terminal

Rust

Preserve MCP namespace descriptions in the tool catalog cache (#38623)

jif42b5f05cef69
diff --git a/codex-rs/codex-mcp/src/tool_catalog_cache.rs b/codex-rs/codex-mcp/src/tool_catalog_cache.rs
index bb953dc5a8..e6e99f4acb 100644
--- a/codex-rs/codex-mcp/src/tool_catalog_cache.rs
+++ b/codex-rs/codex-mcp/src/tool_catalog_cache.rs
@@ -161,8 +161,6 @@ impl McpToolCatalogCacheContext {
let mut tools = tools.to_vec();
for tool in &mut tools {
- // Initialize instructions belong to one live connection and must not cross sessions.
- tool.namespace_description = None;
// Tool annotations affect approval and parallelism decisions, so only the live
// connection may supply them.
tool.tool.annotations = None;
diff --git a/codex-rs/core/tests/suite/mcp_tool_cache.rs b/codex-rs/core/tests/suite/mcp_tool_cache.rs
index d4c7c4259b..67795fac3b 100644
--- a/codex-rs/core/tests/suite/mcp_tool_cache.rs
+++ b/codex-rs/core/tests/suite/mcp_tool_cache.rs
@@ -534,7 +534,7 @@ async fn cached_mcp_startup_is_eager_for_root_and_lazy_for_subagents() -> anyhow
);
assert_definition(
&unused_response,
- &format!("Tools in the {NAMESPACE} namespace."),
+ &format!("Use the tools from {cached_process}."),
&format!("Echo from {cached_process}."),
);
assert_eq!(
@@ -631,7 +631,7 @@ async fn cached_mcp_startup_is_eager_for_root_and_lazy_for_subagents() -> anyhow
.context("cached MCP definitions should reach inference before initialization")?;
assert_definition(
&cached_response,
- &format!("Tools in the {NAMESPACE} namespace."),
+ &format!("Use the tools from {cached_process}."),
&format!("Echo from {cached_process}."),
);
let second_pid = wait_for_new_pid(fs.as_ref(), &pid_file, Some(&eager_pid)).await?;