From 438defceb0b5a4a7cf612e3d5f4cd5110ed0260a Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyathvikku@gmail.com>
Date: Wed, 25 Mar 2026 14:48:28 -0700
Subject: [PATCH] fix(mothership): key resumes by orchestration id (#3771)

---
 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 8861b23e47..39d4a11203 100644
--- a/apps/sim/lib/copilot/orchestrator/index.ts
+++ b/apps/sim/lib/copilot/orchestrator/index.ts
@@ -126,6 +126,7 @@ export async function orchestrateCopilotStream(
     runId,
     messageId,
   })
+  const continuationWorkerId = `sim-resume:${crypto.randomUUID()}`
   const withLogContext = (message: string) =>
     appendCopilotLogContext(message, {
       requestId: context.requestId,
@@ -253,7 +254,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[] = []
@@ -272,6 +273,7 @@ export async function orchestrateCopilotStream(
               {
                 toolCallId,
                 runId: continuation.runId,
+                workerId: resumeWorkerId,
               }
             )
             continue
@@ -287,6 +289,7 @@ export async function orchestrateCopilotStream(
                 {
                   toolCallId,
                   runId: continuation.runId,
+                  workerId: resumeWorkerId,
                   claimedBy: durableRow.claimedBy,
                 }
               )
@@ -355,6 +358,7 @@ export async function orchestrateCopilotStream(
               {
                 checkpointId: continuation.checkpointId,
                 runId: continuation.runId,
+                workerId: resumeWorkerId,
                 retry: resumeRetries,
                 missingToolCallIds,
               }
@@ -385,6 +389,7 @@ export async function orchestrateCopilotStream(
               {
                 checkpointId: continuation.checkpointId,
                 runId: continuation.runId,
+                workerId: resumeWorkerId,
                 retry: resumeRetries,
               }
             )
@@ -424,6 +429,7 @@ export async function orchestrateCopilotStream(
               {
                 checkpointId: continuation.checkpointId,
                 runId: continuation.runId,
+                workerId: resumeWorkerId,
                 newlyClaimedToolCallIds,
                 claimFailures,
               }
@@ -439,6 +445,7 @@ export async function orchestrateCopilotStream(
             logger.info(withLogContext('Retrying async resume after claim contention'), {
               checkpointId: continuation.checkpointId,
               runId: continuation.runId,
+              workerId: resumeWorkerId,
               retry: resumeRetries,
               claimFailures,
             })
@@ -469,6 +476,7 @@ export async function orchestrateCopilotStream(
         logger.info(withLogContext('Resuming async tool continuation'), {
           checkpointId: continuation.checkpointId,
           runId: continuation.runId,
+          workerId: resumeWorkerId,
           toolCallIds: readyTools.map((tool) => tool.toolCallId),
         })