@mastra/inngest 0.10.4 → 0.10.5-alpha.0

package/.turbo/turbo-build.log

@@ -1,23 +1,23 @@
 
-> @mastra/inngest@0.10.3 build /home/runner/work/mastra/mastra/workflows/inngest
+> @mastra/inngest@0.10.5-alpha.0 build /home/runner/work/mastra/mastra/workflows/inngest
 > tsup src/index.ts --format esm,cjs --experimental-dts --clean --treeshake=smallest --splitting
 
 CLI Building entry: src/index.ts
 CLI Using tsconfig: tsconfig.json
 CLI tsup v8.5.0
 TSC Build start
-TSC ⚡️ Build success in 7542ms
+TSC ⚡️ Build success in 8463ms
 DTS Build start
 CLI Target: es2022
 Analysis will use the bundled TypeScript version 5.8.3
 Writing package typings: /home/runner/work/mastra/mastra/workflows/inngest/dist/_tsup-dts-rollup.d.ts
 Analysis will use the bundled TypeScript version 5.8.3
 Writing package typings: /home/runner/work/mastra/mastra/workflows/inngest/dist/_tsup-dts-rollup.d.cts
-DTS ⚡️ Build success in 7133ms
+DTS ⚡️ Build success in 6163ms
 CLI Cleaning output folder
 ESM Build start
 CJS Build start
-ESM dist/index.js 22.93 KB
-ESM ⚡️ Build success in 318ms
-CJS dist/index.cjs 23.07 KB
-CJS ⚡️ Build success in 319ms
+ESM dist/index.js 25.94 KB
+ESM ⚡️ Build success in 270ms
+CJS dist/index.cjs 26.13 KB
+CJS ⚡️ Build success in 271ms

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @mastra/inngest
 
+## 0.10.5-alpha.0
+
+### Patch Changes
+
+- 63f6b7d: dependencies updates:
+  - Updated dependency [`inngest@^3.39.1` ↗︎](https://www.npmjs.com/package/inngest/v/3.39.1) (from `^3.35.1`, in `dependencies`)
+  - Updated dependency [`zod@^3.25.57` ↗︎](https://www.npmjs.com/package/zod/v/3.25.57) (from `^3.25.56`, in `dependencies`)
+- Updated dependencies [63f6b7d]
+- Updated dependencies [36f1c36]
+- Updated dependencies [10d352e]
+- Updated dependencies [53d3c37]
+  - @mastra/core@0.10.6-alpha.0
+
 ## 0.10.4
 
 ### Patch Changes

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

@@ -1,6 +1,6 @@
+import { Agent } from '@mastra/core';
 import type { BaseContext } from 'inngest';
 import { ClientOptions } from 'inngest';
-import { cloneStep } from '@mastra/core/workflows';
 import { DefaultExecutionEngine } from '@mastra/core/workflows';
 import type { ExecuteFunction } from '@mastra/core/workflows';
 import type { ExecutionContext } from '@mastra/core/workflows';
@@ -19,29 +19,46 @@ import type { Span } from '@opentelemetry/api';
 import type { Step } from '@mastra/core/workflows';
 import type { StepFlowEntry } from '@mastra/core/workflows';
 import type { StepResult } from '@mastra/core/workflows';
+import { Tool } from '@mastra/core';
+import type { ToolExecutionContext } from '@mastra/core';
 import { Workflow } from '@mastra/core/workflows';
 import type { WorkflowConfig } from '@mastra/core/workflows';
 import type { WorkflowResult } from '@mastra/core/workflows';
 import type { WorkflowRun } from '@mastra/core';
 import type { WorkflowRuns } from '@mastra/core';
-import type { z } from 'zod';
+import { z } from 'zod';
 
-declare function cloneWorkflow<TWorkflowId extends string = string, TInput extends z.ZodType<any> = z.ZodType<any>, TOutput extends z.ZodType<any> = z.ZodType<any>, TSteps extends Step<string, any, any, any, any>[] = Step<string, any, any, any, any>[]>(workflow: InngestWorkflow<TSteps, string, TInput, TOutput>, opts: {
-    id: TWorkflowId;
-}): InngestWorkflow<TSteps, TWorkflowId, TInput, TOutput>;
+export declare function createStep<TStepId extends string, TStepInput extends z.ZodType<any>, TStepOutput extends z.ZodType<any>, TResumeSchema extends z.ZodType<any>, TSuspendSchema extends z.ZodType<any>>(params: {
+    id: TStepId;
+    description?: string;
+    inputSchema: TStepInput;
+    outputSchema: TStepOutput;
+    resumeSchema?: TResumeSchema;
+    suspendSchema?: TSuspendSchema;
+    execute: ExecuteFunction<z.infer<TStepInput>, z.infer<TStepOutput>, z.infer<TResumeSchema>, z.infer<TSuspendSchema>, InngestEngineType>;
+}): Step<TStepId, TStepInput, TStepOutput, TResumeSchema, TSuspendSchema, InngestEngineType>;
+
+export declare function createStep<TStepId extends string, TStepInput extends z.ZodObject<{
+    prompt: z.ZodString;
+}>, TStepOutput extends z.ZodObject<{
+    text: z.ZodString;
+}>, TResumeSchema extends z.ZodType<any>, TSuspendSchema extends z.ZodType<any>>(agent: Agent<TStepId, any, any>): Step<TStepId, TStepInput, TStepOutput, TResumeSchema, TSuspendSchema, InngestEngineType>;
+
+export declare function createStep<TSchemaIn extends z.ZodType<any>, TSchemaOut extends z.ZodType<any>, TContext extends ToolExecutionContext<TSchemaIn>>(tool: Tool<TSchemaIn, TSchemaOut, TContext> & {
+    inputSchema: TSchemaIn;
+    outputSchema: TSchemaOut;
+    execute: (context: TContext) => Promise<any>;
+}): Step<string, TSchemaIn, TSchemaOut, z.ZodType<any>, z.ZodType<any>, InngestEngineType>;
 
 export declare function init(inngest: Inngest): {
-    createWorkflow<TWorkflowId extends string = string, TInput extends z.ZodType<any> = z.ZodType<any, z.ZodTypeDef, any>, TOutput extends z.ZodType<any> = z.ZodType<any, z.ZodTypeDef, any>, TSteps extends Step<string, any, any>[] = Step<string, any, any, z.ZodType<any, z.ZodTypeDef, any>, z.ZodType<any, z.ZodTypeDef, any>, any>[]>(params: WorkflowConfig<TWorkflowId, TInput, TOutput, TSteps>): InngestWorkflow<TSteps, TWorkflowId, TInput, TOutput, TInput>;
-    createStep<TStepId extends string, TStepInput extends z.ZodType<any>, TStepOutput extends z.ZodType<any>, TResumeSchema extends z.ZodType<any>, TSuspendSchema extends z.ZodType<any>>(params: {
+    createWorkflow<TWorkflowId extends string = string, TInput extends z.ZodType<any> = z.ZodType<any, z.ZodTypeDef, any>, TOutput extends z.ZodType<any> = z.ZodType<any, z.ZodTypeDef, any>, TSteps extends Step<string, any, any, any, any, InngestEngineType>[] = Step<string, any, any, any, any, InngestEngineType>[]>(params: WorkflowConfig<TWorkflowId, TInput, TOutput, TSteps>): InngestWorkflow<InngestEngineType, TSteps, TWorkflowId, TInput, TOutput, TInput>;
+    createStep: typeof createStep;
+    cloneStep<TStepId extends string>(step: Step<string, any, any, any, any, InngestEngineType>, opts: {
         id: TStepId;
-        inputSchema: TStepInput;
-        outputSchema: TStepOutput;
-        resumeSchema?: TResumeSchema;
-        suspendSchema?: TSuspendSchema;
-        execute: ExecuteFunction<z.infer<TStepInput>, z.infer<TStepOutput>, z.infer<TResumeSchema>, z.infer<TSuspendSchema>, InngestEngineType>;
-    }): Step<TStepId, TStepInput, TStepOutput, TResumeSchema, TSuspendSchema, InngestEngineType>;
-    cloneStep: typeof cloneStep;
-    cloneWorkflow: typeof cloneWorkflow;
+    }): Step<TStepId, any, any, any, any, InngestEngineType>;
+    cloneWorkflow<TWorkflowId extends string = string, TInput extends z.ZodType<any> = z.ZodType<any, z.ZodTypeDef, any>, TOutput extends z.ZodType<any> = z.ZodType<any, z.ZodTypeDef, any>, TSteps extends Step<string, any, any, any, any, InngestEngineType>[] = Step<string, any, any, any, any, InngestEngineType>[]>(workflow: Workflow<InngestEngineType, TSteps, string, TInput, TOutput, TInput>, opts: {
+        id: TWorkflowId;
+    }): Workflow<InngestEngineType, TSteps, TWorkflowId, TInput, TOutput, TInput>;
 };
 
 export declare type InngestEngineType = {
@@ -71,6 +88,10 @@ export declare class InngestExecutionEngine extends DefaultExecutionEngine {
         };
         runtimeContext: RuntimeContext;
     }): Promise<StepResult<any, any, any, any>>;
+    executeSleep({ id, duration }: {
+        id: string;
+        duration: number;
+    }): Promise<void>;
     executeStep({ step, stepResults, executionContext, resume, prevOutput, emitter, runtimeContext, }: {
         step: Step<string, any, any>;
         stepResults: Record<string, StepResult<any, any, any, any>>;
@@ -131,7 +152,7 @@ export declare class InngestExecutionEngine extends DefaultExecutionEngine {
     }): Promise<StepResult<any, any, any, any>>;
 }
 
-export declare class InngestRun<TSteps extends Step<string, any, any>[] = Step<string, any, any>[], TInput extends z.ZodType<any> = z.ZodType<any>, TOutput extends z.ZodType<any> = z.ZodType<any>> extends Run<TSteps, TInput, TOutput> {
+export declare class InngestRun<TEngineType = InngestEngineType, TSteps extends Step<string, any, any>[] = Step<string, any, any>[], TInput extends z.ZodType<any> = z.ZodType<any>, TOutput extends z.ZodType<any> = z.ZodType<any>> extends Run<TEngineType, TSteps, TInput, TOutput> {
     #private;
     private inngest;
     serializedStepGraph: SerializedStepFlowEntry[];
@@ -162,7 +183,7 @@ export declare class InngestRun<TSteps extends Step<string, any, any>[] = Step<s
     watch(cb: (event: any) => void): () => void;
 }
 
-export declare class InngestWorkflow<TSteps extends Step<string, any, any>[] = Step<string, any, any>[], TWorkflowId extends string = string, TInput extends z.ZodType<any> = z.ZodType<any>, TOutput extends z.ZodType<any> = z.ZodType<any>, TPrevSchema extends z.ZodType<any> = TInput> extends Workflow<TSteps, TWorkflowId, TInput, TOutput, InngestEngineType, TPrevSchema> {
+export declare class InngestWorkflow<TEngineType = InngestEngineType, TSteps extends Step<string, any, any>[] = Step<string, any, any>[], TWorkflowId extends string = string, TInput extends z.ZodType<any> = z.ZodType<any>, TOutput extends z.ZodType<any> = z.ZodType<any>, TPrevSchema extends z.ZodType<any> = TInput> extends Workflow<TEngineType, TSteps, TWorkflowId, TInput, TOutput, TPrevSchema> {
     #private;
     inngest: Inngest;
     private function;
@@ -178,7 +199,7 @@ export declare class InngestWorkflow<TSteps extends Step<string, any, any>[] = S
     __registerMastra(mastra: Mastra): void;
     createRun(options?: {
         runId?: string;
-    }): Run<TSteps, TInput, TOutput>;
+    }): Run<TEngineType, TSteps, TInput, TOutput>;
     getFunction(): InngestFunction<Omit<InngestFunction.Options<Inngest<ClientOptions>, InngestMiddleware.Stack, InngestFunction.Trigger<string>[] | [{
     cron: string;
     } & Partial<Record<"event" | "if", never>>] | [{

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

@@ -1,6 +1,6 @@
+import { Agent } from '@mastra/core';
 import type { BaseContext } from 'inngest';
 import { ClientOptions } from 'inngest';
-import { cloneStep } from '@mastra/core/workflows';
 import { DefaultExecutionEngine } from '@mastra/core/workflows';
 import type { ExecuteFunction } from '@mastra/core/workflows';
 import type { ExecutionContext } from '@mastra/core/workflows';
@@ -19,29 +19,46 @@ import type { Span } from '@opentelemetry/api';
 import type { Step } from '@mastra/core/workflows';
 import type { StepFlowEntry } from '@mastra/core/workflows';
 import type { StepResult } from '@mastra/core/workflows';
+import { Tool } from '@mastra/core';
+import type { ToolExecutionContext } from '@mastra/core';
 import { Workflow } from '@mastra/core/workflows';
 import type { WorkflowConfig } from '@mastra/core/workflows';
 import type { WorkflowResult } from '@mastra/core/workflows';
 import type { WorkflowRun } from '@mastra/core';
 import type { WorkflowRuns } from '@mastra/core';
-import type { z } from 'zod';
+import { z } from 'zod';
 
-declare function cloneWorkflow<TWorkflowId extends string = string, TInput extends z.ZodType<any> = z.ZodType<any>, TOutput extends z.ZodType<any> = z.ZodType<any>, TSteps extends Step<string, any, any, any, any>[] = Step<string, any, any, any, any>[]>(workflow: InngestWorkflow<TSteps, string, TInput, TOutput>, opts: {
-    id: TWorkflowId;
-}): InngestWorkflow<TSteps, TWorkflowId, TInput, TOutput>;
+export declare function createStep<TStepId extends string, TStepInput extends z.ZodType<any>, TStepOutput extends z.ZodType<any>, TResumeSchema extends z.ZodType<any>, TSuspendSchema extends z.ZodType<any>>(params: {
+    id: TStepId;
+    description?: string;
+    inputSchema: TStepInput;
+    outputSchema: TStepOutput;
+    resumeSchema?: TResumeSchema;
+    suspendSchema?: TSuspendSchema;
+    execute: ExecuteFunction<z.infer<TStepInput>, z.infer<TStepOutput>, z.infer<TResumeSchema>, z.infer<TSuspendSchema>, InngestEngineType>;
+}): Step<TStepId, TStepInput, TStepOutput, TResumeSchema, TSuspendSchema, InngestEngineType>;
+
+export declare function createStep<TStepId extends string, TStepInput extends z.ZodObject<{
+    prompt: z.ZodString;
+}>, TStepOutput extends z.ZodObject<{
+    text: z.ZodString;
+}>, TResumeSchema extends z.ZodType<any>, TSuspendSchema extends z.ZodType<any>>(agent: Agent<TStepId, any, any>): Step<TStepId, TStepInput, TStepOutput, TResumeSchema, TSuspendSchema, InngestEngineType>;
+
+export declare function createStep<TSchemaIn extends z.ZodType<any>, TSchemaOut extends z.ZodType<any>, TContext extends ToolExecutionContext<TSchemaIn>>(tool: Tool<TSchemaIn, TSchemaOut, TContext> & {
+    inputSchema: TSchemaIn;
+    outputSchema: TSchemaOut;
+    execute: (context: TContext) => Promise<any>;
+}): Step<string, TSchemaIn, TSchemaOut, z.ZodType<any>, z.ZodType<any>, InngestEngineType>;
 
 export declare function init(inngest: Inngest): {
-    createWorkflow<TWorkflowId extends string = string, TInput extends z.ZodType<any> = z.ZodType<any, z.ZodTypeDef, any>, TOutput extends z.ZodType<any> = z.ZodType<any, z.ZodTypeDef, any>, TSteps extends Step<string, any, any>[] = Step<string, any, any, z.ZodType<any, z.ZodTypeDef, any>, z.ZodType<any, z.ZodTypeDef, any>, any>[]>(params: WorkflowConfig<TWorkflowId, TInput, TOutput, TSteps>): InngestWorkflow<TSteps, TWorkflowId, TInput, TOutput, TInput>;
-    createStep<TStepId extends string, TStepInput extends z.ZodType<any>, TStepOutput extends z.ZodType<any>, TResumeSchema extends z.ZodType<any>, TSuspendSchema extends z.ZodType<any>>(params: {
+    createWorkflow<TWorkflowId extends string = string, TInput extends z.ZodType<any> = z.ZodType<any, z.ZodTypeDef, any>, TOutput extends z.ZodType<any> = z.ZodType<any, z.ZodTypeDef, any>, TSteps extends Step<string, any, any, any, any, InngestEngineType>[] = Step<string, any, any, any, any, InngestEngineType>[]>(params: WorkflowConfig<TWorkflowId, TInput, TOutput, TSteps>): InngestWorkflow<InngestEngineType, TSteps, TWorkflowId, TInput, TOutput, TInput>;
+    createStep: typeof createStep;
+    cloneStep<TStepId extends string>(step: Step<string, any, any, any, any, InngestEngineType>, opts: {
         id: TStepId;
-        inputSchema: TStepInput;
-        outputSchema: TStepOutput;
-        resumeSchema?: TResumeSchema;
-        suspendSchema?: TSuspendSchema;
-        execute: ExecuteFunction<z.infer<TStepInput>, z.infer<TStepOutput>, z.infer<TResumeSchema>, z.infer<TSuspendSchema>, InngestEngineType>;
-    }): Step<TStepId, TStepInput, TStepOutput, TResumeSchema, TSuspendSchema, InngestEngineType>;
-    cloneStep: typeof cloneStep;
-    cloneWorkflow: typeof cloneWorkflow;
+    }): Step<TStepId, any, any, any, any, InngestEngineType>;
+    cloneWorkflow<TWorkflowId extends string = string, TInput extends z.ZodType<any> = z.ZodType<any, z.ZodTypeDef, any>, TOutput extends z.ZodType<any> = z.ZodType<any, z.ZodTypeDef, any>, TSteps extends Step<string, any, any, any, any, InngestEngineType>[] = Step<string, any, any, any, any, InngestEngineType>[]>(workflow: Workflow<InngestEngineType, TSteps, string, TInput, TOutput, TInput>, opts: {
+        id: TWorkflowId;
+    }): Workflow<InngestEngineType, TSteps, TWorkflowId, TInput, TOutput, TInput>;
 };
 
 export declare type InngestEngineType = {
@@ -71,6 +88,10 @@ export declare class InngestExecutionEngine extends DefaultExecutionEngine {
         };
         runtimeContext: RuntimeContext;
     }): Promise<StepResult<any, any, any, any>>;
+    executeSleep({ id, duration }: {
+        id: string;
+        duration: number;
+    }): Promise<void>;
     executeStep({ step, stepResults, executionContext, resume, prevOutput, emitter, runtimeContext, }: {
         step: Step<string, any, any>;
         stepResults: Record<string, StepResult<any, any, any, any>>;
@@ -131,7 +152,7 @@ export declare class InngestExecutionEngine extends DefaultExecutionEngine {
     }): Promise<StepResult<any, any, any, any>>;
 }
 
-export declare class InngestRun<TSteps extends Step<string, any, any>[] = Step<string, any, any>[], TInput extends z.ZodType<any> = z.ZodType<any>, TOutput extends z.ZodType<any> = z.ZodType<any>> extends Run<TSteps, TInput, TOutput> {
+export declare class InngestRun<TEngineType = InngestEngineType, TSteps extends Step<string, any, any>[] = Step<string, any, any>[], TInput extends z.ZodType<any> = z.ZodType<any>, TOutput extends z.ZodType<any> = z.ZodType<any>> extends Run<TEngineType, TSteps, TInput, TOutput> {
     #private;
     private inngest;
     serializedStepGraph: SerializedStepFlowEntry[];
@@ -162,7 +183,7 @@ export declare class InngestRun<TSteps extends Step<string, any, any>[] = Step<s
     watch(cb: (event: any) => void): () => void;
 }
 
-export declare class InngestWorkflow<TSteps extends Step<string, any, any>[] = Step<string, any, any>[], TWorkflowId extends string = string, TInput extends z.ZodType<any> = z.ZodType<any>, TOutput extends z.ZodType<any> = z.ZodType<any>, TPrevSchema extends z.ZodType<any> = TInput> extends Workflow<TSteps, TWorkflowId, TInput, TOutput, InngestEngineType, TPrevSchema> {
+export declare class InngestWorkflow<TEngineType = InngestEngineType, TSteps extends Step<string, any, any>[] = Step<string, any, any>[], TWorkflowId extends string = string, TInput extends z.ZodType<any> = z.ZodType<any>, TOutput extends z.ZodType<any> = z.ZodType<any>, TPrevSchema extends z.ZodType<any> = TInput> extends Workflow<TEngineType, TSteps, TWorkflowId, TInput, TOutput, TPrevSchema> {
     #private;
     inngest: Inngest;
     private function;
@@ -178,7 +199,7 @@ export declare class InngestWorkflow<TSteps extends Step<string, any, any>[] = S
     __registerMastra(mastra: Mastra): void;
     createRun(options?: {
         runId?: string;
-    }): Run<TSteps, TInput, TOutput>;
+    }): Run<TEngineType, TSteps, TInput, TOutput>;
     getFunction(): InngestFunction<Omit<InngestFunction.Options<Inngest<ClientOptions>, InngestMiddleware.Stack, InngestFunction.Trigger<string>[] | [{
     cron: string;
     } & Partial<Record<"event" | "if", never>>] | [{

package/dist/index.cjs

@@ -2,10 +2,12 @@
 
 var crypto = require('crypto');
 var realtime = require('@inngest/realtime');
+var core = require('@mastra/core');
 var di = require('@mastra/core/di');
 var workflows = require('@mastra/core/workflows');
 var _constants = require('@mastra/core/workflows/_constants');
 var hono = require('inngest/hono');
+var zod = require('zod');
 
 // src/index.ts
 function serve({ mastra, inngest }) {
@@ -270,31 +272,128 @@ var InngestWorkflow = class _InngestWorkflow extends workflows.Workflow {
     return [this.getFunction(), ...this.getNestedFunctions(this.executionGraph.steps)];
   }
 };
-function cloneWorkflow(workflow, opts) {
-  const wf = new InngestWorkflow(
-    {
-      id: opts.id,
-      inputSchema: workflow.inputSchema,
-      outputSchema: workflow.outputSchema,
-      steps: workflow.stepDefs,
-      mastra: workflow.mastra
-    },
-    workflow.inngest
-  );
-  wf.setStepFlow(workflow.stepGraph);
-  wf.commit();
-  return wf;
+function createStep(params) {
+  if (params instanceof core.Agent) {
+    return {
+      id: params.name,
+      // @ts-ignore
+      inputSchema: zod.z.object({
+        prompt: zod.z.string()
+        // resourceId: z.string().optional(),
+        // threadId: z.string().optional(),
+      }),
+      // @ts-ignore
+      outputSchema: zod.z.object({
+        text: zod.z.string()
+      }),
+      execute: async ({ inputData, [_constants.EMITTER_SYMBOL]: emitter, runtimeContext }) => {
+        let streamPromise = {};
+        streamPromise.promise = new Promise((resolve, reject) => {
+          streamPromise.resolve = resolve;
+          streamPromise.reject = reject;
+        });
+        const toolData = {
+          name: params.name,
+          args: inputData
+        };
+        await emitter.emit("watch-v2", {
+          type: "tool-call-streaming-start",
+          ...toolData
+        });
+        const { fullStream } = await params.stream(inputData.prompt, {
+          // resourceId: inputData.resourceId,
+          // threadId: inputData.threadId,
+          runtimeContext,
+          onFinish: (result) => {
+            streamPromise.resolve(result.text);
+          }
+        });
+        for await (const chunk of fullStream) {
+          switch (chunk.type) {
+            case "text-delta":
+              await emitter.emit("watch-v2", {
+                type: "tool-call-delta",
+                ...toolData,
+                argsTextDelta: chunk.textDelta
+              });
+              break;
+            case "step-start":
+            case "step-finish":
+            case "finish":
+              break;
+            case "tool-call":
+            case "tool-result":
+            case "tool-call-streaming-start":
+            case "tool-call-delta":
+            case "source":
+            case "file":
+            default:
+              await emitter.emit("watch-v2", chunk);
+              break;
+          }
+        }
+        return {
+          text: await streamPromise.promise
+        };
+      }
+    };
+  }
+  if (params instanceof core.Tool) {
+    if (!params.inputSchema || !params.outputSchema) {
+      throw new Error("Tool must have input and output schemas defined");
+    }
+    return {
+      // TODO: tool probably should have strong id type
+      // @ts-ignore
+      id: params.id,
+      inputSchema: params.inputSchema,
+      outputSchema: params.outputSchema,
+      execute: async ({ inputData, mastra, runtimeContext }) => {
+        return params.execute({
+          context: inputData,
+          mastra,
+          runtimeContext
+        });
+      }
+    };
+  }
+  return {
+    id: params.id,
+    description: params.description,
+    inputSchema: params.inputSchema,
+    outputSchema: params.outputSchema,
+    resumeSchema: params.resumeSchema,
+    suspendSchema: params.suspendSchema,
+    execute: params.execute
+  };
 }
 function init(inngest) {
   return {
     createWorkflow(params) {
       return new InngestWorkflow(params, inngest);
     },
-    createStep(params) {
-      return workflows.createStep(params);
+    createStep,
+    cloneStep(step, opts) {
+      return {
+        id: opts.id,
+        description: step.description,
+        inputSchema: step.inputSchema,
+        outputSchema: step.outputSchema,
+        execute: step.execute
+      };
     },
-    cloneStep: workflows.cloneStep,
-    cloneWorkflow
+    cloneWorkflow(workflow, opts) {
+      const wf = new workflows.Workflow({
+        id: opts.id,
+        inputSchema: workflow.inputSchema,
+        outputSchema: workflow.outputSchema,
+        steps: workflow.stepDefs,
+        mastra: workflow.mastra
+      });
+      wf.setStepFlow(workflow.stepGraph);
+      wf.commit();
+      return wf;
+    }
   };
 }
 var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
@@ -385,6 +484,9 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
       runtimeContext
     });
   }
+  async executeSleep({ id, duration }) {
+    await this.inngestStep.sleep(id, duration);
+  }
   async executeStep({
     step,
     stepResults,
@@ -758,5 +860,6 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
 exports.InngestExecutionEngine = InngestExecutionEngine;
 exports.InngestRun = InngestRun;
 exports.InngestWorkflow = InngestWorkflow;
+exports.createStep = createStep;
 exports.init = init;
 exports.serve = serve;

package/dist/index.d.cts

@@ -1,4 +1,5 @@
 export { serve } from './_tsup-dts-rollup.cjs';
+export { createStep } from './_tsup-dts-rollup.cjs';
 export { init } from './_tsup-dts-rollup.cjs';
 export { InngestEngineType } from './_tsup-dts-rollup.cjs';
 export { InngestRun } from './_tsup-dts-rollup.cjs';

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 export { serve } from './_tsup-dts-rollup.js';
+export { createStep } from './_tsup-dts-rollup.js';
 export { init } from './_tsup-dts-rollup.js';
 export { InngestEngineType } from './_tsup-dts-rollup.js';
 export { InngestRun } from './_tsup-dts-rollup.js';

package/dist/index.js

@@ -1,9 +1,11 @@
 import { randomUUID } from 'crypto';
 import { subscribe } from '@inngest/realtime';
+import { Agent, Tool } from '@mastra/core';
 import { RuntimeContext } from '@mastra/core/di';
-import { Run, Workflow, cloneStep, createStep, DefaultExecutionEngine } from '@mastra/core/workflows';
+import { Run, Workflow, DefaultExecutionEngine } from '@mastra/core/workflows';
 import { EMITTER_SYMBOL } from '@mastra/core/workflows/_constants';
 import { serve as serve$1 } from 'inngest/hono';
+import { z } from 'zod';
 
 // src/index.ts
 function serve({ mastra, inngest }) {
@@ -268,31 +270,128 @@ var InngestWorkflow = class _InngestWorkflow extends Workflow {
     return [this.getFunction(), ...this.getNestedFunctions(this.executionGraph.steps)];
   }
 };
-function cloneWorkflow(workflow, opts) {
-  const wf = new InngestWorkflow(
-    {
-      id: opts.id,
-      inputSchema: workflow.inputSchema,
-      outputSchema: workflow.outputSchema,
-      steps: workflow.stepDefs,
-      mastra: workflow.mastra
-    },
-    workflow.inngest
-  );
-  wf.setStepFlow(workflow.stepGraph);
-  wf.commit();
-  return wf;
+function createStep(params) {
+  if (params instanceof Agent) {
+    return {
+      id: params.name,
+      // @ts-ignore
+      inputSchema: z.object({
+        prompt: z.string()
+        // resourceId: z.string().optional(),
+        // threadId: z.string().optional(),
+      }),
+      // @ts-ignore
+      outputSchema: z.object({
+        text: z.string()
+      }),
+      execute: async ({ inputData, [EMITTER_SYMBOL]: emitter, runtimeContext }) => {
+        let streamPromise = {};
+        streamPromise.promise = new Promise((resolve, reject) => {
+          streamPromise.resolve = resolve;
+          streamPromise.reject = reject;
+        });
+        const toolData = {
+          name: params.name,
+          args: inputData
+        };
+        await emitter.emit("watch-v2", {
+          type: "tool-call-streaming-start",
+          ...toolData
+        });
+        const { fullStream } = await params.stream(inputData.prompt, {
+          // resourceId: inputData.resourceId,
+          // threadId: inputData.threadId,
+          runtimeContext,
+          onFinish: (result) => {
+            streamPromise.resolve(result.text);
+          }
+        });
+        for await (const chunk of fullStream) {
+          switch (chunk.type) {
+            case "text-delta":
+              await emitter.emit("watch-v2", {
+                type: "tool-call-delta",
+                ...toolData,
+                argsTextDelta: chunk.textDelta
+              });
+              break;
+            case "step-start":
+            case "step-finish":
+            case "finish":
+              break;
+            case "tool-call":
+            case "tool-result":
+            case "tool-call-streaming-start":
+            case "tool-call-delta":
+            case "source":
+            case "file":
+            default:
+              await emitter.emit("watch-v2", chunk);
+              break;
+          }
+        }
+        return {
+          text: await streamPromise.promise
+        };
+      }
+    };
+  }
+  if (params instanceof Tool) {
+    if (!params.inputSchema || !params.outputSchema) {
+      throw new Error("Tool must have input and output schemas defined");
+    }
+    return {
+      // TODO: tool probably should have strong id type
+      // @ts-ignore
+      id: params.id,
+      inputSchema: params.inputSchema,
+      outputSchema: params.outputSchema,
+      execute: async ({ inputData, mastra, runtimeContext }) => {
+        return params.execute({
+          context: inputData,
+          mastra,
+          runtimeContext
+        });
+      }
+    };
+  }
+  return {
+    id: params.id,
+    description: params.description,
+    inputSchema: params.inputSchema,
+    outputSchema: params.outputSchema,
+    resumeSchema: params.resumeSchema,
+    suspendSchema: params.suspendSchema,
+    execute: params.execute
+  };
 }
 function init(inngest) {
   return {
     createWorkflow(params) {
       return new InngestWorkflow(params, inngest);
     },
-    createStep(params) {
-      return createStep(params);
+    createStep,
+    cloneStep(step, opts) {
+      return {
+        id: opts.id,
+        description: step.description,
+        inputSchema: step.inputSchema,
+        outputSchema: step.outputSchema,
+        execute: step.execute
+      };
     },
-    cloneStep,
-    cloneWorkflow
+    cloneWorkflow(workflow, opts) {
+      const wf = new Workflow({
+        id: opts.id,
+        inputSchema: workflow.inputSchema,
+        outputSchema: workflow.outputSchema,
+        steps: workflow.stepDefs,
+        mastra: workflow.mastra
+      });
+      wf.setStepFlow(workflow.stepGraph);
+      wf.commit();
+      return wf;
+    }
   };
 }
 var InngestExecutionEngine = class extends DefaultExecutionEngine {
@@ -383,6 +482,9 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
       runtimeContext
     });
   }
+  async executeSleep({ id, duration }) {
+    await this.inngestStep.sleep(id, duration);
+  }
   async executeStep({
     step,
     stepResults,
@@ -753,4 +855,4 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
   }
 };
 
-export { InngestExecutionEngine, InngestRun, InngestWorkflow, init, serve };
+export { InngestExecutionEngine, InngestRun, InngestWorkflow, createStep, init, serve };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/inngest",
-  "version": "0.10.4",
+  "version": "0.10.5-alpha.0",
   "description": "Mastra Inngest integration",
   "type": "module",
   "main": "dist/index.js",
@@ -20,27 +20,27 @@
   },
   "dependencies": {
     "@inngest/realtime": "^0.3.1",
-    "inngest": "^3.35.1",
-    "zod": "^3.25.56",
-    "@opentelemetry/api": "^1.9.0"
+    "@opentelemetry/api": "^1.9.0",
+    "inngest": "^3.39.1",
+    "zod": "^3.25.57"
   },
   "devDependencies": {
     "@ai-sdk/openai": "^1.3.22",
-    "@hono/node-server": "^1.14.3",
+    "@hono/node-server": "^1.14.4",
     "@microsoft/api-extractor": "^7.52.8",
-    "@types/node": "^20.17.57",
-    "ai": "^4.3.15",
+    "@types/node": "^20.19.0",
+    "ai": "^4.3.16",
     "eslint": "^9.28.0",
     "execa": "^9.6.0",
     "get-port": "7.1.0",
-    "hono": "^4.7.7",
+    "hono": "^4.7.11",
     "tsup": "^8.5.0",
-    "typescript": "^5.8.2",
+    "typescript": "^5.8.3",
     "vitest": "^2.1.9",
     "@internal/lint": "0.0.12",
-    "@mastra/deployer": "0.10.5",
-    "@mastra/core": "0.10.5",
-    "@mastra/libsql": "0.10.2"
+    "@mastra/core": "0.10.6-alpha.0",
+    "@mastra/libsql": "0.10.3-alpha.0",
+    "@mastra/deployer": "0.10.6-alpha.0"
   },
   "peerDependencies": {
     "@mastra/core": "^0.10.2-alpha.0"

package/src/index.test.ts

@@ -259,6 +259,186 @@ describe('MastraInngestWorkflow', () => {
 
       srv.close();
     });
+
+    it('should execute a a sleep step', async ctx => {
+      const inngest = new Inngest({
+        id: 'mastra',
+        baseUrl: `http://localhost:${(ctx as any).inngestPort}`,
+      });
+
+      const { createWorkflow, createStep } = init(inngest);
+
+      const execute = vi.fn<any>().mockResolvedValue({ result: 'success' });
+      const step1 = createStep({
+        id: 'step1',
+        execute,
+        inputSchema: z.object({}),
+        outputSchema: z.object({ result: z.string() }),
+      });
+      const step2 = createStep({
+        id: 'step2',
+        execute: async ({ inputData }) => {
+          return { result: 'slept successfully: ' + 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],
+      });
+
+      workflow.then(step1).sleep(1000).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 = workflow.createRun();
+      const startTime = Date.now();
+      const result = await run.start({ inputData: {} });
+      const endTime = Date.now();
+
+      expect(execute).toHaveBeenCalled();
+      expect(result.steps['step1']).toEqual({
+        status: 'success',
+        output: { result: 'success' },
+        // payload: {},
+        // startedAt: expect.any(Number),
+        // endedAt: expect.any(Number),
+      });
+
+      expect(result.steps['step2']).toEqual({
+        status: 'success',
+        output: { result: 'slept successfully: success' },
+        // payload: { result: 'success' },
+        // startedAt: expect.any(Number),
+        // endedAt: expect.any(Number),
+      });
+
+      expect(endTime - startTime).toBeGreaterThan(1000);
+
+      srv.close();
+    });
+
+    it('should execute a a sleep until step', async ctx => {
+      const inngest = new Inngest({
+        id: 'mastra',
+        baseUrl: `http://localhost:${(ctx as any).inngestPort}`,
+      });
+
+      const { createWorkflow, createStep } = init(inngest);
+
+      const execute = vi.fn<any>().mockResolvedValue({ result: 'success' });
+      const step1 = createStep({
+        id: 'step1',
+        execute,
+        inputSchema: z.object({}),
+        outputSchema: z.object({ result: z.string() }),
+      });
+      const step2 = createStep({
+        id: 'step2',
+        execute: async ({ inputData }) => {
+          return { result: 'slept successfully: ' + 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],
+      });
+
+      workflow
+        .then(step1)
+        .sleepUntil(new Date(Date.now() + 1000))
+        .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 = workflow.createRun();
+      const startTime = Date.now();
+      const result = await run.start({ inputData: {} });
+      const endTime = Date.now();
+
+      expect(execute).toHaveBeenCalled();
+      expect(result.steps['step1']).toEqual({
+        status: 'success',
+        output: { result: 'success' },
+        // payload: {},
+        // startedAt: expect.any(Number),
+        // endedAt: expect.any(Number),
+      });
+
+      expect(result.steps['step2']).toEqual({
+        status: 'success',
+        output: { result: 'slept successfully: success' },
+        // payload: { result: 'success' },
+        // startedAt: expect.any(Number),
+        // endedAt: expect.any(Number),
+      });
+
+      expect(endTime - startTime).toBeGreaterThan(1000);
+
+      srv.close();
+    });
   });
 
   describe('Variable Resolution', () => {
@@ -4781,7 +4961,6 @@ describe('MastraInngestWorkflow', () => {
 
         const app = await createHonoServer(mastra);
         app.use('*', async (ctx, next) => {
-          'middleware', ctx.req.method, ctx.req.url;
           await next();
         });
 

package/src/index.ts

@@ -1,8 +1,9 @@
 import { randomUUID } from 'crypto';
 import { subscribe } from '@inngest/realtime';
-import type { Mastra, WorkflowRun, WorkflowRuns } from '@mastra/core';
+import { Agent, Tool } from '@mastra/core';
+import type { Mastra, ToolExecutionContext, WorkflowRun, WorkflowRuns } from '@mastra/core';
 import { RuntimeContext } from '@mastra/core/di';
-import { Workflow, createStep, Run, DefaultExecutionEngine, cloneStep } from '@mastra/core/workflows';
+import { Workflow, Run, DefaultExecutionEngine } from '@mastra/core/workflows';
 import type {
   ExecuteFunction,
   ExecutionContext,
@@ -20,7 +21,7 @@ import { EMITTER_SYMBOL } from '@mastra/core/workflows/_constants';
 import type { Span } from '@opentelemetry/api';
 import type { Inngest, BaseContext } from 'inngest';
 import { serve as inngestServe } from 'inngest/hono';
-import type { z } from 'zod';
+import { z } from 'zod';
 
 export type InngestEngineType = {
   step: any;
@@ -42,10 +43,11 @@ export function serve({ mastra, inngest }: { mastra: Mastra; inngest: Inngest })
 }
 
 export class InngestRun<
+  TEngineType = InngestEngineType,
   TSteps extends Step<string, any, any>[] = Step<string, any, any>[],
   TInput extends z.ZodType<any> = z.ZodType<any>,
   TOutput extends z.ZodType<any> = z.ZodType<any>,
-> extends Run<TSteps, TInput, TOutput> {
+> extends Run<TEngineType, TSteps, TInput, TOutput> {
   private inngest: Inngest;
   serializedStepGraph: SerializedStepFlowEntry[];
   #mastra: Mastra;
@@ -207,12 +209,13 @@ export class InngestRun<
 }
 
 export class InngestWorkflow<
+  TEngineType = InngestEngineType,
   TSteps extends Step<string, any, any>[] = Step<string, any, any>[],
   TWorkflowId extends string = string,
   TInput extends z.ZodType<any> = z.ZodType<any>,
   TOutput extends z.ZodType<any> = z.ZodType<any>,
   TPrevSchema extends z.ZodType<any> = TInput,
-> extends Workflow<TSteps, TWorkflowId, TInput, TOutput, InngestEngineType, TPrevSchema> {
+> extends Workflow<TEngineType, TSteps, TWorkflowId, TInput, TOutput, TPrevSchema> {
   #mastra: Mastra;
   public inngest: Inngest;
 
@@ -277,11 +280,11 @@ export class InngestWorkflow<
     }
   }
 
-  createRun(options?: { runId?: string }): Run<TSteps, TInput, TOutput> {
+  createRun(options?: { runId?: string }): Run<TEngineType, TSteps, TInput, TOutput> {
     const runIdToUse = options?.runId || randomUUID();
 
     // Return a new Run instance with object parameters
-    const run: Run<TSteps, TInput, TOutput> =
+    const run: Run<TEngineType, TSteps, TInput, TOutput> =
       this.runs.get(runIdToUse) ??
       new InngestRun(
         {
@@ -375,29 +378,185 @@ export class InngestWorkflow<
   }
 }
 
-function cloneWorkflow<
-  TWorkflowId extends string = string,
-  TInput extends z.ZodType<any> = z.ZodType<any>,
-  TOutput extends z.ZodType<any> = z.ZodType<any>,
-  TSteps extends Step<string, any, any, any, any>[] = Step<string, any, any, any, any>[],
+export function createStep<
+  TStepId extends string,
+  TStepInput extends z.ZodType<any>,
+  TStepOutput extends z.ZodType<any>,
+  TResumeSchema extends z.ZodType<any>,
+  TSuspendSchema extends z.ZodType<any>,
+>(params: {
+  id: TStepId;
+  description?: string;
+  inputSchema: TStepInput;
+  outputSchema: TStepOutput;
+  resumeSchema?: TResumeSchema;
+  suspendSchema?: TSuspendSchema;
+  execute: ExecuteFunction<
+    z.infer<TStepInput>,
+    z.infer<TStepOutput>,
+    z.infer<TResumeSchema>,
+    z.infer<TSuspendSchema>,
+    InngestEngineType
+  >;
+}): Step<TStepId, TStepInput, TStepOutput, TResumeSchema, TSuspendSchema, InngestEngineType>;
+
+export function createStep<
+  TStepId extends string,
+  TStepInput extends z.ZodObject<{ prompt: z.ZodString }>,
+  TStepOutput extends z.ZodObject<{ text: z.ZodString }>,
+  TResumeSchema extends z.ZodType<any>,
+  TSuspendSchema extends z.ZodType<any>,
 >(
-  workflow: InngestWorkflow<TSteps, string, TInput, TOutput>,
-  opts: { id: TWorkflowId },
-): InngestWorkflow<TSteps, TWorkflowId, TInput, TOutput> {
-  const wf = new InngestWorkflow(
-    {
-      id: opts.id,
-      inputSchema: workflow.inputSchema,
-      outputSchema: workflow.outputSchema,
-      steps: workflow.stepDefs,
-      mastra: workflow.mastra,
-    },
-    workflow.inngest,
-  );
+  agent: Agent<TStepId, any, any>,
+): Step<TStepId, TStepInput, TStepOutput, TResumeSchema, TSuspendSchema, InngestEngineType>;
+
+export function createStep<
+  TSchemaIn extends z.ZodType<any>,
+  TSchemaOut extends z.ZodType<any>,
+  TContext extends ToolExecutionContext<TSchemaIn>,
+>(
+  tool: Tool<TSchemaIn, TSchemaOut, TContext> & {
+    inputSchema: TSchemaIn;
+    outputSchema: TSchemaOut;
+    execute: (context: TContext) => Promise<any>;
+  },
+): Step<string, TSchemaIn, TSchemaOut, z.ZodType<any>, z.ZodType<any>, InngestEngineType>;
+
+export function createStep<
+  TStepId extends string,
+  TStepInput extends z.ZodType<any>,
+  TStepOutput extends z.ZodType<any>,
+  TResumeSchema extends z.ZodType<any>,
+  TSuspendSchema extends z.ZodType<any>,
+>(
+  params:
+    | {
+        id: TStepId;
+        description?: string;
+        inputSchema: TStepInput;
+        outputSchema: TStepOutput;
+        resumeSchema?: TResumeSchema;
+        suspendSchema?: TSuspendSchema;
+        execute: ExecuteFunction<
+          z.infer<TStepInput>,
+          z.infer<TStepOutput>,
+          z.infer<TResumeSchema>,
+          z.infer<TSuspendSchema>,
+          InngestEngineType
+        >;
+      }
+    | Agent<any, any, any>
+    | (Tool<TStepInput, TStepOutput, any> & {
+        inputSchema: TStepInput;
+        outputSchema: TStepOutput;
+        execute: (context: ToolExecutionContext<TStepInput>) => Promise<any>;
+      }),
+): Step<TStepId, TStepInput, TStepOutput, TResumeSchema, TSuspendSchema, InngestEngineType> {
+  if (params instanceof Agent) {
+    return {
+      id: params.name,
+      // @ts-ignore
+      inputSchema: z.object({
+        prompt: z.string(),
+        // resourceId: z.string().optional(),
+        // threadId: z.string().optional(),
+      }),
+      // @ts-ignore
+      outputSchema: z.object({
+        text: z.string(),
+      }),
+      execute: async ({ inputData, [EMITTER_SYMBOL]: emitter, runtimeContext }) => {
+        let streamPromise = {} as {
+          promise: Promise<string>;
+          resolve: (value: string) => void;
+          reject: (reason?: any) => void;
+        };
+
+        streamPromise.promise = new Promise((resolve, reject) => {
+          streamPromise.resolve = resolve;
+          streamPromise.reject = reject;
+        });
+        const toolData = {
+          name: params.name,
+          args: inputData,
+        };
+        await emitter.emit('watch-v2', {
+          type: 'tool-call-streaming-start',
+          ...toolData,
+        });
+        const { fullStream } = await params.stream(inputData.prompt, {
+          // resourceId: inputData.resourceId,
+          // threadId: inputData.threadId,
+          runtimeContext,
+          onFinish: result => {
+            streamPromise.resolve(result.text);
+          },
+        });
+
+        for await (const chunk of fullStream) {
+          switch (chunk.type) {
+            case 'text-delta':
+              await emitter.emit('watch-v2', {
+                type: 'tool-call-delta',
+                ...toolData,
+                argsTextDelta: chunk.textDelta,
+              });
+              break;
+
+            case 'step-start':
+            case 'step-finish':
+            case 'finish':
+              break;
+
+            case 'tool-call':
+            case 'tool-result':
+            case 'tool-call-streaming-start':
+            case 'tool-call-delta':
+            case 'source':
+            case 'file':
+            default:
+              await emitter.emit('watch-v2', chunk);
+              break;
+          }
+        }
+
+        return {
+          text: await streamPromise.promise,
+        };
+      },
+    };
+  }
+
+  if (params instanceof Tool) {
+    if (!params.inputSchema || !params.outputSchema) {
+      throw new Error('Tool must have input and output schemas defined');
+    }
+
+    return {
+      // TODO: tool probably should have strong id type
+      // @ts-ignore
+      id: params.id,
+      inputSchema: params.inputSchema,
+      outputSchema: params.outputSchema,
+      execute: async ({ inputData, mastra, runtimeContext }) => {
+        return params.execute({
+          context: inputData,
+          mastra,
+          runtimeContext,
+        });
+      },
+    };
+  }
 
-  wf.setStepFlow(workflow.stepGraph);
-  wf.commit();
-  return wf;
+  return {
+    id: params.id,
+    description: params.description,
+    inputSchema: params.inputSchema,
+    outputSchema: params.outputSchema,
+    resumeSchema: params.resumeSchema,
+    suspendSchema: params.suspendSchema,
+    execute: params.execute,
+  };
 }
 
 export function init(inngest: Inngest) {
@@ -406,34 +565,58 @@ export function init(inngest: Inngest) {
       TWorkflowId extends string = string,
       TInput extends z.ZodType<any> = z.ZodType<any>,
       TOutput extends z.ZodType<any> = z.ZodType<any>,
-      TSteps extends Step<string, any, any>[] = Step<string, any, any>[],
+      TSteps extends Step<string, any, any, any, any, InngestEngineType>[] = Step<
+        string,
+        any,
+        any,
+        any,
+        any,
+        InngestEngineType
+      >[],
     >(params: WorkflowConfig<TWorkflowId, TInput, TOutput, TSteps>) {
-      return new InngestWorkflow(params, inngest);
+      return new InngestWorkflow<InngestEngineType, TSteps, TWorkflowId, TInput, TOutput, TInput>(params, inngest);
     },
-    createStep<
-      TStepId extends string,
-      TStepInput extends z.ZodType<any>,
-      TStepOutput extends z.ZodType<any>,
-      TResumeSchema extends z.ZodType<any>,
-      TSuspendSchema extends z.ZodType<any>,
-    >(params: {
-      id: TStepId;
-      inputSchema: TStepInput;
-      outputSchema: TStepOutput;
-      resumeSchema?: TResumeSchema;
-      suspendSchema?: TSuspendSchema;
-      execute: ExecuteFunction<
-        z.infer<TStepInput>,
-        z.infer<TStepOutput>,
-        z.infer<TResumeSchema>,
-        z.infer<TSuspendSchema>,
+    createStep,
+    cloneStep<TStepId extends string>(
+      step: Step<string, any, any, any, any, InngestEngineType>,
+      opts: { id: TStepId },
+    ): Step<TStepId, any, any, any, any, InngestEngineType> {
+      return {
+        id: opts.id,
+        description: step.description,
+        inputSchema: step.inputSchema,
+        outputSchema: step.outputSchema,
+        execute: step.execute,
+      };
+    },
+    cloneWorkflow<
+      TWorkflowId extends string = string,
+      TInput extends z.ZodType<any> = z.ZodType<any>,
+      TOutput extends z.ZodType<any> = z.ZodType<any>,
+      TSteps extends Step<string, any, any, any, any, InngestEngineType>[] = Step<
+        string,
+        any,
+        any,
+        any,
+        any,
         InngestEngineType
-      >;
-    }) {
-      return createStep<TStepId, TStepInput, TStepOutput, TResumeSchema, TSuspendSchema, InngestEngineType>(params);
+      >[],
+    >(
+      workflow: Workflow<InngestEngineType, TSteps, string, TInput, TOutput, TInput>,
+      opts: { id: TWorkflowId },
+    ): Workflow<InngestEngineType, TSteps, TWorkflowId, TInput, TOutput, TInput> {
+      const wf = new Workflow({
+        id: opts.id,
+        inputSchema: workflow.inputSchema,
+        outputSchema: workflow.outputSchema,
+        steps: workflow.stepDefs,
+        mastra: workflow.mastra,
+      });
+
+      wf.setStepFlow(workflow.stepGraph);
+      wf.commit();
+      return wf;
     },
-    cloneStep,
-    cloneWorkflow,
   };
 }
 
@@ -558,6 +741,10 @@ export class InngestExecutionEngine extends DefaultExecutionEngine {
     });
   }
 
+  async executeSleep({ id, duration }: { id: string; duration: number }): Promise<void> {
+    await this.inngestStep.sleep(id, duration);
+  }
+
   async executeStep({
     step,
     stepResults,