[codex] Outline ToolExecutor handler bodies

codex-rs/core/src/tools/code_mode/execute_handler.rs

@@ -104,6 +104,15 @@ impl ToolExecutor<ToolInvocation> for CodeModeExecuteHandler {
     async fn handle(
         &self,
         invocation: ToolInvocation,
+    ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
+        self.handle_call(invocation).await
+    }
+}
+
+impl CodeModeExecuteHandler {
+    async fn handle_call(
+        &self,
+        invocation: ToolInvocation,
     ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
         let ToolInvocation {
             session,

codex-rs/core/src/tools/code_mode/wait_handler.rs

@@ -57,6 +57,15 @@ impl ToolExecutor<ToolInvocation> for CodeModeWaitHandler {
     async fn handle(
         &self,
         invocation: ToolInvocation,
+    ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
+        self.handle_call(invocation).await
+    }
+}
+
+impl CodeModeWaitHandler {
+    async fn handle_call(
+        &self,
+        invocation: ToolInvocation,
     ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
         let ToolInvocation {
             session,

codex-rs/core/src/tools/handlers/agent_jobs/report_agent_job_result.rs

@@ -26,6 +26,15 @@ impl ToolExecutor<ToolInvocation> for ReportAgentJobResultHandler {
     async fn handle(
         &self,
         invocation: ToolInvocation,
+    ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
+        self.handle_call(invocation).await
+    }
+}
+
+impl ReportAgentJobResultHandler {
+    async fn handle_call(
+        &self,
+        invocation: ToolInvocation,
     ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
         let ToolInvocation {
             session, payload, ..

codex-rs/core/src/tools/handlers/agent_jobs/spawn_agents_on_csv.rs

@@ -27,6 +27,15 @@ impl ToolExecutor<ToolInvocation> for SpawnAgentsOnCsvHandler {
     async fn handle(
         &self,
         invocation: ToolInvocation,
+    ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
+        self.handle_call(invocation).await
+    }
+}
+
+impl SpawnAgentsOnCsvHandler {
+    async fn handle_call(
+        &self,
+        invocation: ToolInvocation,
     ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
         let ToolInvocation {
             session,

codex-rs/core/src/tools/handlers/apply_patch.rs

@@ -318,6 +318,15 @@ impl ToolExecutor<ToolInvocation> for ApplyPatchHandler {
     async fn handle(
         &self,
         invocation: ToolInvocation,
+    ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
+        self.handle_call(invocation).await
+    }
+}
+
+impl ApplyPatchHandler {
+    async fn handle_call(
+        &self,
+        invocation: ToolInvocation,
     ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
         let ToolInvocation {
             session,

codex-rs/core/src/tools/handlers/dynamic.rs

@@ -89,6 +89,15 @@ impl ToolExecutor<ToolInvocation> for DynamicToolHandler {
     async fn handle(
         &self,
         invocation: ToolInvocation,
+    ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
+        self.handle_call(invocation).await
+    }
+}
+
+impl DynamicToolHandler {
+    async fn handle_call(
+        &self,
+        invocation: ToolInvocation,
     ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
         let ToolInvocation {
             session,

codex-rs/core/src/tools/handlers/extension_tools.rs

@@ -221,6 +221,15 @@ mod tests {
         async fn handle(
             &self,
             call: codex_tools::ToolCall,
+        ) -> Result<Box<dyn codex_tools::ToolOutput>, codex_tools::FunctionCallError> {
+            self.handle_call(call).await
+        }
+    }
+
+    impl CapturingExtensionExecutor {
+        async fn handle_call(
+            &self,
+            call: codex_tools::ToolCall,
         ) -> Result<Box<dyn codex_tools::ToolOutput>, codex_tools::FunctionCallError> {
             let item = ExtensionTurnItem::WebSearch(WebSearchItem {
                 id: call.call_id.clone(),
@@ -452,6 +461,15 @@ mod tests {
         async fn handle(
             &self,
             call: codex_tools::ToolCall,
+        ) -> Result<Box<dyn codex_tools::ToolOutput>, codex_tools::FunctionCallError> {
+            self.handle_call(call).await
+        }
+    }
+
+    impl ImageGenerationExtensionExecutor {
+        async fn handle_call(
+            &self,
+            call: codex_tools::ToolCall,
         ) -> Result<Box<dyn codex_tools::ToolOutput>, codex_tools::FunctionCallError> {
             call.turn_item_emitter
                 .emit_started(ExtensionTurnItem::ImageGeneration(

codex-rs/core/src/tools/handlers/list_available_plugins_to_install.rs

@@ -71,6 +71,15 @@ impl ToolExecutor<ToolInvocation> for ListAvailablePluginsToInstallHandler {
     async fn handle(
         &self,
         invocation: ToolInvocation,
+    ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
+        self.handle_call(invocation).await
+    }
+}
+
+impl ListAvailablePluginsToInstallHandler {
+    async fn handle_call(
+        &self,
+        invocation: ToolInvocation,
     ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
         let ToolInvocation { payload, .. } = invocation;
         match payload {

codex-rs/core/src/tools/handlers/mcp.rs

@@ -116,6 +116,15 @@ impl ToolExecutor<ToolInvocation> for McpHandler {
     async fn handle(
         &self,
         invocation: ToolInvocation,
+    ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
+        self.handle_call(invocation).await
+    }
+}
+
+impl McpHandler {
+    async fn handle_call(
+        &self,
+        invocation: ToolInvocation,
     ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
         let ToolInvocation {
             session,

codex-rs/core/src/tools/handlers/mcp_resource/list_mcp_resource_templates.rs

@@ -43,6 +43,15 @@ impl ToolExecutor<ToolInvocation> for ListMcpResourceTemplatesHandler {
     async fn handle(
         &self,
         invocation: ToolInvocation,
+    ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
+        self.handle_call(invocation).await
+    }
+}
+
+impl ListMcpResourceTemplatesHandler {
+    async fn handle_call(
+        &self,
+        invocation: ToolInvocation,
     ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
         let ToolInvocation {
             session,

codex-rs/core/src/tools/handlers/mcp_resource/list_mcp_resources.rs

@@ -43,6 +43,15 @@ impl ToolExecutor<ToolInvocation> for ListMcpResourcesHandler {
     async fn handle(
         &self,
         invocation: ToolInvocation,
+    ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
+        self.handle_call(invocation).await
+    }
+}
+
+impl ListMcpResourcesHandler {
+    async fn handle_call(
+        &self,
+        invocation: ToolInvocation,
     ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
         let ToolInvocation {
             session,

codex-rs/core/src/tools/handlers/mcp_resource/read_mcp_resource.rs

@@ -43,6 +43,15 @@ impl ToolExecutor<ToolInvocation> for ReadMcpResourceHandler {
     async fn handle(
         &self,
         invocation: ToolInvocation,
+    ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
+        self.handle_call(invocation).await
+    }
+}
+
+impl ReadMcpResourceHandler {
+    async fn handle_call(
+        &self,
+        invocation: ToolInvocation,
     ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
         let ToolInvocation {
             session,

codex-rs/core/src/tools/handlers/multi_agents/send_input.rs

@@ -26,6 +26,15 @@ impl ToolExecutor<ToolInvocation> for Handler {
     async fn handle(
         &self,
         invocation: ToolInvocation,
+    ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
+        self.handle_call(invocation).await
+    }
+}
+
+impl Handler {
+    async fn handle_call(
+        &self,
+        invocation: ToolInvocation,
     ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
         let ToolInvocation {
             session,

codex-rs/core/src/tools/handlers/multi_agents/wait.rs

@@ -47,6 +47,15 @@ impl ToolExecutor<ToolInvocation> for Handler {
     async fn handle(
         &self,
         invocation: ToolInvocation,
+    ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
+        self.handle_call(invocation).await
+    }
+}
+
+impl Handler {
+    async fn handle_call(
+        &self,
+        invocation: ToolInvocation,
     ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
         let ToolInvocation {
             session,

codex-rs/core/src/tools/handlers/multi_agents_v2/followup_task.rs

@@ -20,6 +20,15 @@ impl ToolExecutor<ToolInvocation> for Handler {
     async fn handle(
         &self,
         invocation: ToolInvocation,
+    ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
+        self.handle_call(invocation).await
+    }
+}
+
+impl Handler {
+    async fn handle_call(
+        &self,
+        invocation: ToolInvocation,
     ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
         let arguments = function_arguments(invocation.payload.clone())?;
         let args: FollowupTaskArgs = parse_arguments(&arguments)?;

codex-rs/core/src/tools/handlers/multi_agents_v2/list_agents.rs

@@ -18,6 +18,15 @@ impl ToolExecutor<ToolInvocation> for Handler {
     async fn handle(
         &self,
         invocation: ToolInvocation,
+    ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
+        self.handle_call(invocation).await
+    }
+}
+
+impl Handler {
+    async fn handle_call(
+        &self,
+        invocation: ToolInvocation,
     ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
         let ToolInvocation {
             session,

codex-rs/core/src/tools/handlers/multi_agents_v2/send_message.rs

@@ -20,6 +20,15 @@ impl ToolExecutor<ToolInvocation> for Handler {
     async fn handle(
         &self,
         invocation: ToolInvocation,
+    ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
+        self.handle_call(invocation).await
+    }
+}
+
+impl Handler {
+    async fn handle_call(
+        &self,
+        invocation: ToolInvocation,
     ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
         let arguments = function_arguments(invocation.payload.clone())?;
         let args: SendMessageArgs = parse_arguments(&arguments)?;

codex-rs/core/src/tools/handlers/multi_agents_v2/wait.rs

@@ -32,6 +32,15 @@ impl ToolExecutor<ToolInvocation> for Handler {
     async fn handle(
         &self,
         invocation: ToolInvocation,
+    ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
+        self.handle_call(invocation).await
+    }
+}
+
+impl Handler {
+    async fn handle_call(
+        &self,
+        invocation: ToolInvocation,
     ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
         let ToolInvocation {
             session,

codex-rs/core/src/tools/handlers/plan.rs

@@ -58,6 +58,15 @@ impl ToolExecutor<ToolInvocation> for PlanHandler {
     async fn handle(
         &self,
         invocation: ToolInvocation,
+    ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
+        self.handle_call(invocation).await
+    }
+}
+
+impl PlanHandler {
+    async fn handle_call(
+        &self,
+        invocation: ToolInvocation,
     ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
         let ToolInvocation {
             session,

codex-rs/core/src/tools/handlers/request_permissions.rs

@@ -38,6 +38,15 @@ impl ToolExecutor<ToolInvocation> for RequestPermissionsHandler {
     async fn handle(
         &self,
         invocation: ToolInvocation,
+    ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
+        self.handle_call(invocation).await
+    }
+}
+
+impl RequestPermissionsHandler {
+    async fn handle_call(
+        &self,
+        invocation: ToolInvocation,
     ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
         let ToolInvocation {
             session,

codex-rs/core/src/tools/handlers/request_plugin_install.rs

@@ -65,6 +65,15 @@ impl ToolExecutor<ToolInvocation> for RequestPluginInstallHandler {
     async fn handle(
         &self,
         invocation: ToolInvocation,
+    ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
+        self.handle_call(invocation).await
+    }
+}
+
+impl RequestPluginInstallHandler {
+    async fn handle_call(
+        &self,
+        invocation: ToolInvocation,
     ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
         let ToolInvocation {
             payload,

codex-rs/core/src/tools/handlers/request_user_input.rs

@@ -33,6 +33,15 @@ impl ToolExecutor<ToolInvocation> for RequestUserInputHandler {
     async fn handle(
         &self,
         invocation: ToolInvocation,
+    ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
+        self.handle_call(invocation).await
+    }
+}
+
+impl RequestUserInputHandler {
+    async fn handle_call(
+        &self,
+        invocation: ToolInvocation,
     ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
         let ToolInvocation {
             session,

codex-rs/core/src/tools/handlers/shell/shell_command.rs

@@ -144,6 +144,15 @@ impl ToolExecutor<ToolInvocation> for ShellCommandHandler {
     async fn handle(
         &self,
         invocation: ToolInvocation,
+    ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
+        self.handle_call(invocation).await
+    }
+}
+
+impl ShellCommandHandler {
+    async fn handle_call(
+        &self,
+        invocation: ToolInvocation,
     ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
         let ToolInvocation {
             session,

codex-rs/core/src/tools/handlers/test_sync.rs

@@ -74,6 +74,15 @@ impl ToolExecutor<ToolInvocation> for TestSyncHandler {
     async fn handle(
         &self,
         invocation: ToolInvocation,
+    ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
+        self.handle_call(invocation).await
+    }
+}
+
+impl TestSyncHandler {
+    async fn handle_call(
+        &self,
+        invocation: ToolInvocation,
     ) -> Result<Box<dyn crate::tools::context::ToolOutput>, FunctionCallError> {
         let ToolInvocation { payload, .. } = invocation;