From 41a7d247ea6566fc1aeb420e13895bc73648cfeb Mon Sep 17 00:00:00 2001
From: Siddharth Ganesan <siddharthganesan@gmail.com>
Date: Tue, 24 Mar 2026 02:45:31 -0700
Subject: [PATCH] fix(mothership): parallel tool calls

---
 .../lib/copilot/orchestrator/index.test.ts    | 37 ++++++++++++++++
 apps/sim/lib/copilot/orchestrator/index.ts    | 43 +++++++++++++++++++
 2 files changed, 80 insertions(+)

diff --git a/apps/sim/lib/copilot/orchestrator/index.test.ts b/apps/sim/lib/copilot/orchestrator/index.test.ts
index ac6afeb2ef..9a39b88220 100644
--- a/apps/sim/lib/copilot/orchestrator/index.test.ts
+++ b/apps/sim/lib/copilot/orchestrator/index.test.ts
@@ -278,4 +278,41 @@ describe('orchestrateCopilotStream async continuation', () => {
     expect(releaseCompletedAsyncToolClaim).toHaveBeenCalledWith('tool-1', 'run-1')
     expect(markAsyncToolDelivered).not.toHaveBeenCalled()
   })
+
+  it('does not send a partial resume payload when only some pending tool calls are claimable', async () => {
+    claimCompletedAsyncToolCall
+      .mockResolvedValueOnce({ toolCallId: 'tool-1' })
+      .mockResolvedValueOnce(null)
+      .mockResolvedValueOnce({ toolCallId: 'tool-1' })
+      .mockResolvedValueOnce(null)
+      .mockResolvedValueOnce({ toolCallId: 'tool-1' })
+      .mockResolvedValueOnce(null)
+      .mockResolvedValueOnce({ toolCallId: 'tool-1' })
+      .mockResolvedValueOnce(null)
+    getAsyncToolCall.mockResolvedValue(null)
+
+    runStreamLoop.mockImplementationOnce(async (_url: string, _opts: RequestInit, context: any) => {
+      context.awaitingAsyncContinuation = {
+        checkpointId: 'checkpoint-1',
+        runId: 'run-1',
+        pendingToolCallIds: ['tool-1', 'tool-2'],
+      }
+    })
+
+    const result = await orchestrateCopilotStream(
+      { message: 'hello' },
+      {
+        userId: 'user-1',
+        workflowId: 'workflow-1',
+        chatId: 'chat-1',
+        executionId: 'exec-1',
+        runId: 'run-1',
+      }
+    )
+
+    expect(result.success).toBe(true)
+    expect(runStreamLoop).toHaveBeenCalledTimes(1)
+    expect(releaseCompletedAsyncToolClaim).toHaveBeenCalledWith('tool-1', 'run-1')
+    expect(markAsyncToolDelivered).not.toHaveBeenCalled()
+  })
 })
diff --git a/apps/sim/lib/copilot/orchestrator/index.ts b/apps/sim/lib/copilot/orchestrator/index.ts
index 055ca27c31..961f97efe6 100644
--- a/apps/sim/lib/copilot/orchestrator/index.ts
+++ b/apps/sim/lib/copilot/orchestrator/index.ts
@@ -246,6 +246,49 @@ export async function orchestrateCopilotStream(
           continue
         }
 
+        const missingToolCallIds = continuation.pendingToolCallIds.filter(
+          (toolCallId) => !claimableToolCallIds.includes(toolCallId)
+        )
+        if (missingToolCallIds.length > 0) {
+          if (claimedToolCallIds.length > 0 && claimedByWorkerId) {
+            logger.info('Releasing partial async tool claims before retrying resume', {
+              checkpointId: continuation.checkpointId,
+              runId: continuation.runId,
+              claimedToolCallIds,
+              missingToolCallIds,
+            })
+            await Promise.all(
+              claimedToolCallIds.map((toolCallId) =>
+                releaseCompletedAsyncToolClaim(toolCallId, claimedByWorkerId!).catch(() => null)
+              )
+            )
+            claimedToolCallIds = []
+            claimedByWorkerId = null
+          }
+          if (emptyClaimRetries < 3) {
+            emptyClaimRetries++
+            logger.info(
+              'Retrying async resume claim after only a subset of tool calls were claimable',
+              {
+                checkpointId: continuation.checkpointId,
+                runId: continuation.runId,
+                retry: emptyClaimRetries,
+                missingToolCallIds,
+              }
+            )
+            await new Promise((resolve) => setTimeout(resolve, 250 * emptyClaimRetries))
+            continue
+          }
+          logger.warn('Skipping async resume because not all tool calls were claimable', {
+            checkpointId: continuation.checkpointId,
+            runId: continuation.runId,
+            claimableToolCallIds,
+            missingToolCallIds,
+          })
+          context.awaitingAsyncContinuation = undefined
+          break
+        }
+
         if (claimableToolCallIds.length === 0) {
           if (emptyClaimRetries < 3 && continuation.pendingToolCallIds.length > 0) {
             emptyClaimRetries++