diff --git a/codex-rs/core/src/session/tests.rs b/codex-rs/core/src/session/tests.rs
index b250cadfb052..ec3c6ad36b94 100644
--- a/codex-rs/core/src/session/tests.rs
+++ b/codex-rs/core/src/session/tests.rs
@@ -8770,7 +8770,7 @@ async fn rejects_escalated_permissions_when_policy_not_on_request() {
     let tool_name = "shell";
     let call_id = "test-call".to_string();
 
-    let handler = ShellHandler;
+    let handler = ShellHandler::default();
     let resp = handler
         .handle(ToolInvocation {
             session: Arc::clone(&session),
@@ -8845,7 +8845,7 @@ async fn unified_exec_rejects_escalated_permissions_when_policy_not_on_request()
     let turn_context = Arc::new(turn_context_raw);
     let tracker = Arc::new(tokio::sync::Mutex::new(TurnDiffTracker::new()));
 
-    let handler = ExecCommandHandler;
+    let handler = ExecCommandHandler::default();
     let resp = handler
         .handle(ToolInvocation {
             session: Arc::clone(&session),
diff --git a/codex-rs/core/src/session/tests/guardian_tests.rs b/codex-rs/core/src/session/tests/guardian_tests.rs
index 857ec950c23c..5c473ef1f9d4 100644
--- a/codex-rs/core/src/session/tests/guardian_tests.rs
+++ b/codex-rs/core/src/session/tests/guardian_tests.rs
@@ -323,7 +323,7 @@ async fn guardian_allows_shell_additional_permissions_requests_past_policy_valid
         arg0: None,
     };
 
-    let handler = ShellHandler;
+    let handler = ShellHandler::default();
     let resp = handler
         .handle(ToolInvocation {
             session: Arc::clone(&session),
@@ -437,7 +437,7 @@ async fn strict_auto_review_turn_grant_forces_guardian_for_shell_policy_skip() {
     let session = Arc::new(session);
     let turn_context = Arc::new(turn_context_raw);
 
-    let handler = ShellHandler;
+    let handler = ShellHandler::default();
     let command = if cfg!(windows) {
         vec![
             "cmd.exe".to_string(),
@@ -498,7 +498,7 @@ async fn guardian_allows_unified_exec_additional_permissions_requests_past_polic
     let turn_context = Arc::new(turn_context_raw);
     let tracker = Arc::new(tokio::sync::Mutex::new(TurnDiffTracker::new()));
 
-    let handler = ExecCommandHandler;
+    let handler = ExecCommandHandler::default();
     let resp = handler
         .handle(ToolInvocation {
             session: Arc::clone(&session),
@@ -615,7 +615,7 @@ async fn shell_handler_allows_sticky_turn_permissions_without_inline_request_per
     let session = Arc::new(session);
     let turn_context = Arc::new(turn_context_raw);
 
-    let handler = ShellHandler;
+    let handler = ShellHandler::default();
     let resp = handler
         .handle(ToolInvocation {
             session: Arc::clone(&session),
diff --git a/codex-rs/core/src/tools/code_mode/execute_handler.rs b/codex-rs/core/src/tools/code_mode/execute_handler.rs
index 42841d21895e..0e11cd166f45 100644
--- a/codex-rs/core/src/tools/code_mode/execute_handler.rs
+++ b/codex-rs/core/src/tools/code_mode/execute_handler.rs
@@ -5,6 +5,7 @@ use crate::tools::context::ToolPayload;
 use crate::tools::registry::ToolHandler;
 use crate::tools::registry::ToolKind;
 use codex_tools::ToolName;
+use codex_tools::ToolSpec;
 
 use super::ExecContext;
 use super::PUBLIC_TOOL_NAME;
@@ -12,9 +13,15 @@ use super::build_enabled_tools;
 use super::handle_runtime_response;
 use super::is_exec_tool_name;
 
-pub struct CodeModeExecuteHandler;
+pub struct CodeModeExecuteHandler {
+    spec: ToolSpec,
+}
 
 impl CodeModeExecuteHandler {
+    pub(crate) fn new(spec: ToolSpec) -> Self {
+        Self { spec }
+    }
+
     async fn execute(
         &self,
         session: std::sync::Arc<crate::session::session::Session>,
@@ -83,6 +90,10 @@ impl ToolHandler for CodeModeExecuteHandler {
         ToolName::plain(PUBLIC_TOOL_NAME)
     }
 
+    fn spec(&self) -> Option<ToolSpec> {
+        Some(self.spec.clone())
+    }
+
     fn kind(&self) -> ToolKind {
         ToolKind::Function
     }
diff --git a/codex-rs/core/src/tools/code_mode/wait_handler.rs b/codex-rs/core/src/tools/code_mode/wait_handler.rs
index 8024c9586584..21191be02d68 100644
--- a/codex-rs/core/src/tools/code_mode/wait_handler.rs
+++ b/codex-rs/core/src/tools/code_mode/wait_handler.rs
@@ -7,11 +7,13 @@ use crate::tools::context::ToolPayload;
 use crate::tools::registry::ToolHandler;
 use crate::tools::registry::ToolKind;
 use codex_tools::ToolName;
+use codex_tools::ToolSpec;
 
 use super::DEFAULT_WAIT_YIELD_TIME_MS;
 use super::ExecContext;
 use super::WAIT_TOOL_NAME;
 use super::handle_runtime_response;
+use super::wait_spec::create_wait_tool;
 
 pub struct CodeModeWaitHandler;
 
@@ -46,6 +48,10 @@ impl ToolHandler for CodeModeWaitHandler {
         ToolName::plain(WAIT_TOOL_NAME)
     }
 
+    fn spec(&self) -> Option<ToolSpec> {
+        Some(create_wait_tool())
+    }
+
     fn kind(&self) -> ToolKind {
         ToolKind::Function
     }
diff --git a/codex-rs/core/src/tools/handlers/agent_jobs/report_agent_job_result.rs b/codex-rs/core/src/tools/handlers/agent_jobs/report_agent_job_result.rs
index 90cde7d44638..a7a36a49d53a 100644
--- a/codex-rs/core/src/tools/handlers/agent_jobs/report_agent_job_result.rs
+++ b/codex-rs/core/src/tools/handlers/agent_jobs/report_agent_job_result.rs
@@ -2,9 +2,11 @@ use crate::function_tool::FunctionCallError;
 use crate::tools::context::FunctionToolOutput;
 use crate::tools::context::ToolInvocation;
 use crate::tools::context::ToolPayload;
+use crate::tools::handlers::agent_jobs_spec::create_report_agent_job_result_tool;
 use crate::tools::registry::ToolHandler;
 use crate::tools::registry::ToolKind;
 use codex_tools::ToolName;
+use codex_tools::ToolSpec;
 
 use super::*;
 
@@ -17,6 +19,10 @@ impl ToolHandler for ReportAgentJobResultHandler {
         ToolName::plain("report_agent_job_result")
     }
 
+    fn spec(&self) -> Option<ToolSpec> {
+        Some(create_report_agent_job_result_tool())
+    }
+
     fn kind(&self) -> ToolKind {
         ToolKind::Function
     }
diff --git a/codex-rs/core/src/tools/handlers/agent_jobs/spawn_agents_on_csv.rs b/codex-rs/core/src/tools/handlers/agent_jobs/spawn_agents_on_csv.rs
index 911f1a5eef5b..a1d0b5e7ae56 100644
--- a/codex-rs/core/src/tools/handlers/agent_jobs/spawn_agents_on_csv.rs
+++ b/codex-rs/core/src/tools/handlers/agent_jobs/spawn_agents_on_csv.rs
@@ -2,9 +2,11 @@ use crate::function_tool::FunctionCallError;
 use crate::tools::context::FunctionToolOutput;
 use crate::tools::context::ToolInvocation;
 use crate::tools::context::ToolPayload;
+use crate::tools::handlers::agent_jobs_spec::create_spawn_agents_on_csv_tool;
 use crate::tools::registry::ToolHandler;
 use crate::tools::registry::ToolKind;
 use codex_tools::ToolName;
+use codex_tools::ToolSpec;
 
 use super::*;
 
@@ -17,6 +19,10 @@ impl ToolHandler for SpawnAgentsOnCsvHandler {
         ToolName::plain("spawn_agents_on_csv")
     }
 
+    fn spec(&self) -> Option<ToolSpec> {
+        Some(create_spawn_agents_on_csv_tool())
+    }
+
     fn kind(&self) -> ToolKind {
         ToolKind::Function
     }
diff --git a/codex-rs/core/src/tools/handlers/apply_patch.rs b/codex-rs/core/src/tools/handlers/apply_patch.rs
index 104ab9ffb6c3..2b63c1cb17ab 100644
--- a/codex-rs/core/src/tools/handlers/apply_patch.rs
+++ b/codex-rs/core/src/tools/handlers/apply_patch.rs
@@ -22,6 +22,8 @@ use crate::tools::events::ToolEmitter;
 use crate::tools::events::ToolEventCtx;
 use crate::tools::handlers::apply_granted_turn_permissions;
 use crate::tools::handlers::apply_patch_spec::ApplyPatchToolArgs;
+use crate::tools::handlers::apply_patch_spec::create_apply_patch_freeform_tool;
+use crate::tools::handlers::apply_patch_spec::create_apply_patch_json_tool;
 use crate::tools::handlers::parse_arguments;
 use crate::tools::hook_names::HookToolName;
 use crate::tools::orchestrator::ToolOrchestrator;
@@ -41,6 +43,7 @@ use codex_exec_server::ExecutorFileSystem;
 use codex_features::Feature;
 use codex_protocol::models::AdditionalPermissionProfile;
 use codex_protocol::models::FileSystemPermissions;
+use codex_protocol::openai_models::ApplyPatchToolType;
 use codex_protocol::protocol::EventMsg;
 use codex_protocol::protocol::FileChange;
 use codex_protocol::protocol::PatchApplyUpdatedEvent;
@@ -48,11 +51,30 @@ use codex_sandboxing::policy_transforms::effective_file_system_sandbox_policy;
 use codex_sandboxing::policy_transforms::merge_permission_profiles;
 use codex_sandboxing::policy_transforms::normalize_additional_permissions;
 use codex_tools::ToolName;
+use codex_tools::ToolSpec;
 use codex_utils_absolute_path::AbsolutePathBuf;
 
 const APPLY_PATCH_ARGUMENT_DIFF_BUFFER_INTERVAL: Duration = Duration::from_millis(500);
 
-pub struct ApplyPatchHandler;
+pub struct ApplyPatchHandler {
+    options: ApplyPatchToolType,
+}
+
+impl Default for ApplyPatchHandler {
+    fn default() -> Self {
+        Self {
+            options: ApplyPatchToolType::Freeform,
+        }
+    }
+}
+
+impl ApplyPatchHandler {
+    pub(crate) fn new(apply_patch_tool_type: ApplyPatchToolType) -> Self {
+        Self {
+            options: apply_patch_tool_type,
+        }
+    }
+}
 
 #[derive(Default)]
 struct ApplyPatchArgumentDiffConsumer {
@@ -297,6 +319,13 @@ impl ToolHandler for ApplyPatchHandler {
         ToolName::plain("apply_patch")
     }
 
+    fn spec(&self) -> Option<ToolSpec> {
+        Some(match self.options {
+            ApplyPatchToolType::Freeform => create_apply_patch_freeform_tool(),
+            ApplyPatchToolType::Function => create_apply_patch_json_tool(),
+        })
+    }
+
     fn kind(&self) -> ToolKind {
         ToolKind::Function
     }
diff --git a/codex-rs/core/src/tools/handlers/apply_patch_tests.rs b/codex-rs/core/src/tools/handlers/apply_patch_tests.rs
index 04472e4623a9..c0d4d17f322f 100644
--- a/codex-rs/core/src/tools/handlers/apply_patch_tests.rs
+++ b/codex-rs/core/src/tools/handlers/apply_patch_tests.rs
@@ -49,7 +49,7 @@ async fn pre_tool_use_payload_uses_json_patch_input() {
         arguments: json!({ "input": patch }).to_string(),
     };
     let invocation = invocation_for_payload(payload).await;
-    let handler = ApplyPatchHandler;
+    let handler = ApplyPatchHandler::default();
 
     assert_eq!(
         handler.pre_tool_use_payload(&invocation),
@@ -67,7 +67,7 @@ async fn pre_tool_use_payload_uses_freeform_patch_input() {
         input: patch.to_string(),
     };
     let invocation = invocation_for_payload(payload).await;
-    let handler = ApplyPatchHandler;
+    let handler = ApplyPatchHandler::default();
 
     assert_eq!(
         handler.pre_tool_use_payload(&invocation),
@@ -86,7 +86,7 @@ async fn post_tool_use_payload_uses_patch_input_and_tool_output() {
     };
     let invocation = invocation_for_payload(payload).await;
     let output = ApplyPatchToolOutput::from_text("Success. Updated files.".to_string());
-    let handler = ApplyPatchHandler;
+    let handler = ApplyPatchHandler::default();
 
     assert_eq!(
         handler.post_tool_use_payload(&invocation, &output),
diff --git a/codex-rs/core/src/tools/handlers/goal/create_goal.rs b/codex-rs/core/src/tools/handlers/goal/create_goal.rs
index 18c6c3b01072..37ca319ad1c9 100644
--- a/codex-rs/core/src/tools/handlers/goal/create_goal.rs
+++ b/codex-rs/core/src/tools/handlers/goal/create_goal.rs
@@ -4,10 +4,12 @@ use crate::tools::context::FunctionToolOutput;
 use crate::tools::context::ToolInvocation;
 use crate::tools::context::ToolPayload;
 use crate::tools::handlers::goal_spec::CREATE_GOAL_TOOL_NAME;
+use crate::tools::handlers::goal_spec::create_create_goal_tool;
 use crate::tools::handlers::parse_arguments;
 use crate::tools::registry::ToolHandler;
 use crate::tools::registry::ToolKind;
 use codex_tools::ToolName;
+use codex_tools::ToolSpec;
 
 use super::CompletionBudgetReport;
 use super::CreateGoalArgs;
@@ -23,6 +25,10 @@ impl ToolHandler for CreateGoalHandler {
         ToolName::plain(CREATE_GOAL_TOOL_NAME)
     }
 
+    fn spec(&self) -> Option<ToolSpec> {
+        Some(create_create_goal_tool())
+    }
+
     fn kind(&self) -> ToolKind {
         ToolKind::Function
     }
diff --git a/codex-rs/core/src/tools/handlers/goal/get_goal.rs b/codex-rs/core/src/tools/handlers/goal/get_goal.rs
index e70c6d9bf00d..f1af6dc5bb26 100644
--- a/codex-rs/core/src/tools/handlers/goal/get_goal.rs
+++ b/codex-rs/core/src/tools/handlers/goal/get_goal.rs
@@ -3,9 +3,11 @@ use crate::tools::context::FunctionToolOutput;
 use crate::tools::context::ToolInvocation;
 use crate::tools::context::ToolPayload;
 use crate::tools::handlers::goal_spec::GET_GOAL_TOOL_NAME;
+use crate::tools::handlers::goal_spec::create_get_goal_tool;
 use crate::tools::registry::ToolHandler;
 use crate::tools::registry::ToolKind;
 use codex_tools::ToolName;
+use codex_tools::ToolSpec;
 
 use super::CompletionBudgetReport;
 use super::format_goal_error;
@@ -20,6 +22,10 @@ impl ToolHandler for GetGoalHandler {
         ToolName::plain(GET_GOAL_TOOL_NAME)
     }
 
+    fn spec(&self) -> Option<ToolSpec> {
+        Some(create_get_goal_tool())
+    }
+
     fn kind(&self) -> ToolKind {
         ToolKind::Function
     }
diff --git a/codex-rs/core/src/tools/handlers/goal/update_goal.rs b/codex-rs/core/src/tools/handlers/goal/update_goal.rs
index 46d6d26a04f5..bdb2315a681e 100644
--- a/codex-rs/core/src/tools/handlers/goal/update_goal.rs
+++ b/codex-rs/core/src/tools/handlers/goal/update_goal.rs
@@ -5,11 +5,13 @@ use crate::tools::context::FunctionToolOutput;
 use crate::tools::context::ToolInvocation;
 use crate::tools::context::ToolPayload;
 use crate::tools::handlers::goal_spec::UPDATE_GOAL_TOOL_NAME;
+use crate::tools::handlers::goal_spec::create_update_goal_tool;
 use crate::tools::handlers::parse_arguments;
 use crate::tools::registry::ToolHandler;
 use crate::tools::registry::ToolKind;
 use codex_protocol::protocol::ThreadGoalStatus;
 use codex_tools::ToolName;
+use codex_tools::ToolSpec;
 
 use super::CompletionBudgetReport;
 use super::UpdateGoalArgs;
@@ -25,6 +27,10 @@ impl ToolHandler for UpdateGoalHandler {
         ToolName::plain(UPDATE_GOAL_TOOL_NAME)
     }
 
+    fn spec(&self) -> Option<ToolSpec> {
+        Some(create_update_goal_tool())
+    }
+
     fn kind(&self) -> ToolKind {
         ToolKind::Function
     }
diff --git a/codex-rs/core/src/tools/handlers/mcp_resource/list_mcp_resource_templates.rs b/codex-rs/core/src/tools/handlers/mcp_resource/list_mcp_resource_templates.rs
index 2c87edf0c78a..5e42bc3c0dce 100644
--- a/codex-rs/core/src/tools/handlers/mcp_resource/list_mcp_resource_templates.rs
+++ b/codex-rs/core/src/tools/handlers/mcp_resource/list_mcp_resource_templates.rs
@@ -4,11 +4,13 @@ use crate::function_tool::FunctionCallError;
 use crate::tools::context::FunctionToolOutput;
 use crate::tools::context::ToolInvocation;
 use crate::tools::context::ToolPayload;
+use crate::tools::handlers::mcp_resource_spec::create_list_mcp_resource_templates_tool;
 use crate::tools::registry::ToolHandler;
 use crate::tools::registry::ToolKind;
 use codex_protocol::models::function_call_output_content_items_to_text;
 use codex_protocol::protocol::McpInvocation;
 use codex_tools::ToolName;
+use codex_tools::ToolSpec;
 
 use rmcp::model::PaginatedRequestParams;
 
@@ -31,6 +33,14 @@ impl ToolHandler for ListMcpResourceTemplatesHandler {
         ToolName::plain("list_mcp_resource_templates")
     }
 
+    fn spec(&self) -> Option<ToolSpec> {
+        Some(create_list_mcp_resource_templates_tool())
+    }
+
+    fn supports_parallel_tool_calls(&self) -> bool {
+        true
+    }
+
     fn kind(&self) -> ToolKind {
         ToolKind::Function
     }
diff --git a/codex-rs/core/src/tools/handlers/mcp_resource/list_mcp_resources.rs b/codex-rs/core/src/tools/handlers/mcp_resource/list_mcp_resources.rs
index ed6285214116..77b224cd1a9a 100644
--- a/codex-rs/core/src/tools/handlers/mcp_resource/list_mcp_resources.rs
+++ b/codex-rs/core/src/tools/handlers/mcp_resource/list_mcp_resources.rs
@@ -4,11 +4,13 @@ use crate::function_tool::FunctionCallError;
 use crate::tools::context::FunctionToolOutput;
 use crate::tools::context::ToolInvocation;
 use crate::tools::context::ToolPayload;
+use crate::tools::handlers::mcp_resource_spec::create_list_mcp_resources_tool;
 use crate::tools::registry::ToolHandler;
 use crate::tools::registry::ToolKind;
 use codex_protocol::models::function_call_output_content_items_to_text;
 use codex_protocol::protocol::McpInvocation;
 use codex_tools::ToolName;
+use codex_tools::ToolSpec;
 
 use rmcp::model::PaginatedRequestParams;
 
@@ -31,6 +33,14 @@ impl ToolHandler for ListMcpResourcesHandler {
         ToolName::plain("list_mcp_resources")
     }
 
+    fn spec(&self) -> Option<ToolSpec> {
+        Some(create_list_mcp_resources_tool())
+    }
+
+    fn supports_parallel_tool_calls(&self) -> bool {
+        true
+    }
+
     fn kind(&self) -> ToolKind {
         ToolKind::Function
     }
diff --git a/codex-rs/core/src/tools/handlers/mcp_resource/read_mcp_resource.rs b/codex-rs/core/src/tools/handlers/mcp_resource/read_mcp_resource.rs
index 91d5a4317e50..50944aefb6d2 100644
--- a/codex-rs/core/src/tools/handlers/mcp_resource/read_mcp_resource.rs
+++ b/codex-rs/core/src/tools/handlers/mcp_resource/read_mcp_resource.rs
@@ -4,11 +4,13 @@ use crate::function_tool::FunctionCallError;
 use crate::tools::context::FunctionToolOutput;
 use crate::tools::context::ToolInvocation;
 use crate::tools::context::ToolPayload;
+use crate::tools::handlers::mcp_resource_spec::create_read_mcp_resource_tool;
 use crate::tools::registry::ToolHandler;
 use crate::tools::registry::ToolKind;
 use codex_protocol::models::function_call_output_content_items_to_text;
 use codex_protocol::protocol::McpInvocation;
 use codex_tools::ToolName;
+use codex_tools::ToolSpec;
 
 use rmcp::model::ReadResourceRequestParams;
 
@@ -31,6 +33,14 @@ impl ToolHandler for ReadMcpResourceHandler {
         ToolName::plain("read_mcp_resource")
     }
 
+    fn spec(&self) -> Option<ToolSpec> {
+        Some(create_read_mcp_resource_tool())
+    }
+
+    fn supports_parallel_tool_calls(&self) -> bool {
+        true
+    }
+
     fn kind(&self) -> ToolKind {
         ToolKind::Function
     }
diff --git a/codex-rs/core/src/tools/handlers/mod.rs b/codex-rs/core/src/tools/handlers/mod.rs
index a1aa7e139a6a..24bddc2c5f61 100644
--- a/codex-rs/core/src/tools/handlers/mod.rs
+++ b/codex-rs/core/src/tools/handlers/mod.rs
@@ -64,12 +64,14 @@ pub use request_user_input::RequestUserInputHandler;
 pub use shell::ContainerExecHandler;
 pub use shell::LocalShellHandler;
 pub use shell::ShellCommandHandler;
+pub(crate) use shell::ShellCommandHandlerOptions;
 pub use shell::ShellHandler;
 pub use test_sync::TestSyncHandler;
 pub use tool_search::ToolSearchHandler;
 pub use unavailable_tool::UnavailableToolHandler;
 pub(crate) use unavailable_tool::unavailable_tool_message;
 pub use unified_exec::ExecCommandHandler;
+pub(crate) use unified_exec::ExecCommandHandlerOptions;
 pub use unified_exec::WriteStdinHandler;
 pub use view_image::ViewImageHandler;
 
diff --git a/codex-rs/core/src/tools/handlers/multi_agents/close_agent.rs b/codex-rs/core/src/tools/handlers/multi_agents/close_agent.rs
index 70d24c4288bc..7d47290c1098 100644
--- a/codex-rs/core/src/tools/handlers/multi_agents/close_agent.rs
+++ b/codex-rs/core/src/tools/handlers/multi_agents/close_agent.rs
@@ -1,5 +1,7 @@
 use super::*;
+use crate::tools::handlers::multi_agents_spec::create_close_agent_tool_v1;
 use crate::turn_timing::now_unix_timestamp_ms;
+use codex_tools::ToolSpec;
 
 pub(crate) struct Handler;
 
@@ -10,6 +12,10 @@ impl ToolHandler for Handler {
         ToolName::plain("close_agent")
     }
 
+    fn spec(&self) -> Option<ToolSpec> {
+        Some(create_close_agent_tool_v1())
+    }
+
     fn kind(&self) -> ToolKind {
         ToolKind::Function
     }
diff --git a/codex-rs/core/src/tools/handlers/multi_agents/resume_agent.rs b/codex-rs/core/src/tools/handlers/multi_agents/resume_agent.rs
index 8fa4622617fc..0b86c9abdf6f 100644
--- a/codex-rs/core/src/tools/handlers/multi_agents/resume_agent.rs
+++ b/codex-rs/core/src/tools/handlers/multi_agents/resume_agent.rs
@@ -1,6 +1,8 @@
 use super::*;
 use crate::agent::next_thread_spawn_depth;
+use crate::tools::handlers::multi_agents_spec::create_resume_agent_tool;
 use crate::turn_timing::now_unix_timestamp_ms;
+use codex_tools::ToolSpec;
 use std::sync::Arc;
 
 pub(crate) struct Handler;
@@ -12,6 +14,10 @@ impl ToolHandler for Handler {
         ToolName::plain("resume_agent")
     }
 
+    fn spec(&self) -> Option<ToolSpec> {
+        Some(create_resume_agent_tool())
+    }
+
     fn kind(&self) -> ToolKind {
         ToolKind::Function
     }
diff --git a/codex-rs/core/src/tools/handlers/multi_agents/send_input.rs b/codex-rs/core/src/tools/handlers/multi_agents/send_input.rs
index 0994ba5e2f91..cc65a00f4105 100644
--- a/codex-rs/core/src/tools/handlers/multi_agents/send_input.rs
+++ b/codex-rs/core/src/tools/handlers/multi_agents/send_input.rs
@@ -1,6 +1,8 @@
 use super::*;
 use crate::agent::control::render_input_preview;
+use crate::tools::handlers::multi_agents_spec::create_send_input_tool_v1;
 use crate::turn_timing::now_unix_timestamp_ms;
+use codex_tools::ToolSpec;
 
 pub(crate) struct Handler;
 
@@ -11,6 +13,10 @@ impl ToolHandler for Handler {
         ToolName::plain("send_input")
     }
 
+    fn spec(&self) -> Option<ToolSpec> {
+        Some(create_send_input_tool_v1())
+    }
+
     fn kind(&self) -> ToolKind {
         ToolKind::Function
     }
diff --git a/codex-rs/core/src/tools/handlers/multi_agents/spawn.rs b/codex-rs/core/src/tools/handlers/multi_agents/spawn.rs
index adfb926fe776..40e9cc5d389d 100644
--- a/codex-rs/core/src/tools/handlers/multi_agents/spawn.rs
+++ b/codex-rs/core/src/tools/handlers/multi_agents/spawn.rs
@@ -6,9 +6,21 @@ use crate::agent::exceeds_thread_spawn_depth_limit;
 use crate::agent::next_thread_spawn_depth;
 use crate::agent::role::DEFAULT_ROLE_NAME;
 use crate::agent::role::apply_role_to_config;
+use crate::tools::handlers::multi_agents_spec::SpawnAgentToolOptions;
+use crate::tools::handlers::multi_agents_spec::create_spawn_agent_tool_v1;
 use crate::turn_timing::now_unix_timestamp_ms;
+use codex_tools::ToolSpec;
 
-pub(crate) struct Handler;
+#[derive(Default)]
+pub(crate) struct Handler {
+    options: SpawnAgentToolOptions,
+}
+
+impl Handler {
+    pub(crate) fn new(options: SpawnAgentToolOptions) -> Self {
+        Self { options }
+    }
+}
 
 impl ToolHandler for Handler {
     type Output = SpawnAgentResult;
@@ -17,6 +29,10 @@ impl ToolHandler for Handler {
         ToolName::plain("spawn_agent")
     }
 
+    fn spec(&self) -> Option<ToolSpec> {
+        Some(create_spawn_agent_tool_v1(self.options.clone()))
+    }
+
     fn kind(&self) -> ToolKind {
         ToolKind::Function
     }
diff --git a/codex-rs/core/src/tools/handlers/multi_agents/wait.rs b/codex-rs/core/src/tools/handlers/multi_agents/wait.rs
index 8d6c09193ef7..9e63450a6a3e 100644
--- a/codex-rs/core/src/tools/handlers/multi_agents/wait.rs
+++ b/codex-rs/core/src/tools/handlers/multi_agents/wait.rs
@@ -1,7 +1,10 @@
 use super::*;
 use crate::agent::status::is_final;
+use crate::tools::handlers::multi_agents_spec::WaitAgentTimeoutOptions;
+use crate::tools::handlers::multi_agents_spec::create_wait_agent_tool_v1;
 use crate::turn_timing::now_unix_timestamp_ms;
 use codex_protocol::error::CodexErr;
+use codex_tools::ToolSpec;
 use futures::FutureExt;
 use futures::StreamExt;
 use futures::stream::FuturesUnordered;
@@ -13,7 +16,16 @@ use tokio::time::Instant;
 
 use tokio::time::timeout_at;
 
-pub(crate) struct Handler;
+#[derive(Default)]
+pub(crate) struct Handler {
+    options: WaitAgentTimeoutOptions,
+}
+
+impl Handler {
+    pub(crate) fn new(options: WaitAgentTimeoutOptions) -> Self {
+        Self { options }
+    }
+}
 
 impl ToolHandler for Handler {
     type Output = WaitAgentResult;
@@ -22,6 +34,10 @@ impl ToolHandler for Handler {
         ToolName::plain("wait_agent")
     }
 
+    fn spec(&self) -> Option<ToolSpec> {
+        Some(create_wait_agent_tool_v1(self.options))
+    }
+
     fn kind(&self) -> ToolKind {
         ToolKind::Function
     }
diff --git a/codex-rs/core/src/tools/handlers/multi_agents_spec.rs b/codex-rs/core/src/tools/handlers/multi_agents_spec.rs
index 2cbef2104b78..233491efa42b 100644
--- a/codex-rs/core/src/tools/handlers/multi_agents_spec.rs
+++ b/codex-rs/core/src/tools/handlers/multi_agents_spec.rs
@@ -9,9 +9,9 @@ use std::collections::BTreeMap;
 const SPAWN_AGENT_INHERITED_MODEL_GUIDANCE: &str = "Spawned agents inherit your current model by default. Omit `model` to use that preferred default; set `model` only when an explicit override is needed.";
 const SPAWN_AGENT_MODEL_OVERRIDE_DESCRIPTION: &str = "Optional model override for the new agent. Leave unset to inherit the same model as the parent, which is the preferred default. Only set this when the user explicitly asks for a different model or the task clearly requires one.";
 
-#[derive(Debug, Clone)]
-pub struct SpawnAgentToolOptions<'a> {
-    pub available_models: &'a [ModelPreset],
+#[derive(Debug, Clone, Default)]
+pub struct SpawnAgentToolOptions {
+    pub available_models: Vec<ModelPreset>,
     pub agent_type_description: String,
     pub hide_agent_type_model_reasoning: bool,
     pub include_usage_hint: bool,
@@ -26,9 +26,19 @@ pub struct WaitAgentTimeoutOptions {
     pub max_timeout_ms: i64,
 }
 
-pub fn create_spawn_agent_tool_v1(options: SpawnAgentToolOptions<'_>) -> ToolSpec {
+impl Default for WaitAgentTimeoutOptions {
+    fn default() -> Self {
+        Self {
+            default_timeout_ms: super::multi_agents_common::DEFAULT_WAIT_TIMEOUT_MS,
+            min_timeout_ms: super::multi_agents_common::MIN_WAIT_TIMEOUT_MS,
+            max_timeout_ms: super::multi_agents_common::MAX_WAIT_TIMEOUT_MS,
+        }
+    }
+}
+
+pub fn create_spawn_agent_tool_v1(options: SpawnAgentToolOptions) -> ToolSpec {
     let available_models_description = (!options.hide_agent_type_model_reasoning)
-        .then(|| spawn_agent_models_description(options.available_models));
+        .then(|| spawn_agent_models_description(&options.available_models));
     let return_value_description =
         "Returns the spawned agent id plus the user-facing nickname when available.";
     let mut properties = spawn_agent_common_properties_v1(&options.agent_type_description);
@@ -51,9 +61,9 @@ pub fn create_spawn_agent_tool_v1(options: SpawnAgentToolOptions<'_>) -> ToolSpe
     })
 }
 
-pub fn create_spawn_agent_tool_v2(options: SpawnAgentToolOptions<'_>) -> ToolSpec {
+pub fn create_spawn_agent_tool_v2(options: SpawnAgentToolOptions) -> ToolSpec {
     let available_models_description = (!options.hide_agent_type_model_reasoning)
-        .then(|| spawn_agent_models_description(options.available_models));
+        .then(|| spawn_agent_models_description(&options.available_models));
     let mut properties = spawn_agent_common_properties_v2(&options.agent_type_description);
     if options.hide_agent_type_model_reasoning {
         hide_spawn_agent_metadata_options(&mut properties);
diff --git a/codex-rs/core/src/tools/handlers/multi_agents_spec_tests.rs b/codex-rs/core/src/tools/handlers/multi_agents_spec_tests.rs
index dcba73eadacf..c8fa1a0f900a 100644
--- a/codex-rs/core/src/tools/handlers/multi_agents_spec_tests.rs
+++ b/codex-rs/core/src/tools/handlers/multi_agents_spec_tests.rs
@@ -33,7 +33,7 @@ fn model_preset(id: &str, show_in_picker: bool) -> ModelPreset {
 #[test]
 fn spawn_agent_tool_v2_requires_task_name_and_lists_visible_models() {
     let tool = create_spawn_agent_tool_v2(SpawnAgentToolOptions {
-        available_models: &[
+        available_models: vec![
             model_preset("visible", /*show_in_picker*/ true),
             model_preset("hidden", /*show_in_picker*/ false),
         ],
@@ -99,7 +99,7 @@ fn spawn_agent_tool_v2_requires_task_name_and_lists_visible_models() {
 #[test]
 fn spawn_agent_tool_v1_keeps_legacy_fork_context_field() {
     let tool = create_spawn_agent_tool_v1(SpawnAgentToolOptions {
-        available_models: &[],
+        available_models: Vec::new(),
         agent_type_description: "role help".to_string(),
         hide_agent_type_model_reasoning: false,
         include_usage_hint: true,
diff --git a/codex-rs/core/src/tools/handlers/multi_agents_tests.rs b/codex-rs/core/src/tools/handlers/multi_agents_tests.rs
index 6f44673f13f3..43503be8c170 100644
--- a/codex-rs/core/src/tools/handlers/multi_agents_tests.rs
+++ b/codex-rs/core/src/tools/handlers/multi_agents_tests.rs
@@ -180,7 +180,7 @@ async fn handler_rejects_non_function_payloads() {
             input: "hello".to_string(),
         },
     );
-    let Err(err) = SpawnAgentHandler.handle(invocation).await else {
+    let Err(err) = SpawnAgentHandler::default().handle(invocation).await else {
         panic!("payload should be rejected");
     };
     assert_eq!(
@@ -200,7 +200,7 @@ async fn spawn_agent_rejects_empty_message() {
         "spawn_agent",
         function_payload(json!({"message": "   "})),
     );
-    let Err(err) = SpawnAgentHandler.handle(invocation).await else {
+    let Err(err) = SpawnAgentHandler::default().handle(invocation).await else {
         panic!("empty message should be rejected");
     };
     assert_eq!(
@@ -221,7 +221,7 @@ async fn spawn_agent_rejects_when_message_and_items_are_both_set() {
             "items": [{"type": "mention", "name": "drive", "path": "app://drive"}]
         })),
     );
-    let Err(err) = SpawnAgentHandler.handle(invocation).await else {
+    let Err(err) = SpawnAgentHandler::default().handle(invocation).await else {
         panic!("message+items should be rejected");
     };
     assert_eq!(
@@ -268,7 +268,7 @@ async fn spawn_agent_uses_explorer_role_and_preserves_approval_policy() {
             "agent_type": "explorer"
         })),
     );
-    let output = SpawnAgentHandler
+    let output = SpawnAgentHandler::default()
         .handle(invocation)
         .await
         .expect("spawn_agent should succeed");
@@ -303,7 +303,7 @@ async fn spawn_agent_fork_context_rejects_agent_type_override() {
         .expect("root thread should start");
     session.services.agent_control = manager.agent_control();
     session.conversation_id = root.thread_id;
-    let err = SpawnAgentHandler
+    let err = SpawnAgentHandler::default()
         .handle(invocation(
             Arc::new(session),
             Arc::new(turn),
@@ -336,7 +336,7 @@ async fn spawn_agent_fork_context_rejects_child_model_overrides() {
     session.services.agent_control = manager.agent_control();
     session.conversation_id = root.thread_id;
 
-    let err = SpawnAgentHandler
+    let err = SpawnAgentHandler::default()
         .handle(invocation(
             Arc::new(session),
             Arc::new(turn),
@@ -380,7 +380,7 @@ async fn multi_agent_v2_spawn_fork_turns_all_rejects_agent_type_override() {
         ..turn
     };
 
-    let err = SpawnAgentHandlerV2
+    let err = SpawnAgentHandlerV2::default()
         .handle(invocation(
             Arc::new(session),
             Arc::new(turn),
@@ -420,7 +420,7 @@ async fn multi_agent_v2_spawn_defaults_to_full_fork_and_rejects_child_model_over
         .expect("test config should allow feature update");
     turn.config = Arc::new(config);
 
-    let err = SpawnAgentHandlerV2
+    let err = SpawnAgentHandlerV2::default()
         .handle(invocation(
             Arc::new(session),
             Arc::new(turn),
@@ -464,7 +464,7 @@ async fn multi_agent_v2_spawn_partial_fork_turns_allows_agent_type_override() {
         ..turn
     };
 
-    let output = SpawnAgentHandlerV2
+    let output = SpawnAgentHandlerV2::default()
         .handle(invocation(
             Arc::new(session),
             Arc::new(turn),
@@ -506,7 +506,7 @@ async fn spawn_agent_returns_agent_id_without_task_name() {
     let manager = thread_manager();
     session.services.agent_control = manager.agent_control();
 
-    let output = SpawnAgentHandler
+    let output = SpawnAgentHandler::default()
         .handle(invocation(
             Arc::new(session),
             Arc::new(turn),
@@ -552,7 +552,7 @@ async fn multi_agent_v2_spawn_requires_task_name() {
             "message": "inspect this repo"
         })),
     );
-    let Err(err) = SpawnAgentHandlerV2.handle(invocation).await else {
+    let Err(err) = SpawnAgentHandlerV2::default().handle(invocation).await else {
         panic!("missing task_name should be rejected");
     };
     let FunctionCallError::RespondToModel(message) = err else {
@@ -588,7 +588,7 @@ async fn multi_agent_v2_spawn_rejects_legacy_items_field() {
             "task_name": "worker"
         })),
     );
-    let Err(err) = SpawnAgentHandlerV2.handle(invocation).await else {
+    let Err(err) = SpawnAgentHandlerV2::default().handle(invocation).await else {
         panic!("legacy items field should be rejected");
     };
     let FunctionCallError::RespondToModel(message) = err else {
@@ -606,7 +606,7 @@ async fn spawn_agent_errors_when_manager_dropped() {
         "spawn_agent",
         function_payload(json!({"message": "hello"})),
     );
-    let Err(err) = SpawnAgentHandler.handle(invocation).await else {
+    let Err(err) = SpawnAgentHandler::default().handle(invocation).await else {
         panic!("spawn should fail without a manager");
     };
     assert_eq!(
@@ -640,7 +640,7 @@ async fn multi_agent_v2_spawn_returns_path_and_send_message_accepts_relative_pat
 
     let session = Arc::new(session);
     let turn = Arc::new(turn);
-    let spawn_output = SpawnAgentHandlerV2
+    let spawn_output = SpawnAgentHandlerV2::default()
         .handle(invocation(
             session.clone(),
             turn.clone(),
@@ -735,7 +735,7 @@ async fn multi_agent_v2_spawn_rejects_legacy_fork_context() {
         .expect("test config should allow feature update");
     turn.config = Arc::new(config);
 
-    let err = SpawnAgentHandlerV2
+    let err = SpawnAgentHandlerV2::default()
         .handle(invocation(
             Arc::new(session),
             Arc::new(turn),
@@ -774,7 +774,7 @@ async fn multi_agent_v2_spawn_rejects_invalid_fork_turns_string() {
         .expect("test config should allow feature update");
     turn.config = Arc::new(config);
 
-    let err = SpawnAgentHandlerV2
+    let err = SpawnAgentHandlerV2::default()
         .handle(invocation(
             Arc::new(session),
             Arc::new(turn),
@@ -813,7 +813,7 @@ async fn multi_agent_v2_spawn_rejects_zero_fork_turns() {
         .expect("test config should allow feature update");
     turn.config = Arc::new(config);
 
-    let err = SpawnAgentHandlerV2
+    let err = SpawnAgentHandlerV2::default()
         .handle(invocation(
             Arc::new(session),
             Arc::new(turn),
@@ -1008,7 +1008,7 @@ async fn multi_agent_v2_list_agents_returns_completed_status_and_last_task_messa
 
     let session = Arc::new(session);
     let turn = Arc::new(turn);
-    let spawn_output = SpawnAgentHandlerV2
+    let spawn_output = SpawnAgentHandlerV2::default()
         .handle(invocation(
             session.clone(),
             turn.clone(),
@@ -1189,7 +1189,7 @@ async fn multi_agent_v2_list_agents_omits_closed_agents() {
 
     let session = Arc::new(session);
     let turn = Arc::new(turn);
-    let spawn_output = SpawnAgentHandlerV2
+    let spawn_output = SpawnAgentHandlerV2::default()
         .handle(invocation(
             session.clone(),
             turn.clone(),
@@ -1253,7 +1253,7 @@ async fn multi_agent_v2_send_message_rejects_legacy_items_field() {
     let session = Arc::new(session);
     let turn = Arc::new(turn);
 
-    SpawnAgentHandlerV2
+    SpawnAgentHandlerV2::default()
         .handle(invocation(
             session.clone(),
             turn.clone(),
@@ -1309,7 +1309,7 @@ async fn multi_agent_v2_send_message_rejects_interrupt_parameter() {
     let session = Arc::new(session);
     let turn = Arc::new(turn);
 
-    SpawnAgentHandlerV2
+    SpawnAgentHandlerV2::default()
         .handle(invocation(
             session.clone(),
             turn.clone(),
@@ -1382,7 +1382,7 @@ async fn multi_agent_v2_followup_task_completion_notifies_parent_on_every_turn()
     let session = Arc::new(session);
     let turn = Arc::new(turn);
 
-    SpawnAgentHandlerV2
+    SpawnAgentHandlerV2::default()
         .handle(invocation(
             session.clone(),
             turn.clone(),
@@ -1517,7 +1517,7 @@ async fn multi_agent_v2_followup_task_rejects_legacy_items_field() {
     let session = Arc::new(session);
     let turn = Arc::new(turn);
 
-    SpawnAgentHandlerV2
+    SpawnAgentHandlerV2::default()
         .handle(invocation(
             session.clone(),
             turn.clone(),
@@ -1570,7 +1570,7 @@ async fn multi_agent_v2_interrupted_turn_does_not_notify_parent() {
     let session = Arc::new(session);
     let turn = Arc::new(turn);
 
-    SpawnAgentHandlerV2
+    SpawnAgentHandlerV2::default()
         .handle(invocation(
             session.clone(),
             turn.clone(),
@@ -1648,7 +1648,7 @@ async fn multi_agent_v2_spawn_omits_agent_id_when_named() {
         .expect("test config should allow feature update");
     turn.config = Arc::new(config);
 
-    let output = SpawnAgentHandlerV2
+    let output = SpawnAgentHandlerV2::default()
         .handle(invocation(
             Arc::new(session),
             Arc::new(turn),
@@ -1696,7 +1696,7 @@ async fn multi_agent_v2_spawn_surfaces_task_name_validation_errors() {
             "task_name": "BadName"
         })),
     );
-    let Err(err) = SpawnAgentHandlerV2.handle(invocation).await else {
+    let Err(err) = SpawnAgentHandlerV2::default().handle(invocation).await else {
         panic!("invalid agent name should be rejected");
     };
     assert_eq!(
@@ -1754,7 +1754,7 @@ async fn spawn_agent_reapplies_runtime_sandbox_after_role_config() {
             "agent_type": "explorer"
         })),
     );
-    let output = SpawnAgentHandler
+    let output = SpawnAgentHandler::default()
         .handle(invocation)
         .await
         .expect("spawn_agent should succeed");
@@ -1815,7 +1815,7 @@ async fn spawn_agent_rejects_when_depth_limit_exceeded() {
         "spawn_agent",
         function_payload(json!({"message": "hello"})),
     );
-    let Err(err) = SpawnAgentHandler.handle(invocation).await else {
+    let Err(err) = SpawnAgentHandler::default().handle(invocation).await else {
         panic!("spawn should fail when depth limit exceeded");
     };
     assert_eq!(
@@ -1855,7 +1855,7 @@ async fn spawn_agent_allows_depth_up_to_configured_max_depth() {
         "spawn_agent",
         function_payload(json!({"message": "hello"})),
     );
-    let output = SpawnAgentHandler
+    let output = SpawnAgentHandler::default()
         .handle(invocation)
         .await
         .expect("spawn should succeed within configured depth");
@@ -1914,7 +1914,7 @@ async fn multi_agent_v2_spawn_agent_ignores_configured_max_depth() {
             "fork_turns": "none"
         })),
     );
-    let output = SpawnAgentHandlerV2
+    let output = SpawnAgentHandlerV2::default()
         .handle(invocation)
         .await
         .expect("multi-agent v2 spawn should ignore max depth");
@@ -2306,7 +2306,7 @@ async fn wait_agent_rejects_non_positive_timeout() {
             "timeout_ms": 0
         })),
     );
-    let Err(err) = WaitAgentHandler.handle(invocation).await else {
+    let Err(err) = WaitAgentHandler::default().handle(invocation).await else {
         panic!("non-positive timeout should be rejected");
     };
     assert_eq!(
@@ -2324,7 +2324,7 @@ async fn wait_agent_rejects_invalid_target() {
         "wait_agent",
         function_payload(json!({"targets": ["invalid"]})),
     );
-    let Err(err) = WaitAgentHandler.handle(invocation).await else {
+    let Err(err) = WaitAgentHandler::default().handle(invocation).await else {
         panic!("invalid id should be rejected");
     };
     let FunctionCallError::RespondToModel(msg) = err else {
@@ -2342,7 +2342,7 @@ async fn wait_agent_rejects_empty_targets() {
         "wait_agent",
         function_payload(json!({"targets": []})),
     );
-    let Err(err) = WaitAgentHandler.handle(invocation).await else {
+    let Err(err) = WaitAgentHandler::default().handle(invocation).await else {
         panic!("empty ids should be rejected");
     };
     assert_eq!(
@@ -2370,7 +2370,7 @@ async fn multi_agent_v2_wait_agent_accepts_timeout_only_argument() {
     let session = Arc::new(session);
     let turn = Arc::new(turn);
 
-    SpawnAgentHandlerV2
+    SpawnAgentHandlerV2::default()
         .handle(invocation(
             session.clone(),
             turn.clone(),
@@ -2400,7 +2400,7 @@ async fn multi_agent_v2_wait_agent_accepts_timeout_only_argument() {
         let session = session.clone();
         let turn = turn.clone();
         async move {
-            WaitAgentHandlerV2
+            WaitAgentHandlerV2::default()
                 .handle(invocation(
                     session,
                     turn,
@@ -2452,7 +2452,7 @@ async fn multi_agent_v2_wait_agent_uses_configured_min_timeout() {
 
     let early = timeout(
         Duration::from_millis(/*millis*/ 20),
-        WaitAgentHandlerV2.handle(invocation(
+        WaitAgentHandlerV2::default().handle(invocation(
             session.clone(),
             turn.clone(),
             "wait_agent",
@@ -2467,7 +2467,7 @@ async fn multi_agent_v2_wait_agent_uses_configured_min_timeout() {
 
     let output = timeout(
         Duration::from_secs(/*secs*/ 1),
-        WaitAgentHandlerV2.handle(invocation(
+        WaitAgentHandlerV2::default().handle(invocation(
             session,
             turn,
             "wait_agent",
@@ -2506,7 +2506,7 @@ async fn wait_agent_returns_not_found_for_missing_agents() {
             "timeout_ms": 1000
         })),
     );
-    let output = WaitAgentHandler
+    let output = WaitAgentHandler::default()
         .handle(invocation)
         .await
         .expect("wait_agent should succeed");
@@ -2546,7 +2546,7 @@ async fn wait_agent_times_out_when_status_is_not_final() {
             "timeout_ms": MIN_WAIT_TIMEOUT_MS
         })),
     );
-    let output = WaitAgentHandler
+    let output = WaitAgentHandler::default()
         .handle(invocation)
         .await
         .expect("wait_agent should succeed");
@@ -2592,7 +2592,7 @@ async fn wait_agent_clamps_short_timeouts_to_minimum() {
 
     let early = timeout(
         Duration::from_millis(50),
-        WaitAgentHandler.handle(invocation),
+        WaitAgentHandler::default().handle(invocation),
     )
     .await;
     assert!(
@@ -2642,7 +2642,7 @@ async fn wait_agent_returns_final_status_without_timeout() {
             "timeout_ms": 1000
         })),
     );
-    let output = WaitAgentHandler
+    let output = WaitAgentHandler::default()
         .handle(invocation)
         .await
         .expect("wait_agent should succeed");
@@ -2678,7 +2678,7 @@ async fn multi_agent_v2_wait_agent_returns_summary_for_mailbox_activity() {
 
     let session = Arc::new(session);
     let turn = Arc::new(turn);
-    let spawn_output = SpawnAgentHandlerV2
+    let spawn_output = SpawnAgentHandlerV2::default()
         .handle(invocation(
             session.clone(),
             turn.clone(),
@@ -2713,7 +2713,7 @@ async fn multi_agent_v2_wait_agent_returns_summary_for_mailbox_activity() {
         let session = session.clone();
         let turn = turn.clone();
         async move {
-            WaitAgentHandlerV2
+            WaitAgentHandlerV2::default()
                 .handle(invocation(
                     session,
                     turn,
@@ -2769,7 +2769,7 @@ async fn multi_agent_v2_wait_agent_returns_for_already_queued_mail() {
     let session = Arc::new(session);
     let turn = Arc::new(turn);
 
-    SpawnAgentHandlerV2
+    SpawnAgentHandlerV2::default()
         .handle(invocation(
             session.clone(),
             turn.clone(),
@@ -2805,7 +2805,7 @@ async fn multi_agent_v2_wait_agent_returns_for_already_queued_mail() {
 
     let output = timeout(
         Duration::from_millis(500),
-        WaitAgentHandlerV2.handle(invocation(
+        WaitAgentHandlerV2::default().handle(invocation(
             session,
             turn,
             "wait_agent",
@@ -2848,7 +2848,7 @@ async fn multi_agent_v2_wait_agent_wakes_on_any_mailbox_notification() {
     let turn = Arc::new(turn);
 
     for task_name in ["worker_a", "worker_b"] {
-        SpawnAgentHandlerV2
+        SpawnAgentHandlerV2::default()
             .handle(invocation(
                 session.clone(),
                 turn.clone(),
@@ -2879,7 +2879,7 @@ async fn multi_agent_v2_wait_agent_wakes_on_any_mailbox_notification() {
         let session = session.clone();
         let turn = turn.clone();
         async move {
-            WaitAgentHandlerV2
+            WaitAgentHandlerV2::default()
                 .handle(invocation(
                     session,
                     turn,
@@ -2935,7 +2935,7 @@ async fn multi_agent_v2_wait_agent_does_not_return_completed_content() {
     let session = Arc::new(session);
     let turn = Arc::new(turn);
 
-    SpawnAgentHandlerV2
+    SpawnAgentHandlerV2::default()
         .handle(invocation(
             session.clone(),
             turn.clone(),
@@ -2964,7 +2964,7 @@ async fn multi_agent_v2_wait_agent_does_not_return_completed_content() {
         let session = session.clone();
         let turn = turn.clone();
         async move {
-            WaitAgentHandlerV2
+            WaitAgentHandlerV2::default()
                 .handle(invocation(
                     session,
                     turn,
@@ -3021,7 +3021,7 @@ async fn multi_agent_v2_close_agent_accepts_task_name_target() {
 
     let session = Arc::new(session);
     let turn = Arc::new(turn);
-    SpawnAgentHandlerV2
+    SpawnAgentHandlerV2::default()
         .handle(invocation(
             session.clone(),
             turn.clone(),
@@ -3176,7 +3176,7 @@ async fn tool_handlers_cascade_close_and_resume_and_keep_explicitly_closed_subtr
     let parent_thread_id = parent.thread_id;
     let parent_session = parent.thread.codex.session.clone();
 
-    let child_spawn_output = SpawnAgentHandler
+    let child_spawn_output = SpawnAgentHandler::default()
         .handle(invocation(
             parent_session.clone(),
             parent_session.new_default_turn().await,
@@ -3201,7 +3201,7 @@ async fn tool_handlers_cascade_close_and_resume_and_keep_explicitly_closed_subtr
         .await
         .expect("child thread should exist");
     let child_session = child_thread.codex.session.clone();
-    let grandchild_spawn_output = SpawnAgentHandler
+    let grandchild_spawn_output = SpawnAgentHandler::default()
         .handle(invocation(
             child_session.clone(),
             child_session.new_default_turn().await,
diff --git a/codex-rs/core/src/tools/handlers/multi_agents_v2/close_agent.rs b/codex-rs/core/src/tools/handlers/multi_agents_v2/close_agent.rs
index f09bc7f3439a..d3a290d3631f 100644
--- a/codex-rs/core/src/tools/handlers/multi_agents_v2/close_agent.rs
+++ b/codex-rs/core/src/tools/handlers/multi_agents_v2/close_agent.rs
@@ -1,5 +1,7 @@
 use super::*;
+use crate::tools::handlers::multi_agents_spec::create_close_agent_tool_v2;
 use crate::turn_timing::now_unix_timestamp_ms;
+use codex_tools::ToolSpec;
 
 pub(crate) struct Handler;
 
@@ -10,6 +12,10 @@ impl ToolHandler for Handler {
         ToolName::plain("close_agent")
     }
 
+    fn spec(&self) -> Option<ToolSpec> {
+        Some(create_close_agent_tool_v2())
+    }
+
     fn kind(&self) -> ToolKind {
         ToolKind::Function
     }
diff --git a/codex-rs/core/src/tools/handlers/multi_agents_v2/followup_task.rs b/codex-rs/core/src/tools/handlers/multi_agents_v2/followup_task.rs
index a5dfcb09ddf0..147d238b7ecd 100644
--- a/codex-rs/core/src/tools/handlers/multi_agents_v2/followup_task.rs
+++ b/codex-rs/core/src/tools/handlers/multi_agents_v2/followup_task.rs
@@ -3,6 +3,8 @@ use super::message_tool::MessageDeliveryMode;
 use super::message_tool::handle_message_string_tool;
 use super::*;
 use crate::tools::context::FunctionToolOutput;
+use crate::tools::handlers::multi_agents_spec::create_followup_task_tool;
+use codex_tools::ToolSpec;
 
 pub(crate) struct Handler;
 
@@ -13,6 +15,10 @@ impl ToolHandler for Handler {
         ToolName::plain("followup_task")
     }
 
+    fn spec(&self) -> Option<ToolSpec> {
+        Some(create_followup_task_tool())
+    }
+
     fn kind(&self) -> ToolKind {
         ToolKind::Function
     }
diff --git a/codex-rs/core/src/tools/handlers/multi_agents_v2/list_agents.rs b/codex-rs/core/src/tools/handlers/multi_agents_v2/list_agents.rs
index dabfe72a7dae..37365f2a5d9f 100644
--- a/codex-rs/core/src/tools/handlers/multi_agents_v2/list_agents.rs
+++ b/codex-rs/core/src/tools/handlers/multi_agents_v2/list_agents.rs
@@ -1,5 +1,7 @@
 use super::*;
 use crate::agent::control::ListedAgent;
+use crate::tools::handlers::multi_agents_spec::create_list_agents_tool;
+use codex_tools::ToolSpec;
 
 pub(crate) struct Handler;
 
@@ -10,6 +12,10 @@ impl ToolHandler for Handler {
         ToolName::plain("list_agents")
     }
 
+    fn spec(&self) -> Option<ToolSpec> {
+        Some(create_list_agents_tool())
+    }
+
     fn kind(&self) -> ToolKind {
         ToolKind::Function
     }
diff --git a/codex-rs/core/src/tools/handlers/multi_agents_v2/send_message.rs b/codex-rs/core/src/tools/handlers/multi_agents_v2/send_message.rs
index e814c69f5f68..38a0cc3ab865 100644
--- a/codex-rs/core/src/tools/handlers/multi_agents_v2/send_message.rs
+++ b/codex-rs/core/src/tools/handlers/multi_agents_v2/send_message.rs
@@ -3,6 +3,8 @@ use super::message_tool::SendMessageArgs;
 use super::message_tool::handle_message_string_tool;
 use super::*;
 use crate::tools::context::FunctionToolOutput;
+use crate::tools::handlers::multi_agents_spec::create_send_message_tool;
+use codex_tools::ToolSpec;
 
 pub(crate) struct Handler;
 
@@ -13,6 +15,10 @@ impl ToolHandler for Handler {
         ToolName::plain("send_message")
     }
 
+    fn spec(&self) -> Option<ToolSpec> {
+        Some(create_send_message_tool())
+    }
+
     fn kind(&self) -> ToolKind {
         ToolKind::Function
     }
diff --git a/codex-rs/core/src/tools/handlers/multi_agents_v2/spawn.rs b/codex-rs/core/src/tools/handlers/multi_agents_v2/spawn.rs
index 8f09dbcaf2dc..fc44d3df4716 100644
--- a/codex-rs/core/src/tools/handlers/multi_agents_v2/spawn.rs
+++ b/codex-rs/core/src/tools/handlers/multi_agents_v2/spawn.rs
@@ -5,12 +5,24 @@ use crate::agent::control::render_input_preview;
 use crate::agent::next_thread_spawn_depth;
 use crate::agent::role::DEFAULT_ROLE_NAME;
 use crate::agent::role::apply_role_to_config;
+use crate::tools::handlers::multi_agents_spec::SpawnAgentToolOptions;
+use crate::tools::handlers::multi_agents_spec::create_spawn_agent_tool_v2;
 use crate::turn_timing::now_unix_timestamp_ms;
 use codex_protocol::AgentPath;
 use codex_protocol::protocol::InterAgentCommunication;
 use codex_protocol::protocol::Op;
+use codex_tools::ToolSpec;
 
-pub(crate) struct Handler;
+#[derive(Default)]
+pub(crate) struct Handler {
+    options: SpawnAgentToolOptions,
+}
+
+impl Handler {
+    pub(crate) fn new(options: SpawnAgentToolOptions) -> Self {
+        Self { options }
+    }
+}
 
 impl ToolHandler for Handler {
     type Output = SpawnAgentResult;
@@ -19,6 +31,10 @@ impl ToolHandler for Handler {
         ToolName::plain("spawn_agent")
     }
 
+    fn spec(&self) -> Option<ToolSpec> {
+        Some(create_spawn_agent_tool_v2(self.options.clone()))
+    }
+
     fn kind(&self) -> ToolKind {
         ToolKind::Function
     }
diff --git a/codex-rs/core/src/tools/handlers/multi_agents_v2/wait.rs b/codex-rs/core/src/tools/handlers/multi_agents_v2/wait.rs
index 706c0ad6acbd..d5fbe49c7ee0 100644
--- a/codex-rs/core/src/tools/handlers/multi_agents_v2/wait.rs
+++ b/codex-rs/core/src/tools/handlers/multi_agents_v2/wait.rs
@@ -1,11 +1,23 @@
 use super::*;
+use crate::tools::handlers::multi_agents_spec::WaitAgentTimeoutOptions;
+use crate::tools::handlers::multi_agents_spec::create_wait_agent_tool_v2;
 use crate::turn_timing::now_unix_timestamp_ms;
+use codex_tools::ToolSpec;
 use std::collections::HashMap;
 use std::time::Duration;
 use tokio::time::Instant;
 use tokio::time::timeout_at;
 
-pub(crate) struct Handler;
+#[derive(Default)]
+pub(crate) struct Handler {
+    options: WaitAgentTimeoutOptions,
+}
+
+impl Handler {
+    pub(crate) fn new(options: WaitAgentTimeoutOptions) -> Self {
+        Self { options }
+    }
+}
 
 impl ToolHandler for Handler {
     type Output = WaitAgentResult;
@@ -14,6 +26,10 @@ impl ToolHandler for Handler {
         ToolName::plain("wait_agent")
     }
 
+    fn spec(&self) -> Option<ToolSpec> {
+        Some(create_wait_agent_tool_v2(self.options))
+    }
+
     fn kind(&self) -> ToolKind {
         ToolKind::Function
     }
diff --git a/codex-rs/core/src/tools/handlers/plan.rs b/codex-rs/core/src/tools/handlers/plan.rs
index ce217f457d9a..2995fbbc257c 100644
--- a/codex-rs/core/src/tools/handlers/plan.rs
+++ b/codex-rs/core/src/tools/handlers/plan.rs
@@ -2,6 +2,7 @@ use crate::function_tool::FunctionCallError;
 use crate::tools::context::ToolInvocation;
 use crate::tools::context::ToolOutput;
 use crate::tools::context::ToolPayload;
+use crate::tools::handlers::plan_spec::create_update_plan_tool;
 use crate::tools::registry::ToolHandler;
 use crate::tools::registry::ToolKind;
 use codex_protocol::config_types::ModeKind;
@@ -10,6 +11,7 @@ use codex_protocol::models::ResponseInputItem;
 use codex_protocol::plan_tool::UpdatePlanArgs;
 use codex_protocol::protocol::EventMsg;
 use codex_tools::ToolName;
+use codex_tools::ToolSpec;
 use serde_json::Value as JsonValue;
 
 pub struct PlanHandler;
@@ -49,6 +51,10 @@ impl ToolHandler for PlanHandler {
         ToolName::plain("update_plan")
     }
 
+    fn spec(&self) -> Option<ToolSpec> {
+        Some(create_update_plan_tool())
+    }
+
     fn kind(&self) -> ToolKind {
         ToolKind::Function
     }
diff --git a/codex-rs/core/src/tools/handlers/request_permissions.rs b/codex-rs/core/src/tools/handlers/request_permissions.rs
index 7b49ec5803d8..01d182057827 100644
--- a/codex-rs/core/src/tools/handlers/request_permissions.rs
+++ b/codex-rs/core/src/tools/handlers/request_permissions.rs
@@ -6,9 +6,12 @@ use crate::tools::context::FunctionToolOutput;
 use crate::tools::context::ToolInvocation;
 use crate::tools::context::ToolPayload;
 use crate::tools::handlers::parse_arguments_with_base_path;
+use crate::tools::handlers::shell_spec::create_request_permissions_tool;
+use crate::tools::handlers::shell_spec::request_permissions_tool_description;
 use crate::tools::registry::ToolHandler;
 use crate::tools::registry::ToolKind;
 use codex_tools::ToolName;
+use codex_tools::ToolSpec;
 
 pub struct RequestPermissionsHandler;
 
@@ -19,6 +22,12 @@ impl ToolHandler for RequestPermissionsHandler {
         ToolName::plain("request_permissions")
     }
 
+    fn spec(&self) -> Option<ToolSpec> {
+        Some(create_request_permissions_tool(
+            request_permissions_tool_description(),
+        ))
+    }
+
     fn kind(&self) -> ToolKind {
         ToolKind::Function
     }
diff --git a/codex-rs/core/src/tools/handlers/request_plugin_install.rs b/codex-rs/core/src/tools/handlers/request_plugin_install.rs
index 879a8955b496..7a9ace3848e2 100644
--- a/codex-rs/core/src/tools/handlers/request_plugin_install.rs
+++ b/codex-rs/core/src/tools/handlers/request_plugin_install.rs
@@ -12,10 +12,13 @@ use codex_tools::REQUEST_PLUGIN_INSTALL_PERSIST_ALWAYS_VALUE;
 use codex_tools::REQUEST_PLUGIN_INSTALL_PERSIST_KEY;
 use codex_tools::REQUEST_PLUGIN_INSTALL_TOOL_NAME;
 use codex_tools::RequestPluginInstallArgs;
+use codex_tools::RequestPluginInstallEntry;
 use codex_tools::RequestPluginInstallResult;
 use codex_tools::ToolName;
+use codex_tools::ToolSpec;
 use codex_tools::all_requested_connectors_picked_up;
 use codex_tools::build_request_plugin_install_elicitation_request;
+use codex_tools::collect_request_plugin_install_entries;
 use codex_tools::filter_request_plugin_install_discoverable_tools_for_client;
 use codex_tools::verified_connector_install_completed;
 use rmcp::model::RequestId;
@@ -30,10 +33,22 @@ use crate::tools::context::FunctionToolOutput;
 use crate::tools::context::ToolInvocation;
 use crate::tools::context::ToolPayload;
 use crate::tools::handlers::parse_arguments;
+use crate::tools::handlers::request_plugin_install_spec::create_request_plugin_install_tool;
 use crate::tools::registry::ToolHandler;
 use crate::tools::registry::ToolKind;
 
-pub struct RequestPluginInstallHandler;
+#[derive(Default)]
+pub struct RequestPluginInstallHandler {
+    discoverable_tools: Vec<RequestPluginInstallEntry>,
+}
+
+impl RequestPluginInstallHandler {
+    pub(crate) fn new(discoverable_tools: &[DiscoverableTool]) -> Self {
+        Self {
+            discoverable_tools: collect_request_plugin_install_entries(discoverable_tools),
+        }
+    }
+}
 
 impl ToolHandler for RequestPluginInstallHandler {
     type Output = FunctionToolOutput;
@@ -42,6 +57,14 @@ impl ToolHandler for RequestPluginInstallHandler {
         ToolName::plain(REQUEST_PLUGIN_INSTALL_TOOL_NAME)
     }
 
+    fn spec(&self) -> Option<ToolSpec> {
+        Some(create_request_plugin_install_tool(&self.discoverable_tools))
+    }
+
+    fn supports_parallel_tool_calls(&self) -> bool {
+        true
+    }
+
     fn kind(&self) -> ToolKind {
         ToolKind::Function
     }
diff --git a/codex-rs/core/src/tools/handlers/request_user_input.rs b/codex-rs/core/src/tools/handlers/request_user_input.rs
index a30fe9a07459..6d262348582a 100644
--- a/codex-rs/core/src/tools/handlers/request_user_input.rs
+++ b/codex-rs/core/src/tools/handlers/request_user_input.rs
@@ -4,13 +4,16 @@ use crate::tools::context::ToolInvocation;
 use crate::tools::context::ToolPayload;
 use crate::tools::handlers::parse_arguments;
 use crate::tools::handlers::request_user_input_spec::REQUEST_USER_INPUT_TOOL_NAME;
+use crate::tools::handlers::request_user_input_spec::create_request_user_input_tool;
 use crate::tools::handlers::request_user_input_spec::normalize_request_user_input_args;
+use crate::tools::handlers::request_user_input_spec::request_user_input_tool_description;
 use crate::tools::handlers::request_user_input_spec::request_user_input_unavailable_message;
 use crate::tools::registry::ToolHandler;
 use crate::tools::registry::ToolKind;
 use codex_protocol::config_types::ModeKind;
 use codex_protocol::request_user_input::RequestUserInputArgs;
 use codex_tools::ToolName;
+use codex_tools::ToolSpec;
 
 pub struct RequestUserInputHandler {
     pub available_modes: Vec<ModeKind>,
@@ -23,6 +26,12 @@ impl ToolHandler for RequestUserInputHandler {
         ToolName::plain(REQUEST_USER_INPUT_TOOL_NAME)
     }
 
+    fn spec(&self) -> Option<ToolSpec> {
+        Some(create_request_user_input_tool(
+            request_user_input_tool_description(&self.available_modes),
+        ))
+    }
+
     fn kind(&self) -> ToolKind {
         ToolKind::Function
     }
diff --git a/codex-rs/core/src/tools/handlers/shell.rs b/codex-rs/core/src/tools/handlers/shell.rs
index a0d744305e81..f6960bca41d5 100644
--- a/codex-rs/core/src/tools/handlers/shell.rs
+++ b/codex-rs/core/src/tools/handlers/shell.rs
@@ -38,6 +38,7 @@ mod shell_handler;
 pub use container_exec::ContainerExecHandler;
 pub use local_shell::LocalShellHandler;
 pub use shell_command::ShellCommandHandler;
+pub(crate) use shell_command::ShellCommandHandlerOptions;
 pub use shell_handler::ShellHandler;
 
 fn shell_function_payload_command(payload: &ToolPayload) -> Option<String> {
diff --git a/codex-rs/core/src/tools/handlers/shell/local_shell.rs b/codex-rs/core/src/tools/handlers/shell/local_shell.rs
index bdb70e936842..1a75fb998ec7 100644
--- a/codex-rs/core/src/tools/handlers/shell/local_shell.rs
+++ b/codex-rs/core/src/tools/handlers/shell/local_shell.rs
@@ -12,13 +12,24 @@ use crate::tools::registry::PreToolUsePayload;
 use crate::tools::registry::ToolHandler;
 use crate::tools::registry::ToolKind;
 use crate::tools::runtimes::shell::ShellRuntimeBackend;
+use codex_tools::ToolSpec;
 
+use super::super::shell_spec::create_local_shell_tool;
 use super::RunExecLikeArgs;
 use super::local_shell_payload_command;
 use super::run_exec_like;
 use super::shell_handler::ShellHandler;
 
-pub struct LocalShellHandler;
+#[derive(Default)]
+pub struct LocalShellHandler {
+    include_spec: bool,
+}
+
+impl LocalShellHandler {
+    pub(crate) fn new() -> Self {
+        Self { include_spec: true }
+    }
+}
 
 impl ToolHandler for LocalShellHandler {
     type Output = FunctionToolOutput;
@@ -27,6 +38,14 @@ impl ToolHandler for LocalShellHandler {
         ToolName::plain("local_shell")
     }
 
+    fn spec(&self) -> Option<ToolSpec> {
+        self.include_spec.then(create_local_shell_tool)
+    }
+
+    fn supports_parallel_tool_calls(&self) -> bool {
+        self.include_spec
+    }
+
     fn kind(&self) -> ToolKind {
         ToolKind::Function
     }
diff --git a/codex-rs/core/src/tools/handlers/shell/shell_command.rs b/codex-rs/core/src/tools/handlers/shell/shell_command.rs
index 69f965b51e09..3b5e4e77e53f 100644
--- a/codex-rs/core/src/tools/handlers/shell/shell_command.rs
+++ b/codex-rs/core/src/tools/handlers/shell/shell_command.rs
@@ -23,7 +23,10 @@ use crate::tools::registry::PreToolUsePayload;
 use crate::tools::registry::ToolHandler;
 use crate::tools::registry::ToolKind;
 use crate::tools::runtimes::shell::ShellRuntimeBackend;
+use codex_tools::ToolSpec;
 
+use super::super::shell_spec::CommandToolOptions;
+use super::super::shell_spec::create_shell_command_tool;
 use super::RunExecLikeArgs;
 use super::run_exec_like;
 use super::shell_command_payload_command;
@@ -36,9 +39,24 @@ enum ShellCommandBackend {
 
 pub struct ShellCommandHandler {
     backend: ShellCommandBackend,
+    options: Option<ShellCommandHandlerOptions>,
+}
+
+#[derive(Clone, Copy)]
+pub(crate) struct ShellCommandHandlerOptions {
+    pub(crate) backend_config: ShellCommandBackendConfig,
+    pub(crate) allow_login_shell: bool,
+    pub(crate) exec_permission_approvals_enabled: bool,
 }
 
 impl ShellCommandHandler {
+    pub(crate) fn new(options: ShellCommandHandlerOptions) -> Self {
+        Self {
+            options: Some(options),
+            ..Self::from(options.backend_config)
+        }
+    }
+
     fn shell_runtime_backend(&self) -> ShellRuntimeBackend {
         match self.backend {
             ShellCommandBackend::Classic => ShellRuntimeBackend::ShellCommandClassic,
@@ -99,7 +117,10 @@ impl From<ShellCommandBackendConfig> for ShellCommandHandler {
             ShellCommandBackendConfig::Classic => ShellCommandBackend::Classic,
             ShellCommandBackendConfig::ZshFork => ShellCommandBackend::ZshFork,
         };
-        Self { backend }
+        Self {
+            backend,
+            options: None,
+        }
     }
 }
 
@@ -110,6 +131,19 @@ impl ToolHandler for ShellCommandHandler {
         ToolName::plain("shell_command")
     }
 
+    fn spec(&self) -> Option<ToolSpec> {
+        self.options.map(|options| {
+            create_shell_command_tool(CommandToolOptions {
+                allow_login_shell: options.allow_login_shell,
+                exec_permission_approvals_enabled: options.exec_permission_approvals_enabled,
+            })
+        })
+    }
+
+    fn supports_parallel_tool_calls(&self) -> bool {
+        self.options.is_some()
+    }
+
     fn kind(&self) -> ToolKind {
         ToolKind::Function
     }
diff --git a/codex-rs/core/src/tools/handlers/shell/shell_handler.rs b/codex-rs/core/src/tools/handlers/shell/shell_handler.rs
index 30220d3db0da..34ba8a2a8ecc 100644
--- a/codex-rs/core/src/tools/handlers/shell/shell_handler.rs
+++ b/codex-rs/core/src/tools/handlers/shell/shell_handler.rs
@@ -18,15 +18,27 @@ use crate::tools::registry::PreToolUsePayload;
 use crate::tools::registry::ToolHandler;
 use crate::tools::registry::ToolKind;
 use crate::tools::runtimes::shell::ShellRuntimeBackend;
+use codex_tools::ToolSpec;
 
+use super::super::shell_spec::ShellToolOptions;
+use super::super::shell_spec::create_shell_tool;
 use super::RunExecLikeArgs;
 use super::run_exec_like;
 use super::shell_function_post_tool_use_payload;
 use super::shell_function_pre_tool_use_payload;
 
-pub struct ShellHandler;
+#[derive(Default)]
+pub struct ShellHandler {
+    options: Option<ShellToolOptions>,
+}
 
 impl ShellHandler {
+    pub(crate) fn new(options: ShellToolOptions) -> Self {
+        Self {
+            options: Some(options),
+        }
+    }
+
     pub(super) fn to_exec_params(
         params: &ShellToolCallParams,
         turn_context: &TurnContext,
@@ -58,6 +70,14 @@ impl ToolHandler for ShellHandler {
         ToolName::plain("shell")
     }
 
+    fn spec(&self) -> Option<ToolSpec> {
+        self.options.map(create_shell_tool)
+    }
+
+    fn supports_parallel_tool_calls(&self) -> bool {
+        self.options.is_some()
+    }
+
     fn kind(&self) -> ToolKind {
         ToolKind::Function
     }
diff --git a/codex-rs/core/src/tools/handlers/shell_tests.rs b/codex-rs/core/src/tools/handlers/shell_tests.rs
index a7e6dae35c7c..ce97b8317e71 100644
--- a/codex-rs/core/src/tools/handlers/shell_tests.rs
+++ b/codex-rs/core/src/tools/handlers/shell_tests.rs
@@ -221,7 +221,7 @@ async fn local_shell_pre_tool_use_payload_uses_joined_command() {
         },
     };
     let (session, turn) = make_session_and_context().await;
-    let handler = LocalShellHandler;
+    let handler = LocalShellHandler::default();
 
     assert_eq!(
         handler.pre_tool_use_payload(&ToolInvocation {
diff --git a/codex-rs/core/src/tools/handlers/test_sync.rs b/codex-rs/core/src/tools/handlers/test_sync.rs
index e04400d17e5d..6254b94829d3 100644
--- a/codex-rs/core/src/tools/handlers/test_sync.rs
+++ b/codex-rs/core/src/tools/handlers/test_sync.rs
@@ -13,9 +13,11 @@ use crate::tools::context::FunctionToolOutput;
 use crate::tools::context::ToolInvocation;
 use crate::tools::context::ToolPayload;
 use crate::tools::handlers::parse_arguments;
+use crate::tools::handlers::test_sync_spec::create_test_sync_tool;
 use crate::tools::registry::ToolHandler;
 use crate::tools::registry::ToolKind;
 use codex_tools::ToolName;
+use codex_tools::ToolSpec;
 
 pub struct TestSyncHandler;
 
@@ -61,6 +63,14 @@ impl ToolHandler for TestSyncHandler {
         ToolName::plain("test_sync_tool")
     }
 
+    fn spec(&self) -> Option<ToolSpec> {
+        Some(create_test_sync_tool())
+    }
+
+    fn supports_parallel_tool_calls(&self) -> bool {
+        true
+    }
+
     fn kind(&self) -> ToolKind {
         ToolKind::Function
     }
diff --git a/codex-rs/core/src/tools/handlers/tool_search.rs b/codex-rs/core/src/tools/handlers/tool_search.rs
index bc2e727dfbb0..70410db3ae35 100644
--- a/codex-rs/core/src/tools/handlers/tool_search.rs
+++ b/codex-rs/core/src/tools/handlers/tool_search.rs
@@ -2,6 +2,7 @@ use crate::function_tool::FunctionCallError;
 use crate::tools::context::ToolInvocation;
 use crate::tools::context::ToolPayload;
 use crate::tools::context::ToolSearchOutput;
+use crate::tools::handlers::tool_search_spec::create_tool_search_tool;
 use crate::tools::registry::ToolHandler;
 use crate::tools::registry::ToolKind;
 use crate::tools::tool_search_entry::ToolSearchEntry;
@@ -13,6 +14,8 @@ use codex_tools::LoadableToolSpec;
 use codex_tools::TOOL_SEARCH_DEFAULT_LIMIT;
 use codex_tools::TOOL_SEARCH_TOOL_NAME;
 use codex_tools::ToolName;
+use codex_tools::ToolSearchSourceInfo;
+use codex_tools::ToolSpec;
 use codex_tools::coalesce_loadable_tool_specs;
 use std::collections::HashMap;
 
@@ -21,11 +24,15 @@ const COMPUTER_USE_TOOL_SEARCH_LIMIT: usize = 20;
 
 pub struct ToolSearchHandler {
     entries: Vec<ToolSearchEntry>,
+    search_source_infos: Vec<ToolSearchSourceInfo>,
     search_engine: SearchEngine<usize>,
 }
 
 impl ToolSearchHandler {
-    pub(crate) fn new(entries: Vec<ToolSearchEntry>) -> Self {
+    pub(crate) fn new(
+        entries: Vec<ToolSearchEntry>,
+        search_source_infos: Vec<ToolSearchSourceInfo>,
+    ) -> Self {
         let documents: Vec<Document<usize>> = entries
             .iter()
             .map(|entry| entry.search_text.clone())
@@ -37,6 +44,7 @@ impl ToolSearchHandler {
 
         Self {
             entries,
+            search_source_infos,
             search_engine,
         }
     }
@@ -49,6 +57,17 @@ impl ToolHandler for ToolSearchHandler {
         ToolName::plain(TOOL_SEARCH_TOOL_NAME)
     }
 
+    fn spec(&self) -> Option<ToolSpec> {
+        Some(create_tool_search_tool(
+            &self.search_source_infos,
+            TOOL_SEARCH_DEFAULT_LIMIT,
+        ))
+    }
+
+    fn supports_parallel_tool_calls(&self) -> bool {
+        true
+    }
+
     fn kind(&self) -> ToolKind {
         ToolKind::Function
     }
@@ -415,6 +434,9 @@ mod tests {
         mcp_tools: Option<&[ToolInfo]>,
         dynamic_tools: &[DynamicToolSpec],
     ) -> ToolSearchHandler {
-        ToolSearchHandler::new(build_tool_search_entries(mcp_tools, dynamic_tools))
+        ToolSearchHandler::new(
+            build_tool_search_entries(mcp_tools, dynamic_tools),
+            Vec::new(),
+        )
     }
 }
diff --git a/codex-rs/core/src/tools/handlers/unavailable_tool.rs b/codex-rs/core/src/tools/handlers/unavailable_tool.rs
index 64bb200581b5..b0a41e9fa78d 100644
--- a/codex-rs/core/src/tools/handlers/unavailable_tool.rs
+++ b/codex-rs/core/src/tools/handlers/unavailable_tool.rs
@@ -5,14 +5,26 @@ use crate::tools::context::ToolPayload;
 use crate::tools::registry::ToolHandler;
 use crate::tools::registry::ToolKind;
 use codex_tools::ToolName;
+use codex_tools::ToolSpec;
 
 pub struct UnavailableToolHandler {
     tool_name: ToolName,
+    spec: Option<ToolSpec>,
 }
 
 impl UnavailableToolHandler {
-    pub fn new(tool_name: ToolName) -> Self {
-        Self { tool_name }
+    pub fn new(tool_name: ToolName, spec: ToolSpec) -> Self {
+        Self {
+            tool_name,
+            spec: Some(spec),
+        }
+    }
+
+    pub fn without_spec(tool_name: ToolName) -> Self {
+        Self {
+            tool_name,
+            spec: None,
+        }
     }
 }
 
@@ -32,6 +44,10 @@ impl ToolHandler for UnavailableToolHandler {
         self.tool_name.clone()
     }
 
+    fn spec(&self) -> Option<ToolSpec> {
+        self.spec.clone()
+    }
+
     fn kind(&self) -> ToolKind {
         ToolKind::Function
     }
diff --git a/codex-rs/core/src/tools/handlers/unified_exec.rs b/codex-rs/core/src/tools/handlers/unified_exec.rs
index 80e85ccd474a..c97f5bb6f2d1 100644
--- a/codex-rs/core/src/tools/handlers/unified_exec.rs
+++ b/codex-rs/core/src/tools/handlers/unified_exec.rs
@@ -22,6 +22,7 @@ mod exec_command;
 mod write_stdin;
 
 pub use exec_command::ExecCommandHandler;
+pub(crate) use exec_command::ExecCommandHandlerOptions;
 pub use write_stdin::WriteStdinHandler;
 
 #[derive(Debug, Deserialize)]
diff --git a/codex-rs/core/src/tools/handlers/unified_exec/exec_command.rs b/codex-rs/core/src/tools/handlers/unified_exec/exec_command.rs
index 75ae3fea29e6..351fb2e9835e 100644
--- a/codex-rs/core/src/tools/handlers/unified_exec/exec_command.rs
+++ b/codex-rs/core/src/tools/handlers/unified_exec/exec_command.rs
@@ -27,15 +27,45 @@ use codex_otel::SessionTelemetry;
 use codex_otel::TOOL_CALL_UNIFIED_EXEC_METRIC;
 use codex_shell_command::is_safe_command::is_known_safe_command;
 use codex_tools::ToolName;
+use codex_tools::ToolSpec;
 use codex_utils_output_truncation::approx_token_count;
 
+use super::super::shell_spec::CommandToolOptions;
+use super::super::shell_spec::create_exec_command_tool_with_environment_id;
 use super::ExecCommandArgs;
 use super::ExecCommandEnvironmentArgs;
 use super::effective_max_output_tokens;
 use super::get_command;
 use super::post_unified_exec_tool_use_payload;
 
-pub struct ExecCommandHandler;
+#[derive(Clone, Copy)]
+pub(crate) struct ExecCommandHandlerOptions {
+    pub(crate) allow_login_shell: bool,
+    pub(crate) exec_permission_approvals_enabled: bool,
+    pub(crate) include_environment_id: bool,
+}
+
+pub struct ExecCommandHandler {
+    options: ExecCommandHandlerOptions,
+}
+
+impl Default for ExecCommandHandler {
+    fn default() -> Self {
+        Self {
+            options: ExecCommandHandlerOptions {
+                allow_login_shell: false,
+                exec_permission_approvals_enabled: false,
+                include_environment_id: false,
+            },
+        }
+    }
+}
+
+impl ExecCommandHandler {
+    pub(crate) fn new(options: ExecCommandHandlerOptions) -> Self {
+        Self { options }
+    }
+}
 
 impl ToolHandler for ExecCommandHandler {
     type Output = ExecCommandToolOutput;
@@ -44,6 +74,20 @@ impl ToolHandler for ExecCommandHandler {
         ToolName::plain("exec_command")
     }
 
+    fn spec(&self) -> Option<ToolSpec> {
+        Some(create_exec_command_tool_with_environment_id(
+            CommandToolOptions {
+                allow_login_shell: self.options.allow_login_shell,
+                exec_permission_approvals_enabled: self.options.exec_permission_approvals_enabled,
+            },
+            self.options.include_environment_id,
+        ))
+    }
+
+    fn supports_parallel_tool_calls(&self) -> bool {
+        true
+    }
+
     fn kind(&self) -> ToolKind {
         ToolKind::Function
     }
diff --git a/codex-rs/core/src/tools/handlers/unified_exec/write_stdin.rs b/codex-rs/core/src/tools/handlers/unified_exec/write_stdin.rs
index 1e9c68f227ff..b7be04f2a317 100644
--- a/codex-rs/core/src/tools/handlers/unified_exec/write_stdin.rs
+++ b/codex-rs/core/src/tools/handlers/unified_exec/write_stdin.rs
@@ -10,8 +10,10 @@ use crate::unified_exec::WriteStdinRequest;
 use codex_protocol::protocol::EventMsg;
 use codex_protocol::protocol::TerminalInteractionEvent;
 use codex_tools::ToolName;
+use codex_tools::ToolSpec;
 use serde::Deserialize;
 
+use super::super::shell_spec::create_write_stdin_tool;
 use super::effective_max_output_tokens;
 use super::post_unified_exec_tool_use_payload;
 
@@ -36,6 +38,10 @@ impl ToolHandler for WriteStdinHandler {
         ToolName::plain("write_stdin")
     }
 
+    fn spec(&self) -> Option<ToolSpec> {
+        Some(create_write_stdin_tool())
+    }
+
     fn kind(&self) -> ToolKind {
         ToolKind::Function
     }
diff --git a/codex-rs/core/src/tools/handlers/unified_exec_tests.rs b/codex-rs/core/src/tools/handlers/unified_exec_tests.rs
index 8818b2e3442c..02123c4b6460 100644
--- a/codex-rs/core/src/tools/handlers/unified_exec_tests.rs
+++ b/codex-rs/core/src/tools/handlers/unified_exec_tests.rs
@@ -184,7 +184,7 @@ async fn exec_command_pre_tool_use_payload_uses_raw_command() {
         arguments: serde_json::json!({ "cmd": "printf exec command" }).to_string(),
     };
     let (session, turn) = make_session_and_context().await;
-    let handler = ExecCommandHandler;
+    let handler = ExecCommandHandler::default();
 
     assert_eq!(
         handler.pre_tool_use_payload(&ToolInvocation {
@@ -244,7 +244,7 @@ async fn exec_command_post_tool_use_payload_uses_output_for_noninteractive_one_s
         hook_command: Some("echo three".to_string()),
     };
     let invocation = invocation_for_payload("exec_command", "call-43", payload).await;
-    let handler = ExecCommandHandler;
+    let handler = ExecCommandHandler::default();
     assert_eq!(
         handler.post_tool_use_payload(&invocation, &output),
         Some(crate::tools::registry::PostToolUsePayload {
@@ -273,7 +273,7 @@ async fn exec_command_post_tool_use_payload_uses_output_for_interactive_completi
         hook_command: Some("echo three".to_string()),
     };
     let invocation = invocation_for_payload("exec_command", "call-44", payload).await;
-    let handler = ExecCommandHandler;
+    let handler = ExecCommandHandler::default();
 
     assert_eq!(
         handler.post_tool_use_payload(&invocation, &output),
@@ -303,7 +303,7 @@ async fn exec_command_post_tool_use_payload_skips_running_sessions() {
         hook_command: Some("echo three".to_string()),
     };
     let invocation = invocation_for_payload("exec_command", "call-45", payload).await;
-    let handler = ExecCommandHandler;
+    let handler = ExecCommandHandler::default();
     assert_eq!(handler.post_tool_use_payload(&invocation, &output), None);
 }
 
diff --git a/codex-rs/core/src/tools/handlers/view_image.rs b/codex-rs/core/src/tools/handlers/view_image.rs
index a7cbe7d975c4..d52a8441595a 100644
--- a/codex-rs/core/src/tools/handlers/view_image.rs
+++ b/codex-rs/core/src/tools/handlers/view_image.rs
@@ -17,11 +17,32 @@ use crate::tools::context::ToolInvocation;
 use crate::tools::context::ToolOutput;
 use crate::tools::context::ToolPayload;
 use crate::tools::handlers::parse_arguments;
+use crate::tools::handlers::view_image_spec::ViewImageToolOptions;
+use crate::tools::handlers::view_image_spec::create_view_image_tool;
 use crate::tools::registry::ToolHandler;
 use crate::tools::registry::ToolKind;
 use codex_tools::ToolName;
+use codex_tools::ToolSpec;
 
-pub struct ViewImageHandler;
+pub struct ViewImageHandler {
+    options: ViewImageToolOptions,
+}
+
+impl Default for ViewImageHandler {
+    fn default() -> Self {
+        Self {
+            options: ViewImageToolOptions {
+                can_request_original_image_detail: false,
+            },
+        }
+    }
+}
+
+impl ViewImageHandler {
+    pub(crate) fn new(options: ViewImageToolOptions) -> Self {
+        Self { options }
+    }
+}
 
 const VIEW_IMAGE_UNSUPPORTED_MESSAGE: &str =
     "view_image is not allowed because you do not support image inputs";
@@ -44,6 +65,14 @@ impl ToolHandler for ViewImageHandler {
         ToolName::plain("view_image")
     }
 
+    fn spec(&self) -> Option<ToolSpec> {
+        Some(create_view_image_tool(self.options))
+    }
+
+    fn supports_parallel_tool_calls(&self) -> bool {
+        true
+    }
+
     fn kind(&self) -> ToolKind {
         ToolKind::Function
     }
diff --git a/codex-rs/core/src/tools/registry.rs b/codex-rs/core/src/tools/registry.rs
index 98e8e227aa30..c1b5854b6869 100644
--- a/codex-rs/core/src/tools/registry.rs
+++ b/codex-rs/core/src/tools/registry.rs
@@ -18,6 +18,7 @@ use crate::tools::context::ToolOutput;
 use crate::tools::context::ToolPayload;
 use crate::tools::hook_names::HookToolName;
 use crate::tools::tool_dispatch_trace::ToolDispatchTrace;
+use crate::util::error_or_panic;
 use codex_hooks::HookEvent;
 use codex_hooks::HookEventAfterToolUse;
 use codex_hooks::HookPayload;
@@ -47,6 +48,14 @@ pub trait ToolHandler: Send + Sync {
     /// The concrete tool name handled by this handler instance.
     fn tool_name(&self) -> ToolName;
 
+    fn spec(&self) -> Option<ToolSpec> {
+        None
+    }
+
+    fn supports_parallel_tool_calls(&self) -> bool {
+        false
+    }
+
     fn kind(&self) -> ToolKind;
 
     fn matches_kind(&self, payload: &ToolPayload) -> bool {
@@ -512,37 +521,26 @@ impl ToolRegistry {
 pub struct ToolRegistryBuilder {
     handlers: HashMap<ToolName, Arc<dyn AnyToolHandler>>,
     specs: Vec<ConfiguredToolSpec>,
+    code_mode_enabled: bool,
 }
 
 impl ToolRegistryBuilder {
-    pub fn new() -> Self {
+    pub fn new(code_mode_enabled: bool) -> Self {
         Self {
             handlers: HashMap::new(),
             specs: Vec::new(),
+            code_mode_enabled,
         }
     }
 
-    pub fn push_spec_with_parallel_support(
-        &mut self,
-        spec: ToolSpec,
-        supports_parallel_tool_calls: bool,
-    ) {
-        self.specs
-            .push(ConfiguredToolSpec::new(spec, supports_parallel_tool_calls));
-    }
-
-    pub(crate) fn push_spec(
-        &mut self,
-        spec: ToolSpec,
-        supports_parallel_tool_calls: bool,
-        code_mode_enabled: bool,
-    ) {
-        let spec = if code_mode_enabled {
+    pub(crate) fn push_spec(&mut self, spec: ToolSpec, supports_parallel_tool_calls: bool) {
+        let spec = if self.code_mode_enabled {
             codex_tools::augment_tool_spec_for_code_mode(spec)
         } else {
             spec
         };
-        self.push_spec_with_parallel_support(spec, supports_parallel_tool_calls);
+        self.specs
+            .push(ConfiguredToolSpec::new(spec, supports_parallel_tool_calls));
     }
 
     pub fn register_handler<H>(&mut self, handler: Arc<H>)
@@ -550,11 +548,18 @@ impl ToolRegistryBuilder {
         H: ToolHandler + 'static,
     {
         let name = handler.tool_name();
-        let display_name = name.display();
-        let handler: Arc<dyn AnyToolHandler> = handler;
-        if self.handlers.insert(name, handler).is_some() {
-            warn!("overwriting handler for tool {display_name}");
+        if self.handlers.contains_key(&name) {
+            error_or_panic(format!("handler for tool {name} already registered"));
+            return;
         }
+
+        if let Some(spec) = handler.spec() {
+            let supports_parallel_tool_calls = handler.supports_parallel_tool_calls();
+            self.push_spec(spec, supports_parallel_tool_calls);
+        }
+
+        let handler: Arc<dyn AnyToolHandler> = handler;
+        self.handlers.insert(name, handler);
     }
 
     pub(crate) fn specs(&self) -> &[ConfiguredToolSpec] {
diff --git a/codex-rs/core/src/tools/registry_tests.rs b/codex-rs/core/src/tools/registry_tests.rs
index ef7273999de1..d445b196a27e 100644
--- a/codex-rs/core/src/tools/registry_tests.rs
+++ b/codex-rs/core/src/tools/registry_tests.rs
@@ -1,4 +1,7 @@
 use super::*;
+use crate::tools::handlers::GetGoalHandler;
+use crate::tools::handlers::goal_spec::GET_GOAL_TOOL_NAME;
+use crate::tools::handlers::goal_spec::create_get_goal_tool;
 use pretty_assertions::assert_eq;
 
 struct TestHandler {
@@ -62,3 +65,18 @@ fn handler_looks_up_namespaced_aliases_explicitly() {
             .is_some_and(|handler| Arc::ptr_eq(handler, &namespaced_handler))
     );
 }
+
+#[test]
+fn register_handler_adds_handler_and_augments_specs_for_code_mode() {
+    let mut builder = ToolRegistryBuilder::new(/*code_mode_enabled*/ true);
+    builder.register_handler(Arc::new(GetGoalHandler));
+
+    let (specs, registry) = builder.build();
+
+    assert_eq!(specs.len(), 1);
+    assert_eq!(
+        specs[0].spec,
+        codex_tools::augment_tool_spec_for_code_mode(create_get_goal_tool())
+    );
+    assert!(registry.has_handler(&codex_tools::ToolName::plain(GET_GOAL_TOOL_NAME)));
+}
diff --git a/codex-rs/core/src/tools/spec.rs b/codex-rs/core/src/tools/spec.rs
index b1dfb9f865b7..a3e93f84361b 100644
--- a/codex-rs/core/src/tools/spec.rs
+++ b/codex-rs/core/src/tools/spec.rs
@@ -153,13 +153,15 @@ pub(crate) fn build_specs_with_discoverable_tools(
                 output_schema: None,
                 defer_loading: None,
             });
-            builder.push_spec(
+            builder.register_handler(Arc::new(UnavailableToolHandler::new(
+                unavailable_tool,
                 spec,
-                /*supports_parallel_tool_calls*/ false,
-                config.code_mode_enabled,
-            );
+            )));
+        } else {
+            builder.register_handler(Arc::new(UnavailableToolHandler::without_spec(
+                unavailable_tool,
+            )));
         }
-        builder.register_handler(Arc::new(UnavailableToolHandler::new(unavailable_tool)));
     }
     builder
 }
diff --git a/codex-rs/core/src/tools/spec_plan.rs b/codex-rs/core/src/tools/spec_plan.rs
index bca9d549a7c9..6445099618ef 100644
--- a/codex-rs/core/src/tools/spec_plan.rs
+++ b/codex-rs/core/src/tools/spec_plan.rs
@@ -1,5 +1,4 @@
 use crate::tools::code_mode::execute_spec::create_code_mode_tool;
-use crate::tools::code_mode::wait_spec::create_wait_tool;
 use crate::tools::handlers::ApplyPatchHandler;
 use crate::tools::handlers::CodeModeExecuteHandler;
 use crate::tools::handlers::CodeModeWaitHandler;
@@ -7,6 +6,7 @@ use crate::tools::handlers::ContainerExecHandler;
 use crate::tools::handlers::CreateGoalHandler;
 use crate::tools::handlers::DynamicToolHandler;
 use crate::tools::handlers::ExecCommandHandler;
+use crate::tools::handlers::ExecCommandHandlerOptions;
 use crate::tools::handlers::GetGoalHandler;
 use crate::tools::handlers::ListMcpResourceTemplatesHandler;
 use crate::tools::handlers::ListMcpResourcesHandler;
@@ -18,6 +18,7 @@ use crate::tools::handlers::RequestPermissionsHandler;
 use crate::tools::handlers::RequestPluginInstallHandler;
 use crate::tools::handlers::RequestUserInputHandler;
 use crate::tools::handlers::ShellCommandHandler;
+use crate::tools::handlers::ShellCommandHandlerOptions;
 use crate::tools::handlers::ShellHandler;
 use crate::tools::handlers::TestSyncHandler;
 use crate::tools::handlers::ToolSearchHandler;
@@ -26,67 +27,29 @@ use crate::tools::handlers::ViewImageHandler;
 use crate::tools::handlers::WriteStdinHandler;
 use crate::tools::handlers::agent_jobs::ReportAgentJobResultHandler;
 use crate::tools::handlers::agent_jobs::SpawnAgentsOnCsvHandler;
-use crate::tools::handlers::agent_jobs_spec::create_report_agent_job_result_tool;
-use crate::tools::handlers::agent_jobs_spec::create_spawn_agents_on_csv_tool;
-use crate::tools::handlers::apply_patch_spec::create_apply_patch_freeform_tool;
-use crate::tools::handlers::apply_patch_spec::create_apply_patch_json_tool;
-use crate::tools::handlers::goal_spec::create_create_goal_tool;
-use crate::tools::handlers::goal_spec::create_get_goal_tool;
-use crate::tools::handlers::goal_spec::create_update_goal_tool;
-use crate::tools::handlers::mcp_resource_spec::create_list_mcp_resource_templates_tool;
-use crate::tools::handlers::mcp_resource_spec::create_list_mcp_resources_tool;
-use crate::tools::handlers::mcp_resource_spec::create_read_mcp_resource_tool;
 use crate::tools::handlers::multi_agents::CloseAgentHandler;
 use crate::tools::handlers::multi_agents::ResumeAgentHandler;
 use crate::tools::handlers::multi_agents::SendInputHandler;
 use crate::tools::handlers::multi_agents::SpawnAgentHandler;
 use crate::tools::handlers::multi_agents::WaitAgentHandler;
 use crate::tools::handlers::multi_agents_spec::SpawnAgentToolOptions;
-use crate::tools::handlers::multi_agents_spec::create_close_agent_tool_v1;
-use crate::tools::handlers::multi_agents_spec::create_close_agent_tool_v2;
-use crate::tools::handlers::multi_agents_spec::create_followup_task_tool;
-use crate::tools::handlers::multi_agents_spec::create_list_agents_tool;
-use crate::tools::handlers::multi_agents_spec::create_resume_agent_tool;
-use crate::tools::handlers::multi_agents_spec::create_send_input_tool_v1;
-use crate::tools::handlers::multi_agents_spec::create_send_message_tool;
-use crate::tools::handlers::multi_agents_spec::create_spawn_agent_tool_v1;
-use crate::tools::handlers::multi_agents_spec::create_spawn_agent_tool_v2;
-use crate::tools::handlers::multi_agents_spec::create_wait_agent_tool_v1;
-use crate::tools::handlers::multi_agents_spec::create_wait_agent_tool_v2;
 use crate::tools::handlers::multi_agents_v2::CloseAgentHandler as CloseAgentHandlerV2;
 use crate::tools::handlers::multi_agents_v2::FollowupTaskHandler as FollowupTaskHandlerV2;
 use crate::tools::handlers::multi_agents_v2::ListAgentsHandler as ListAgentsHandlerV2;
 use crate::tools::handlers::multi_agents_v2::SendMessageHandler as SendMessageHandlerV2;
 use crate::tools::handlers::multi_agents_v2::SpawnAgentHandler as SpawnAgentHandlerV2;
 use crate::tools::handlers::multi_agents_v2::WaitAgentHandler as WaitAgentHandlerV2;
-use crate::tools::handlers::plan_spec::create_update_plan_tool;
-use crate::tools::handlers::request_plugin_install_spec::create_request_plugin_install_tool;
-use crate::tools::handlers::request_user_input_spec::create_request_user_input_tool;
-use crate::tools::handlers::request_user_input_spec::request_user_input_tool_description;
-use crate::tools::handlers::shell_spec::CommandToolOptions;
 use crate::tools::handlers::shell_spec::ShellToolOptions;
-use crate::tools::handlers::shell_spec::create_exec_command_tool_with_environment_id;
-use crate::tools::handlers::shell_spec::create_local_shell_tool;
-use crate::tools::handlers::shell_spec::create_request_permissions_tool;
-use crate::tools::handlers::shell_spec::create_shell_command_tool;
-use crate::tools::handlers::shell_spec::create_shell_tool;
-use crate::tools::handlers::shell_spec::create_write_stdin_tool;
-use crate::tools::handlers::shell_spec::request_permissions_tool_description;
-use crate::tools::handlers::test_sync_spec::create_test_sync_tool;
-use crate::tools::handlers::tool_search_spec::create_tool_search_tool;
 use crate::tools::handlers::view_image_spec::ViewImageToolOptions;
-use crate::tools::handlers::view_image_spec::create_view_image_tool;
 use crate::tools::hosted_spec::WebSearchToolOptions;
 use crate::tools::hosted_spec::create_image_generation_tool;
 use crate::tools::hosted_spec::create_web_search_tool;
 use crate::tools::registry::ToolRegistryBuilder;
 use crate::tools::spec_plan_types::ToolRegistryBuildParams;
 use crate::tools::spec_plan_types::agent_type_description;
-use codex_protocol::openai_models::ApplyPatchToolType;
 use codex_protocol::openai_models::ConfigShellToolType;
 use codex_tools::ResponsesApiNamespace;
 use codex_tools::ResponsesApiNamespaceTool;
-use codex_tools::TOOL_SEARCH_DEFAULT_LIMIT;
 use codex_tools::ToolEnvironmentMode;
 use codex_tools::ToolName;
 use codex_tools::ToolSearchSource;
@@ -95,7 +58,6 @@ use codex_tools::ToolSpec;
 use codex_tools::ToolsConfig;
 use codex_tools::coalesce_loadable_tool_specs;
 use codex_tools::collect_code_mode_exec_prompt_tool_definitions;
-use codex_tools::collect_request_plugin_install_entries;
 use codex_tools::collect_tool_search_source_infos;
 use codex_tools::default_namespace_description;
 use codex_tools::dynamic_tool_to_loadable_tool_spec;
@@ -108,7 +70,7 @@ pub fn build_tool_registry_builder(
     config: &ToolsConfig,
     params: ToolRegistryBuildParams<'_>,
 ) -> ToolRegistryBuilder {
-    let mut builder = ToolRegistryBuilder::new();
+    let mut builder = ToolRegistryBuilder::new(config.code_mode_enabled);
     let exec_permission_approvals_enabled = config.exec_permission_approvals_enabled;
 
     if config.code_mode_enabled {
@@ -142,7 +104,7 @@ pub fn build_tool_registry_builder(
         );
         enabled_tools
             .sort_by(|left, right| compare_code_mode_tools(left, right, &namespace_descriptions));
-        builder.push_spec(
+        builder.register_handler(Arc::new(CodeModeExecuteHandler::new(
             create_code_mode_tool(
                 &enabled_tools,
                 &namespace_descriptions,
@@ -152,15 +114,7 @@ pub fn build_tool_registry_builder(
                         .deferred_mcp_tools
                         .is_some_and(|tools| !tools.is_empty()),
             ),
-            /*supports_parallel_tool_calls*/ false,
-            config.code_mode_enabled,
-        );
-        builder.register_handler(Arc::new(CodeModeExecuteHandler));
-        builder.push_spec(
-            create_wait_tool(),
-            /*supports_parallel_tool_calls*/ false,
-            config.code_mode_enabled,
-        );
+        )));
         builder.register_handler(Arc::new(CodeModeWaitHandler));
     }
 
@@ -169,51 +123,32 @@ pub fn build_tool_registry_builder(
             matches!(config.environment_mode, ToolEnvironmentMode::Multiple);
         match &config.shell_type {
             ConfigShellToolType::Default => {
-                builder.push_spec(
-                    create_shell_tool(ShellToolOptions {
-                        exec_permission_approvals_enabled,
-                    }),
-                    /*supports_parallel_tool_calls*/ true,
-                    config.code_mode_enabled,
-                );
+                builder.register_handler(Arc::new(ShellHandler::new(ShellToolOptions {
+                    exec_permission_approvals_enabled,
+                })));
             }
             ConfigShellToolType::Local => {
-                builder.push_spec(
-                    create_local_shell_tool(),
-                    /*supports_parallel_tool_calls*/ true,
-                    config.code_mode_enabled,
-                );
+                builder.register_handler(Arc::new(LocalShellHandler::new()));
             }
             ConfigShellToolType::UnifiedExec => {
-                builder.push_spec(
-                    create_exec_command_tool_with_environment_id(
-                        CommandToolOptions {
-                            allow_login_shell: config.allow_login_shell,
-                            exec_permission_approvals_enabled,
-                        },
+                builder.register_handler(Arc::new(ExecCommandHandler::new(
+                    ExecCommandHandlerOptions {
+                        allow_login_shell: config.allow_login_shell,
+                        exec_permission_approvals_enabled,
                         include_environment_id,
-                    ),
-                    /*supports_parallel_tool_calls*/ true,
-                    config.code_mode_enabled,
-                );
-                builder.push_spec(
-                    create_write_stdin_tool(),
-                    /*supports_parallel_tool_calls*/ false,
-                    config.code_mode_enabled,
-                );
-                builder.register_handler(Arc::new(ExecCommandHandler));
+                    },
+                )));
                 builder.register_handler(Arc::new(WriteStdinHandler));
             }
             ConfigShellToolType::Disabled => {}
             ConfigShellToolType::ShellCommand => {
-                builder.push_spec(
-                    create_shell_command_tool(CommandToolOptions {
+                builder.register_handler(Arc::new(ShellCommandHandler::new(
+                    ShellCommandHandlerOptions {
+                        backend_config: config.shell_command_backend,
                         allow_login_shell: config.allow_login_shell,
                         exec_permission_approvals_enabled,
-                    }),
-                    /*supports_parallel_tool_calls*/ true,
-                    config.code_mode_enabled,
-                );
+                    },
+                )));
             }
         }
     }
@@ -221,79 +156,56 @@ pub fn build_tool_registry_builder(
     if config.environment_mode.has_environment()
         && config.shell_type != ConfigShellToolType::Disabled
     {
-        builder.register_handler(Arc::new(ShellHandler));
-        builder.register_handler(Arc::new(ContainerExecHandler));
-        builder.register_handler(Arc::new(LocalShellHandler));
-        builder.register_handler(Arc::new(ShellCommandHandler::from(
-            config.shell_command_backend,
-        )));
+        match &config.shell_type {
+            ConfigShellToolType::Default => {
+                builder.register_handler(Arc::new(ContainerExecHandler));
+                builder.register_handler(Arc::new(LocalShellHandler::default()));
+                builder.register_handler(Arc::new(ShellCommandHandler::from(
+                    config.shell_command_backend,
+                )));
+            }
+            ConfigShellToolType::Local => {
+                builder.register_handler(Arc::new(ShellHandler::default()));
+                builder.register_handler(Arc::new(ContainerExecHandler));
+                builder.register_handler(Arc::new(ShellCommandHandler::from(
+                    config.shell_command_backend,
+                )));
+            }
+            ConfigShellToolType::UnifiedExec => {
+                builder.register_handler(Arc::new(ShellHandler::default()));
+                builder.register_handler(Arc::new(ContainerExecHandler));
+                builder.register_handler(Arc::new(LocalShellHandler::default()));
+                builder.register_handler(Arc::new(ShellCommandHandler::from(
+                    config.shell_command_backend,
+                )));
+            }
+            ConfigShellToolType::ShellCommand => {
+                builder.register_handler(Arc::new(ShellHandler::default()));
+                builder.register_handler(Arc::new(ContainerExecHandler));
+                builder.register_handler(Arc::new(LocalShellHandler::default()));
+            }
+            ConfigShellToolType::Disabled => {}
+        }
     }
 
     if params.mcp_tools.is_some() {
-        builder.push_spec(
-            create_list_mcp_resources_tool(),
-            /*supports_parallel_tool_calls*/ true,
-            config.code_mode_enabled,
-        );
-        builder.push_spec(
-            create_list_mcp_resource_templates_tool(),
-            /*supports_parallel_tool_calls*/ true,
-            config.code_mode_enabled,
-        );
-        builder.push_spec(
-            create_read_mcp_resource_tool(),
-            /*supports_parallel_tool_calls*/ true,
-            config.code_mode_enabled,
-        );
         builder.register_handler(Arc::new(ListMcpResourcesHandler));
         builder.register_handler(Arc::new(ListMcpResourceTemplatesHandler));
         builder.register_handler(Arc::new(ReadMcpResourceHandler));
     }
 
-    builder.push_spec(
-        create_update_plan_tool(),
-        /*supports_parallel_tool_calls*/ false,
-        config.code_mode_enabled,
-    );
     builder.register_handler(Arc::new(PlanHandler));
     if config.goal_tools {
-        builder.push_spec(
-            create_get_goal_tool(),
-            /*supports_parallel_tool_calls*/ false,
-            config.code_mode_enabled,
-        );
         builder.register_handler(Arc::new(GetGoalHandler));
-        builder.push_spec(
-            create_create_goal_tool(),
-            /*supports_parallel_tool_calls*/ false,
-            config.code_mode_enabled,
-        );
         builder.register_handler(Arc::new(CreateGoalHandler));
-        builder.push_spec(
-            create_update_goal_tool(),
-            /*supports_parallel_tool_calls*/ false,
-            config.code_mode_enabled,
-        );
         builder.register_handler(Arc::new(UpdateGoalHandler));
     }
 
-    builder.push_spec(
-        create_request_user_input_tool(request_user_input_tool_description(
-            &config.request_user_input_available_modes,
-        )),
-        /*supports_parallel_tool_calls*/ false,
-        config.code_mode_enabled,
-    );
     builder.register_handler(Arc::new(RequestUserInputHandler {
         available_modes: config.request_user_input_available_modes.clone(),
     }));
 
     if config.request_permissions_tool_enabled {
-        builder.push_spec(
-            create_request_permissions_tool(request_permissions_tool_description()),
-            /*supports_parallel_tool_calls*/ false,
-            config.code_mode_enabled,
-        );
         builder.register_handler(Arc::new(RequestPermissionsHandler));
     }
 
@@ -330,13 +242,9 @@ pub fn build_tool_registry_builder(
             });
         }
 
-        builder.push_spec(
-            create_tool_search_tool(&search_source_infos, TOOL_SEARCH_DEFAULT_LIMIT),
-            /*supports_parallel_tool_calls*/ true,
-            config.code_mode_enabled,
-        );
         builder.register_handler(Arc::new(ToolSearchHandler::new(
             params.tool_search_entries.to_vec(),
+            search_source_infos,
         )));
     }
 
@@ -344,36 +252,17 @@ pub fn build_tool_registry_builder(
         && let Some(discoverable_tools) =
             params.discoverable_tools.filter(|tools| !tools.is_empty())
     {
-        builder.push_spec(
-            create_request_plugin_install_tool(&collect_request_plugin_install_entries(
-                discoverable_tools,
-            )),
-            /*supports_parallel_tool_calls*/ true,
-            /*code_mode_enabled*/ false,
-        );
-        builder.register_handler(Arc::new(RequestPluginInstallHandler));
+        builder.register_handler(Arc::new(RequestPluginInstallHandler::new(
+            discoverable_tools,
+        )));
     }
 
     if config.environment_mode.has_environment()
         && let Some(apply_patch_tool_type) = &config.apply_patch_tool_type
     {
-        match apply_patch_tool_type {
-            ApplyPatchToolType::Freeform => {
-                builder.push_spec(
-                    create_apply_patch_freeform_tool(),
-                    /*supports_parallel_tool_calls*/ false,
-                    config.code_mode_enabled,
-                );
-            }
-            ApplyPatchToolType::Function => {
-                builder.push_spec(
-                    create_apply_patch_json_tool(),
-                    /*supports_parallel_tool_calls*/ false,
-                    config.code_mode_enabled,
-                );
-            }
-        }
-        builder.register_handler(Arc::new(ApplyPatchHandler));
+        builder.register_handler(Arc::new(ApplyPatchHandler::new(
+            apply_patch_tool_type.clone(),
+        )));
     }
 
     if config
@@ -381,11 +270,6 @@ pub fn build_tool_registry_builder(
         .iter()
         .any(|tool| tool == "test_sync_tool")
     {
-        builder.push_spec(
-            create_test_sync_tool(),
-            /*supports_parallel_tool_calls*/ true,
-            config.code_mode_enabled,
-        );
         builder.register_handler(Arc::new(TestSyncHandler));
     }
 
@@ -394,135 +278,62 @@ pub fn build_tool_registry_builder(
         web_search_config: config.web_search_config.as_ref(),
         web_search_tool_type: config.web_search_tool_type,
     }) {
-        builder.push_spec(
-            web_search_tool,
-            /*supports_parallel_tool_calls*/ false,
-            config.code_mode_enabled,
-        );
+        builder.push_spec(web_search_tool, /*supports_parallel_tool_calls*/ false);
     }
 
     if config.image_gen_tool {
         builder.push_spec(
             create_image_generation_tool("png"),
             /*supports_parallel_tool_calls*/ false,
-            config.code_mode_enabled,
         );
     }
 
     if config.environment_mode.has_environment() {
-        builder.push_spec(
-            create_view_image_tool(ViewImageToolOptions {
-                can_request_original_image_detail: config.can_request_original_image_detail,
-            }),
-            /*supports_parallel_tool_calls*/ true,
-            config.code_mode_enabled,
-        );
-        builder.register_handler(Arc::new(ViewImageHandler));
+        builder.register_handler(Arc::new(ViewImageHandler::new(ViewImageToolOptions {
+            can_request_original_image_detail: config.can_request_original_image_detail,
+        })));
     }
 
     if config.collab_tools {
         if config.multi_agent_v2 {
             let agent_type_description =
                 agent_type_description(config, params.default_agent_type_description);
-            builder.push_spec(
-                create_spawn_agent_tool_v2(SpawnAgentToolOptions {
-                    available_models: &config.available_models,
-                    agent_type_description,
-                    hide_agent_type_model_reasoning: config.hide_spawn_agent_metadata,
-                    include_usage_hint: config.spawn_agent_usage_hint,
-                    usage_hint_text: config.spawn_agent_usage_hint_text.clone(),
-                    max_concurrent_threads_per_session: config.max_concurrent_threads_per_session,
-                }),
-                /*supports_parallel_tool_calls*/ false,
-                config.code_mode_enabled,
-            );
-            builder.push_spec(
-                create_send_message_tool(),
-                /*supports_parallel_tool_calls*/ false,
-                config.code_mode_enabled,
-            );
-            builder.push_spec(
-                create_followup_task_tool(),
-                /*supports_parallel_tool_calls*/ false,
-                config.code_mode_enabled,
-            );
-            builder.push_spec(
-                create_wait_agent_tool_v2(params.wait_agent_timeouts),
-                /*supports_parallel_tool_calls*/ false,
-                config.code_mode_enabled,
-            );
-            builder.push_spec(
-                create_close_agent_tool_v2(),
-                /*supports_parallel_tool_calls*/ false,
-                config.code_mode_enabled,
-            );
-            builder.push_spec(
-                create_list_agents_tool(),
-                /*supports_parallel_tool_calls*/ false,
-                config.code_mode_enabled,
-            );
-            builder.register_handler(Arc::new(SpawnAgentHandlerV2));
+            builder.register_handler(Arc::new(SpawnAgentHandlerV2::new(SpawnAgentToolOptions {
+                available_models: config.available_models.clone(),
+                agent_type_description,
+                hide_agent_type_model_reasoning: config.hide_spawn_agent_metadata,
+                include_usage_hint: config.spawn_agent_usage_hint,
+                usage_hint_text: config.spawn_agent_usage_hint_text.clone(),
+                max_concurrent_threads_per_session: config.max_concurrent_threads_per_session,
+            })));
             builder.register_handler(Arc::new(SendMessageHandlerV2));
             builder.register_handler(Arc::new(FollowupTaskHandlerV2));
-            builder.register_handler(Arc::new(WaitAgentHandlerV2));
+            builder.register_handler(Arc::new(WaitAgentHandlerV2::new(
+                params.wait_agent_timeouts,
+            )));
             builder.register_handler(Arc::new(CloseAgentHandlerV2));
             builder.register_handler(Arc::new(ListAgentsHandlerV2));
         } else {
             let agent_type_description =
                 agent_type_description(config, params.default_agent_type_description);
-            builder.push_spec(
-                create_spawn_agent_tool_v1(SpawnAgentToolOptions {
-                    available_models: &config.available_models,
-                    agent_type_description,
-                    hide_agent_type_model_reasoning: config.hide_spawn_agent_metadata,
-                    include_usage_hint: config.spawn_agent_usage_hint,
-                    usage_hint_text: config.spawn_agent_usage_hint_text.clone(),
-                    max_concurrent_threads_per_session: config.max_concurrent_threads_per_session,
-                }),
-                /*supports_parallel_tool_calls*/ false,
-                config.code_mode_enabled,
-            );
-            builder.push_spec(
-                create_send_input_tool_v1(),
-                /*supports_parallel_tool_calls*/ false,
-                config.code_mode_enabled,
-            );
-            builder.push_spec(
-                create_resume_agent_tool(),
-                /*supports_parallel_tool_calls*/ false,
-                config.code_mode_enabled,
-            );
-            builder.register_handler(Arc::new(ResumeAgentHandler));
-            builder.push_spec(
-                create_wait_agent_tool_v1(params.wait_agent_timeouts),
-                /*supports_parallel_tool_calls*/ false,
-                config.code_mode_enabled,
-            );
-            builder.push_spec(
-                create_close_agent_tool_v1(),
-                /*supports_parallel_tool_calls*/ false,
-                config.code_mode_enabled,
-            );
-            builder.register_handler(Arc::new(SpawnAgentHandler));
+            builder.register_handler(Arc::new(SpawnAgentHandler::new(SpawnAgentToolOptions {
+                available_models: config.available_models.clone(),
+                agent_type_description,
+                hide_agent_type_model_reasoning: config.hide_spawn_agent_metadata,
+                include_usage_hint: config.spawn_agent_usage_hint,
+                usage_hint_text: config.spawn_agent_usage_hint_text.clone(),
+                max_concurrent_threads_per_session: config.max_concurrent_threads_per_session,
+            })));
             builder.register_handler(Arc::new(SendInputHandler));
-            builder.register_handler(Arc::new(WaitAgentHandler));
+            builder.register_handler(Arc::new(ResumeAgentHandler));
+            builder.register_handler(Arc::new(WaitAgentHandler::new(params.wait_agent_timeouts)));
             builder.register_handler(Arc::new(CloseAgentHandler));
         }
     }
 
     if config.agent_jobs_tools {
-        builder.push_spec(
-            create_spawn_agents_on_csv_tool(),
-            /*supports_parallel_tool_calls*/ false,
-            config.code_mode_enabled,
-        );
         builder.register_handler(Arc::new(SpawnAgentsOnCsvHandler));
         if config.agent_jobs_worker_tools {
-            builder.push_spec(
-                create_report_agent_job_result_tool(),
-                /*supports_parallel_tool_calls*/ false,
-                config.code_mode_enabled,
-            );
             builder.register_handler(Arc::new(ReportAgentJobResultHandler));
         }
     }
@@ -584,7 +395,6 @@ pub fn build_tool_registry_builder(
                         tools,
                     }),
                     /*supports_parallel_tool_calls*/ false,
-                    config.code_mode_enabled,
                 );
             }
         }
@@ -609,11 +419,7 @@ pub fn build_tool_registry_builder(
     for spec in coalesce_loadable_tool_specs(dynamic_tool_specs) {
         let spec = spec.into();
         if config.namespace_tools || !matches!(spec, ToolSpec::Namespace(_)) {
-            builder.push_spec(
-                spec,
-                /*supports_parallel_tool_calls*/ false,
-                config.code_mode_enabled,
-            );
+            builder.push_spec(spec, /*supports_parallel_tool_calls*/ false);
         }
     }
 
diff --git a/codex-rs/core/src/tools/spec_plan_tests.rs b/codex-rs/core/src/tools/spec_plan_tests.rs
index f41060906b99..a77c5c2e19ad 100644
--- a/codex-rs/core/src/tools/spec_plan_tests.rs
+++ b/codex-rs/core/src/tools/spec_plan_tests.rs
@@ -1,8 +1,29 @@
 use super::*;
+use crate::tools::handlers::apply_patch_spec::create_apply_patch_freeform_tool;
+use crate::tools::handlers::goal_spec::create_create_goal_tool;
+use crate::tools::handlers::goal_spec::create_get_goal_tool;
+use crate::tools::handlers::goal_spec::create_update_goal_tool;
 use crate::tools::handlers::multi_agents_spec::WaitAgentTimeoutOptions;
+use crate::tools::handlers::multi_agents_spec::create_close_agent_tool_v1;
+use crate::tools::handlers::multi_agents_spec::create_close_agent_tool_v2;
+use crate::tools::handlers::multi_agents_spec::create_resume_agent_tool;
+use crate::tools::handlers::multi_agents_spec::create_send_input_tool_v1;
+use crate::tools::handlers::multi_agents_spec::create_send_message_tool;
+use crate::tools::handlers::multi_agents_spec::create_spawn_agent_tool_v1;
+use crate::tools::handlers::multi_agents_spec::create_spawn_agent_tool_v2;
+use crate::tools::handlers::multi_agents_spec::create_wait_agent_tool_v1;
+use crate::tools::handlers::multi_agents_spec::create_wait_agent_tool_v2;
+use crate::tools::handlers::plan_spec::create_update_plan_tool;
 use crate::tools::handlers::request_user_input_spec::REQUEST_USER_INPUT_TOOL_NAME;
+use crate::tools::handlers::request_user_input_spec::create_request_user_input_tool;
+use crate::tools::handlers::request_user_input_spec::request_user_input_tool_description;
 use crate::tools::handlers::shell_spec::CommandToolOptions;
 use crate::tools::handlers::shell_spec::create_exec_command_tool;
+use crate::tools::handlers::shell_spec::create_request_permissions_tool;
+use crate::tools::handlers::shell_spec::create_write_stdin_tool;
+use crate::tools::handlers::shell_spec::request_permissions_tool_description;
+use crate::tools::handlers::view_image_spec::ViewImageToolOptions;
+use crate::tools::handlers::view_image_spec::create_view_image_tool;
 use crate::tools::registry::ToolRegistry;
 use crate::tools::spec_plan_types::ToolNamespace;
 use crate::tools::spec_plan_types::ToolRegistryBuildDeferredTool;
@@ -2423,9 +2444,9 @@ fn request_user_input_tool_spec(available_modes: &[ModeKind]) -> ToolSpec {
     create_request_user_input_tool(request_user_input_tool_description(available_modes))
 }
 
-fn spawn_agent_tool_options(config: &ToolsConfig) -> SpawnAgentToolOptions<'_> {
+fn spawn_agent_tool_options(config: &ToolsConfig) -> SpawnAgentToolOptions {
     SpawnAgentToolOptions {
-        available_models: &config.available_models,
+        available_models: config.available_models.clone(),
         agent_type_description: agent_type_description(config, DEFAULT_AGENT_TYPE_DESCRIPTION),
         hide_agent_type_model_reasoning: config.hide_spawn_agent_metadata,
         include_usage_hint: config.spawn_agent_usage_hint,