fix(workflows): cancel runs by execution id

Author: icecrasher321

apps/sim/app/api/v2/workflows/[workflowId]/runs/[runId]/cancel/route.ts

@@ -13,7 +13,7 @@ export const POST = defineV2JsonRoute({
   operation: workflowOperations.cancelRun,
   rateLimit: v2RateLimits.publicApi,
   errorPolicy: v2WorkflowErrorPolicies.cancelRun,
-  mapInput: ({ params }) => ({ workflowId: params.workflowId, runId: params.runId }),
+  mapInput: ({ params }) => ({ runId: params.runId }),
   useCase: cancelWorkflowRun,
   present: (result) => ({
     data: {

apps/sim/app/api/v2/workflows/[workflowId]/runs/[runId]/route.test.ts

@@ -359,7 +359,7 @@ describe('v2 run detail and cancel adapters', () => {
     })
     expect(mocks.cancel).toHaveBeenCalledWith({
       principal,
-      input: { workflowId: 'workflow-1', runId: 'run-1' },
+      input: { runId: 'run-1' },
       request: expect.anything(),
     })
     expect(v2RouteMocks.operationRate).toHaveBeenCalledTimes(2)
@@ -417,7 +417,7 @@ describe('v2 run detail and cancel adapters', () => {
     expect(response.status).toBe(200)
     expect(mocks.cancel).toHaveBeenCalledWith({
       principal: personalPrincipal,
-      input: { workflowId: 'workflow-1', runId: 'run-1' },
+      input: { runId: 'run-1' },
       request: expect.anything(),
     })
   })

apps/sim/app/api/workflows/[id]/executions/[executionId]/cancel/route.test.ts

@@ -64,7 +64,6 @@ describe('POST /api/workflows/[id]/executions/[executionId]/cancel', () => {
     expect(mocks.cancel).toHaveBeenCalledWith({
       principal,
       input: {
-        workflowId: 'workflow-1',
         runId: 'execution-1',
         abortSignal: expect.any(AbortSignal),
       },

apps/sim/app/api/workflows/[id]/executions/[executionId]/cancel/route.ts

@@ -19,7 +19,6 @@ export const POST = defineInternalJsonRoute({
   }),
   errorPolicy: internalWorkflowErrorPolicies.concealRunAuthorization,
   mapInput: ({ params }, { request }) => ({
-    workflowId: params.id,
     runId: params.executionId,
     abortSignal: request.signal,
   }),

apps/sim/lib/copilot/generated/tool-catalog-v1.ts

@@ -1629,9 +1629,8 @@ export const CancelWorkflowRun: ToolCatalogEntry = {
         description:
           'Required workflow execution ID returned by run_workflow with async:true or found with query_logs. This identifies a workflow run, not an agent invocation or chat request.',
       },
-      workflowId: { type: 'string', description: 'Required workflow ID that owns the execution.' },
     },
-    required: ['workflowId', 'executionId'],
+    required: ['executionId'],
   },
   requiredPermission: 'write',
   requiresApproval: true,

apps/sim/lib/copilot/generated/tool-schemas-v1.ts

@@ -1569,12 +1569,8 @@ export const TOOL_RUNTIME_SCHEMAS: Record<string, ToolRuntimeSchemaEntry> = {
           description:
             'Required workflow execution ID returned by run_workflow with async:true or found with query_logs. This identifies a workflow run, not an agent invocation or chat request.',
         },
-        workflowId: {
-          type: 'string',
-          description: 'Required workflow ID that owns the execution.',
-        },
       },
-      required: ['workflowId', 'executionId'],
+      required: ['executionId'],
     },
     resultSchema: undefined,
   },

apps/sim/lib/copilot/tools/handlers/param-types.ts

@@ -61,7 +61,6 @@ export interface RunWorkflowParams {
 }
 
 export interface CancelWorkflowRunParams {
-  workflowId: string
   /** The workflow execution ID returned by run_workflow or query_logs. */
   executionId: string
 }

apps/sim/lib/copilot/tools/handlers/workflow/mutations.test.ts

@@ -169,17 +169,16 @@ describe('workflow mutation Copilot adapters', () => {
     mocks.executeWorkflowUseCase.mockResolvedValue({
       success: true,
       executionId: 'execution-1',
+      workflowId: 'workflow-1',
+      workspaceId: 'workspace-1',
       redisAvailable: true,
       durablyRecorded: true,
       locallyAborted: false,
       pausedCancelled: false,
       reason: 'recorded',
     })
 
-    const result = await executeCancelWorkflowRun(
-      { workflowId: 'workflow-1', executionId: 'execution-1' },
-      context
-    )
+    const result = await executeCancelWorkflowRun({ executionId: 'execution-1' }, context)
 
     expect(result).toEqual({
       success: true,
@@ -198,9 +197,7 @@ describe('workflow mutation Copilot adapters', () => {
         operation: expect.objectContaining({ id: 'workflows.runs.cancel' }),
       }),
       {
-        workflowId: 'workflow-1',
         runId: 'execution-1',
-        assertedWorkspaceId: 'workspace-1',
       }
     )
   })
@@ -215,10 +212,7 @@ describe('workflow mutation Copilot adapters', () => {
       })
     )
 
-    const result = await executeCancelWorkflowRun(
-      { workflowId: 'workflow-1', executionId: 'execution-1' },
-      context
-    )
+    const result = await executeCancelWorkflowRun({ executionId: 'execution-1' }, context)
 
     expect(result).toEqual({
       success: false,
@@ -227,25 +221,12 @@ describe('workflow mutation Copilot adapters', () => {
   })
 
   it('requires an execution ID before attempting workflow-run cancellation', async () => {
-    const result = await executeCancelWorkflowRun(
-      { workflowId: 'workflow-1' } as CancelWorkflowRunParams,
-      context
-    )
+    const result = await executeCancelWorkflowRun({} as CancelWorkflowRunParams, context)
 
     expect(result).toEqual({ success: false, error: 'executionId is required' })
     expect(mocks.executeWorkflowUseCase).not.toHaveBeenCalled()
   })
 
-  it('requires a workflow ID even when the execution context contains one', async () => {
-    const result = await executeCancelWorkflowRun(
-      { executionId: 'execution-1' } as CancelWorkflowRunParams,
-      context
-    )
-
-    expect(result).toEqual({ success: false, error: 'workflowId is required' })
-    expect(mocks.executeWorkflowUseCase).not.toHaveBeenCalled()
-  })
-
   it.each([
     {
       label: 'until',

apps/sim/lib/copilot/tools/handlers/workflow/mutations.ts

@@ -289,10 +289,6 @@ export async function executeCancelWorkflowRun(
   context: ExecutionContext
 ): Promise<ToolCallResult> {
   try {
-    const workflowId = params.workflowId
-    if (!workflowId) {
-      return { success: false, error: 'workflowId is required' }
-    }
     const executionId = resolveInputFromExecutionId(params.executionId)
     if (!executionId) {
       return { success: false, error: 'executionId is required' }
@@ -303,16 +299,14 @@ export async function executeCancelWorkflowRun(
       'Request aborted before workflow run cancellation could be applied.'
     )
     const result = await executeCopilotWorkflowUseCase(context, cancelWorkflowRun, {
-      workflowId,
       runId: executionId,
-      assertedWorkspaceId: context.workspaceId,
       ...(context.abortSignal ? { abortSignal: context.abortSignal } : {}),
     })
 
     return {
       success: result.success,
       output: {
-        workflowId,
+        workflowId: result.workflowId,
         executionId: result.executionId,
         durablyRecorded: result.durablyRecorded,
         locallyAborted: result.locallyAborted,

apps/sim/lib/webhooks/slack-custom-ingress.test.ts

@@ -92,6 +92,18 @@ describe('handleSlackAgentSessionStopped', () => {
     await handleSlackAgentSessionStopped('credential-1', { kind: 'stop' })
 
     expect(mocks.cancel).toHaveBeenCalledTimes(2)
+    expect(mocks.cancel).toHaveBeenNthCalledWith(1, {
+      executionId: 'execution-1',
+      workflowId: 'workflow-1',
+      attributedUserId: 'user-1',
+      workspaceId: 'workspace-1',
+    })
+    expect(mocks.cancel).toHaveBeenNthCalledWith(2, {
+      executionId: 'execution-2',
+      workflowId: 'workflow-2',
+      attributedUserId: 'user-2',
+      workspaceId: 'workspace-1',
+    })
     expect(mocks.unregister).toHaveBeenCalledTimes(2)
     expect(mocks.setStatus).toHaveBeenCalledWith(
       'xoxb-test',