@mastra/inngest 0.0.0-support-d1-client-20250701191943 → 0.0.0-tool-call-parts-20250630193309

package/CHANGELOG.md

@@ -1,26 +1,21 @@
 # @mastra/inngest
 
-## 0.0.0-support-d1-client-20250701191943
+## 0.0.0-tool-call-parts-20250630193309
 
 ### Patch Changes
 
-- e423a31: Fix bug where nested workflows would cause Inngest duplicate key error
 - 764f86a: Introduces the runCount property in the execution parameters for the steps execute function
 - 1760a1c: Use workflow stream in playground instead of watch
-- 038e5ae: Add cancel workflow run
 - Updated dependencies [9dda1ac]
 - Updated dependencies [7e801dd]
-- Updated dependencies [a606c75]
 - Updated dependencies [7aa70a4]
 - Updated dependencies [764f86a]
 - Updated dependencies [1760a1c]
-- Updated dependencies [038e5ae]
 - Updated dependencies [7dda16a]
-- Updated dependencies [4e809ad]
+- Updated dependencies [d80069a]
 - Updated dependencies [57929df]
-- Updated dependencies [b7852ed]
 - Updated dependencies [6320a61]
-  - @mastra/core@0.0.0-support-d1-client-20250701191943
+  - @mastra/core@0.0.0-tool-call-parts-20250630193309
 
 ## 0.11.0
 

package/dist/_tsup-dts-rollup.d.cts

@@ -91,10 +91,9 @@ export declare class InngestExecutionEngine extends DefaultExecutionEngine {
             delay?: number;
         };
         runtimeContext: RuntimeContext;
-        abortController: AbortController;
     }): Promise<TOutput>;
     protected fmtReturnValue<TOutput>(executionSpan: Span | undefined, emitter: Emitter, stepResults: Record<string, StepResult<any, any, any, any>>, lastOutput: StepResult<any, any, any, any>, error?: Error | string): Promise<TOutput>;
-    superExecuteStep({ workflowId, runId, step, stepResults, executionContext, resume, prevOutput, emitter, abortController, runtimeContext, }: {
+    superExecuteStep({ workflowId, runId, step, stepResults, executionContext, resume, prevOutput, emitter, runtimeContext, }: {
         workflowId: string;
         runId: string;
         step: Step<string, any, any>;
@@ -106,7 +105,6 @@ export declare class InngestExecutionEngine extends DefaultExecutionEngine {
         };
         prevOutput: any;
         emitter: Emitter;
-        abortController: AbortController;
         runtimeContext: RuntimeContext;
     }): Promise<StepResult<any, any, any, any>>;
     executeSleep({ id, duration }: {
@@ -117,10 +115,19 @@ export declare class InngestExecutionEngine extends DefaultExecutionEngine {
         event: string;
         timeout?: number;
     }): Promise<any>;
-    executeStep({ step, stepResults, executionContext, resume, prevOutput, emitter, abortController, runtimeContext, }: {
+    executeStep({ step, stepResults, executionContext, resume, prevOutput, emitter, runtimeContext, }: {
         step: Step<string, any, any>;
         stepResults: Record<string, StepResult<any, any, any, any>>;
-        executionContext: ExecutionContext;
+        executionContext: {
+            workflowId: string;
+            runId: string;
+            executionPath: number[];
+            suspendedPaths: Record<string, number[]>;
+            retryConfig: {
+                attempts: number;
+                delay: number;
+            };
+        };
         resume?: {
             steps: string[];
             resumePayload: any;
@@ -128,7 +135,6 @@ export declare class InngestExecutionEngine extends DefaultExecutionEngine {
         };
         prevOutput: any;
         emitter: Emitter;
-        abortController: AbortController;
         runtimeContext: RuntimeContext;
     }): Promise<StepResult<any, any, any, any>>;
     persistStepUpdate({ workflowId, runId, stepResults, executionContext, serializedStepGraph, workflowStatus, result, error, }: {
@@ -141,7 +147,7 @@ export declare class InngestExecutionEngine extends DefaultExecutionEngine {
         result?: Record<string, any>;
         error?: string | Error;
     }): Promise<void>;
-    executeConditional({ workflowId, runId, entry, prevOutput, prevStep, stepResults, serializedStepGraph, resume, executionContext, emitter, abortController, runtimeContext, }: {
+    executeConditional({ workflowId, runId, entry, prevOutput, prevStep, stepResults, serializedStepGraph, resume, executionContext, emitter, runtimeContext, }: {
         workflowId: string;
         runId: string;
         entry: {
@@ -161,7 +167,6 @@ export declare class InngestExecutionEngine extends DefaultExecutionEngine {
         };
         executionContext: ExecutionContext;
         emitter: Emitter;
-        abortController: AbortController;
         runtimeContext: RuntimeContext;
     }): Promise<StepResult<any, any, any, any>>;
 }
@@ -186,7 +191,6 @@ export declare class InngestRun<TEngineType = InngestEngineType, TSteps extends
     getRuns(eventId: string): Promise<any>;
     getRunOutput(eventId: string): Promise<any>;
     sendEvent(event: string, data: any): Promise<void>;
-    cancel(): Promise<void>;
     start({ inputData, }: {
         inputData?: z.infer<TInput>;
         runtimeContext?: RuntimeContext;

package/dist/_tsup-dts-rollup.d.ts

@@ -91,10 +91,9 @@ export declare class InngestExecutionEngine extends DefaultExecutionEngine {
             delay?: number;
         };
         runtimeContext: RuntimeContext;
-        abortController: AbortController;
     }): Promise<TOutput>;
     protected fmtReturnValue<TOutput>(executionSpan: Span | undefined, emitter: Emitter, stepResults: Record<string, StepResult<any, any, any, any>>, lastOutput: StepResult<any, any, any, any>, error?: Error | string): Promise<TOutput>;
-    superExecuteStep({ workflowId, runId, step, stepResults, executionContext, resume, prevOutput, emitter, abortController, runtimeContext, }: {
+    superExecuteStep({ workflowId, runId, step, stepResults, executionContext, resume, prevOutput, emitter, runtimeContext, }: {
         workflowId: string;
         runId: string;
         step: Step<string, any, any>;
@@ -106,7 +105,6 @@ export declare class InngestExecutionEngine extends DefaultExecutionEngine {
         };
         prevOutput: any;
         emitter: Emitter;
-        abortController: AbortController;
         runtimeContext: RuntimeContext;
     }): Promise<StepResult<any, any, any, any>>;
     executeSleep({ id, duration }: {
@@ -117,10 +115,19 @@ export declare class InngestExecutionEngine extends DefaultExecutionEngine {
         event: string;
         timeout?: number;
     }): Promise<any>;
-    executeStep({ step, stepResults, executionContext, resume, prevOutput, emitter, abortController, runtimeContext, }: {
+    executeStep({ step, stepResults, executionContext, resume, prevOutput, emitter, runtimeContext, }: {
         step: Step<string, any, any>;
         stepResults: Record<string, StepResult<any, any, any, any>>;
-        executionContext: ExecutionContext;
+        executionContext: {
+            workflowId: string;
+            runId: string;
+            executionPath: number[];
+            suspendedPaths: Record<string, number[]>;
+            retryConfig: {
+                attempts: number;
+                delay: number;
+            };
+        };
         resume?: {
             steps: string[];
             resumePayload: any;
@@ -128,7 +135,6 @@ export declare class InngestExecutionEngine extends DefaultExecutionEngine {
         };
         prevOutput: any;
         emitter: Emitter;
-        abortController: AbortController;
         runtimeContext: RuntimeContext;
     }): Promise<StepResult<any, any, any, any>>;
     persistStepUpdate({ workflowId, runId, stepResults, executionContext, serializedStepGraph, workflowStatus, result, error, }: {
@@ -141,7 +147,7 @@ export declare class InngestExecutionEngine extends DefaultExecutionEngine {
         result?: Record<string, any>;
         error?: string | Error;
     }): Promise<void>;
-    executeConditional({ workflowId, runId, entry, prevOutput, prevStep, stepResults, serializedStepGraph, resume, executionContext, emitter, abortController, runtimeContext, }: {
+    executeConditional({ workflowId, runId, entry, prevOutput, prevStep, stepResults, serializedStepGraph, resume, executionContext, emitter, runtimeContext, }: {
         workflowId: string;
         runId: string;
         entry: {
@@ -161,7 +167,6 @@ export declare class InngestExecutionEngine extends DefaultExecutionEngine {
         };
         executionContext: ExecutionContext;
         emitter: Emitter;
-        abortController: AbortController;
         runtimeContext: RuntimeContext;
     }): Promise<StepResult<any, any, any, any>>;
 }
@@ -186,7 +191,6 @@ export declare class InngestRun<TEngineType = InngestEngineType, TSteps extends
     getRuns(eventId: string): Promise<any>;
     getRunOutput(eventId: string): Promise<any>;
     sendEvent(event: string, data: any): Promise<void>;
-    cancel(): Promise<void>;
     start({ inputData, }: {
         inputData?: z.infer<TInput>;
         runtimeContext?: RuntimeContext;

package/dist/index.cjs

@@ -12,17 +12,13 @@ var zod = require('zod');
 // src/index.ts
 function serve({ mastra, inngest }) {
   const wfs = mastra.getWorkflows();
-  const functions = Array.from(
-    new Set(
-      Object.values(wfs).flatMap((wf) => {
-        if (wf instanceof InngestWorkflow) {
-          wf.__registerMastra(mastra);
-          return wf.getFunctions();
-        }
-        return [];
-      })
-    )
-  );
+  const functions = Object.values(wfs).flatMap((wf) => {
+    if (wf instanceof InngestWorkflow) {
+      wf.__registerMastra(mastra);
+      return wf.getFunctions();
+    }
+    return [];
+  });
   return hono.serve({
     client: inngest,
     functions
@@ -52,14 +48,8 @@ var InngestRun = class extends workflows.Run {
     while (runs?.[0]?.status !== "Completed" || runs?.[0]?.event_id !== eventId) {
       await new Promise((resolve) => setTimeout(resolve, 1e3));
       runs = await this.getRuns(eventId);
-      if (runs?.[0]?.status === "Failed") {
+      if (runs?.[0]?.status === "Failed" || runs?.[0]?.status === "Cancelled") {
         throw new Error(`Function run ${runs?.[0]?.status}`);
-      } else if (runs?.[0]?.status === "Cancelled") {
-        const snapshot = await this.#mastra?.storage?.loadWorkflowSnapshot({
-          workflowName: this.workflowId,
-          runId: this.runId
-        });
-        return { output: { result: { steps: snapshot?.context, status: "canceled" } } };
       }
     }
     return runs?.[0];
@@ -70,28 +60,6 @@ var InngestRun = class extends workflows.Run {
       data
     });
   }
-  async cancel() {
-    await this.inngest.send({
-      name: `cancel.workflow.${this.workflowId}`,
-      data: {
-        runId: this.runId
-      }
-    });
-    const snapshot = await this.#mastra?.storage?.loadWorkflowSnapshot({
-      workflowName: this.workflowId,
-      runId: this.runId
-    });
-    if (snapshot) {
-      await this.#mastra?.storage?.persistWorkflowSnapshot({
-        workflowName: this.workflowId,
-        runId: this.runId,
-        snapshot: {
-          ...snapshot,
-          status: "canceled"
-        }
-      });
-    }
-  }
   async start({
     inputData
   }) {
@@ -356,12 +324,8 @@ var InngestWorkflow = class _InngestWorkflow extends workflows.Workflow {
       return this.function;
     }
     this.function = this.inngest.createFunction(
-      {
-        id: `workflow.${this.id}`,
-        // @ts-ignore
-        retries: this.retryConfig?.attempts ?? 0,
-        cancelOn: [{ event: `cancel.workflow.${this.id}` }]
-      },
+      // @ts-ignore
+      { id: `workflow.${this.id}`, retries: this.retryConfig?.attempts ?? 0 },
       { event: `workflow.${this.id}` },
       async ({ event, step, attempt, publish }) => {
         let { inputData, runId, resume } = event.data;
@@ -403,8 +367,7 @@ var InngestWorkflow = class _InngestWorkflow extends workflows.Workflow {
           retryConfig: this.retryConfig,
           runtimeContext: new di.RuntimeContext(),
           // TODO
-          resume,
-          abortController: new AbortController()
+          resume
         });
         return { result, runId };
       }
@@ -448,7 +411,7 @@ function createStep(params) {
       outputSchema: zod.z.object({
         text: zod.z.string()
       }),
-      execute: async ({ inputData, [_constants.EMITTER_SYMBOL]: emitter, runtimeContext, abortSignal, abort }) => {
+      execute: async ({ inputData, [_constants.EMITTER_SYMBOL]: emitter, runtimeContext }) => {
         let streamPromise = {};
         streamPromise.promise = new Promise((resolve, reject) => {
           streamPromise.resolve = resolve;
@@ -468,12 +431,8 @@ function createStep(params) {
           runtimeContext,
           onFinish: (result) => {
             streamPromise.resolve(result.text);
-          },
-          abortSignal
+          }
         });
-        if (abortSignal.aborted) {
-          return abort();
-        }
         for await (const chunk of fullStream) {
           switch (chunk.type) {
             case "text-delta":
@@ -648,7 +607,6 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
     resume,
     prevOutput,
     emitter,
-    abortController,
     runtimeContext
   }) {
     return super.executeStep({
@@ -660,7 +618,6 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
       resume,
       prevOutput,
       emitter,
-      abortController,
       runtimeContext
     });
   }
@@ -684,7 +641,6 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
     resume,
     prevOutput,
     emitter,
-    abortController,
     runtimeContext
   }) {
     const startedAt = await this.inngestStep.run(
@@ -928,8 +884,7 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
           [_constants.EMITTER_SYMBOL]: emitter,
           engine: {
             step: this.inngestStep
-          },
-          abortSignal: abortController.signal
+          }
         });
         const endedAt = Date.now();
         execResults = {
@@ -1060,7 +1015,6 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
     resume,
     executionContext,
     emitter,
-    abortController,
     runtimeContext
   }) {
     let execResults;
@@ -1090,14 +1044,10 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
               },
               bail: () => {
               },
-              abort: () => {
-                abortController.abort();
-              },
               [_constants.EMITTER_SYMBOL]: emitter,
               engine: {
                 step: this.inngestStep
-              },
-              abortSignal: abortController.signal
+              }
             });
             return result ? index : null;
           } catch (e) {
@@ -1126,7 +1076,6 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
             executionSpan: executionContext.executionSpan
           },
           emitter,
-          abortController,
           runtimeContext
         })
       )

package/dist/index.js

@@ -10,17 +10,13 @@ import { z } from 'zod';
 // src/index.ts
 function serve({ mastra, inngest }) {
   const wfs = mastra.getWorkflows();
-  const functions = Array.from(
-    new Set(
-      Object.values(wfs).flatMap((wf) => {
-        if (wf instanceof InngestWorkflow) {
-          wf.__registerMastra(mastra);
-          return wf.getFunctions();
-        }
-        return [];
-      })
-    )
-  );
+  const functions = Object.values(wfs).flatMap((wf) => {
+    if (wf instanceof InngestWorkflow) {
+      wf.__registerMastra(mastra);
+      return wf.getFunctions();
+    }
+    return [];
+  });
   return serve$1({
     client: inngest,
     functions
@@ -50,14 +46,8 @@ var InngestRun = class extends Run {
     while (runs?.[0]?.status !== "Completed" || runs?.[0]?.event_id !== eventId) {
       await new Promise((resolve) => setTimeout(resolve, 1e3));
       runs = await this.getRuns(eventId);
-      if (runs?.[0]?.status === "Failed") {
+      if (runs?.[0]?.status === "Failed" || runs?.[0]?.status === "Cancelled") {
         throw new Error(`Function run ${runs?.[0]?.status}`);
-      } else if (runs?.[0]?.status === "Cancelled") {
-        const snapshot = await this.#mastra?.storage?.loadWorkflowSnapshot({
-          workflowName: this.workflowId,
-          runId: this.runId
-        });
-        return { output: { result: { steps: snapshot?.context, status: "canceled" } } };
       }
     }
     return runs?.[0];
@@ -68,28 +58,6 @@ var InngestRun = class extends Run {
       data
     });
   }
-  async cancel() {
-    await this.inngest.send({
-      name: `cancel.workflow.${this.workflowId}`,
-      data: {
-        runId: this.runId
-      }
-    });
-    const snapshot = await this.#mastra?.storage?.loadWorkflowSnapshot({
-      workflowName: this.workflowId,
-      runId: this.runId
-    });
-    if (snapshot) {
-      await this.#mastra?.storage?.persistWorkflowSnapshot({
-        workflowName: this.workflowId,
-        runId: this.runId,
-        snapshot: {
-          ...snapshot,
-          status: "canceled"
-        }
-      });
-    }
-  }
   async start({
     inputData
   }) {
@@ -354,12 +322,8 @@ var InngestWorkflow = class _InngestWorkflow extends Workflow {
       return this.function;
     }
     this.function = this.inngest.createFunction(
-      {
-        id: `workflow.${this.id}`,
-        // @ts-ignore
-        retries: this.retryConfig?.attempts ?? 0,
-        cancelOn: [{ event: `cancel.workflow.${this.id}` }]
-      },
+      // @ts-ignore
+      { id: `workflow.${this.id}`, retries: this.retryConfig?.attempts ?? 0 },
       { event: `workflow.${this.id}` },
       async ({ event, step, attempt, publish }) => {
         let { inputData, runId, resume } = event.data;
@@ -401,8 +365,7 @@ var InngestWorkflow = class _InngestWorkflow extends Workflow {
           retryConfig: this.retryConfig,
           runtimeContext: new RuntimeContext(),
           // TODO
-          resume,
-          abortController: new AbortController()
+          resume
         });
         return { result, runId };
       }
@@ -446,7 +409,7 @@ function createStep(params) {
       outputSchema: z.object({
         text: z.string()
       }),
-      execute: async ({ inputData, [EMITTER_SYMBOL]: emitter, runtimeContext, abortSignal, abort }) => {
+      execute: async ({ inputData, [EMITTER_SYMBOL]: emitter, runtimeContext }) => {
         let streamPromise = {};
         streamPromise.promise = new Promise((resolve, reject) => {
           streamPromise.resolve = resolve;
@@ -466,12 +429,8 @@ function createStep(params) {
           runtimeContext,
           onFinish: (result) => {
             streamPromise.resolve(result.text);
-          },
-          abortSignal
+          }
         });
-        if (abortSignal.aborted) {
-          return abort();
-        }
         for await (const chunk of fullStream) {
           switch (chunk.type) {
             case "text-delta":
@@ -646,7 +605,6 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
     resume,
     prevOutput,
     emitter,
-    abortController,
     runtimeContext
   }) {
     return super.executeStep({
@@ -658,7 +616,6 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
       resume,
       prevOutput,
       emitter,
-      abortController,
       runtimeContext
     });
   }
@@ -682,7 +639,6 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
     resume,
     prevOutput,
     emitter,
-    abortController,
     runtimeContext
   }) {
     const startedAt = await this.inngestStep.run(
@@ -926,8 +882,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
           [EMITTER_SYMBOL]: emitter,
           engine: {
             step: this.inngestStep
-          },
-          abortSignal: abortController.signal
+          }
         });
         const endedAt = Date.now();
         execResults = {
@@ -1058,7 +1013,6 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
     resume,
     executionContext,
     emitter,
-    abortController,
     runtimeContext
   }) {
     let execResults;
@@ -1088,14 +1042,10 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
               },
               bail: () => {
               },
-              abort: () => {
-                abortController.abort();
-              },
               [EMITTER_SYMBOL]: emitter,
               engine: {
                 step: this.inngestStep
-              },
-              abortSignal: abortController.signal
+              }
             });
             return result ? index : null;
           } catch (e) {
@@ -1124,7 +1074,6 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
             executionSpan: executionContext.executionSpan
           },
           emitter,
-          abortController,
           runtimeContext
         })
       )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/inngest",
-  "version": "0.0.0-support-d1-client-20250701191943",
+  "version": "0.0.0-tool-call-parts-20250630193309",
   "description": "Mastra Inngest integration",
   "type": "module",
   "main": "dist/index.js",
@@ -36,14 +36,14 @@
     "hono": "^4.8.3",
     "tsup": "^8.5.0",
     "typescript": "^5.8.3",
-    "vitest": "^3.2.4",
-    "@internal/lint": "0.0.0-support-d1-client-20250701191943",
-    "@mastra/libsql": "0.0.0-support-d1-client-20250701191943",
-    "@mastra/deployer": "0.0.0-support-d1-client-20250701191943",
-    "@mastra/core": "0.0.0-support-d1-client-20250701191943"
+    "vitest": "^2.1.9",
+    "@mastra/core": "0.0.0-tool-call-parts-20250630193309",
+    "@mastra/libsql": "0.0.0-tool-call-parts-20250630193309",
+    "@internal/lint": "0.0.0-tool-call-parts-20250630193309",
+    "@mastra/deployer": "0.0.0-tool-call-parts-20250630193309"
   },
   "peerDependencies": {
-    "@mastra/core": "0.0.0-support-d1-client-20250701191943"
+    "@mastra/core": "0.0.0-tool-call-parts-20250630193309"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --experimental-dts --clean --treeshake=smallest --splitting",

package/src/index.test.ts

@@ -732,203 +732,6 @@ describe('MastraInngestWorkflow', () => {
     });
   });
 
-  describe('abort', () => {
-    it('should be able to abort workflow execution in between steps', async ctx => {
-      const inngest = new Inngest({
-        id: 'mastra',
-        baseUrl: `http://localhost:${(ctx as any).inngestPort}`,
-        middleware: [realtimeMiddleware()],
-      });
-
-      const { createWorkflow, createStep } = init(inngest);
-
-      const step1 = createStep({
-        id: 'step1',
-        execute: async ({ inputData }) => {
-          return { result: 'step1: ' + inputData.value };
-        },
-        inputSchema: z.object({ value: z.string() }),
-        outputSchema: z.object({ result: z.string() }),
-      });
-      const step2 = createStep({
-        id: 'step2',
-        execute: async ({ inputData }) => {
-          return { result: 'step2: ' + inputData.result };
-        },
-        inputSchema: z.object({ result: z.string() }),
-        outputSchema: z.object({ result: z.string() }),
-      });
-
-      const workflow = createWorkflow({
-        id: 'test-workflow',
-        inputSchema: z.object({}),
-        outputSchema: z.object({
-          result: z.string(),
-        }),
-        steps: [step1, step2],
-      });
-
-      workflow.then(step1).sleep(2000).then(step2).commit();
-
-      const mastra = new Mastra({
-        storage: new DefaultStorage({
-          url: ':memory:',
-        }),
-        workflows: {
-          'test-workflow': workflow,
-        },
-        server: {
-          apiRoutes: [
-            {
-              path: '/inngest/api',
-              method: 'ALL',
-              createHandler: async ({ mastra }) => inngestServe({ mastra, inngest }),
-            },
-          ],
-        },
-      });
-
-      const app = await createHonoServer(mastra);
-
-      const srv = serve({
-        fetch: app.fetch,
-        port: (ctx as any).handlerPort,
-      });
-      await new Promise(resolve => setTimeout(resolve, 2000));
-
-      const run = await workflow.createRunAsync();
-      const p = run.start({ inputData: { value: 'test' } });
-
-      setTimeout(() => {
-        run.cancel();
-      }, 1000);
-
-      const result = await p;
-
-      srv.close();
-
-      expect(result.status).toBe('canceled');
-      expect(result.steps['step1']).toEqual({
-        status: 'success',
-        output: { result: 'step1: test' },
-        payload: { value: 'test' },
-        startedAt: expect.any(Number),
-        endedAt: expect.any(Number),
-      });
-
-      expect(result.steps['step2']).toBeUndefined();
-    });
-
-    it('should be able to abort workflow execution during a step', async ctx => {
-      const inngest = new Inngest({
-        id: 'mastra',
-        baseUrl: `http://localhost:${(ctx as any).inngestPort}`,
-        middleware: [realtimeMiddleware()],
-      });
-
-      const { createWorkflow, createStep } = init(inngest);
-
-      const step1 = createStep({
-        id: 'step1',
-        execute: async ({ inputData }) => {
-          return { result: 'step1: ' + inputData.value };
-        },
-        inputSchema: z.object({ value: z.string() }),
-        outputSchema: z.object({ result: z.string() }),
-      });
-      const step2 = createStep({
-        id: 'step2',
-        execute: async ({ inputData, abortSignal, abort }) => {
-          console.log('abort signal', abortSignal);
-          const timeout: Promise<string> = new Promise((resolve, _reject) => {
-            const ref = setTimeout(() => {
-              resolve('step2: ' + inputData.result);
-            }, 5000);
-
-            abortSignal.addEventListener('abort', () => {
-              resolve('');
-              clearTimeout(ref);
-            });
-          });
-
-          const result = await timeout;
-          if (abortSignal.aborted) {
-            return abort();
-          }
-          return { result };
-        },
-        inputSchema: z.object({ result: z.string() }),
-        outputSchema: z.object({ result: z.string() }),
-      });
-
-      const workflow = createWorkflow({
-        id: 'test-workflow',
-        inputSchema: z.object({}),
-        outputSchema: z.object({
-          result: z.string(),
-        }),
-        steps: [step1, step2],
-      });
-
-      workflow.then(step1).then(step2).commit();
-
-      const mastra = new Mastra({
-        storage: new DefaultStorage({
-          url: ':memory:',
-        }),
-        workflows: {
-          'test-workflow': workflow,
-        },
-        server: {
-          apiRoutes: [
-            {
-              path: '/inngest/api',
-              method: 'ALL',
-              createHandler: async ({ mastra }) => inngestServe({ mastra, inngest }),
-            },
-          ],
-        },
-      });
-
-      const app = await createHonoServer(mastra);
-
-      const srv = serve({
-        fetch: app.fetch,
-        port: (ctx as any).handlerPort,
-      });
-      await new Promise(resolve => setTimeout(resolve, 2000));
-
-      const run = await workflow.createRunAsync();
-      const p = run.start({ inputData: { value: 'test' } });
-
-      setTimeout(() => {
-        run.cancel();
-      }, 1000);
-
-      const result = await p;
-      console.log('result', result);
-
-      srv.close();
-
-      expect(result.status).toBe('canceled');
-      expect(result.steps['step1']).toEqual({
-        status: 'success',
-        output: { result: 'step1: test' },
-        payload: { value: 'test' },
-        startedAt: expect.any(Number),
-        endedAt: expect.any(Number),
-      });
-
-      // expect(result.steps['step2']).toEqual({
-      //   status: 'canceled',
-      //   payload: { result: 'step1: test' },
-      //   output: undefined,
-      //   startedAt: expect.any(Number),
-      //   endedAt: expect.any(Number),
-      // });
-    });
-  });
-
   describe('Variable Resolution', () => {
     it('should resolve trigger data', async ctx => {
       const inngest = new Inngest({

package/src/index.ts

@@ -33,17 +33,13 @@ export type InngestEngineType = {
 
 export function serve({ mastra, inngest }: { mastra: Mastra; inngest: Inngest }): ReturnType<typeof inngestServe> {
   const wfs = mastra.getWorkflows();
-  const functions = Array.from(
-    new Set(
-      Object.values(wfs).flatMap(wf => {
-        if (wf instanceof InngestWorkflow) {
-          wf.__registerMastra(mastra);
-          return wf.getFunctions();
-        }
-        return [];
-      }),
-    ),
-  );
+  const functions = Object.values(wfs).flatMap(wf => {
+    if (wf instanceof InngestWorkflow) {
+      wf.__registerMastra(mastra);
+      return wf.getFunctions();
+    }
+    return [];
+  });
   return inngestServe({
     client: inngest,
     functions,
@@ -98,14 +94,8 @@ export class InngestRun<
     while (runs?.[0]?.status !== 'Completed' || runs?.[0]?.event_id !== eventId) {
       await new Promise(resolve => setTimeout(resolve, 1000));
       runs = await this.getRuns(eventId);
-      if (runs?.[0]?.status === 'Failed') {
+      if (runs?.[0]?.status === 'Failed' || runs?.[0]?.status === 'Cancelled') {
         throw new Error(`Function run ${runs?.[0]?.status}`);
-      } else if (runs?.[0]?.status === 'Cancelled') {
-        const snapshot = await this.#mastra?.storage?.loadWorkflowSnapshot({
-          workflowName: this.workflowId,
-          runId: this.runId,
-        });
-        return { output: { result: { steps: snapshot?.context, status: 'canceled' } } };
       }
     }
     return runs?.[0];
@@ -118,30 +108,6 @@ export class InngestRun<
     });
   }
 
-  async cancel() {
-    await this.inngest.send({
-      name: `cancel.workflow.${this.workflowId}`,
-      data: {
-        runId: this.runId,
-      },
-    });
-
-    const snapshot = await this.#mastra?.storage?.loadWorkflowSnapshot({
-      workflowName: this.workflowId,
-      runId: this.runId,
-    });
-    if (snapshot) {
-      await this.#mastra?.storage?.persistWorkflowSnapshot({
-        workflowName: this.workflowId,
-        runId: this.runId,
-        snapshot: {
-          ...snapshot,
-          status: 'canceled' as any,
-        },
-      });
-    }
-  }
-
   async start({
     inputData,
   }: {
@@ -498,12 +464,8 @@ export class InngestWorkflow<
       return this.function;
     }
     this.function = this.inngest.createFunction(
-      {
-        id: `workflow.${this.id}`,
-        // @ts-ignore
-        retries: this.retryConfig?.attempts ?? 0,
-        cancelOn: [{ event: `cancel.workflow.${this.id}` }],
-      },
+      // @ts-ignore
+      { id: `workflow.${this.id}`, retries: this.retryConfig?.attempts ?? 0 },
       { event: `workflow.${this.id}` },
       async ({ event, step, attempt, publish }) => {
         let { inputData, runId, resume } = event.data;
@@ -552,7 +514,6 @@ export class InngestWorkflow<
           retryConfig: this.retryConfig,
           runtimeContext: new RuntimeContext(), // TODO
           resume,
-          abortController: new AbortController(),
         });
 
         return { result, runId };
@@ -675,7 +636,7 @@ export function createStep<
       outputSchema: z.object({
         text: z.string(),
       }),
-      execute: async ({ inputData, [EMITTER_SYMBOL]: emitter, runtimeContext, abortSignal, abort }) => {
+      execute: async ({ inputData, [EMITTER_SYMBOL]: emitter, runtimeContext }) => {
         let streamPromise = {} as {
           promise: Promise<string>;
           resolve: (value: string) => void;
@@ -701,13 +662,8 @@ export function createStep<
           onFinish: result => {
             streamPromise.resolve(result.text);
           },
-          abortSignal,
         });
 
-        if (abortSignal.aborted) {
-          return abort();
-        }
-
         for await (const chunk of fullStream) {
           switch (chunk.type) {
             case 'text-delta':
@@ -865,7 +821,6 @@ export class InngestExecutionEngine extends DefaultExecutionEngine {
       delay?: number;
     };
     runtimeContext: RuntimeContext;
-    abortController: AbortController;
   }): Promise<TOutput> {
     await params.emitter.emit('watch-v2', {
       type: 'start',
@@ -965,7 +920,6 @@ export class InngestExecutionEngine extends DefaultExecutionEngine {
     resume,
     prevOutput,
     emitter,
-    abortController,
     runtimeContext,
   }: {
     workflowId: string;
@@ -979,7 +933,6 @@ export class InngestExecutionEngine extends DefaultExecutionEngine {
     };
     prevOutput: any;
     emitter: Emitter;
-    abortController: AbortController;
     runtimeContext: RuntimeContext;
   }): Promise<StepResult<any, any, any, any>> {
     return super.executeStep({
@@ -991,7 +944,6 @@ export class InngestExecutionEngine extends DefaultExecutionEngine {
       resume,
       prevOutput,
       emitter,
-      abortController,
       runtimeContext,
     });
   }
@@ -1020,12 +972,17 @@ export class InngestExecutionEngine extends DefaultExecutionEngine {
     resume,
     prevOutput,
     emitter,
-    abortController,
     runtimeContext,
   }: {
     step: Step<string, any, any>;
     stepResults: Record<string, StepResult<any, any, any, any>>;
-    executionContext: ExecutionContext;
+    executionContext: {
+      workflowId: string;
+      runId: string;
+      executionPath: number[];
+      suspendedPaths: Record<string, number[]>;
+      retryConfig: { attempts: number; delay: number };
+    };
     resume?: {
       steps: string[];
       resumePayload: any;
@@ -1033,7 +990,6 @@ export class InngestExecutionEngine extends DefaultExecutionEngine {
     };
     prevOutput: any;
     emitter: Emitter;
-    abortController: AbortController;
     runtimeContext: RuntimeContext;
   }): Promise<StepResult<any, any, any, any>> {
     const startedAt = await this.inngestStep.run(
@@ -1304,7 +1260,6 @@ export class InngestExecutionEngine extends DefaultExecutionEngine {
           engine: {
             step: this.inngestStep,
           },
-          abortSignal: abortController.signal,
         });
         const endedAt = Date.now();
 
@@ -1458,7 +1413,6 @@ export class InngestExecutionEngine extends DefaultExecutionEngine {
     resume,
     executionContext,
     emitter,
-    abortController,
     runtimeContext,
   }: {
     workflowId: string;
@@ -1480,7 +1434,6 @@ export class InngestExecutionEngine extends DefaultExecutionEngine {
     };
     executionContext: ExecutionContext;
     emitter: Emitter;
-    abortController: AbortController;
     runtimeContext: RuntimeContext;
   }): Promise<StepResult<any, any, any, any>> {
     let execResults: any;
@@ -1512,14 +1465,10 @@ export class InngestExecutionEngine extends DefaultExecutionEngine {
                 // TODO: this function shouldn't have suspend probably?
                 suspend: async (_suspendPayload: any) => {},
                 bail: () => {},
-                abort: () => {
-                  abortController.abort();
-                },
                 [EMITTER_SYMBOL]: emitter,
                 engine: {
                   step: this.inngestStep,
                 },
-                abortSignal: abortController.signal,
               });
               return result ? index : null;
               // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -1551,7 +1500,6 @@ export class InngestExecutionEngine extends DefaultExecutionEngine {
             executionSpan: executionContext.executionSpan,
           },
           emitter,
-          abortController,
           runtimeContext,
         }),
       ),