@mastra/inngest 0.0.0-fix-prompt-enhance-route-20251210210827 → 0.0.0-fix-11329-windows-path-20251222155941

package/dist/index.js

@@ -1,12 +1,14 @@
 import { Tool } from '@mastra/core/tools';
-import { DefaultExecutionEngine, createTimeTravelExecutionParams, Run, Workflow } from '@mastra/core/workflows';
-import { EMITTER_SYMBOL, STREAM_FORMAT_SYMBOL } from '@mastra/core/workflows/_constants';
+import { DefaultExecutionEngine, createTimeTravelExecutionParams, Run, hydrateSerializedStepErrors, Workflow } from '@mastra/core/workflows';
+import { PUBSUB_SYMBOL, STREAM_FORMAT_SYMBOL } from '@mastra/core/workflows/_constants';
 import { z } from 'zod';
 import { randomUUID } from 'crypto';
 import { RequestContext } from '@mastra/core/di';
 import { RetryAfterError, NonRetriableError } from 'inngest';
-import { ReadableStream } from 'stream/web';
+import { getErrorFromUnknown } from '@mastra/core/error';
 import { subscribe } from '@inngest/realtime';
+import { PubSub } from '@mastra/core/events';
+import { ReadableStream } from 'stream/web';
 import { ChunkFrom, WorkflowRunOutput } from '@mastra/core/stream';
 import { serve as serve$1 } from 'inngest/hono';
 
@@ -23,17 +25,18 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
   // Hook Overrides
   // =============================================================================
   /**
-   * Format errors with stack traces for better debugging in Inngest
+   * Format errors while preserving Error instances and their custom properties.
+   * Uses getErrorFromUnknown to ensure all error properties are preserved.
    */
   formatResultError(error, lastOutput) {
-    if (error instanceof Error) {
-      return error.stack ?? error.message;
-    }
     const outputError = lastOutput?.error;
-    if (outputError instanceof Error) {
-      return outputError.message;
-    }
-    return outputError ?? error ?? "Unknown error";
+    const errorSource = error || outputError;
+    const errorInstance = getErrorFromUnknown(errorSource, {
+      serializeStack: true,
+      // Include stack in JSON for better debugging in Inngest
+      fallbackMessage: "Unknown workflow error"
+    });
+    return errorInstance.toJSON();
   }
   /**
    * Detect InngestWorkflow instances for special nested workflow handling
@@ -65,18 +68,24 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
           error: e,
           attributes: { status: "failed" }
         });
+        if (cause.error && !(cause.error instanceof Error)) {
+          cause.error = getErrorFromUnknown(cause.error, { serializeStack: false });
+        }
         return { ok: false, error: cause };
       }
-      const errorMessage = e instanceof Error ? e.message : String(e);
+      const errorInstance = getErrorFromUnknown(e, {
+        serializeStack: false,
+        fallbackMessage: "Unknown step execution error"
+      });
       params.stepSpan?.error({
-        error: e,
+        error: errorInstance,
         attributes: { status: "failed" }
       });
       return {
         ok: false,
         error: {
           status: "failed",
-          error: `Error: ${errorMessage}`,
+          error: errorInstance,
           endedAt: Date.now()
         }
       };
@@ -105,11 +114,14 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
         return await operationFn();
       } catch (e) {
         if (retryConfig) {
-          const errorMessage = e instanceof Error ? e.message : String(e);
-          throw new RetryAfterError(errorMessage, retryConfig.delay, {
+          const errorInstance = getErrorFromUnknown(e, {
+            serializeStack: false,
+            fallbackMessage: "Unknown step execution error"
+          });
+          throw new RetryAfterError(errorInstance.message, retryConfig.delay, {
             cause: {
               status: "failed",
-              error: `Error: ${errorMessage}`,
+              error: errorInstance,
               endedAt: Date.now()
             }
           });
@@ -124,6 +136,18 @@ var InngestExecutionEngine = class extends 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.
@@ -132,7 +156,18 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
     if (!(params.step instanceof InngestWorkflow)) {
       return null;
     }
-    const { step, stepResults, executionContext, resume, timeTravel, prevOutput, inputData, emitter, startedAt } = params;
+    const {
+      step,
+      stepResults,
+      executionContext,
+      resume,
+      timeTravel,
+      prevOutput,
+      inputData,
+      pubsub,
+      startedAt,
+      perStep
+    } = params;
     const isResume = !!resume?.steps?.length;
     let result;
     let runId;
@@ -157,7 +192,8 @@ var InngestExecutionEngine = class extends 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;
@@ -183,7 +219,8 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
             timeTravel: timeTravelParams,
             initialState: executionContext.state ?? {},
             runId: executionContext.runId,
-            outputOptions: { includeState: true }
+            outputOptions: { includeState: true },
+            perStep
           }
         });
         result = invokeResp.result;
@@ -195,7 +232,8 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
           data: {
             inputData,
             initialState: executionContext.state ?? {},
-            outputOptions: { includeState: true }
+            outputOptions: { includeState: true },
+            perStep
           }
         });
         result = invokeResp.result;
@@ -221,16 +259,20 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
       `workflow.${executionContext.workflowId}.step.${step.id}.nestedwf-results`,
       async () => {
         if (result.status === "failed") {
-          await emitter.emit("watch", {
-            type: "workflow-step-result",
-            payload: {
-              id: step.id,
-              status: "failed",
-              error: result?.error,
-              payload: prevOutput
+          await pubsub.publish(`workflow.events.v2.${executionContext.runId}`, {
+            type: "watch",
+            runId: executionContext.runId,
+            data: {
+              type: "workflow-step-result",
+              payload: {
+                id: step.id,
+                status: "failed",
+                error: result?.error,
+                payload: prevOutput
+              }
             }
           });
-          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;
@@ -239,17 +281,22 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
           for (const [stepName, stepResult] of suspendedSteps) {
             const suspendPath = [stepName, ...stepResult?.suspendPayload?.__workflow_meta?.path ?? []];
             executionContext.suspendedPaths[step.id] = executionContext.executionPath;
-            await emitter.emit("watch", {
-              type: "workflow-step-suspended",
-              payload: {
-                id: step.id,
-                status: "suspended"
+            await pubsub.publish(`workflow.events.v2.${executionContext.runId}`, {
+              type: "watch",
+              runId: executionContext.runId,
+              data: {
+                type: "workflow-step-suspended",
+                payload: {
+                  id: step.id,
+                  status: "suspended"
+                }
               }
             });
             return {
               executionContext,
               result: {
                 status: "suspended",
+                suspendedAt: Date.now(),
                 payload: stepResult.payload,
                 suspendPayload: {
                   ...stepResult?.suspendPayload,
@@ -262,39 +309,205 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
             executionContext,
             result: {
               status: "suspended",
+              suspendedAt: Date.now(),
               payload: {}
             }
           };
+        } else if (result.status === "tripwire") {
+          await pubsub.publish(`workflow.events.v2.${executionContext.runId}`, {
+            type: "watch",
+            runId: executionContext.runId,
+            data: {
+              type: "workflow-step-result",
+              payload: {
+                id: step.id,
+                status: "tripwire",
+                error: result?.tripwire?.reason,
+                payload: prevOutput
+              }
+            }
+          });
+          return {
+            executionContext,
+            result: {
+              status: "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 emitter.emit("watch", {
-          type: "workflow-step-result",
-          payload: {
-            id: step.id,
-            status: "success",
-            output: result?.result
+        await pubsub.publish(`workflow.events.v2.${executionContext.runId}`, {
+          type: "watch",
+          runId: executionContext.runId,
+          data: {
+            type: "workflow-step-result",
+            payload: {
+              id: step.id,
+              status: "success",
+              output: result?.result
+            }
           }
         });
-        await emitter.emit("watch", {
-          type: "workflow-step-finish",
-          payload: {
-            id: step.id,
-            metadata: {}
+        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: "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
     };
   }
 };
+var InngestPubSub = class extends PubSub {
+  inngest;
+  workflowId;
+  publishFn;
+  subscriptions = /* @__PURE__ */ new Map();
+  constructor(inngest, workflowId, publishFn) {
+    super();
+    this.inngest = inngest;
+    this.workflowId = workflowId;
+    this.publishFn = publishFn;
+  }
+  /**
+   * Publish an event to Inngest's realtime system.
+   *
+   * Topic format: "workflow.events.v2.{runId}"
+   * Maps to Inngest channel: "workflow:{workflowId}:{runId}"
+   */
+  async publish(topic, event) {
+    if (!this.publishFn) {
+      return;
+    }
+    const match = topic.match(/^workflow\.events\.v2\.(.+)$/);
+    if (!match) {
+      return;
+    }
+    const runId = match[1];
+    try {
+      await this.publishFn({
+        channel: `workflow:${this.workflowId}:${runId}`,
+        topic: "watch",
+        data: event.data
+      });
+    } catch (err) {
+      console.error("InngestPubSub publish error:", err?.message ?? err);
+    }
+  }
+  /**
+   * Subscribe to events from Inngest's realtime system.
+   *
+   * Topic format: "workflow.events.v2.{runId}"
+   * Maps to Inngest channel: "workflow:{workflowId}:{runId}"
+   */
+  async subscribe(topic, cb) {
+    const match = topic.match(/^workflow\.events\.v2\.(.+)$/);
+    if (!match || !match[1]) {
+      return;
+    }
+    const runId = match[1];
+    if (this.subscriptions.has(topic)) {
+      this.subscriptions.get(topic).callbacks.add(cb);
+      return;
+    }
+    const callbacks = /* @__PURE__ */ new Set([cb]);
+    const channel = `workflow:${this.workflowId}:${runId}`;
+    const streamPromise = subscribe(
+      {
+        channel,
+        topics: ["watch"],
+        app: this.inngest
+      },
+      (message) => {
+        const event = {
+          id: crypto.randomUUID(),
+          type: "watch",
+          runId,
+          data: message.data,
+          createdAt: /* @__PURE__ */ new Date()
+        };
+        for (const callback of callbacks) {
+          callback(event);
+        }
+      }
+    );
+    this.subscriptions.set(topic, {
+      unsubscribe: () => {
+        streamPromise.then((stream) => stream.cancel()).catch((err) => {
+          console.error("InngestPubSub unsubscribe error:", err);
+        });
+      },
+      callbacks
+    });
+  }
+  /**
+   * Unsubscribe a callback from a topic.
+   * If no callbacks remain, the underlying Inngest subscription is cancelled.
+   */
+  async unsubscribe(topic, cb) {
+    const sub = this.subscriptions.get(topic);
+    if (!sub) {
+      return;
+    }
+    sub.callbacks.delete(cb);
+    if (sub.callbacks.size === 0) {
+      sub.unsubscribe();
+      this.subscriptions.delete(topic);
+    }
+  }
+  /**
+   * Flush any pending operations. No-op for Inngest.
+   */
+  async flush() {
+  }
+  /**
+   * Clean up all subscriptions during graceful shutdown.
+   */
+  async close() {
+    for (const [, sub] of this.subscriptions) {
+      sub.unsubscribe();
+    }
+    this.subscriptions.clear();
+  }
+};
 var InngestRun = class extends Run {
   inngest;
   serializedStepGraph;
@@ -306,27 +519,77 @@ var InngestRun = class extends Run {
     this.#mastra = params.mastra;
   }
   async getRuns(eventId) {
-    const response = await fetch(`${this.inngest.apiBaseUrl ?? "https://api.inngest.com"}/v1/events/${eventId}/runs`, {
-      headers: {
-        Authorization: `Bearer ${process.env.INNGEST_SIGNING_KEY}`
+    const maxRetries = 3;
+    let lastError = null;
+    for (let attempt = 0; attempt < maxRetries; attempt++) {
+      try {
+        const response = await fetch(
+          `${this.inngest.apiBaseUrl ?? "https://api.inngest.com"}/v1/events/${eventId}/runs`,
+          {
+            headers: {
+              Authorization: `Bearer ${process.env.INNGEST_SIGNING_KEY}`
+            }
+          }
+        );
+        if (response.status === 429) {
+          const retryAfter = parseInt(response.headers.get("retry-after") || "2", 10);
+          await new Promise((resolve) => setTimeout(resolve, retryAfter * 1e3));
+          continue;
+        }
+        if (!response.ok) {
+          throw new Error(`Inngest API error: ${response.status} ${response.statusText}`);
+        }
+        const text = await response.text();
+        if (!text) {
+          await new Promise((resolve) => setTimeout(resolve, 1e3 * (attempt + 1)));
+          continue;
+        }
+        const json = JSON.parse(text);
+        return json.data;
+      } catch (error) {
+        lastError = error;
+        if (attempt < maxRetries - 1) {
+          await new Promise((resolve) => setTimeout(resolve, 1e3 * Math.pow(2, attempt)));
+        }
       }
-    });
-    const json = await response.json();
-    return json.data;
+    }
+    throw new NonRetriableError(`Failed to get runs after ${maxRetries} attempts: ${lastError?.message}`);
   }
-  async getRunOutput(eventId) {
-    let runs = await this.getRuns(eventId);
+  async getRunOutput(eventId, maxWaitMs = 3e5) {
+    const startTime = Date.now();
     const storage = this.#mastra?.getStorage();
-    while (runs?.[0]?.status !== "Completed" || runs?.[0]?.event_id !== eventId) {
-      await new Promise((resolve) => setTimeout(resolve, 1e3));
-      runs = await this.getRuns(eventId);
+    while (Date.now() - startTime < maxWaitMs) {
+      let runs;
+      try {
+        runs = await this.getRuns(eventId);
+      } catch (error) {
+        if (error instanceof NonRetriableError) {
+          throw error;
+        }
+        throw new NonRetriableError(
+          `Failed to poll workflow status: ${error instanceof Error ? error.message : String(error)}`
+        );
+      }
+      if (runs?.[0]?.status === "Completed" && runs?.[0]?.event_id === eventId) {
+        return runs[0];
+      }
       if (runs?.[0]?.status === "Failed") {
         const snapshot = await storage?.loadWorkflowSnapshot({
           workflowName: this.workflowId,
           runId: this.runId
         });
+        if (snapshot?.context) {
+          snapshot.context = hydrateSerializedStepErrors(snapshot.context);
+        }
         return {
-          output: { result: { steps: snapshot?.context, status: "failed", error: runs?.[0]?.output?.message } }
+          output: {
+            result: {
+              steps: snapshot?.context,
+              status: "failed",
+              // Get the original error from NonRetriableError's cause (which contains the workflow result)
+              error: getErrorFromUnknown(runs?.[0]?.output?.cause?.error, { serializeStack: false })
+            }
+          }
         };
       }
       if (runs?.[0]?.status === "Cancelled") {
@@ -336,8 +599,9 @@ var InngestRun = class extends Run {
         });
         return { output: { result: { steps: snapshot?.context, status: "canceled" } } };
       }
+      await new Promise((resolve) => setTimeout(resolve, 1e3 + Math.random() * 1e3));
     }
-    return runs?.[0];
+    throw new NonRetriableError(`Workflow did not complete within ${maxWaitMs}ms`);
   }
   async cancel() {
     const storage = this.#mastra?.getStorage();
@@ -367,13 +631,60 @@ var InngestRun = class extends Run {
   async start(params) {
     return this._start(params);
   }
+  /**
+   * Starts the workflow execution without waiting for completion (fire-and-forget).
+   * Returns immediately with the runId after sending the event to Inngest.
+   * The workflow executes independently in Inngest.
+   * 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({
+      workflowName: this.workflowId,
+      runId: this.runId,
+      resourceId: this.resourceId,
+      snapshot: {
+        runId: this.runId,
+        serializedStepGraph: this.serializedStepGraph,
+        status: "running",
+        value: {},
+        context: {},
+        activePaths: [],
+        suspendedPaths: {},
+        activeStepsPath: {},
+        resumeLabels: {},
+        waitingPaths: {},
+        timestamp: Date.now()
+      }
+    });
+    const inputDataToUse = await this._validateInput(params.inputData);
+    const initialStateToUse = await this._validateInitialState(params.initialState ?? {});
+    const eventOutput = await this.inngest.send({
+      name: `workflow.${this.workflowId}`,
+      data: {
+        inputData: inputDataToUse,
+        initialState: initialStateToUse,
+        runId: this.runId,
+        resourceId: this.resourceId,
+        outputOptions: params.outputOptions,
+        tracingOptions: params.tracingOptions,
+        requestContext: params.requestContext ? Object.fromEntries(params.requestContext.entries()) : {},
+        perStep: params.perStep
+      }
+    });
+    const eventId = eventOutput.ids[0];
+    if (!eventId) {
+      throw new Error("Event ID is not set");
+    }
+    return { runId: this.runId };
+  }
   async _start({
     inputData,
     initialState,
     outputOptions,
     tracingOptions,
     format,
-    requestContext
+    requestContext,
+    perStep
   }) {
     await this.#mastra.getStorage()?.persistWorkflowSnapshot({
       workflowName: this.workflowId,
@@ -405,7 +716,8 @@ var InngestRun = class extends Run {
         outputOptions,
         tracingOptions,
         format,
-        requestContext: requestContext ? Object.fromEntries(requestContext.entries()) : {}
+        requestContext: requestContext ? Object.fromEntries(requestContext.entries()) : {},
+        perStep
       }
     });
     const eventId = eventOutput.ids[0];
@@ -414,9 +726,7 @@ var InngestRun = class extends Run {
     }
     const runOutput = await this.getRunOutput(eventId);
     const result = runOutput?.output?.result;
-    if (result.status === "failed") {
-      result.error = new Error(result.error);
-    }
+    this.hydrateFailedResult(result);
     if (result.status !== "suspended") {
       this.cleanup?.();
     }
@@ -466,7 +776,8 @@ var InngestRun = class extends Run {
           resumePayload: resumeDataToUse,
           resumePath: steps?.[0] ? snapshot?.suspendedPaths?.[steps?.[0]] : void 0
         },
-        requestContext: mergedRequestContext
+        requestContext: mergedRequestContext,
+        perStep: params.perStep
       }
     });
     const eventId = eventOutput.ids[0];
@@ -475,9 +786,7 @@ var InngestRun = class extends Run {
     }
     const runOutput = await this.getRunOutput(eventId);
     const result = runOutput?.output?.result;
-    if (result.status === "failed") {
-      result.error = new Error(result.error);
-    }
+    this.hydrateFailedResult(result);
     return result;
   }
   async timeTravel(params) {
@@ -558,7 +867,8 @@ var InngestRun = class extends 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];
@@ -567,9 +877,7 @@ var InngestRun = class extends Run {
     }
     const runOutput = await this.getRunOutput(eventId);
     const result = runOutput?.output?.result;
-    if (result.status === "failed") {
-      result.error = new Error(result.error);
-    }
+    this.hydrateFailedResult(result);
     return result;
   }
   watch(cb) {
@@ -651,7 +959,8 @@ var InngestRun = class extends Run {
     tracingOptions,
     closeOnSuspend = true,
     initialState,
-    outputOptions
+    outputOptions,
+    perStep
   } = {}) {
     if (this.closeStreamAction && this.streamOutput) {
       return this.streamOutput;
@@ -687,7 +996,8 @@ var InngestRun = class extends Run {
           initialState,
           tracingOptions,
           outputOptions,
-          format: "vnext"
+          format: "vnext",
+          perStep
         });
         let executionResults;
         try {
@@ -730,7 +1040,8 @@ var InngestRun = class extends Run {
     nestedStepsContext,
     requestContext,
     tracingOptions,
-    outputOptions
+    outputOptions,
+    perStep
   }) {
     this.closeStreamAction = async () => {
     };
@@ -765,7 +1076,8 @@ var InngestRun = class extends Run {
           initialState,
           requestContext,
           tracingOptions,
-          outputOptions
+          outputOptions,
+          perStep
         });
         self.executionResults = executionResultsPromise;
         let executionResults;
@@ -790,6 +1102,18 @@ var InngestRun = class extends Run {
     });
     return this.streamOutput;
   }
+  /**
+   * Hydrates errors in a failed workflow result back to proper Error instances.
+   * This ensures error.cause chains and custom properties are preserved.
+   */
+  hydrateFailedResult(result) {
+    if (result.status === "failed") {
+      result.error = getErrorFromUnknown(result.error, { serializeStack: false });
+      if (result.steps) {
+        hydrateSerializedStepErrors(result.steps);
+      }
+    }
+  }
 };
 
 // src/workflow.ts
@@ -827,6 +1151,7 @@ var InngestWorkflow = class _InngestWorkflow extends Workflow {
     return run ?? (this.runs.get(runId) ? { ...this.runs.get(runId), workflowName: this.id } : null);
   }
   __registerMastra(mastra) {
+    super.__registerMastra(mastra);
     this.#mastra = mastra;
     this.executionEngine.__registerMastra(mastra);
     const updateNested = (step) => {
@@ -868,7 +1193,9 @@ var InngestWorkflow = class _InngestWorkflow extends 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({
         workflowName: this.id,
@@ -907,34 +1234,13 @@ var InngestWorkflow = class _InngestWorkflow extends 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 randomUUID();
           });
         }
-        const emitter = {
-          emit: async (event2, data) => {
-            if (!publish) {
-              return;
-            }
-            try {
-              await publish({
-                channel: `workflow:${this.id}:${runId}`,
-                topic: event2,
-                data
-              });
-            } catch (err) {
-              this.logger.error("Error emitting event: " + (err?.stack ?? err?.message ?? err));
-            }
-          },
-          on: (_event, _callback) => {
-          },
-          off: (_event, _callback) => {
-          },
-          once: (_event, _callback) => {
-          }
-        };
+        const pubsub = new InngestPubSub(this.inngest, this.id, publish);
         const engine = new InngestExecutionEngine(this.#mastra, step, attempt, this.options);
         const result = await engine.execute({
           workflowId: this.id,
@@ -944,21 +1250,32 @@ var InngestWorkflow = class _InngestWorkflow extends Workflow {
           serializedStepGraph: this.serializedStepGraph,
           input: inputData,
           initialState,
-          emitter,
+          pubsub,
           retryConfig: this.retryConfig,
           requestContext: new RequestContext(Object.entries(event.data.requestContext ?? {})),
           resume,
           timeTravel,
+          perStep,
           format,
           abortController: new AbortController(),
           // currentSpan: undefined, // TODO: Pass actual parent Span from workflow execution context
           outputOptions,
           outputWriter: async (chunk) => {
-            void emitter.emit("watch", chunk).catch(() => {
-            });
+            try {
+              await pubsub.publish(`workflow.events.v2.${runId}`, {
+                type: "watch",
+                runId,
+                data: chunk
+              });
+            } catch (err) {
+              this.logger.debug?.("Failed to publish watch event:", err);
+            }
           }
         });
         await step.run(`workflow.${this.id}.finalize`, async () => {
+          if (result.status !== "paused") {
+            await engine.invokeLifecycleCallbacksInternal(result);
+          }
           if (result.status === "failed") {
             throw new NonRetriableError(`Workflow failed`, {
               cause: result
@@ -1043,7 +1360,8 @@ function createStep(params, agentOptions) {
       outputSchema,
       execute: async ({
         inputData,
-        [EMITTER_SYMBOL]: emitter,
+        runId,
+        [PUBSUB_SYMBOL]: pubsub,
         [STREAM_FORMAT_SYMBOL]: streamFormat,
         requestContext,
         tracingContext,
@@ -1098,22 +1416,24 @@ function createStep(params, agentOptions) {
           stream = modelOutput.fullStream;
         }
         if (streamFormat === "legacy") {
-          await emitter.emit("watch", {
-            type: "tool-call-streaming-start",
-            ...toolData ?? {}
+          await pubsub.publish(`workflow.events.v2.${runId}`, {
+            type: "watch",
+            runId,
+            data: { type: "tool-call-streaming-start", ...toolData ?? {} }
           });
           for await (const chunk of stream) {
             if (chunk.type === "text-delta") {
-              await emitter.emit("watch", {
-                type: "tool-call-delta",
-                ...toolData ?? {},
-                argsTextDelta: chunk.textDelta
+              await pubsub.publish(`workflow.events.v2.${runId}`, {
+                type: "watch",
+                runId,
+                data: { type: "tool-call-delta", ...toolData ?? {}, argsTextDelta: chunk.textDelta }
               });
             }
           }
-          await emitter.emit("watch", {
-            type: "tool-call-streaming-finish",
-            ...toolData ?? {}
+          await pubsub.publish(`workflow.events.v2.${runId}`, {
+            type: "watch",
+            runId,
+            data: { type: "tool-call-streaming-finish", ...toolData ?? {} }
           });
         } else {
           for await (const chunk of stream) {
@@ -1225,6 +1545,6 @@ function init(inngest) {
   };
 }
 
-export { InngestExecutionEngine, InngestRun, InngestWorkflow, _compatibilityCheck, createStep, init, serve };
+export { InngestExecutionEngine, InngestPubSub, InngestRun, InngestWorkflow, _compatibilityCheck, createStep, init, serve };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map