fix(api): preserve cancelled queue status

Author: TheodoreSpeaks

apps/docs/openapi-core.json

@@ -1484,7 +1484,7 @@
           },
           "status": {
             "type": "string",
-            "enum": ["queued", "processing", "completed", "failed"],
+            "enum": ["queued", "processing", "completed", "failed", "cancelled"],
             "description": "Current status of the job.",
             "example": "completed"
           },

apps/sim/app/api/cron/cleanup-stale-executions/route.ts

@@ -203,7 +203,6 @@ export const GET = withRouteHandler(async (request: NextRequest) => {
       })
     }
 
-    // Delete completed/failed jobs older than retention period
     const retentionThreshold = new Date(Date.now() - JOB_RETENTION_HOURS * 60 * 60 * 1000)
     let asyncJobsDeleted = 0
 
@@ -212,7 +211,11 @@ export const GET = withRouteHandler(async (request: NextRequest) => {
         .delete(asyncJobs)
         .where(
           and(
-            inArray(asyncJobs.status, [JOB_STATUS.COMPLETED, JOB_STATUS.FAILED]),
+            inArray(asyncJobs.status, [
+              JOB_STATUS.COMPLETED,
+              JOB_STATUS.FAILED,
+              JOB_STATUS.CANCELLED,
+            ]),
             lt(asyncJobs.completedAt, retentionThreshold)
           )
         )

apps/sim/lib/api/contracts/common.ts

@@ -106,7 +106,7 @@ export const getStatusContract = defineRouteContract({
   },
 })
 
-const jobStatusSchema = z.enum(['pending', 'processing', 'completed', 'failed'])
+const jobStatusSchema = z.enum(['pending', 'processing', 'completed', 'failed', 'cancelled'])
 
 const jobStatusResponseSchema = z
   .object({

apps/sim/lib/core/async-jobs/backends/database.test.ts

@@ -112,3 +112,20 @@ describe('DatabaseJobQueue batchEnqueueAndWait', () => {
     expect(maxInFlight).toBe(2)
   })
 })
+
+describe('DatabaseJobQueue cancelJob', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    resetDbChainMock()
+  })
+
+  it('persists cancellation as its own terminal status', async () => {
+    const queue = new DatabaseJobQueue()
+
+    await queue.cancelJob('workflow:1')
+
+    expect(dbChainMockFns.set).toHaveBeenCalledWith(
+      expect.objectContaining({ status: 'cancelled', error: 'Cancelled' })
+    )
+  })
+})

apps/sim/lib/core/async-jobs/backends/database.ts

@@ -314,7 +314,7 @@ export class DatabaseJobQueue implements JobQueueBackend {
     await db
       .update(asyncJobs)
       .set({
-        status: JOB_STATUS.FAILED,
+        status: JOB_STATUS.CANCELLED,
         completedAt: now,
         error: 'Cancelled',
         updatedAt: now,

apps/sim/lib/core/async-jobs/backends/trigger-dev.test.ts

@@ -158,4 +158,21 @@ describe('TriggerDevJobQueue getJob', () => {
       metadata: { workflowId: 'workflow-1' },
     })
   })
+
+  it('preserves a cancelled Trigger.dev run as cancelled', async () => {
+    mockRetrieveRun.mockResolvedValueOnce({
+      id: 'run-cancelled',
+      taskIdentifier: 'workflow-execution',
+      payload: { workflowId: 'workflow-1' },
+      status: 'CANCELED',
+      createdAt: '2026-08-05T12:00:00.000Z',
+      finishedAt: '2026-08-05T12:00:01.000Z',
+      attemptCount: 0,
+    })
+    const queue = new TriggerDevJobQueue()
+
+    const job = await queue.getJob('run-cancelled')
+
+    expect(job).toMatchObject({ id: 'run-cancelled', status: 'cancelled' })
+  })
 })

apps/sim/lib/core/async-jobs/backends/trigger-dev.ts

@@ -63,6 +63,7 @@ function mapTriggerDevStatus(status: string): JobStatus {
     case 'COMPLETED':
       return JOB_STATUS.COMPLETED
     case 'CANCELED':
+      return JOB_STATUS.CANCELLED
     case 'FAILED':
     case 'CRASHED':
     case 'INTERRUPTED':

apps/sim/lib/core/async-jobs/types.ts

@@ -2,10 +2,10 @@
  * Types and constants for the async job queue system
  */
 
-/** Retention period for completed/failed jobs (in hours) */
+/** Retention period for terminal jobs (in hours) */
 export const JOB_RETENTION_HOURS = 24
 
-/** Retention period for completed/failed jobs (in seconds, for Redis TTL) */
+/** Retention period for terminal jobs (in seconds, for Redis TTL) */
 export const JOB_RETENTION_SECONDS = JOB_RETENTION_HOURS * 60 * 60
 
 /** Max lifetime for jobs in Redis (in seconds) - cleanup for stuck pending/processing jobs */
@@ -16,6 +16,7 @@ export const JOB_STATUS = {
   PROCESSING: 'processing',
   COMPLETED: 'completed',
   FAILED: 'failed',
+  CANCELLED: 'cancelled',
 } as const
 
 export type JobStatus = (typeof JOB_STATUS)[keyof typeof JOB_STATUS]

apps/sim/lib/workflows/executor/execution-status.test.ts

@@ -12,9 +12,16 @@ vi.mock('@/lib/core/async-jobs', () => ({
   getJobQueue: vi.fn().mockResolvedValue({ getJob: mockGetJob }),
 }))
 
-vi.mock('@/lib/workflows/executor/enqueue-execution', () => ({
-  RESUME_EXECUTION_JOB_ID_PREFIX: 'resume-execution:',
-  WORKFLOW_EXECUTION_JOB_ID_PREFIX: 'workflow-execution:',
+vi.mock('@/lib/logs/execution/functional-outputs', () => ({
+  collectFunctionalBlockOutputs: vi.fn().mockReturnValue(new Map()),
+}))
+
+vi.mock('@/lib/logs/execution/trace-store', () => ({
+  materializeExecutionData: vi.fn(),
+}))
+
+vi.mock('@/lib/workflows/executor/paused-execution-metadata', () => ({
+  getAutomaticResumeWaitingMetadata: vi.fn().mockReturnValue(null),
 }))
 
 import { getWorkflowExecutionStatus } from '@/lib/workflows/executor/execution-status'
@@ -56,6 +63,25 @@ describe('getWorkflowExecutionStatus queue projection', () => {
     expect(mockGetJob).toHaveBeenCalledWith('workflow-execution:execution-1')
   })
 
+  it('preserves queue cancellation as a cancelled execution resource', async () => {
+    mockGetJob.mockResolvedValue({
+      status: 'cancelled',
+      createdAt: new Date('2026-08-05T12:00:00.000Z'),
+      completedAt: new Date('2026-08-05T12:00:01.000Z'),
+      metadata: { workflowId: 'workflow-1' },
+    })
+
+    const status = await getWorkflowExecutionStatus(input)
+
+    expect(status).toMatchObject({
+      executionId: 'execution-1',
+      status: 'cancelled',
+      level: 'info',
+      endedAt: '2026-08-05T12:00:01.000Z',
+      error: null,
+    })
+  })
+
   it('uses the resume entry ID when the queued work is a resume attempt', async () => {
     queueTableRows(schemaMock.resumeQueue, [{ id: 'resume-entry-1', status: 'claimed' }])
     mockGetJob.mockResolvedValueOnce({