Fix mothership tool scheduling

Author: Sg312

apps/sim/lib/copilot/orchestrator/sse/handlers/handlers.ts

@@ -396,16 +396,21 @@ export const sseHandlers: Record<string, SSEHandler> = {
       return
     }
 
-    // Auto-allowed client-executable tool: client runs it, we wait for completion.
+    // Client-executable tool: if the server can handle it, execute server-side.
+    // Otherwise wait for the client (React UI) to complete it.
     if (clientExecutable) {
-      toolCall.status = 'executing'
-      const completion = await waitForToolCompletion(
-        toolCallId,
-        options.timeout || STREAM_TIMEOUT_MS,
-        options.abortSignal
-      )
-      handleClientCompletion(toolCall, toolCallId, completion)
-      await emitSyntheticToolResult(toolCallId, toolCall.name, completion, options)
+      if (isToolAvailableOnSimSide(toolName)) {
+        fireToolExecution()
+      } else {
+        toolCall.status = 'executing'
+        const completion = await waitForToolCompletion(
+          toolCallId,
+          options.timeout || STREAM_TIMEOUT_MS,
+          options.abortSignal
+        )
+        handleClientCompletion(toolCall, toolCallId, completion)
+        await emitSyntheticToolResult(toolCallId, toolCall.name, completion, options)
+      }
       return
     }
 
@@ -643,14 +648,18 @@ export const subAgentHandlers: Record<string, SSEHandler> = {
     }
 
     if (clientExecutable) {
-      toolCall.status = 'executing'
-      const completion = await waitForToolCompletion(
-        toolCallId,
-        options.timeout || STREAM_TIMEOUT_MS,
-        options.abortSignal
-      )
-      handleClientCompletion(toolCall, toolCallId, completion)
-      await emitSyntheticToolResult(toolCallId, toolCall.name, completion, options)
+      if (isToolAvailableOnSimSide(toolName)) {
+        fireToolExecution()
+      } else {
+        toolCall.status = 'executing'
+        const completion = await waitForToolCompletion(
+          toolCallId,
+          options.timeout || STREAM_TIMEOUT_MS,
+          options.abortSignal
+        )
+        handleClientCompletion(toolCall, toolCallId, completion)
+        await emitSyntheticToolResult(toolCallId, toolCall.name, completion, options)
+      }
       return
     }