Skip to content

Commit fc9481b

Browse files
authored
fix(executor): resume a paused draft run on the graph it paused on (#10057)
* fix(executor): resume a paused draft run on the graph it paused on * test(executor): type the draft resume snapshots instead of casting to any
1 parent d2f870a commit fc9481b

3 files changed

Lines changed: 101 additions & 31 deletions

File tree

‎apps/sim/lib/logs/execution/logging-session.ts‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -839,13 +839,12 @@ export class LoggingSession {
839839
workspaceId,
840840
variables
841841
)
842-
this.workflowState =
843-
workflowState ??
844-
(deploymentVersionId
845-
? await loadDeployedWorkflowStateForLogging(this.workflowId)
846-
: await loadWorkflowStateForExecution(this.workflowId))
847-
848842
if (!skipLogCreation) {
843+
this.workflowState =
844+
workflowState ??
845+
(deploymentVersionId
846+
? await loadDeployedWorkflowStateForLogging(this.workflowId)
847+
: await loadWorkflowStateForExecution(this.workflowId))
849848
await executionLogger.startWorkflowExecution({
850849
workflowId: this.workflowId,
851850
workspaceId,

‎apps/sim/lib/workflows/executor/execution-core.test.ts‎

Lines changed: 54 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -222,11 +222,7 @@ describe('executeWorkflowCore terminal finalization sequencing', () => {
222222
enforceCredentialAccess: false,
223223
startTime: new Date().toISOString(),
224224
},
225-
workflow: {
226-
id: 'workflow-1',
227-
userId: 'workflow-owner',
228-
variables: {},
229-
},
225+
workflow: { version: '1.0', blocks: [], connections: [], loops: {}, parallels: {} },
230226
input: { hello: 'world' },
231227
workflowVariables: {},
232228
selectedOutputs: [],
@@ -914,6 +910,58 @@ describe('executeWorkflowCore terminal finalization sequencing', () => {
914910
expect(loadWorkflowDeploymentVersionStateMock).not.toHaveBeenCalled()
915911
})
916912

913+
function createDraftResumeSnapshot(workflow: unknown) {
914+
const base = createSnapshot()
915+
return new ExecutionSnapshot(
916+
{ ...base.metadata, resumeFromSnapshot: true, resumeTerminalNoop: true },
917+
workflow,
918+
{},
919+
{},
920+
[]
921+
)
922+
}
923+
924+
it('runs a draft resume on the graph it paused on, never the live draft', async () => {
925+
const pausedWorkflow = {
926+
version: '1.0',
927+
blocks: [{ id: 'paused-block' }],
928+
connections: [],
929+
loops: {},
930+
parallels: {},
931+
}
932+
executorExecuteMock.mockResolvedValue({
933+
success: true,
934+
status: 'completed',
935+
output: {},
936+
logs: [],
937+
metadata: { duration: 1, startTime: 'start', endTime: 'end' },
938+
})
939+
940+
await executeWorkflowCore({
941+
snapshot: createDraftResumeSnapshot(pausedWorkflow),
942+
callbacks: {},
943+
loggingSession: loggingSession as unknown as LoggingSession,
944+
skipLogCreation: true,
945+
})
946+
947+
expect(loadWorkflowFromNormalizedTablesMock).not.toHaveBeenCalled()
948+
expect(executorConstructorMock).toHaveBeenCalledWith(
949+
expect.objectContaining({ workflow: pausedWorkflow })
950+
)
951+
})
952+
953+
it('fails a draft resume whose snapshot lost its paused graph', async () => {
954+
await expect(
955+
executeWorkflowCore({
956+
snapshot: createDraftResumeSnapshot(undefined),
957+
callbacks: {},
958+
loggingSession: loggingSession as unknown as LoggingSession,
959+
skipLogCreation: true,
960+
})
961+
).rejects.toThrow('Draft resume is missing the workflow graph it paused on')
962+
expect(loadWorkflowFromNormalizedTablesMock).not.toHaveBeenCalled()
963+
})
964+
917965
describe('PII redaction of restored large values', () => {
918966
const sourceItems = [{ email: 'alice@example.com', count: 7 }]
919967
const maskedItems = [{ email: '<EMAIL_ADDRESS>', count: 7 }]
@@ -953,6 +1001,7 @@ describe('executeWorkflowCore terminal finalization sequencing', () => {
9531001
decisions: { router: {}, condition: {} },
9541002
completedLoops: [],
9551003
activeExecutionPath: [],
1004+
pendingQueue: [],
9561005
trustedLargeValueAccess: { executionIds: [], largeValueKeys: [], fileKeys: [] },
9571006
}
9581007
}

‎apps/sim/lib/workflows/executor/execution-core.ts‎

Lines changed: 42 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import { createLogger } from '@sim/logger'
1111
import { getErrorMessage, redactBoundParameters, toError } from '@sim/utils/errors'
1212
import { filterUndefined, isPlainRecord, isRecordLike } from '@sim/utils/object'
1313
import { mergeSubblockStateWithValues } from '@sim/workflow-persistence/subblocks'
14-
import type { Edge } from '@xyflow/react'
1514
import { eq } from 'drizzle-orm'
1615
import { z } from 'zod'
1716
import { type EffectivePiiRedaction, resolveEffectivePiiRedaction } from '@/lib/billing/retention'
@@ -79,6 +78,7 @@ import {
7978
buildParallelSentinelEndId,
8079
} from '@/executor/utils/subflow-node-id-codec'
8180
import { Serializer } from '@/serializer'
81+
import type { SerializedWorkflow } from '@/serializer/types'
8282

8383
const logger = createLogger('ExecutionCore')
8484

@@ -686,6 +686,16 @@ async function executeWorkflowCoreImpl(
686686
if (resumeFromSnapshot && !useDraftState && !resumeDeploymentVersionId) {
687687
throw new Error('Deployed resume requires its admitted deployment version')
688688
}
689+
/**
690+
* A draft resume runs the graph it paused on, never the live draft. Any `write`
691+
* member can edit the draft while the resumed run keeps its starter's identity
692+
* (personal variables, credential access), so reloading it would run another
693+
* member's later edits as the starter.
694+
*/
695+
const resumesPausedDraft = resumeFromSnapshot && useDraftState
696+
if (resumesPausedDraft && !Array.isArray(snapshot.workflow?.blocks)) {
697+
throw new Error('Draft resume is missing the workflow graph it paused on')
698+
}
689699
const pinnedDeploymentVersionId = metadata.pinnedDeploymentVersionId
690700
if (pinnedDeploymentVersionId && (useDraftState || metadata.workflowStateOverride)) {
691701
throw new Error('A pinned deployment version cannot run draft or overridden workflow state')
@@ -797,16 +807,18 @@ async function executeWorkflowCoreImpl(
797807
}
798808

799809
const [workflowState, env, piiPolicyRow] = await Promise.all([
800-
withDatabaseReadRetry(loadWorkflowState, { label: 'loadWorkflowState' }),
810+
resumesPausedDraft
811+
? undefined
812+
: withDatabaseReadRetry(loadWorkflowState, { label: 'loadWorkflowState' }),
801813
reads.environment,
802814
reads.piiPolicyRow,
803815
])
804816

805-
const { blocks, loops, parallels } = workflowState
806-
const edges: Edge[] = workflowState.edges
807-
deploymentVersionId = workflowState.deploymentVersionId
808-
809-
const mergedStates = mergeSubblockStateWithValues(blocks)
817+
deploymentVersionId = workflowState?.deploymentVersionId
818+
const loadedWorkflow = workflowState && {
819+
...workflowState,
820+
mergedStates: mergeSubblockStateWithValues(workflowState.blocks),
821+
}
810822

811823
const {
812824
personalEncrypted,
@@ -872,7 +884,12 @@ async function executeWorkflowCoreImpl(
872884
triggerData: metadata.correlation ? { correlation: metadata.correlation } : undefined,
873885
skipLogCreation,
874886
deploymentVersionId,
875-
workflowState: { blocks, edges, loops, parallels },
887+
workflowState: loadedWorkflow && {
888+
blocks: loadedWorkflow.blocks,
889+
edges: loadedWorkflow.edges,
890+
loops: loadedWorkflow.loops,
891+
parallels: loadedWorkflow.parallels,
892+
},
876893
})
877894
/**
878895
* A start that failed because the run's workspace or workflow is gone ends the run here,
@@ -881,9 +898,6 @@ async function executeWorkflowCoreImpl(
881898
const deletedScope = loggingSession.getDeletedScope()
882899
if (deletedScope) throw new ExecutionScopeDeletedError(executionId, deletedScope)
883900

884-
// Use edges directly - trigger-to-trigger edges are prevented at creation time
885-
const filteredEdges = edges
886-
887901
// Check if this is a resume execution before trigger resolution
888902
const resumePendingQueue = snapshot.state?.pendingQueue
889903
const resumeRemainingEdges = snapshot.state?.remainingEdges
@@ -905,14 +919,21 @@ async function executeWorkflowCoreImpl(
905919
resumeTerminalNoop,
906920
})
907921
} else if (!triggerBlockId) {
922+
if (!loadedWorkflow) {
923+
throw new Error('Draft resume is missing its pending queue')
924+
}
908925
const executionKind =
909926
triggerType === 'api' || triggerType === 'chat'
910927
? (triggerType as 'api' | 'chat')
911928
: triggerType === 'webhook' || triggerType === 'schedule'
912929
? 'external'
913930
: 'manual'
914931

915-
const startBlock = TriggerUtils.findStartBlock(mergedStates, executionKind, false)
932+
const startBlock = TriggerUtils.findStartBlock(
933+
loadedWorkflow.mergedStates,
934+
executionKind,
935+
false
936+
)
916937

917938
if (!startBlock) {
918939
throw new UserFailure('No start block found. Add a start block to this workflow.')
@@ -927,14 +948,15 @@ async function executeWorkflowCoreImpl(
927948
})
928949
}
929950

930-
// Serialize workflow
931-
const serializedWorkflow = new Serializer().serializeWorkflow(
932-
mergedStates,
933-
filteredEdges,
934-
loops,
935-
parallels,
936-
true
937-
)
951+
const serializedWorkflow: SerializedWorkflow = loadedWorkflow
952+
? new Serializer().serializeWorkflow(
953+
loadedWorkflow.mergedStates,
954+
loadedWorkflow.edges,
955+
loadedWorkflow.loops,
956+
loadedWorkflow.parallels,
957+
true
958+
)
959+
: snapshot.workflow
938960
const inputFileKeys = new Set<string>()
939961
processedInput =
940962
resumeFromSnapshot || runFromBlock

0 commit comments

Comments
 (0)