fix(workflows): reconcile failed abort rollbacks

Author: icecrasher321

apps/sim/lib/execution/cancel-workflow-execution.test.ts

@@ -1149,6 +1149,30 @@ describe('cancelWorkflowExecution', () => {
     expect(mockCancelByExecution).not.toHaveBeenCalled()
   })
 
+  it('finishes cancellation when an aborted idle-pause rollback fails', async () => {
+    const controller = new AbortController()
+    mockStagePausedCancellation.mockImplementationOnce(async () => {
+      controller.abort()
+      return { kind: 'idle' }
+    })
+    mockClearPausedCancellationIntent.mockRejectedValueOnce(new Error('database unavailable'))
+    mockCompletePausedCancellation.mockResolvedValue(true)
+
+    const response = await cancelAsResponse({
+      abortSignal: controller.signal,
+    })
+
+    expect(response.status).toBe(200)
+    await expect(response.json()).resolves.toMatchObject({
+      success: true,
+      pausedCancelled: true,
+      reason: 'recorded',
+    })
+    expect(mockClearPausedCancellationIntent).toHaveBeenCalledWith('ex-1', 'wf-1')
+    expect(mockWriteTerminalEvent).toHaveBeenCalledOnce()
+    expect(mockCompletePausedCancellation).toHaveBeenCalledWith('ex-1', 'wf-1')
+  })
+
   it('rolls back an active resume staged while cancellation is aborted', async () => {
     const controller = new AbortController()
     mockStagePausedCancellation.mockImplementationOnce(async () => {

apps/sim/lib/execution/cancel-workflow-execution.ts

@@ -375,21 +375,30 @@ async function rollbackPausedCancellationAfterAbort(args: {
 }): Promise<boolean> {
   if (!args.abortSignal?.aborted) return false
 
-  if (args.stage.kind === 'active_resume') {
-    const rolledBack = await PauseResumeManager.rollbackActiveResumeCancellation(
-      args.executionId,
-      args.workflowId,
-      args.stage.target.resumeEntryId
-    )
-    if (!rolledBack) {
-      logger.warn('Aborted cancellation could not be rolled back; completing cancellation', {
-        executionId: args.executionId,
-        activeResumeEntryId: args.stage.target.resumeEntryId,
-      })
-      return false
+  try {
+    if (args.stage.kind === 'active_resume') {
+      const rolledBack = await PauseResumeManager.rollbackActiveResumeCancellation(
+        args.executionId,
+        args.workflowId,
+        args.stage.target.resumeEntryId
+      )
+      if (!rolledBack) {
+        logger.warn('Aborted cancellation could not be rolled back; completing cancellation', {
+          executionId: args.executionId,
+          activeResumeEntryId: args.stage.target.resumeEntryId,
+        })
+        return false
+      }
+    } else if (args.stage.kind === 'idle') {
+      await PauseResumeManager.clearPausedCancellationIntent(args.executionId, args.workflowId)
     }
-  } else if (args.stage.kind === 'idle') {
-    await PauseResumeManager.clearPausedCancellationIntent(args.executionId, args.workflowId)
+  } catch (error) {
+    logger.warn('Failed to roll back aborted cancellation; completing cancellation', {
+      executionId: args.executionId,
+      stageKind: args.stage.kind,
+      error: toError(error).message,
+    })
+    return false
   }
 
   return true