This commit is contained in:
Sayan Sisodiya
2026-05-06 16:52:51 -07:00
parent 9e905528bb
commit bc961b75f1
31 changed files with 632 additions and 284 deletions
+3 -3
View File
@@ -108,7 +108,7 @@ fn mcp_tool_to_deferred_responses_api_tool_sets_defer_loading() {
assert_eq!(
mcp_tool_to_deferred_responses_api_tool(
&ToolName::namespaced("mcp__codex_apps__", "lookup_order"),
&ToolName::namespaced("codex_apps", "lookup_order"),
&tool,
)
.expect("convert deferred tool"),
@@ -133,7 +133,7 @@ fn mcp_tool_to_deferred_responses_api_tool_sets_defer_loading() {
#[test]
fn loadable_tool_spec_namespace_serializes_with_deferred_child_tools() {
let namespace = LoadableToolSpec::Namespace(ResponsesApiNamespace {
name: "mcp__codex_apps__calendar".to_string(),
name: "codex_apps__calendar".to_string(),
description: "Plan events".to_string(),
tools: vec![ResponsesApiNamespaceTool::Function(ResponsesApiTool {
name: "create_event".to_string(),
@@ -155,7 +155,7 @@ fn loadable_tool_spec_namespace_serializes_with_deferred_child_tools() {
value,
json!({
"type": "namespace",
"name": "mcp__codex_apps__calendar",
"name": "codex_apps__calendar",
"description": "Plan events",
"tools": [
{
+2 -2
View File
@@ -22,9 +22,9 @@ fn tool_definition() -> ToolDefinition {
#[test]
fn renamed_overrides_name_only() {
assert_eq!(
tool_definition().renamed("mcp__orders__lookup_order".to_string()),
tool_definition().renamed("orders__lookup_order".to_string()),
ToolDefinition {
name: "mcp__orders__lookup_order".to_string(),
name: "orders__lookup_order".to_string(),
..tool_definition()
}
);
+109 -48
View File
@@ -68,6 +68,7 @@ use crate::tool_registry_plan_types::agent_type_description;
use codex_protocol::openai_models::ApplyPatchToolType;
use codex_protocol::openai_models::ConfigShellToolType;
use std::collections::BTreeMap;
use std::collections::HashSet;
pub fn build_tool_registry_plan(
config: &ToolsConfig,
@@ -260,53 +261,6 @@ pub fn build_tool_registry_plan(
plan.register_handler("request_permissions", ToolHandlerKind::RequestPermissions);
}
let deferred_dynamic_tools = params
.dynamic_tools
.iter()
.filter(|tool| tool.defer_loading && (config.namespace_tools || tool.namespace.is_none()))
.collect::<Vec<_>>();
let deferred_mcp_tools_for_search = if config.namespace_tools {
params.deferred_mcp_tools
} else {
None
};
if config.search_tool
&& (deferred_mcp_tools_for_search.is_some() || !deferred_dynamic_tools.is_empty())
{
let mut search_source_infos = deferred_mcp_tools_for_search
.map(|deferred_mcp_tools| {
collect_tool_search_source_infos(deferred_mcp_tools.iter().map(|tool| {
ToolSearchSource {
server_name: tool.server_name,
connector_name: tool.connector_name,
connector_description: tool.connector_description,
}
}))
})
.unwrap_or_default();
if !deferred_dynamic_tools.is_empty() {
search_source_infos.push(ToolSearchSourceInfo {
name: "Dynamic tools".to_string(),
description: Some("Tools provided by the current Codex thread.".to_string()),
});
}
plan.push_spec(
create_tool_search_tool(&search_source_infos, TOOL_SEARCH_DEFAULT_LIMIT),
/*supports_parallel_tool_calls*/ true,
config.code_mode_enabled,
);
plan.register_handler(TOOL_SEARCH_TOOL_NAME, ToolHandlerKind::ToolSearch);
if let Some(deferred_mcp_tools) = deferred_mcp_tools_for_search {
for tool in deferred_mcp_tools {
plan.register_handler(tool.name.clone(), ToolHandlerKind::Mcp);
}
}
}
if config.tool_suggest
&& let Some(discoverable_tools) =
params.discoverable_tools.filter(|tools| !tools.is_empty())
@@ -506,8 +460,96 @@ pub fn build_tool_registry_plan(
}
}
let deferred_dynamic_tools = params
.dynamic_tools
.iter()
.filter(|tool| tool.defer_loading && (config.namespace_tools || tool.namespace.is_none()))
.collect::<Vec<_>>();
let mut claimed_non_mcp_top_level_names =
claimed_non_mcp_top_level_names(&plan, params.dynamic_tools);
if config.search_tool
&& (params.deferred_mcp_tools.is_some() || !deferred_dynamic_tools.is_empty())
{
claimed_non_mcp_top_level_names.insert(TOOL_SEARCH_TOOL_NAME.to_string());
}
let mut skipped_mcp_namespaces = HashSet::new();
let mut should_expose_mcp_namespace = |namespace: &str| {
if reserved_mcp_namespace(namespace) || claimed_non_mcp_top_level_names.contains(namespace)
{
if skipped_mcp_namespaces.insert(namespace.to_string()) {
tracing::warn!(
"skipping MCP namespace `{namespace}` because that top-level tool name is reserved or already claimed"
);
}
return false;
}
true
};
let deferred_mcp_tools_for_search = if config.namespace_tools {
params.deferred_mcp_tools.map(|tools| {
tools
.iter()
.filter(|tool| {
tool.name
.namespace
.as_deref()
.is_some_and(&mut should_expose_mcp_namespace)
})
.collect::<Vec<_>>()
})
} else {
None
};
if config.search_tool
&& (deferred_mcp_tools_for_search.is_some() || !deferred_dynamic_tools.is_empty())
{
let mut search_source_infos = deferred_mcp_tools_for_search
.as_ref()
.map(|deferred_mcp_tools| {
collect_tool_search_source_infos(deferred_mcp_tools.iter().map(|tool| {
ToolSearchSource {
server_name: tool.server_name,
connector_name: tool.connector_name,
connector_description: tool.connector_description,
}
}))
})
.unwrap_or_default();
if !deferred_dynamic_tools.is_empty() {
search_source_infos.push(ToolSearchSourceInfo {
name: "Dynamic tools".to_string(),
description: Some("Tools provided by the current Codex thread.".to_string()),
});
}
plan.push_spec(
create_tool_search_tool(&search_source_infos, TOOL_SEARCH_DEFAULT_LIMIT),
/*supports_parallel_tool_calls*/ true,
config.code_mode_enabled,
);
plan.register_handler(TOOL_SEARCH_TOOL_NAME, ToolHandlerKind::ToolSearch);
if let Some(deferred_mcp_tools) = deferred_mcp_tools_for_search.as_ref() {
for tool in deferred_mcp_tools {
plan.register_handler(tool.name.clone(), ToolHandlerKind::Mcp);
}
}
}
if let Some(mcp_tools) = params.mcp_tools {
let mut entries = mcp_tools.to_vec();
let mut entries = mcp_tools
.iter()
.filter(|tool| {
tool.name
.namespace
.as_deref()
.is_some_and(&mut should_expose_mcp_namespace)
})
.cloned()
.collect::<Vec<_>>();
entries.sort_by_key(|tool| tool.name.display());
let mut namespace_entries = BTreeMap::new();
@@ -615,6 +657,25 @@ fn compare_code_mode_tools(
.then_with(|| left.name.cmp(&right.name))
}
fn claimed_non_mcp_top_level_names(
plan: &ToolRegistryPlan,
dynamic_tools: &[codex_protocol::dynamic_tools::DynamicToolSpec],
) -> HashSet<String> {
plan.specs
.iter()
.map(|tool| tool.name().to_string())
.chain(
dynamic_tools
.iter()
.map(|tool| tool.namespace.clone().unwrap_or_else(|| tool.name.clone())),
)
.collect()
}
fn reserved_mcp_namespace(namespace: &str) -> bool {
matches!(namespace, "functions" | "tools" | "web")
}
fn code_mode_namespace_name<'a>(
tool: &codex_code_mode::ToolDefinition,
namespace_descriptions: &'a BTreeMap<String, codex_code_mode::ToolNamespaceDescription>,
+75 -32
View File
@@ -1205,16 +1205,16 @@ fn namespace_specs_are_hidden_when_namespace_tools_are_disabled() {
let (tools, handlers) = build_specs(
&tools_config,
Some(HashMap::from([(
ToolName::namespaced("mcp__sample__", "echo"),
ToolName::namespaced("sample", "echo"),
mcp_tool("echo", "Echo", serde_json::json!({"type": "object"})),
)])),
/*deferred_mcp_tools*/ None,
&[],
);
assert_lacks_tool_name(&tools, "mcp__sample__");
assert_lacks_tool_name(&tools, "sample");
assert!(handlers.contains(&ToolHandlerSpec {
name: ToolName::namespaced("mcp__sample__", "echo"),
name: ToolName::namespaced("sample", "echo"),
kind: ToolHandlerKind::Mcp,
}));
}
@@ -1374,7 +1374,7 @@ fn search_tool_description_lists_each_mcp_source_once() {
&tools_config,
Some(HashMap::from([
(
ToolName::namespaced("mcp__codex_apps__calendar", "_create_event"),
ToolName::namespaced("codex_apps__calendar", "create_event"),
mcp_tool(
"calendar_create_event",
"Create calendar event",
@@ -1382,37 +1382,34 @@ fn search_tool_description_lists_each_mcp_source_once() {
),
),
(
ToolName::namespaced("mcp__rmcp__", "echo"),
ToolName::namespaced("rmcp", "echo"),
mcp_tool("echo", "Echo", serde_json::json!({"type": "object"})),
),
])),
Some(vec![
deferred_mcp_tool(
"_create_event",
"mcp__codex_apps__calendar",
"create_event",
"codex_apps__calendar",
CODEX_APPS_MCP_SERVER_NAME,
Some("Calendar"),
Some("Plan events and manage your calendar."),
),
deferred_mcp_tool(
"_list_events",
"mcp__codex_apps__calendar",
"list_events",
"codex_apps__calendar",
CODEX_APPS_MCP_SERVER_NAME,
Some("Calendar"),
Some("Plan events and manage your calendar."),
),
deferred_mcp_tool(
"_search_threads",
"mcp__codex_apps__gmail",
"search_threads",
"codex_apps__gmail",
CODEX_APPS_MCP_SERVER_NAME,
Some("Gmail"),
Some("Find and summarize email threads."),
),
deferred_mcp_tool(
"echo",
"mcp__rmcp__",
"rmcp",
/*connector_name*/ None,
"echo", "rmcp", "rmcp", /*connector_name*/ None,
/*connector_description*/ None,
),
]),
@@ -1433,14 +1430,14 @@ fn search_tool_description_lists_each_mcp_source_once() {
1
);
assert!(description.contains("- rmcp"));
assert!(!description.contains("mcp__rmcp__echo"));
assert!(!description.contains("rmcp__echo"));
assert!(handlers.contains(&ToolHandlerSpec {
name: ToolName::namespaced("mcp__codex_apps__calendar", "_create_event"),
name: ToolName::namespaced("codex_apps__calendar", "create_event"),
kind: ToolHandlerKind::Mcp,
}));
assert!(handlers.contains(&ToolHandlerSpec {
name: ToolName::namespaced("mcp__rmcp__", "echo"),
name: ToolName::namespaced("rmcp", "echo"),
kind: ToolHandlerKind::Mcp,
}));
}
@@ -1449,8 +1446,8 @@ fn search_tool_description_lists_each_mcp_source_once() {
fn search_tool_requires_model_capability_and_enabled_feature() {
let model_info = search_capable_model_info();
let deferred_mcp_tools = Some(vec![deferred_mcp_tool(
"_create_event",
"mcp__codex_apps__calendar",
"create_event",
"codex_apps__calendar",
CODEX_APPS_MCP_SERVER_NAME,
Some("Calendar"),
/*connector_description*/ None,
@@ -1540,8 +1537,8 @@ fn search_tool_is_hidden_when_only_deferred_namespace_tools_are_available() {
&tools_config,
/*mcp_tools*/ None,
Some(vec![deferred_mcp_tool(
"_create_event",
"mcp__codex_apps__calendar",
"create_event",
"codex_apps__calendar",
CODEX_APPS_MCP_SERVER_NAME,
Some("Calendar"),
Some("Plan events and manage your calendar."),
@@ -1691,6 +1688,53 @@ fn search_tool_keeps_plain_deferred_dynamic_tools_when_namespace_tools_are_disab
}));
}
#[test]
fn mcp_namespace_colliding_with_dynamic_namespace_is_skipped() {
let model_info = model_info();
let features = Features::with_defaults();
let available_models = Vec::new();
let tools_config = ToolsConfig::new(&ToolsConfigParams {
model_info: &model_info,
available_models: &available_models,
features: &features,
image_generation_tool_auth_allowed: true,
web_search_mode: Some(WebSearchMode::Cached),
session_source: SessionSource::Cli,
permission_profile: &PermissionProfile::Disabled,
windows_sandbox_level: WindowsSandboxLevel::Disabled,
});
let dynamic_tools = vec![DynamicToolSpec {
namespace: Some("shared".to_string()),
name: "automation_update".to_string(),
description: "Create or update automations.".to_string(),
input_schema: json!({"type": "object", "properties": {}}),
defer_loading: false,
}];
let (tools, handlers) = build_specs(
&tools_config,
Some(HashMap::from([(
ToolName::namespaced("shared", "echo"),
mcp_tool("echo", "Echo", json!({"type": "object"})),
)])),
/*deferred_mcp_tools*/ None,
&dynamic_tools,
);
assert_eq!(
namespace_function_names(&tools, "shared"),
vec!["automation_update".to_string()]
);
assert!(!handlers.contains(&ToolHandlerSpec {
name: ToolName::namespaced("shared", "echo"),
kind: ToolHandlerKind::Mcp,
}));
assert!(handlers.contains(&ToolHandlerSpec {
name: ToolName::namespaced("shared", "automation_update"),
kind: ToolHandlerKind::DynamicTool,
}));
}
#[test]
fn tool_suggest_is_not_registered_without_feature_flag() {
let model_info = search_capable_model_info();
@@ -1916,7 +1960,7 @@ fn code_mode_augments_mcp_tool_descriptions_with_namespaced_sample() {
let (tools, _) = build_specs(
&tools_config,
Some(HashMap::from([(
ToolName::namespaced("mcp__sample__", "echo"),
ToolName::namespaced("sample", "echo"),
mcp_tool(
"echo",
"Echo text",
@@ -1935,7 +1979,7 @@ fn code_mode_augments_mcp_tool_descriptions_with_namespaced_sample() {
);
let ResponsesApiTool { description, .. } =
find_namespace_function_tool(&tools, "mcp__sample__", "echo");
find_namespace_function_tool(&tools, "sample", "echo");
assert_eq!(
description,
@@ -1943,7 +1987,7 @@ fn code_mode_augments_mcp_tool_descriptions_with_namespaced_sample() {
exec tool declaration:
```ts
declare const tools: { mcp__sample__echo(args: { message: string; }): Promise<CallToolResult>; };
declare const tools: { sample_echo(args: { message: string; }): Promise<CallToolResult>; };
```"#
);
}
@@ -1969,7 +2013,7 @@ fn code_mode_preserves_nullable_and_literal_mcp_input_shapes() {
let (tools, _) = build_specs(
&tools_config,
Some(HashMap::from([(
ToolName::namespaced("mcp__sample__", "fn"),
ToolName::namespaced("sample", "fn"),
mcp_tool(
"fn",
"Sample fn",
@@ -2020,13 +2064,12 @@ fn code_mode_preserves_nullable_and_literal_mcp_input_shapes() {
&[],
);
let ResponsesApiTool { description, .. } =
find_namespace_function_tool(&tools, "mcp__sample__", "fn");
let ResponsesApiTool { description, .. } = find_namespace_function_tool(&tools, "sample", "fn");
assert!(description.contains(
r#"exec tool declaration:
```ts
declare const tools: { mcp__sample__fn(args: { open?: Array<{ lineno?: number | null; ref_id: string; }> | null; response_length?: "short" | "medium" | "long"; tagged_list?: Array<{ kind: "tagged"; scope: "one" | "two"; variant: "alpha" | "beta"; }> | null; }): Promise<CallToolResult>; };
declare const tools: { sample_fn(args: { open?: Array<{ lineno?: number | null; ref_id: string; }> | null; response_length?: "short" | "medium" | "long"; tagged_list?: Array<{ kind: "tagged"; scope: "one" | "two"; variant: "alpha" | "beta"; }> | null; }): Promise<CallToolResult>; };
```"#
));
}
@@ -2311,7 +2354,7 @@ fn code_mode_augments_mcp_tool_descriptions_with_structured_output_sample() {
let (tools, _) = build_specs(
&tools_config,
Some(HashMap::from([(
ToolName::namespaced("mcp__sample__", "echo"),
ToolName::namespaced("sample", "echo"),
tool,
)])),
/*deferred_mcp_tools*/ None,
@@ -2319,7 +2362,7 @@ fn code_mode_augments_mcp_tool_descriptions_with_structured_output_sample() {
);
let ResponsesApiTool { description, .. } =
find_namespace_function_tool(&tools, "mcp__sample__", "echo");
find_namespace_function_tool(&tools, "sample", "echo");
assert_eq!(
description,
@@ -2327,7 +2370,7 @@ fn code_mode_augments_mcp_tool_descriptions_with_structured_output_sample() {
exec tool declaration:
```ts
declare const tools: { mcp__sample__echo(args: { message: string; }): Promise<CallToolResult<{ echo: string; env: string | null; }>>; };
declare const tools: { sample_echo(args: { message: string; }): Promise<CallToolResult<{ echo: string; env: string | null; }>>; };
```"#
);
}
+4 -4
View File
@@ -38,12 +38,12 @@ fn tool_spec_name_covers_all_variants() {
);
assert_eq!(
ToolSpec::Namespace(ResponsesApiNamespace {
name: "mcp__demo__".to_string(),
name: "demo".to_string(),
description: "Demo tools".to_string(),
tools: Vec::new(),
})
.name(),
"mcp__demo__"
"demo"
);
assert_eq!(
ToolSpec::ToolSearch {
@@ -178,7 +178,7 @@ fn create_tools_json_for_responses_api_includes_top_level_name() {
fn namespace_tool_spec_serializes_expected_wire_shape() {
assert_eq!(
serde_json::to_value(ToolSpec::Namespace(ResponsesApiNamespace {
name: "mcp__demo__".to_string(),
name: "demo".to_string(),
description: "Demo tools".to_string(),
tools: vec![ResponsesApiNamespaceTool::Function(ResponsesApiTool {
name: "lookup_order".to_string(),
@@ -199,7 +199,7 @@ fn namespace_tool_spec_serializes_expected_wire_shape() {
.expect("serialize namespace tool"),
json!({
"type": "namespace",
"name": "mcp__demo__",
"name": "demo",
"description": "Demo tools",
"tools": [
{