@mastra/inngest 0.0.0-stream-vnext-usage-20250908171242 → 0.0.0-suspendRuntimeContextTypeFix-20250930142630

package/dist/index.js

@@ -3,15 +3,20 @@ import { subscribe } from '@inngest/realtime';
 import { wrapMastra, AISpanType } from '@mastra/core/ai-tracing';
 import { RuntimeContext } from '@mastra/core/di';
 import { ToolStream, Tool } from '@mastra/core/tools';
-import { Run, Workflow, DefaultExecutionEngine } from '@mastra/core/workflows';
+import { Run, Workflow, DefaultExecutionEngine, getStepResult, validateStepInput } from '@mastra/core/workflows';
 import { EMITTER_SYMBOL, STREAM_FORMAT_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 }) {
+function serve({
+  mastra,
+  inngest,
+  functions: userFunctions = [],
+  registerOptions
+}) {
   const wfs = mastra.getWorkflows();
-  const functions = Array.from(
+  const workflowFunctions = Array.from(
     new Set(
       Object.values(wfs).flatMap((wf) => {
         if (wf instanceof InngestWorkflow) {
@@ -23,8 +28,9 @@ function serve({ mastra, inngest }) {
     )
   );
   return serve$1({
+    ...registerOptions,
     client: inngest,
-    functions
+    functions: [...workflowFunctions, ...userFunctions]
   });
 }
 var InngestRun = class extends Run {
@@ -52,7 +58,6 @@ var InngestRun = class extends Run {
       await new Promise((resolve) => setTimeout(resolve, 1e3));
       runs = await this.getRuns(eventId);
       if (runs?.[0]?.status === "Failed") {
-        console.log("run", runs?.[0]);
         throw new Error(`Function run ${runs?.[0]?.status}`);
       } else if (runs?.[0]?.status === "Cancelled") {
         const snapshot = await this.#mastra?.storage?.loadWorkflowSnapshot({
@@ -85,6 +90,7 @@ var InngestRun = class extends Run {
       await this.#mastra?.storage?.persistWorkflowSnapshot({
         workflowName: this.workflowId,
         runId: this.runId,
+        resourceId: this.resourceId,
         snapshot: {
           ...snapshot,
           status: "canceled"
@@ -98,6 +104,7 @@ var InngestRun = class extends Run {
     await this.#mastra.getStorage()?.persistWorkflowSnapshot({
       workflowName: this.workflowId,
       runId: this.runId,
+      resourceId: this.resourceId,
       snapshot: {
         runId: this.runId,
         serializedStepGraph: this.serializedStepGraph,
@@ -110,11 +117,13 @@ var InngestRun = class extends Run {
         status: "running"
       }
     });
+    const inputDataToUse = await this._validateInput(inputData);
     const eventOutput = await this.inngest.send({
       name: `workflow.${this.workflowId}`,
       data: {
-        inputData,
-        runId: this.runId
+        inputData: inputDataToUse,
+        runId: this.runId,
+        resourceId: this.resourceId
       }
     });
     const eventId = eventOutput.ids[0];
@@ -150,17 +159,19 @@ var InngestRun = class extends Run {
       workflowName: this.workflowId,
       runId: this.runId
     });
+    const suspendedStep = this.workflowSteps[steps?.[0] ?? ""];
+    const resumeDataToUse = await this._validateResumeData(params.resumeData, suspendedStep);
     const eventOutput = await this.inngest.send({
       name: `workflow.${this.workflowId}`,
       data: {
-        inputData: params.resumeData,
+        inputData: resumeDataToUse,
         runId: this.runId,
         workflowId: this.workflowId,
         stepResults: snapshot?.context,
         resume: {
           steps,
           stepResults: snapshot?.context,
-          resumePayload: params.resumeData,
+          resumePayload: resumeDataToUse,
           // @ts-ignore
           resumePath: snapshot?.suspendedPaths?.[steps?.[0]]
         }
@@ -202,33 +213,9 @@ var InngestRun = class extends Run {
   }
   stream({ inputData, runtimeContext } = {}) {
     const { readable, writable } = new TransformStream();
-    let currentToolData = void 0;
     const writer = writable.getWriter();
     const unwatch = this.watch(async (event) => {
-      if (event.type === "workflow-agent-call-start") {
-        currentToolData = {
-          name: event.payload.name,
-          args: event.payload.args
-        };
-        await writer.write({
-          ...event.payload,
-          type: "tool-call-streaming-start"
-        });
-        return;
-      }
       try {
-        if (event.type === "workflow-agent-call-finish") {
-          return;
-        } else if (!event.type.startsWith("workflow-")) {
-          if (event.type === "text-delta") {
-            await writer.write({
-              type: "tool-call-delta",
-              ...currentToolData ?? {},
-              argsTextDelta: event.textDelta
-            });
-          }
-          return;
-        }
         const e = {
           ...event,
           type: event.type.replace("workflow-", "")
@@ -310,23 +297,14 @@ var InngestWorkflow = class _InngestWorkflow extends Workflow {
       }
     }
   }
-  createRun(options) {
-    const runIdToUse = options?.runId || randomUUID();
-    const run = this.runs.get(runIdToUse) ?? new InngestRun(
-      {
-        workflowId: this.id,
-        runId: runIdToUse,
-        executionEngine: this.executionEngine,
-        executionGraph: this.executionGraph,
-        serializedStepGraph: this.serializedStepGraph,
-        mastra: this.#mastra,
-        retryConfig: this.retryConfig,
-        cleanup: () => this.runs.delete(runIdToUse)
-      },
-      this.inngest
+  /**
+   * @deprecated Use createRunAsync() instead.
+   * @throws {Error} Always throws an error directing users to use createRunAsync()
+   */
+  createRun(_options) {
+    throw new Error(
+      "createRun() has been deprecated. Please use createRunAsync() instead.\n\nMigration guide:\n  Before: const run = workflow.createRun();\n  After:  const run = await workflow.createRunAsync();\n\nNote: createRunAsync() is an async method, so make sure your calling function is async."
     );
-    this.runs.set(runIdToUse, run);
-    return run;
   }
   async createRunAsync(options) {
     const runIdToUse = options?.runId || randomUUID();
@@ -334,12 +312,14 @@ var InngestWorkflow = class _InngestWorkflow extends Workflow {
       {
         workflowId: this.id,
         runId: runIdToUse,
+        resourceId: options?.resourceId,
         executionEngine: this.executionEngine,
         executionGraph: this.executionGraph,
         serializedStepGraph: this.serializedStepGraph,
         mastra: this.#mastra,
         retryConfig: this.retryConfig,
-        cleanup: () => this.runs.delete(runIdToUse)
+        cleanup: () => this.runs.delete(runIdToUse),
+        workflowSteps: this.steps
       },
       this.inngest
     );
@@ -349,6 +329,7 @@ var InngestWorkflow = class _InngestWorkflow extends Workflow {
       await this.mastra?.getStorage()?.persistWorkflowSnapshot({
         workflowName: this.id,
         runId: runIdToUse,
+        resourceId: options?.resourceId,
         snapshot: {
           runId: runIdToUse,
           status: "pending",
@@ -382,7 +363,7 @@ var InngestWorkflow = class _InngestWorkflow extends Workflow {
       },
       { event: `workflow.${this.id}` },
       async ({ event, step, attempt, publish }) => {
-        let { inputData, runId, resume } = event.data;
+        let { inputData, runId, resourceId, resume } = event.data;
         if (!runId) {
           runId = await step.run(`workflow.${this.id}.runIdGen`, async () => {
             return randomUUID();
@@ -414,6 +395,7 @@ var InngestWorkflow = class _InngestWorkflow extends Workflow {
         const result = await engine.execute({
           workflowId: this.id,
           runId,
+          resourceId,
           graph: this.executionGraph,
           serializedStepGraph: this.serializedStepGraph,
           input: inputData,
@@ -458,11 +440,10 @@ function createStep(params) {
   if (isAgent(params)) {
     return {
       id: params.name,
+      description: params.getDescription(),
       // @ts-ignore
       inputSchema: z.object({
         prompt: z.string()
-        // resourceId: z.string().optional(),
-        // threadId: z.string().optional(),
       }),
       // @ts-ignore
       outputSchema: z.object({
@@ -478,13 +459,7 @@ function createStep(params) {
           name: params.name,
           args: inputData
         };
-        await emitter.emit("watch-v2", {
-          type: "workflow-agent-call-start",
-          payload: toolData
-        });
         const { fullStream } = await params.stream(inputData.prompt, {
-          // resourceId: inputData.resourceId,
-          // threadId: inputData.threadId,
           runtimeContext,
           tracingContext,
           onFinish: (result) => {
@@ -495,17 +470,28 @@ function createStep(params) {
         if (abortSignal.aborted) {
           return abort();
         }
+        await emitter.emit("watch-v2", {
+          type: "tool-call-streaming-start",
+          ...toolData ?? {}
+        });
         for await (const chunk of fullStream) {
-          await emitter.emit("watch-v2", chunk);
+          if (chunk.type === "text-delta") {
+            await emitter.emit("watch-v2", {
+              type: "tool-call-delta",
+              ...toolData ?? {},
+              argsTextDelta: chunk.textDelta
+            });
+          }
         }
         await emitter.emit("watch-v2", {
-          type: "workflow-agent-call-finish",
-          payload: toolData
+          type: "tool-call-streaming-finish",
+          ...toolData ?? {}
         });
         return {
           text: await streamPromise.promise
         };
-      }
+      },
+      component: params.component
     };
   }
   if (isTool(params)) {
@@ -516,16 +502,20 @@ function createStep(params) {
       // TODO: tool probably should have strong id type
       // @ts-ignore
       id: params.id,
+      description: params.description,
       inputSchema: params.inputSchema,
       outputSchema: params.outputSchema,
-      execute: async ({ inputData, mastra, runtimeContext, tracingContext }) => {
+      execute: async ({ inputData, mastra, runtimeContext, tracingContext, suspend, resumeData }) => {
         return params.execute({
           context: inputData,
           mastra: wrapMastra(mastra, tracingContext),
           runtimeContext,
-          tracingContext
+          tracingContext,
+          suspend,
+          resumeData
         });
-      }
+      },
+      component: "TOOL"
     };
   }
   return {
@@ -550,7 +540,8 @@ function init(inngest) {
         description: step.description,
         inputSchema: step.inputSchema,
         outputSchema: step.outputSchema,
-        execute: step.execute
+        execute: step.execute,
+        component: step.component
       };
     },
     cloneWorkflow(workflow, opts) {
@@ -570,8 +561,8 @@ function init(inngest) {
 var InngestExecutionEngine = class extends DefaultExecutionEngine {
   inngestStep;
   inngestAttempts;
-  constructor(mastra, inngestStep, inngestAttempts = 0) {
-    super({ mastra });
+  constructor(mastra, inngestStep, inngestAttempts = 0, options) {
+    super({ mastra, options });
     this.inngestStep = inngestStep;
     this.inngestAttempts = inngestAttempts;
   }
@@ -667,7 +658,8 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
       attributes: {
         durationMs: duration,
         sleepType: fn ? "dynamic" : "fixed"
-      }
+      },
+      tracingPolicy: this.options?.tracingPolicy
     });
     if (fn) {
       const stepCallId = randomUUID();
@@ -683,16 +675,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
             currentSpan: sleepSpan
           },
           getInitData: () => stepResults?.input,
-          getStepResult: (step) => {
-            if (!step?.id) {
-              return null;
-            }
-            const result = stepResults[step.id];
-            if (result?.status === "success") {
-              return result.output;
-            }
-            return null;
-          },
+          getStepResult: getStepResult.bind(this, stepResults),
           // TODO: this function shouldn't have suspend probably?
           suspend: async (_suspendPayload) => {
           },
@@ -752,7 +735,8 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
         untilDate: date,
         durationMs: date ? Math.max(0, date.getTime() - Date.now()) : void 0,
         sleepType: fn ? "dynamic" : "fixed"
-      }
+      },
+      tracingPolicy: this.options?.tracingPolicy
     });
     if (fn) {
       date = await this.inngestStep.run(`workflow.${workflowId}.sleepUntil.${entry.id}`, async () => {
@@ -768,16 +752,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
             currentSpan: sleepUntilSpan
           },
           getInitData: () => stepResults?.input,
-          getStepResult: (step) => {
-            if (!step?.id) {
-              return null;
-            }
-            const result = stepResults[step.id];
-            if (result?.status === "success") {
-              return result.output;
-            }
-            return null;
-          },
+          getStepResult: getStepResult.bind(this, stepResults),
           // TODO: this function shouldn't have suspend probably?
           suspend: async (_suspendPayload) => {
           },
@@ -802,6 +777,9 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
           )
         });
       });
+      if (date && !(date instanceof Date)) {
+        date = new Date(date);
+      }
       const time = !date ? 0 : date.getTime() - Date.now();
       sleepUntilSpan?.update({
         attributes: {
@@ -850,7 +828,13 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
       input: prevOutput,
       attributes: {
         stepId: step.id
-      }
+      },
+      tracingPolicy: this.options?.tracingPolicy
+    });
+    const { inputData, validationError } = await validateStepInput({
+      prevOutput,
+      step,
+      validateInputs: this.options?.validateInputs ?? false
     });
     const startedAt = await this.inngestStep.run(
       `workflow.${executionContext.workflowId}.run.${executionContext.runId}.step.${step.id}.running_ev`,
@@ -882,7 +866,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
           payload: {
             id: step.id,
             status: "running",
-            payload: prevOutput,
+            payload: inputData,
             startedAt: startedAt2
           }
         });
@@ -902,7 +886,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
         const invokeResp = await this.inngestStep.invoke(`workflow.${executionContext.workflowId}.step.${step.id}`, {
           function: step.getFunction(),
           data: {
-            inputData: prevOutput,
+            inputData,
             runId,
             resume: {
               runId,
@@ -920,7 +904,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
         const invokeResp = await this.inngestStep.invoke(`workflow.${executionContext.workflowId}.step.${step.id}`, {
           function: step.getFunction(),
           data: {
-            inputData: prevOutput
+            inputData
           }
         });
         result = invokeResp.result;
@@ -1065,24 +1049,21 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
       let suspended;
       let bailed;
       try {
+        if (validationError) {
+          throw validationError;
+        }
         const result = await step.execute({
           runId: executionContext.runId,
           mastra: this.mastra,
           runtimeContext,
           writableStream,
-          inputData: prevOutput,
+          inputData,
           resumeData: resume?.steps[0] === step.id ? resume?.resumePayload : void 0,
           tracingContext: {
             currentSpan: stepAISpan
           },
           getInitData: () => stepResults?.input,
-          getStepResult: (step2) => {
-            const result2 = stepResults[step2.id];
-            if (result2?.status === "success") {
-              return result2.output;
-            }
-            return null;
-          },
+          getStepResult: getStepResult.bind(this, stepResults),
           suspend: async (suspendPayload) => {
             executionContext.suspendedPaths[step.id] = executionContext.executionPath;
             suspended = { payload: suspendPayload };
@@ -1108,14 +1089,14 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
           output: result,
           startedAt,
           endedAt,
-          payload: prevOutput,
+          payload: inputData,
           resumedAt: resume?.steps[0] === step.id ? startedAt : void 0,
           resumePayload: resume?.steps[0] === step.id ? resume?.resumePayload : void 0
         };
       } catch (e) {
         execResults = {
           status: "failed",
-          payload: prevOutput,
+          payload: inputData,
           error: e instanceof Error ? e.message : String(e),
           endedAt: Date.now(),
           startedAt,
@@ -1127,14 +1108,14 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
         execResults = {
           status: "suspended",
           suspendedPayload: suspended.payload,
-          payload: prevOutput,
+          payload: inputData,
           suspendedAt: Date.now(),
           startedAt,
           resumedAt: resume?.steps[0] === step.id ? startedAt : void 0,
           resumePayload: resume?.steps[0] === step.id ? resume?.resumePayload : void 0
         };
       } else if (bailed) {
-        execResults = { status: "bailed", output: bailed.payload, payload: prevOutput, endedAt: Date.now(), startedAt };
+        execResults = { status: "bailed", output: bailed.payload, payload: inputData, endedAt: Date.now(), startedAt };
       }
       if (execResults.status === "failed") {
         if (executionContext.retryConfig.attempts > 0 && this.inngestAttempts < executionContext.retryConfig.attempts) {
@@ -1192,7 +1173,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
           await this.runScorers({
             scorers: step.scorers,
             runId: executionContext.runId,
-            input: prevOutput,
+            input: inputData,
             output: stepRes.result,
             workflowId: executionContext.workflowId,
             stepId: step.id,
@@ -1211,6 +1192,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
     workflowId,
     runId,
     stepResults,
+    resourceId,
     executionContext,
     serializedStepGraph,
     workflowStatus,
@@ -1223,6 +1205,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
         await this.mastra?.getStorage()?.persistWorkflowSnapshot({
           workflowName: workflowId,
           runId,
+          resourceId,
           snapshot: {
             runId,
             value: {},
@@ -1260,11 +1243,12 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
   }) {
     const conditionalSpan = tracingContext?.currentSpan?.createChildSpan({
       type: AISpanType.WORKFLOW_CONDITIONAL,
-      name: `conditional: ${entry.conditions.length} conditions`,
+      name: `conditional: '${entry.conditions.length} conditions'`,
       input: prevOutput,
       attributes: {
         conditionCount: entry.conditions.length
-      }
+      },
+      tracingPolicy: this.options?.tracingPolicy
     });
     let execResults;
     const truthyIndexes = (await Promise.all(
@@ -1272,11 +1256,12 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
         (cond, index) => this.inngestStep.run(`workflow.${workflowId}.conditional.${index}`, async () => {
           const evalSpan = conditionalSpan?.createChildSpan({
             type: AISpanType.WORKFLOW_CONDITIONAL_EVAL,
-            name: `condition ${index}`,
+            name: `condition: '${index}'`,
             input: prevOutput,
             attributes: {
               conditionIndex: index
-            }
+            },
+            tracingPolicy: this.options?.tracingPolicy
           });
           try {
             const result = await cond({
@@ -1290,16 +1275,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
                 currentSpan: evalSpan
               },
               getInitData: () => stepResults?.input,
-              getStepResult: (step) => {
-                if (!step?.id) {
-                  return null;
-                }
-                const result2 = stepResults[step.id];
-                if (result2?.status === "success") {
-                  return result2.output;
-                }
-                return null;
-              },
+              getStepResult: getStepResult.bind(this, stepResults),
               // TODO: this function shouldn't have suspend probably?
               suspend: async (_suspendPayload) => {
               },