From 35c42ba227ca8ef8da623917137e5d4cbdbe1db6 Mon Sep 17 00:00:00 2001
From: Siddharth Ganesan <33737564+Sg312@users.noreply.github.com>
Date: Tue, 17 Mar 2026 13:30:09 -0700
Subject: [PATCH] fix(mothership): fix tool call scheduling (#3635)

* Fix mothership tool scheduling

* Fix
---
 .../orchestrator/sse/handlers/handlers.ts     | 47 +++++++++++--------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/apps/sim/lib/copilot/orchestrator/sse/handlers/handlers.ts b/apps/sim/lib/copilot/orchestrator/sse/handlers/handlers.ts
index fcd6327224..d0431b59cd 100644
--- a/apps/sim/lib/copilot/orchestrator/sse/handlers/handlers.ts
+++ b/apps/sim/lib/copilot/orchestrator/sse/handlers/handlers.ts
@@ -296,7 +296,7 @@ export const sseHandlers: Record<string, SSEHandler> = {
       return
     }
 
-    if (!isToolAvailableOnSimSide(toolName)) {
+    if (!isToolAvailableOnSimSide(toolName) && !clientExecutable) {
       return
     }
 
@@ -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: execute server-side if available, otherwise
+    // delegate to the client (React UI) and wait for completion.
     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
     }
 
@@ -548,7 +553,7 @@ export const subAgentHandlers: Record<string, SSEHandler> = {
       return
     }
 
-    if (!isToolAvailableOnSimSide(toolName)) {
+    if (!isToolAvailableOnSimSide(toolName) && !clientExecutable) {
       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
     }