Skip to content

fix(mothership): key resumes by orchestration id #3771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
icecrasher321 merged 2 commits into from
Mar 25, 2026
Merged

fix(mothership): key resumes by orchestration id #3771

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
984387e
fix(mothership): key resumes by orchestration id
icecrasher321 Mar 25, 2026
bce6fde
Merge branch 'staging' into fix/mothership-id-key
icecrasher321 Mar 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion apps/sim/lib/copilot/orchestrator/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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[] = []
Expand All @@ -272,6 +273,7 @@ export async function orchestrateCopilotStream(
{
toolCallId,
runId: continuation.runId,
workerId: resumeWorkerId,
}
)
continue
Expand All @@ -287,6 +289,7 @@ export async function orchestrateCopilotStream(
{
toolCallId,
runId: continuation.runId,
workerId: resumeWorkerId,
claimedBy: durableRow.claimedBy,
}
)
Expand Down Expand Up @@ -355,6 +358,7 @@ export async function orchestrateCopilotStream(
{
checkpointId: continuation.checkpointId,
runId: continuation.runId,
workerId: resumeWorkerId,
retry: resumeRetries,
missingToolCallIds,
}
Expand Down Expand Up @@ -385,6 +389,7 @@ export async function orchestrateCopilotStream(
{
checkpointId: continuation.checkpointId,
runId: continuation.runId,
workerId: resumeWorkerId,
retry: resumeRetries,
}
)
Expand Down Expand Up @@ -424,6 +429,7 @@ export async function orchestrateCopilotStream(
{
checkpointId: continuation.checkpointId,
runId: continuation.runId,
workerId: resumeWorkerId,
newlyClaimedToolCallIds,
claimFailures,
}
Expand All @@ -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,
})
Expand Down Expand Up @@ -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),
})

Expand Down
Loading