@mastra/inngest 0.0.0-fix-zod4-schema-validation-20251212180638 → 0.0.0-fix-local-pkg-cwd-20251224015404

package/dist/execution-engine.d.ts

@@ -65,6 +65,27 @@ export declare class InngestExecutionEngine extends DefaultExecutionEngine {
      * Provide Inngest step primitive in engine context
      */
     getEngineContext(): Record<string, any>;
+    /**
+     * For Inngest, lifecycle callbacks are invoked in the workflow's finalize step
+     * (wrapped in step.run for durability), not in execute(). Override to skip.
+     */
+    invokeLifecycleCallbacks(_result: {
+        status: any;
+        result?: any;
+        error?: any;
+        steps: Record<string, any>;
+        tripwire?: any;
+    }): Promise<void>;
+    /**
+     * Actually invoke the lifecycle callbacks. Called from workflow.ts finalize step.
+     */
+    invokeLifecycleCallbacksInternal(result: {
+        status: any;
+        result?: any;
+        error?: any;
+        steps: Record<string, any>;
+        tripwire?: any;
+    }): Promise<void>;
     /**
      * Execute nested InngestWorkflow using inngestStep.invoke() for durability.
      * This MUST be called directly (not inside step.run()) due to Inngest constraints.
@@ -83,6 +104,7 @@ export declare class InngestExecutionEngine extends DefaultExecutionEngine {
         inputData: any;
         pubsub: PubSub;
         startedAt: number;
+        perStep?: boolean;
     }): Promise<StepResult<any, any, any, any> | null>;
 }
 //# sourceMappingURL=execution-engine.d.ts.map

package/dist/execution-engine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"execution-engine.d.ts","sourceRoot":"","sources":["../src/execution-engine.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"execution-engine.d.ts","sourceRoot":"","sources":["../src/execution-engine.ts"],"names":[],"mappings":"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"}

package/dist/index.cjs

@@ -138,6 +138,18 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
   getEngineContext() {
     return { step: this.inngestStep };
   }
+  /**
+   * For Inngest, lifecycle callbacks are invoked in the workflow's finalize step
+   * (wrapped in step.run for durability), not in execute(). Override to skip.
+   */
+  async invokeLifecycleCallbacks(_result) {
+  }
+  /**
+   * Actually invoke the lifecycle callbacks. Called from workflow.ts finalize step.
+   */
+  async invokeLifecycleCallbacksInternal(result) {
+    return super.invokeLifecycleCallbacks(result);
+  }
   /**
    * Execute nested InngestWorkflow using inngestStep.invoke() for durability.
    * This MUST be called directly (not inside step.run()) due to Inngest constraints.
@@ -146,7 +158,18 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
     if (!(params.step instanceof InngestWorkflow)) {
       return null;
     }
-    const { step, stepResults, executionContext, resume, timeTravel, prevOutput, inputData, pubsub, startedAt } = params;
+    const {
+      step,
+      stepResults,
+      executionContext,
+      resume,
+      timeTravel,
+      prevOutput,
+      inputData,
+      pubsub,
+      startedAt,
+      perStep
+    } = params;
     const isResume = !!resume?.steps?.length;
     let result;
     let runId;
@@ -154,7 +177,8 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
     try {
       if (isResume) {
         runId = stepResults[resume?.steps?.[0] ?? ""]?.suspendPayload?.__workflow_meta?.runId ?? crypto$1.randomUUID();
-        const snapshot = await this.mastra?.getStorage()?.loadWorkflowSnapshot({
+        const workflowsStore = await this.mastra?.getStorage()?.getStore("workflows");
+        const snapshot = await workflowsStore?.loadWorkflowSnapshot({
           workflowName: step.id,
           runId
         });
@@ -171,14 +195,16 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
               resumePayload: resume.resumePayload,
               resumePath: resume.steps?.[1] ? snapshot?.suspendedPaths?.[resume.steps?.[1]] : void 0
             },
-            outputOptions: { includeState: true }
+            outputOptions: { includeState: true },
+            perStep
           }
         });
         result = invokeResp.result;
         runId = invokeResp.runId;
         executionContext.state = invokeResp.result.state;
       } else if (isTimeTravel) {
-        const snapshot = await this.mastra?.getStorage()?.loadWorkflowSnapshot({
+        const workflowsStoreForTimeTravel = await this.mastra?.getStorage()?.getStore("workflows");
+        const snapshot = await workflowsStoreForTimeTravel?.loadWorkflowSnapshot({
           workflowName: step.id,
           runId: executionContext.runId
         }) ?? { context: {} };
@@ -197,7 +223,8 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
             timeTravel: timeTravelParams,
             initialState: executionContext.state ?? {},
             runId: executionContext.runId,
-            outputOptions: { includeState: true }
+            outputOptions: { includeState: true },
+            perStep
           }
         });
         result = invokeResp.result;
@@ -209,7 +236,8 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
           data: {
             inputData,
             initialState: executionContext.state ?? {},
-            outputOptions: { includeState: true }
+            outputOptions: { includeState: true },
+            perStep
           }
         });
         result = invokeResp.result;
@@ -248,7 +276,7 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
               }
             }
           });
-          return { executionContext, result: { status: "failed", error: result?.error } };
+          return { executionContext, result: { status: "failed", error: result?.error, endedAt: Date.now() } };
         } else if (result.status === "suspended") {
           const suspendedSteps = Object.entries(result.steps).filter(([_stepName, stepResult]) => {
             const stepRes = stepResult;
@@ -272,6 +300,7 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
               executionContext,
               result: {
                 status: "suspended",
+                suspendedAt: Date.now(),
                 payload: stepResult.payload,
                 suspendPayload: {
                   ...stepResult?.suspendPayload,
@@ -284,6 +313,7 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
             executionContext,
             result: {
               status: "suspended",
+              suspendedAt: Date.now(),
               payload: {}
             }
           };
@@ -305,9 +335,34 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
             executionContext,
             result: {
               status: "tripwire",
-              tripwire: result?.tripwire
+              tripwire: result?.tripwire,
+              endedAt: Date.now()
             }
           };
+        } else if (perStep || result.status === "paused") {
+          await pubsub.publish(`workflow.events.v2.${executionContext.runId}`, {
+            type: "watch",
+            runId: executionContext.runId,
+            data: {
+              type: "workflow-step-result",
+              payload: {
+                id: step.id,
+                status: "paused"
+              }
+            }
+          });
+          await pubsub.publish(`workflow.events.v2.${executionContext.runId}`, {
+            type: "watch",
+            runId: executionContext.runId,
+            data: {
+              type: "workflow-step-finish",
+              payload: {
+                id: step.id,
+                metadata: {}
+              }
+            }
+          });
+          return { executionContext, result: { status: "paused" } };
         }
         await pubsub.publish(`workflow.events.v2.${executionContext.runId}`, {
           type: "watch",
@@ -332,14 +387,13 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
             }
           }
         });
-        return { executionContext, result: { status: "success", output: result?.result } };
+        return { executionContext, result: { status: "success", output: result?.result, endedAt: Date.now() } };
       }
     );
     Object.assign(executionContext, res.executionContext);
     return {
       ...res.result,
       startedAt,
-      endedAt: Date.now(),
       payload: inputData,
       resumedAt: resume?.steps[0] === step.id ? startedAt : void 0,
       resumePayload: resume?.steps[0] === step.id ? resume?.resumePayload : void 0
@@ -508,6 +562,7 @@ var InngestRun = class extends workflows.Run {
   async getRunOutput(eventId, maxWaitMs = 3e5) {
     const startTime = Date.now();
     const storage = this.#mastra?.getStorage();
+    const workflowsStore = await storage?.getStore("workflows");
     while (Date.now() - startTime < maxWaitMs) {
       let runs;
       try {
@@ -524,7 +579,7 @@ var InngestRun = class extends workflows.Run {
         return runs[0];
       }
       if (runs?.[0]?.status === "Failed") {
-        const snapshot = await storage?.loadWorkflowSnapshot({
+        const snapshot = await workflowsStore?.loadWorkflowSnapshot({
           workflowName: this.workflowId,
           runId: this.runId
         });
@@ -543,7 +598,7 @@ var InngestRun = class extends workflows.Run {
         };
       }
       if (runs?.[0]?.status === "Cancelled") {
-        const snapshot = await storage?.loadWorkflowSnapshot({
+        const snapshot = await workflowsStore?.loadWorkflowSnapshot({
           workflowName: this.workflowId,
           runId: this.runId
         });
@@ -561,12 +616,13 @@ var InngestRun = class extends workflows.Run {
         runId: this.runId
       }
     });
-    const snapshot = await storage?.loadWorkflowSnapshot({
+    const workflowsStore = await storage?.getStore("workflows");
+    const snapshot = await workflowsStore?.loadWorkflowSnapshot({
       workflowName: this.workflowId,
       runId: this.runId
     });
     if (snapshot) {
-      await storage?.persistWorkflowSnapshot({
+      await workflowsStore?.persistWorkflowSnapshot({
         workflowName: this.workflowId,
         runId: this.runId,
         resourceId: this.resourceId,
@@ -588,7 +644,8 @@ var InngestRun = class extends workflows.Run {
    * Use this when you don't need to wait for the result or want to avoid polling failures.
    */
   async startAsync(params) {
-    await this.#mastra.getStorage()?.persistWorkflowSnapshot({
+    const workflowsStore = await this.#mastra.getStorage()?.getStore("workflows");
+    await workflowsStore?.persistWorkflowSnapshot({
       workflowName: this.workflowId,
       runId: this.runId,
       resourceId: this.resourceId,
@@ -617,7 +674,8 @@ var InngestRun = class extends workflows.Run {
         resourceId: this.resourceId,
         outputOptions: params.outputOptions,
         tracingOptions: params.tracingOptions,
-        requestContext: params.requestContext ? Object.fromEntries(params.requestContext.entries()) : {}
+        requestContext: params.requestContext ? Object.fromEntries(params.requestContext.entries()) : {},
+        perStep: params.perStep
       }
     });
     const eventId = eventOutput.ids[0];
@@ -632,9 +690,11 @@ var InngestRun = class extends workflows.Run {
     outputOptions,
     tracingOptions,
     format,
-    requestContext
+    requestContext,
+    perStep
   }) {
-    await this.#mastra.getStorage()?.persistWorkflowSnapshot({
+    const workflowsStore = await this.#mastra.getStorage()?.getStore("workflows");
+    await workflowsStore?.persistWorkflowSnapshot({
       workflowName: this.workflowId,
       runId: this.runId,
       resourceId: this.resourceId,
@@ -664,7 +724,8 @@ var InngestRun = class extends workflows.Run {
         outputOptions,
         tracingOptions,
         format,
-        requestContext: requestContext ? Object.fromEntries(requestContext.entries()) : {}
+        requestContext: requestContext ? Object.fromEntries(requestContext.entries()) : {},
+        perStep
       }
     });
     const eventId = eventOutput.ids[0];
@@ -700,7 +761,8 @@ var InngestRun = class extends workflows.Run {
         (step) => typeof step === "string" ? step : step?.id
       );
     }
-    const snapshot = await storage?.loadWorkflowSnapshot({
+    const workflowsStore = await storage?.getStore("workflows");
+    const snapshot = await workflowsStore?.loadWorkflowSnapshot({
       workflowName: this.workflowId,
       runId: this.runId
     });
@@ -723,7 +785,8 @@ var InngestRun = class extends workflows.Run {
           resumePayload: resumeDataToUse,
           resumePath: steps?.[0] ? snapshot?.suspendedPaths?.[steps?.[0]] : void 0
         },
-        requestContext: mergedRequestContext
+        requestContext: mergedRequestContext,
+        perStep: params.perStep
       }
     });
     const eventId = eventOutput.ids[0];
@@ -762,12 +825,13 @@ var InngestRun = class extends workflows.Run {
       throw new Error("No steps provided to timeTravel");
     }
     const storage = this.#mastra?.getStorage();
-    const snapshot = await storage?.loadWorkflowSnapshot({
+    const workflowsStore = await storage?.getStore("workflows");
+    const snapshot = await workflowsStore?.loadWorkflowSnapshot({
       workflowName: this.workflowId,
       runId: this.runId
     });
     if (!snapshot) {
-      await storage?.persistWorkflowSnapshot({
+      await workflowsStore?.persistWorkflowSnapshot({
         workflowName: this.workflowId,
         runId: this.runId,
         resourceId: this.resourceId,
@@ -801,7 +865,8 @@ var InngestRun = class extends workflows.Run {
       nestedStepsContext: params.nestedStepsContext,
       snapshot: snapshot ?? { context: {} },
       graph: this.executionGraph,
-      initialState: params.initialState
+      initialState: params.initialState,
+      perStep: params.perStep
     });
     const eventOutput = await this.inngest.send({
       name: `workflow.${this.workflowId}`,
@@ -813,7 +878,8 @@ var InngestRun = class extends workflows.Run {
         timeTravel: timeTravelData,
         tracingOptions: params.tracingOptions,
         outputOptions: params.outputOptions,
-        requestContext: params.requestContext ? Object.fromEntries(params.requestContext.entries()) : {}
+        requestContext: params.requestContext ? Object.fromEntries(params.requestContext.entries()) : {},
+        perStep: params.perStep
       }
     });
     const eventId = eventOutput.ids[0];
@@ -904,7 +970,8 @@ var InngestRun = class extends workflows.Run {
     tracingOptions,
     closeOnSuspend = true,
     initialState,
-    outputOptions
+    outputOptions,
+    perStep
   } = {}) {
     if (this.closeStreamAction && this.streamOutput) {
       return this.streamOutput;
@@ -940,7 +1007,8 @@ var InngestRun = class extends workflows.Run {
           initialState,
           tracingOptions,
           outputOptions,
-          format: "vnext"
+          format: "vnext",
+          perStep
         });
         let executionResults;
         try {
@@ -983,7 +1051,8 @@ var InngestRun = class extends workflows.Run {
     nestedStepsContext,
     requestContext,
     tracingOptions,
-    outputOptions
+    outputOptions,
+    perStep
   }) {
     this.closeStreamAction = async () => {
     };
@@ -1018,7 +1087,8 @@ var InngestRun = class extends workflows.Run {
           initialState,
           requestContext,
           tracingOptions,
-          outputOptions
+          outputOptions,
+          perStep
         });
         self.executionResults = executionResultsPromise;
         let executionResults;
@@ -1080,7 +1150,11 @@ var InngestWorkflow = class _InngestWorkflow extends workflows.Workflow {
       this.logger.debug("Cannot get workflow runs. Mastra engine is not initialized");
       return { runs: [], total: 0 };
     }
-    return storage.listWorkflowRuns({ workflowName: this.id, ...args ?? {} });
+    const workflowsStore = await storage.getStore("workflows");
+    if (!workflowsStore) {
+      return { runs: [], total: 0 };
+    }
+    return workflowsStore.listWorkflowRuns({ workflowName: this.id, ...args ?? {} });
   }
   async getWorkflowRunById(runId) {
     const storage = this.#mastra?.getStorage();
@@ -1088,7 +1162,11 @@ var InngestWorkflow = class _InngestWorkflow extends workflows.Workflow {
       this.logger.debug("Cannot get workflow runs. Mastra engine is not initialized");
       return this.runs.get(runId) ? { ...this.runs.get(runId), workflowName: this.id } : null;
     }
-    const run = await storage.getWorkflowRunById({ runId, workflowName: this.id });
+    const workflowsStore = await storage.getStore("workflows");
+    if (!workflowsStore) {
+      return this.runs.get(runId) ? { ...this.runs.get(runId), workflowName: this.id } : null;
+    }
+    const run = await workflowsStore.getWorkflowRunById({ runId, workflowName: this.id });
     return run ?? (this.runs.get(runId) ? { ...this.runs.get(runId), workflowName: this.id } : null);
   }
   __registerMastra(mastra) {
@@ -1134,9 +1212,12 @@ var InngestWorkflow = class _InngestWorkflow extends workflows.Workflow {
       workflowStatus: run.workflowRunStatus,
       stepResults: {}
     });
-    const workflowSnapshotInStorage = await this.getWorkflowRunExecutionResult(runIdToUse, false);
+    const workflowSnapshotInStorage = await this.getWorkflowRunExecutionResult(runIdToUse, {
+      withNestedWorkflows: false
+    });
     if (!workflowSnapshotInStorage && shouldPersistSnapshot) {
-      await this.mastra?.getStorage()?.persistWorkflowSnapshot({
+      const workflowsStore = await this.mastra?.getStorage()?.getStore("workflows");
+      await workflowsStore?.persistWorkflowSnapshot({
         workflowName: this.id,
         runId: runIdToUse,
         resourceId: options?.resourceId,
@@ -1173,7 +1254,7 @@ var InngestWorkflow = class _InngestWorkflow extends workflows.Workflow {
       },
       { event: `workflow.${this.id}` },
       async ({ event, step, attempt, publish }) => {
-        let { inputData, initialState, runId, resourceId, resume, outputOptions, format, timeTravel } = event.data;
+        let { inputData, initialState, runId, resourceId, resume, outputOptions, format, timeTravel, perStep } = event.data;
         if (!runId) {
           runId = await step.run(`workflow.${this.id}.runIdGen`, async () => {
             return crypto$1.randomUUID();
@@ -1194,6 +1275,7 @@ var InngestWorkflow = class _InngestWorkflow extends workflows.Workflow {
           requestContext: new di.RequestContext(Object.entries(event.data.requestContext ?? {})),
           resume,
           timeTravel,
+          perStep,
           format,
           abortController: new AbortController(),
           // currentSpan: undefined, // TODO: Pass actual parent Span from workflow execution context
@@ -1211,6 +1293,9 @@ var InngestWorkflow = class _InngestWorkflow extends workflows.Workflow {
           }
         });
         await step.run(`workflow.${this.id}.finalize`, async () => {
+          if (result.status !== "paused") {
+            await engine.invokeLifecycleCallbacksInternal(result);
+          }
           if (result.status === "failed") {
             throw new inngest.NonRetriableError(`Workflow failed`, {
               cause: result