diff --git a/codex-rs/tools/src/tool_registry_plan.rs b/codex-rs/tools/src/tool_registry_plan.rs index 555af6c5fd..f6c9b10ea5 100644 --- a/codex-rs/tools/src/tool_registry_plan.rs +++ b/codex-rs/tools/src/tool_registry_plan.rs @@ -1,4 +1,5 @@ use crate::CommandToolOptions; +use crate::LoadableToolSpec; use crate::REQUEST_USER_INPUT_TOOL_NAME; use crate::ResponsesApiNamespace; use crate::ResponsesApiNamespaceTool; @@ -556,15 +557,34 @@ pub fn build_tool_registry_plan( } } + let mut dynamic_tool_specs = Vec::new(); for tool in params.dynamic_tools { match dynamic_tool_to_loadable_tool_spec(tool, default_namespace_description) { Ok(loadable_tool) => { let handler_name = ToolName::new(tool.namespace.clone(), tool.name.clone()); - plan.push_spec( - loadable_tool.into(), - /*supports_parallel_tool_calls*/ false, - config.code_mode_enabled, - ); + match loadable_tool { + LoadableToolSpec::Function(tool) => { + dynamic_tool_specs.push(LoadableToolSpec::Function(tool)); + } + LoadableToolSpec::Namespace(namespace) => { + if let Some(existing) = + dynamic_tool_specs.iter_mut().find_map(|spec| match spec { + LoadableToolSpec::Namespace(existing) + if existing.name == namespace.name => + { + Some(existing) + } + LoadableToolSpec::Function(_) | LoadableToolSpec::Namespace(_) => { + None + } + }) + { + existing.tools.extend(namespace.tools); + } else { + dynamic_tool_specs.push(LoadableToolSpec::Namespace(namespace)); + } + } + } plan.register_handler(handler_name, ToolHandlerKind::DynamicTool); } Err(error) => { @@ -575,6 +595,13 @@ pub fn build_tool_registry_plan( } } } + for loadable_tool in dynamic_tool_specs { + plan.push_spec( + loadable_tool.into(), + /*supports_parallel_tool_calls*/ false, + config.code_mode_enabled, + ); + } plan } diff --git a/codex-rs/tools/src/tool_registry_plan_tests.rs b/codex-rs/tools/src/tool_registry_plan_tests.rs index 0055365e27..30c2aeddc1 100644 --- a/codex-rs/tools/src/tool_registry_plan_tests.rs +++ b/codex-rs/tools/src/tool_registry_plan_tests.rs @@ -1461,6 +1461,80 @@ fn search_tool_registers_for_deferred_dynamic_tools() { })); } +#[test] +fn build_specs_groups_deferred_dynamic_tools_by_namespace() { + let model_info = search_capable_model_info(); + let mut features = Features::with_defaults(); + features.enable(Feature::ToolSearch); + 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, + sandbox_policy: &SandboxPolicy::DangerFullAccess, + windows_sandbox_level: WindowsSandboxLevel::Disabled, + }); + let dynamic_tools = [ + DynamicToolSpec { + namespace: Some("codex_app".to_string()), + name: "automation_update".to_string(), + description: "Create, update, view, or delete recurring automations.".to_string(), + input_schema: json!({ + "type": "object", + "properties": { + "mode": { "type": "string" }, + }, + }), + defer_loading: true, + }, + DynamicToolSpec { + namespace: Some("codex_app".to_string()), + name: "linear_create_issue".to_string(), + description: "Create a Linear issue.".to_string(), + input_schema: json!({ + "type": "object", + "properties": { + "title": { "type": "string" }, + }, + }), + defer_loading: true, + }, + ]; + + let (tools, handlers) = build_specs( + &tools_config, + /*mcp_tools*/ None, + /*deferred_mcp_tools*/ None, + &dynamic_tools, + ); + + assert_eq!( + tools + .iter() + .filter(|tool| tool.name() == "codex_app") + .count(), + 1 + ); + assert_eq!( + namespace_function_names(&tools, "codex_app"), + vec![ + "automation_update".to_string(), + "linear_create_issue".to_string(), + ] + ); + assert!(handlers.contains(&ToolHandlerSpec { + name: ToolName::namespaced("codex_app", "automation_update"), + kind: ToolHandlerKind::DynamicTool, + })); + assert!(handlers.contains(&ToolHandlerSpec { + name: ToolName::namespaced("codex_app", "linear_create_issue"), + kind: ToolHandlerKind::DynamicTool, + })); +} + #[test] fn tool_suggest_is_not_registered_without_feature_flag() { let model_info = search_capable_model_info();