fix(async): preserve outcomes during cleanup

Keep execution finalization cleanup best-effort so cancellation cleanup failures do not overwrite successful or failed outcomes. Restore webhook processor formatting to the repository Biome style to avoid noisy formatter churn.
simstudioai · icecrasher321 · Mar 13, 2026 · Mar 11, 2026 · Mar 11, 2026 · Mar 12, 2026
commit 285d2d73451f59156fa5c0b1dd02f1a601be6f5a
diff --git a/apps/sim/lib/workflows/executor/execution-core.test.ts b/apps/sim/lib/workflows/executor/execution-core.test.ts
@@ -406,4 +406,42 @@ describe('executeWorkflowCore terminal finalization sequencing', () => {
       })
     )
   })
+
+  it('does not replace a successful outcome when cancellation cleanup fails', async () => {
+    executorExecuteMock.mockResolvedValue({
+      success: true,
+      status: 'completed',
+      output: { done: true },
+      logs: [],
+      metadata: { duration: 123, startTime: 'start', endTime: 'end' },
+    })
+
+    clearExecutionCancellationMock.mockRejectedValue(new Error('cleanup failed'))
+
+    await expect(
+      executeWorkflowCore({
+        snapshot: createSnapshot() as any,
+        callbacks: {},
+        loggingSession: loggingSession as any,
+      })
+    ).resolves.toMatchObject({ status: 'completed', success: true })
+
+    expect(safeCompleteWithErrorMock).not.toHaveBeenCalled()
+  })
+
+  it('does not replace the original error when cancellation cleanup fails', async () => {
+    const error = new Error('engine failed')
+    executorExecuteMock.mockRejectedValue(error)
+    clearExecutionCancellationMock.mockRejectedValue(new Error('cleanup failed'))
+
+    await expect(
+      executeWorkflowCore({
+        snapshot: createSnapshot() as any,
+        callbacks: {},
+        loggingSession: loggingSession as any,
+      })
+    ).rejects.toBe(error)
+
+    expect(safeCompleteWithErrorMock).toHaveBeenCalledTimes(1)
+  })
 })
diff --git a/apps/sim/lib/workflows/executor/execution-core.ts b/apps/sim/lib/workflows/executor/execution-core.ts
@@ -137,6 +137,17 @@ function rememberFinalizedExecutionId(executionId: string): void {
   finalizedExecutionIds.set(executionId, now + FINALIZED_EXECUTION_ID_TTL_MS)
 }
 
+async function clearExecutionCancellationSafely(
+  executionId: string,
+  requestId: string
+): Promise<void> {
+  try {
+    await clearExecutionCancellation(executionId)
+  } catch (error) {
+    logger.error(`[${requestId}] Failed to clear execution cancellation`, { error, executionId })
+  }
+}
+
 function markExecutionFinalizedByCore(error: unknown, executionId: string): void {
   rememberFinalizedExecutionId(executionId)
 
@@ -162,9 +173,10 @@ async function finalizeExecutionOutcome(params: {
   result: ExecutionResult
   loggingSession: LoggingSession
   executionId: string
+  requestId: string
   workflowInput: unknown
 }): Promise<void> {
-  const { result, loggingSession, executionId, workflowInput } = params
+  const { result, loggingSession, executionId, requestId, workflowInput } = params
   const { traceSpans, totalDuration } = buildTraceSpans(result)
   const endedAt = new Date().toISOString()
 
@@ -197,7 +209,7 @@ async function finalizeExecutionOutcome(params: {
       executionState: result.executionState,
     })
   } finally {
-    await clearExecutionCancellation(executionId)
+    await clearExecutionCancellationSafely(executionId, requestId)
   }
 }
 
@@ -229,7 +241,7 @@ async function finalizeExecutionError(params: {
     })
     return false
   } finally {
-    await clearExecutionCancellation(executionId)
+    await clearExecutionCancellationSafely(executionId, requestId)
   }
 }
 
@@ -486,6 +498,7 @@ export async function executeWorkflowCore(
       result,
       loggingSession,
       executionId,
+      requestId,
       workflowInput: processedInput,
     })