From 984387e35fb5b983571226389da6541e533dd18c Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyath@simstudio.ai>
Date: Wed, 25 Mar 2026 14:39:31 -0700
Subject: [PATCH] fix(mothership): key resumes by orchestration id

---
 apps/sim/lib/copilot/orchestrator/index.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/apps/sim/lib/copilot/orchestrator/index.ts b/apps/sim/lib/copilot/orchestrator/index.ts
index 3320b0df33..7817436bdf 100644
--- a/apps/sim/lib/copilot/orchestrator/index.ts
+++ b/apps/sim/lib/copilot/orchestrator/index.ts
@@ -123,6 +123,7 @@ export async function orchestrateCopilotStream(
     runId,
     messageId: typeof payloadMsgId === 'string' ? payloadMsgId : crypto.randomUUID(),
   })
+  const continuationWorkerId = `sim-resume:${crypto.randomUUID()}`
   let claimedToolCallIds: string[] = []
   let claimedByWorkerId: string | null = null
 
@@ -198,7 +199,7 @@ export async function orchestrateCopilotStream(
       for (;;) {
         claimedToolCallIds = []
         claimedByWorkerId = null
-        const resumeWorkerId = continuation.runId || context.runId || context.messageId
+        const resumeWorkerId = continuationWorkerId
         const readyTools: ReadyContinuationTool[] = []
         const localPendingPromises: Promise<unknown>[] = []
         const missingToolCallIds: string[] = []
@@ -213,6 +214,7 @@ export async function orchestrateCopilotStream(
             logger.info('Waiting for local async tool completion before retrying resume claim', {
               toolCallId,
               runId: continuation.runId,
+              workerId: resumeWorkerId,
             })
             continue
           }
@@ -223,6 +225,7 @@ export async function orchestrateCopilotStream(
               logger.warn('Async tool continuation is waiting on a claim held by another worker', {
                 toolCallId,
                 runId: continuation.runId,
+                workerId: resumeWorkerId,
                 claimedBy: durableRow.claimedBy,
               })
               continue
@@ -278,6 +281,7 @@ export async function orchestrateCopilotStream(
             logger.info('Retrying async resume after some tool calls were not yet ready', {
               checkpointId: continuation.checkpointId,
               runId: continuation.runId,
+              workerId: resumeWorkerId,
               retry: resumeRetries,
               missingToolCallIds,
             })
@@ -295,6 +299,7 @@ export async function orchestrateCopilotStream(
             logger.info('Retrying async resume because no tool calls were ready yet', {
               checkpointId: continuation.checkpointId,
               runId: continuation.runId,
+              workerId: resumeWorkerId,
               retry: resumeRetries,
             })
             await new Promise((resolve) => setTimeout(resolve, 250 * resumeRetries))
@@ -323,6 +328,7 @@ export async function orchestrateCopilotStream(
             logger.info('Releasing async tool claims after claim contention during resume', {
               checkpointId: continuation.checkpointId,
               runId: continuation.runId,
+              workerId: resumeWorkerId,
               newlyClaimedToolCallIds,
               claimFailures,
             })
@@ -337,6 +343,7 @@ export async function orchestrateCopilotStream(
             logger.info('Retrying async resume after claim contention', {
               checkpointId: continuation.checkpointId,
               runId: continuation.runId,
+              workerId: resumeWorkerId,
               retry: resumeRetries,
               claimFailures,
             })
@@ -359,6 +366,7 @@ export async function orchestrateCopilotStream(
         logger.info('Resuming async tool continuation', {
           checkpointId: continuation.checkpointId,
           runId: continuation.runId,
+          workerId: resumeWorkerId,
           toolCallIds: readyTools.map((tool) => tool.toolCallId),
         })