@mastra/inngest 0.0.0-cloud-storage-adapter-20251106204059 → 0.0.0-cloud-604-map-nested-flow-details-to-side-panel-20251212192149

package/dist/index.js

@@ -1,41 +1,461 @@
+import { Tool } from '@mastra/core/tools';
+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 { ReadableStream } from 'stream/web';
-import { subscribe } from '@inngest/realtime';
 import { RequestContext } from '@mastra/core/di';
-import { wrapMastra, SpanType } from '@mastra/core/observability';
+import { RetryAfterError, NonRetriableError } from 'inngest';
+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 { ToolStream, Tool } from '@mastra/core/tools';
-import { Run, Workflow, DefaultExecutionEngine, createDeprecationProxy, getStepResult, runCountDeprecationMessage, validateStepInput } from '@mastra/core/workflows';
-import { EMITTER_SYMBOL, STREAM_FORMAT_SYMBOL } from '@mastra/core/workflows/_constants';
-import { NonRetriableError, RetryAfterError } from 'inngest';
 import { serve as serve$1 } from 'inngest/hono';
-import { z } from 'zod';
 
 // src/index.ts
-function serve({
-  mastra,
-  inngest,
-  functions: userFunctions = [],
-  registerOptions
-}) {
-  const wfs = mastra.listWorkflows();
-  const workflowFunctions = Array.from(
-    new Set(
-      Object.values(wfs).flatMap((wf) => {
-        if (wf instanceof InngestWorkflow) {
-          wf.__registerMastra(mastra);
-          return wf.getFunctions();
+var InngestExecutionEngine = class extends DefaultExecutionEngine {
+  inngestStep;
+  inngestAttempts;
+  constructor(mastra, inngestStep, inngestAttempts = 0, options) {
+    super({ mastra, options });
+    this.inngestStep = inngestStep;
+    this.inngestAttempts = inngestAttempts;
+  }
+  // =============================================================================
+  // Hook Overrides
+  // =============================================================================
+  /**
+   * Format errors while preserving Error instances and their custom properties.
+   * Uses getErrorFromUnknown to ensure all error properties are preserved.
+   */
+  formatResultError(error, lastOutput) {
+    const outputError = lastOutput?.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
+   */
+  isNestedWorkflowStep(step) {
+    return step instanceof InngestWorkflow;
+  }
+  /**
+   * Inngest requires requestContext serialization for memoization.
+   * When steps are replayed, the original function doesn't re-execute,
+   * so requestContext modifications must be captured and restored.
+   */
+  requiresDurableContextSerialization() {
+    return true;
+  }
+  /**
+   * Execute a step with retry logic for Inngest.
+   * Retries are handled via step-level retry (RetryAfterError thrown INSIDE step.run()).
+   * After retries exhausted, error propagates here and we return a failed result.
+   */
+  async executeStepWithRetry(stepId, runStep, params) {
+    try {
+      const result = await this.wrapDurableOperation(stepId, runStep, { delay: params.delay });
+      return { ok: true, result };
+    } catch (e) {
+      const cause = e?.cause;
+      if (cause?.status === "failed") {
+        params.stepSpan?.error({
+          error: e,
+          attributes: { status: "failed" }
+        });
+        if (cause.error && !(cause.error instanceof Error)) {
+          cause.error = getErrorFromUnknown(cause.error, { serializeStack: false });
         }
-        return [];
-      })
-    )
-  );
-  return serve$1({
-    ...registerOptions,
-    client: inngest,
-    functions: [...workflowFunctions, ...userFunctions]
-  });
-}
+        return { ok: false, error: cause };
+      }
+      const errorInstance = getErrorFromUnknown(e, {
+        serializeStack: false,
+        fallbackMessage: "Unknown step execution error"
+      });
+      params.stepSpan?.error({
+        error: errorInstance,
+        attributes: { status: "failed" }
+      });
+      return {
+        ok: false,
+        error: {
+          status: "failed",
+          error: errorInstance,
+          endedAt: Date.now()
+        }
+      };
+    }
+  }
+  /**
+   * Use Inngest's sleep primitive for durability
+   */
+  async executeSleepDuration(duration, sleepId, workflowId) {
+    await this.inngestStep.sleep(`workflow.${workflowId}.sleep.${sleepId}`, duration < 0 ? 0 : duration);
+  }
+  /**
+   * Use Inngest's sleepUntil primitive for durability
+   */
+  async executeSleepUntilDate(date, sleepUntilId, workflowId) {
+    await this.inngestStep.sleepUntil(`workflow.${workflowId}.sleepUntil.${sleepUntilId}`, date);
+  }
+  /**
+   * Wrap durable operations in Inngest step.run() for durability.
+   * If retryConfig is provided, throws RetryAfterError INSIDE step.run() to trigger
+   * Inngest's step-level retry mechanism (not function-level retry).
+   */
+  async wrapDurableOperation(operationId, operationFn, retryConfig) {
+    return this.inngestStep.run(operationId, async () => {
+      try {
+        return await operationFn();
+      } catch (e) {
+        if (retryConfig) {
+          const errorInstance = getErrorFromUnknown(e, {
+            serializeStack: false,
+            fallbackMessage: "Unknown step execution error"
+          });
+          throw new RetryAfterError(errorInstance.message, retryConfig.delay, {
+            cause: {
+              status: "failed",
+              error: errorInstance,
+              endedAt: Date.now()
+            }
+          });
+        }
+        throw e;
+      }
+    });
+  }
+  /**
+   * Provide Inngest step primitive in engine context
+   */
+  getEngineContext() {
+    return { step: this.inngestStep };
+  }
+  /**
+   * Execute nested InngestWorkflow using inngestStep.invoke() for durability.
+   * This MUST be called directly (not inside step.run()) due to Inngest constraints.
+   */
+  async executeWorkflowStep(params) {
+    if (!(params.step instanceof InngestWorkflow)) {
+      return null;
+    }
+    const { step, stepResults, executionContext, resume, timeTravel, prevOutput, inputData, pubsub, startedAt } = params;
+    const isResume = !!resume?.steps?.length;
+    let result;
+    let runId;
+    const isTimeTravel = !!(timeTravel && timeTravel.steps?.length > 1 && timeTravel.steps[0] === step.id);
+    try {
+      if (isResume) {
+        runId = stepResults[resume?.steps?.[0] ?? ""]?.suspendPayload?.__workflow_meta?.runId ?? randomUUID();
+        const snapshot = await this.mastra?.getStorage()?.loadWorkflowSnapshot({
+          workflowName: step.id,
+          runId
+        });
+        const invokeResp = await this.inngestStep.invoke(`workflow.${executionContext.workflowId}.step.${step.id}`, {
+          function: step.getFunction(),
+          data: {
+            inputData,
+            initialState: executionContext.state ?? snapshot?.value ?? {},
+            runId,
+            resume: {
+              runId,
+              steps: resume.steps.slice(1),
+              stepResults: snapshot?.context,
+              resumePayload: resume.resumePayload,
+              resumePath: resume.steps?.[1] ? snapshot?.suspendedPaths?.[resume.steps?.[1]] : void 0
+            },
+            outputOptions: { includeState: true }
+          }
+        });
+        result = invokeResp.result;
+        runId = invokeResp.runId;
+        executionContext.state = invokeResp.result.state;
+      } else if (isTimeTravel) {
+        const snapshot = await this.mastra?.getStorage()?.loadWorkflowSnapshot({
+          workflowName: step.id,
+          runId: executionContext.runId
+        }) ?? { context: {} };
+        const timeTravelParams = createTimeTravelExecutionParams({
+          steps: timeTravel.steps.slice(1),
+          inputData: timeTravel.inputData,
+          resumeData: timeTravel.resumeData,
+          context: timeTravel.nestedStepResults?.[step.id] ?? {},
+          nestedStepsContext: timeTravel.nestedStepResults ?? {},
+          snapshot,
+          graph: step.buildExecutionGraph()
+        });
+        const invokeResp = await this.inngestStep.invoke(`workflow.${executionContext.workflowId}.step.${step.id}`, {
+          function: step.getFunction(),
+          data: {
+            timeTravel: timeTravelParams,
+            initialState: executionContext.state ?? {},
+            runId: executionContext.runId,
+            outputOptions: { includeState: true }
+          }
+        });
+        result = invokeResp.result;
+        runId = invokeResp.runId;
+        executionContext.state = invokeResp.result.state;
+      } else {
+        const invokeResp = await this.inngestStep.invoke(`workflow.${executionContext.workflowId}.step.${step.id}`, {
+          function: step.getFunction(),
+          data: {
+            inputData,
+            initialState: executionContext.state ?? {},
+            outputOptions: { includeState: true }
+          }
+        });
+        result = invokeResp.result;
+        runId = invokeResp.runId;
+        executionContext.state = invokeResp.result.state;
+      }
+    } catch (e) {
+      const errorCause = e?.cause;
+      if (errorCause && typeof errorCause === "object") {
+        result = errorCause;
+        runId = errorCause.runId || randomUUID();
+      } else {
+        runId = randomUUID();
+        result = {
+          status: "failed",
+          error: e instanceof Error ? e : new Error(String(e)),
+          steps: {},
+          input: inputData
+        };
+      }
+    }
+    const res = await this.inngestStep.run(
+      `workflow.${executionContext.workflowId}.step.${step.id}.nestedwf-results`,
+      async () => {
+        if (result.status === "failed") {
+          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 } };
+        } else if (result.status === "suspended") {
+          const suspendedSteps = Object.entries(result.steps).filter(([_stepName, stepResult]) => {
+            const stepRes = stepResult;
+            return stepRes?.status === "suspended";
+          });
+          for (const [stepName, stepResult] of suspendedSteps) {
+            const suspendPath = [stepName, ...stepResult?.suspendPayload?.__workflow_meta?.path ?? []];
+            executionContext.suspendedPaths[step.id] = executionContext.executionPath;
+            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",
+                payload: stepResult.payload,
+                suspendPayload: {
+                  ...stepResult?.suspendPayload,
+                  __workflow_meta: { runId, path: suspendPath }
+                }
+              }
+            };
+          }
+          return {
+            executionContext,
+            result: {
+              status: "suspended",
+              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
+            }
+          };
+        }
+        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 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 } };
+      }
+    );
+    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;
@@ -47,27 +467,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") {
@@ -77,8 +547,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();
@@ -99,7 +570,8 @@ var InngestRun = class extends Run {
         resourceId: this.resourceId,
         snapshot: {
           ...snapshot,
-          status: "canceled"
+          status: "canceled",
+          value: snapshot.value
         }
       });
     }
@@ -107,12 +579,58 @@ 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()) : {}
+      }
+    });
+    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
+    format,
+    requestContext
   }) {
     await this.#mastra.getStorage()?.persistWorkflowSnapshot({
       workflowName: this.workflowId,
@@ -121,14 +639,15 @@ var InngestRun = class extends Run {
       snapshot: {
         runId: this.runId,
         serializedStepGraph: this.serializedStepGraph,
+        status: "running",
         value: {},
         context: {},
         activePaths: [],
         suspendedPaths: {},
+        activeStepsPath: {},
         resumeLabels: {},
         waitingPaths: {},
-        timestamp: Date.now(),
-        status: "running"
+        timestamp: Date.now()
       }
     });
     const inputDataToUse = await this._validateInput(inputData);
@@ -142,7 +661,8 @@ var InngestRun = class extends Run {
         resourceId: this.resourceId,
         outputOptions,
         tracingOptions,
-        format
+        format,
+        requestContext: requestContext ? Object.fromEntries(requestContext.entries()) : {}
       }
     });
     const eventId = eventOutput.ids[0];
@@ -151,9 +671,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?.();
     }
@@ -172,15 +690,23 @@ var InngestRun = class extends Run {
   }
   async _resume(params) {
     const storage = this.#mastra?.getStorage();
-    const steps = (Array.isArray(params.step) ? params.step : [params.step]).map(
-      (step) => typeof step === "string" ? step : step?.id
-    );
+    let steps = [];
+    if (typeof params.step === "string") {
+      steps = params.step.split(".");
+    } else {
+      steps = (Array.isArray(params.step) ? params.step : [params.step]).map(
+        (step) => typeof step === "string" ? step : step?.id
+      );
+    }
     const snapshot = await storage?.loadWorkflowSnapshot({
       workflowName: this.workflowId,
       runId: this.runId
     });
     const suspendedStep = this.workflowSteps[steps?.[0] ?? ""];
     const resumeDataToUse = await this._validateResumeData(params.resumeData, suspendedStep);
+    const persistedRequestContext = snapshot?.requestContext ?? {};
+    const newRequestContext = params.requestContext ? Object.fromEntries(params.requestContext.entries()) : {};
+    const mergedRequestContext = { ...persistedRequestContext, ...newRequestContext };
     const eventOutput = await this.inngest.send({
       name: `workflow.${this.workflowId}`,
       data: {
@@ -193,9 +719,9 @@ var InngestRun = class extends Run {
           steps,
           stepResults: snapshot?.context,
           resumePayload: resumeDataToUse,
-          // @ts-ignore
-          resumePath: snapshot?.suspendedPaths?.[steps?.[0]]
-        }
+          resumePath: steps?.[0] ? snapshot?.suspendedPaths?.[steps?.[0]] : void 0
+        },
+        requestContext: mergedRequestContext
       }
     });
     const eventId = eventOutput.ids[0];
@@ -204,24 +730,112 @@ 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) {
-    let active = true;
-    const streamPromise = subscribe(
-      {
-        channel: `workflow:${this.workflowId}:${this.runId}`,
-        topics: ["watch"],
-        app: this.inngest
-      },
-      (message) => {
-        if (active) {
-          cb(message.data);
-        }
-      }
+  async timeTravel(params) {
+    const p = this._timeTravel(params).then((result) => {
+      if (result.status !== "suspended") {
+        this.closeStreamAction?.().catch(() => {
+        });
+      }
+      return result;
+    });
+    this.executionResults = p;
+    return p;
+  }
+  async _timeTravel(params) {
+    if (!params.step || Array.isArray(params.step) && params.step?.length === 0) {
+      throw new Error("Step is required and must be a valid step or array of steps");
+    }
+    let steps = [];
+    if (typeof params.step === "string") {
+      steps = params.step.split(".");
+    } else {
+      steps = (Array.isArray(params.step) ? params.step : [params.step]).map(
+        (step) => typeof step === "string" ? step : step?.id
+      );
+    }
+    if (steps.length === 0) {
+      throw new Error("No steps provided to timeTravel");
+    }
+    const storage = this.#mastra?.getStorage();
+    const snapshot = await storage?.loadWorkflowSnapshot({
+      workflowName: this.workflowId,
+      runId: this.runId
+    });
+    if (!snapshot) {
+      await storage?.persistWorkflowSnapshot({
+        workflowName: this.workflowId,
+        runId: this.runId,
+        resourceId: this.resourceId,
+        snapshot: {
+          runId: this.runId,
+          serializedStepGraph: this.serializedStepGraph,
+          status: "pending",
+          value: {},
+          context: {},
+          activePaths: [],
+          suspendedPaths: {},
+          activeStepsPath: {},
+          resumeLabels: {},
+          waitingPaths: {},
+          timestamp: Date.now()
+        }
+      });
+    }
+    if (snapshot?.status === "running") {
+      throw new Error("This workflow run is still running, cannot time travel");
+    }
+    let inputDataToUse = params.inputData;
+    if (inputDataToUse && steps.length === 1) {
+      inputDataToUse = await this._validateTimetravelInputData(params.inputData, this.workflowSteps[steps[0]]);
+    }
+    const timeTravelData = createTimeTravelExecutionParams({
+      steps,
+      inputData: inputDataToUse,
+      resumeData: params.resumeData,
+      context: params.context,
+      nestedStepsContext: params.nestedStepsContext,
+      snapshot: snapshot ?? { context: {} },
+      graph: this.executionGraph,
+      initialState: params.initialState
+    });
+    const eventOutput = await this.inngest.send({
+      name: `workflow.${this.workflowId}`,
+      data: {
+        initialState: timeTravelData.state,
+        runId: this.runId,
+        workflowId: this.workflowId,
+        stepResults: timeTravelData.stepResults,
+        timeTravel: timeTravelData,
+        tracingOptions: params.tracingOptions,
+        outputOptions: params.outputOptions,
+        requestContext: params.requestContext ? Object.fromEntries(params.requestContext.entries()) : {}
+      }
+    });
+    const eventId = eventOutput.ids[0];
+    if (!eventId) {
+      throw new Error("Event ID is not set");
+    }
+    const runOutput = await this.getRunOutput(eventId);
+    const result = runOutput?.output?.result;
+    this.hydrateFailedResult(result);
+    return result;
+  }
+  watch(cb) {
+    let active = true;
+    const streamPromise = subscribe(
+      {
+        channel: `workflow:${this.workflowId}:${this.runId}`,
+        topics: ["watch"],
+        app: this.inngest
+      },
+      (message) => {
+        if (active) {
+          cb(message.data);
+        }
+      }
     );
     return () => {
       active = false;
@@ -235,14 +849,14 @@ var InngestRun = class extends Run {
   streamLegacy({ inputData, requestContext } = {}) {
     const { readable, writable } = new TransformStream();
     const writer = writable.getWriter();
+    void writer.write({
+      // @ts-ignore
+      type: "start",
+      // @ts-ignore
+      payload: { runId: this.runId }
+    });
     const unwatch = this.watch(async (event) => {
       try {
-        await writer.write({
-          // @ts-ignore
-          type: "start",
-          // @ts-ignore
-          payload: { runId: this.runId }
-        });
         const e = {
           ...event,
           type: event.type.replace("workflow-", "")
@@ -358,7 +972,90 @@ var InngestRun = class extends Run {
   streamVNext(args = {}) {
     return this.stream(args);
   }
+  timeTravelStream({
+    inputData,
+    resumeData,
+    initialState,
+    step,
+    context,
+    nestedStepsContext,
+    requestContext,
+    tracingOptions,
+    outputOptions
+  }) {
+    this.closeStreamAction = async () => {
+    };
+    const self = this;
+    const stream = new ReadableStream({
+      async start(controller) {
+        const unwatch = self.watch(async ({ type, from = ChunkFrom.WORKFLOW, payload }) => {
+          controller.enqueue({
+            type,
+            runId: self.runId,
+            from,
+            payload: {
+              stepName: payload?.id,
+              ...payload
+            }
+          });
+        });
+        self.closeStreamAction = async () => {
+          unwatch();
+          try {
+            controller.close();
+          } catch (err) {
+            console.error("Error closing stream:", err);
+          }
+        };
+        const executionResultsPromise = self._timeTravel({
+          inputData,
+          step,
+          context,
+          nestedStepsContext,
+          resumeData,
+          initialState,
+          requestContext,
+          tracingOptions,
+          outputOptions
+        });
+        self.executionResults = executionResultsPromise;
+        let executionResults;
+        try {
+          executionResults = await executionResultsPromise;
+          self.closeStreamAction?.().catch(() => {
+          });
+          if (self.streamOutput) {
+            self.streamOutput.updateResults(executionResults);
+          }
+        } catch (err) {
+          self.streamOutput?.rejectResults(err);
+          self.closeStreamAction?.().catch(() => {
+          });
+        }
+      }
+    });
+    this.streamOutput = new WorkflowRunOutput({
+      runId: this.runId,
+      workflowId: this.workflowId,
+      stream
+    });
+    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
 var InngestWorkflow = class _InngestWorkflow extends Workflow {
   #mastra;
   inngest;
@@ -367,6 +1064,7 @@ var InngestWorkflow = class _InngestWorkflow extends Workflow {
   constructor(params, inngest) {
     const { concurrency, rateLimit, throttle, debounce, priority, ...workflowParams } = params;
     super(workflowParams);
+    this.engineType = "inngest";
     const flowControlEntries = Object.entries({ concurrency, rateLimit, throttle, debounce, priority }).filter(
       ([_, value]) => value !== void 0
     );
@@ -392,6 +1090,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) => {
@@ -422,7 +1121,9 @@ var InngestWorkflow = class _InngestWorkflow extends Workflow {
         mastra: this.#mastra,
         retryConfig: this.retryConfig,
         cleanup: () => this.runs.delete(runIdToUse),
-        workflowSteps: this.steps
+        workflowSteps: this.steps,
+        workflowEngineType: this.engineType,
+        validateInputs: this.options.validateInputs
       },
       this.inngest
     );
@@ -443,13 +1144,13 @@ var InngestWorkflow = class _InngestWorkflow extends Workflow {
           value: {},
           context: {},
           activePaths: [],
+          activeStepsPath: {},
           waitingPaths: {},
           serializedStepGraph: this.serializedStepGraph,
           suspendedPaths: {},
           resumeLabels: {},
           result: void 0,
           error: void 0,
-          // @ts-ignore
           timestamp: Date.now()
         }
       });
@@ -463,42 +1164,20 @@ var InngestWorkflow = class _InngestWorkflow extends Workflow {
     this.function = this.inngest.createFunction(
       {
         id: `workflow.${this.id}`,
-        // @ts-ignore
-        retries: this.retryConfig?.attempts ?? 0,
+        retries: Math.min(this.retryConfig?.attempts ?? 0, 20),
         cancelOn: [{ event: `cancel.workflow.${this.id}` }],
         // Spread flow control configuration
         ...this.flowControlConfig
       },
       { event: `workflow.${this.id}` },
       async ({ event, step, attempt, publish }) => {
-        let { inputData, initialState, runId, resourceId, resume, outputOptions, format } = event.data;
+        let { inputData, initialState, runId, resourceId, resume, outputOptions, format, timeTravel } = 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,
@@ -508,21 +1187,26 @@ var InngestWorkflow = class _InngestWorkflow extends Workflow {
           serializedStepGraph: this.serializedStepGraph,
           input: inputData,
           initialState,
-          emitter,
+          pubsub,
           retryConfig: this.retryConfig,
-          requestContext: new RequestContext(),
-          // TODO
+          requestContext: new RequestContext(Object.entries(event.data.requestContext ?? {})),
           resume,
+          timeTravel,
           format,
           abortController: new AbortController(),
           // currentSpan: undefined, // TODO: Pass actual parent Span from workflow execution context
           outputOptions,
-          writableStream: new WritableStream({
-            write(chunk) {
-              void emitter.emit("watch", chunk).catch(() => {
+          outputWriter: async (chunk) => {
+            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 === "failed") {
@@ -554,30 +1238,63 @@ var InngestWorkflow = class _InngestWorkflow extends Workflow {
     return [this.getFunction(), ...this.getNestedFunctions(this.executionGraph.steps)];
   }
 };
+function serve({
+  mastra,
+  inngest,
+  functions: userFunctions = [],
+  registerOptions
+}) {
+  const wfs = mastra.listWorkflows();
+  const workflowFunctions = Array.from(
+    new Set(
+      Object.values(wfs).flatMap((wf) => {
+        if (wf instanceof InngestWorkflow) {
+          wf.__registerMastra(mastra);
+          return wf.getFunctions();
+        }
+        return [];
+      })
+    )
+  );
+  return serve$1({
+    ...registerOptions,
+    client: inngest,
+    functions: [...workflowFunctions, ...userFunctions]
+  });
+}
+
+// src/types.ts
+var _compatibilityCheck = true;
+
+// src/index.ts
 function isAgent(params) {
   return params?.component === "AGENT";
 }
 function isTool(params) {
   return params instanceof Tool;
 }
+function isInngestWorkflow(params) {
+  return params instanceof InngestWorkflow;
+}
 function createStep(params, agentOptions) {
+  if (isInngestWorkflow(params)) {
+    return params;
+  }
   if (isAgent(params)) {
+    const outputSchema = agentOptions?.structuredOutput?.schema ?? z.object({ text: z.string() });
     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({
-        text: z.string()
-      }),
+      outputSchema,
       execute: async ({
         inputData,
-        [EMITTER_SYMBOL]: emitter,
+        runId,
+        [PUBSUB_SYMBOL]: pubsub,
         [STREAM_FORMAT_SYMBOL]: streamFormat,
         requestContext,
         tracingContext,
@@ -590,6 +1307,7 @@ function createStep(params, agentOptions) {
           streamPromise.resolve = resolve;
           streamPromise.reject = reject;
         });
+        let structuredResult = null;
         const toolData = {
           name: params.name,
           args: inputData
@@ -603,6 +1321,10 @@ function createStep(params, agentOptions) {
             requestContext,
             tracingContext,
             onFinish: (result) => {
+              const resultWithObject = result;
+              if (agentOptions?.structuredOutput?.schema && resultWithObject.object) {
+                structuredResult = resultWithObject.object;
+              }
               streamPromise.resolve(result.text);
               void agentOptions?.onFinish?.(result);
             },
@@ -615,6 +1337,10 @@ function createStep(params, agentOptions) {
             requestContext,
             tracingContext,
             onFinish: (result) => {
+              const resultWithObject = result;
+              if (agentOptions?.structuredOutput?.schema && resultWithObject.object) {
+                structuredResult = resultWithObject.object;
+              }
               streamPromise.resolve(result.text);
               void agentOptions?.onFinish?.(result);
             },
@@ -623,22 +1349,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) {
@@ -648,6 +1376,9 @@ function createStep(params, agentOptions) {
         if (abortSignal.aborted) {
           return abort();
         }
+        if (structuredResult !== null) {
+          return structuredResult;
+        }
         return {
           text: await streamPromise.promise
         };
@@ -661,20 +1392,38 @@ function createStep(params, agentOptions) {
     }
     return {
       // 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, requestContext, tracingContext, suspend, resumeData }) => {
-        return params.execute({
-          context: inputData,
-          mastra: wrapMastra(mastra, tracingContext),
+      suspendSchema: params.suspendSchema,
+      resumeSchema: params.resumeSchema,
+      execute: async ({
+        inputData,
+        mastra,
+        requestContext,
+        tracingContext,
+        suspend,
+        resumeData,
+        runId,
+        workflowId,
+        state,
+        setState
+      }) => {
+        const toolContext = {
+          mastra,
           requestContext,
           tracingContext,
-          suspend,
-          resumeData
-        });
+          workflow: {
+            runId,
+            resumeData,
+            suspend,
+            workflowId,
+            state,
+            setState
+          }
+        };
+        return params.execute(inputData, toolContext);
       },
       component: "TOOL"
     };
@@ -708,6 +1457,8 @@ function init(inngest) {
         suspendSchema: step.suspendSchema,
         stateSchema: step.stateSchema,
         execute: step.execute,
+        retries: step.retries,
+        scorers: step.scorers,
         component: step.component
       };
     },
@@ -717,7 +1468,8 @@ function init(inngest) {
         inputSchema: workflow.inputSchema,
         outputSchema: workflow.outputSchema,
         steps: workflow.stepDefs,
-        mastra: workflow.mastra
+        mastra: workflow.mastra,
+        options: workflow.options
       });
       wf.setStepFlow(workflow.stepGraph);
       wf.commit();
@@ -725,795 +1477,7 @@ function init(inngest) {
     }
   };
 }
-var InngestExecutionEngine = class extends DefaultExecutionEngine {
-  inngestStep;
-  inngestAttempts;
-  constructor(mastra, inngestStep, inngestAttempts = 0, options) {
-    super({ mastra, options });
-    this.inngestStep = inngestStep;
-    this.inngestAttempts = inngestAttempts;
-  }
-  async fmtReturnValue(emitter, stepResults, lastOutput, error) {
-    const base = {
-      status: lastOutput.status,
-      steps: stepResults
-    };
-    if (lastOutput.status === "success") {
-      base.result = lastOutput.output;
-    } else if (lastOutput.status === "failed") {
-      base.error = error instanceof Error ? error?.stack ?? error.message : lastOutput?.error instanceof Error ? lastOutput.error.message : lastOutput.error ?? error ?? "Unknown error";
-    } else if (lastOutput.status === "suspended") {
-      const suspendedStepIds = Object.entries(stepResults).flatMap(([stepId, stepResult]) => {
-        if (stepResult?.status === "suspended") {
-          const nestedPath = stepResult?.suspendPayload?.__workflow_meta?.path;
-          return nestedPath ? [[stepId, ...nestedPath]] : [[stepId]];
-        }
-        return [];
-      });
-      base.suspended = suspendedStepIds;
-    }
-    return base;
-  }
-  // async executeSleep({ id, duration }: { id: string; duration: number }): Promise<void> {
-  //   await this.inngestStep.sleep(id, duration);
-  // }
-  async executeSleep({
-    workflowId,
-    runId,
-    entry,
-    prevOutput,
-    stepResults,
-    emitter,
-    abortController,
-    requestContext,
-    executionContext,
-    writableStream,
-    tracingContext
-  }) {
-    let { duration, fn } = entry;
-    const sleepSpan = tracingContext?.currentSpan?.createChildSpan({
-      type: SpanType.WORKFLOW_SLEEP,
-      name: `sleep: ${duration ? `${duration}ms` : "dynamic"}`,
-      attributes: {
-        durationMs: duration,
-        sleepType: fn ? "dynamic" : "fixed"
-      },
-      tracingPolicy: this.options?.tracingPolicy
-    });
-    if (fn) {
-      const stepCallId = randomUUID();
-      duration = await this.inngestStep.run(`workflow.${workflowId}.sleep.${entry.id}`, async () => {
-        return await fn(
-          createDeprecationProxy(
-            {
-              runId,
-              workflowId,
-              mastra: this.mastra,
-              requestContext,
-              inputData: prevOutput,
-              state: executionContext.state,
-              setState: (state) => {
-                executionContext.state = state;
-              },
-              retryCount: -1,
-              tracingContext: {
-                currentSpan: sleepSpan
-              },
-              getInitData: () => stepResults?.input,
-              getStepResult: getStepResult.bind(this, stepResults),
-              // TODO: this function shouldn't have suspend probably?
-              suspend: async (_suspendPayload) => {
-              },
-              bail: () => {
-              },
-              abort: () => {
-                abortController?.abort();
-              },
-              [EMITTER_SYMBOL]: emitter,
-              [STREAM_FORMAT_SYMBOL]: executionContext.format,
-              engine: { step: this.inngestStep },
-              abortSignal: abortController?.signal,
-              writer: new ToolStream(
-                {
-                  prefix: "workflow-step",
-                  callId: stepCallId,
-                  name: "sleep",
-                  runId
-                },
-                writableStream
-              )
-            },
-            {
-              paramName: "runCount",
-              deprecationMessage: runCountDeprecationMessage,
-              logger: this.logger
-            }
-          )
-        );
-      });
-      sleepSpan?.update({
-        attributes: {
-          durationMs: duration
-        }
-      });
-    }
-    try {
-      await this.inngestStep.sleep(entry.id, !duration || duration < 0 ? 0 : duration);
-      sleepSpan?.end();
-    } catch (e) {
-      sleepSpan?.error({ error: e });
-      throw e;
-    }
-  }
-  async executeSleepUntil({
-    workflowId,
-    runId,
-    entry,
-    prevOutput,
-    stepResults,
-    emitter,
-    abortController,
-    requestContext,
-    executionContext,
-    writableStream,
-    tracingContext
-  }) {
-    let { date, fn } = entry;
-    const sleepUntilSpan = tracingContext?.currentSpan?.createChildSpan({
-      type: SpanType.WORKFLOW_SLEEP,
-      name: `sleepUntil: ${date ? date.toISOString() : "dynamic"}`,
-      attributes: {
-        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 () => {
-        const stepCallId = randomUUID();
-        return await fn(
-          createDeprecationProxy(
-            {
-              runId,
-              workflowId,
-              mastra: this.mastra,
-              requestContext,
-              inputData: prevOutput,
-              state: executionContext.state,
-              setState: (state) => {
-                executionContext.state = state;
-              },
-              retryCount: -1,
-              tracingContext: {
-                currentSpan: sleepUntilSpan
-              },
-              getInitData: () => stepResults?.input,
-              getStepResult: getStepResult.bind(this, stepResults),
-              // TODO: this function shouldn't have suspend probably?
-              suspend: async (_suspendPayload) => {
-              },
-              bail: () => {
-              },
-              abort: () => {
-                abortController?.abort();
-              },
-              [EMITTER_SYMBOL]: emitter,
-              [STREAM_FORMAT_SYMBOL]: executionContext.format,
-              engine: { step: this.inngestStep },
-              abortSignal: abortController?.signal,
-              writer: new ToolStream(
-                {
-                  prefix: "workflow-step",
-                  callId: stepCallId,
-                  name: "sleep",
-                  runId
-                },
-                writableStream
-              )
-            },
-            {
-              paramName: "runCount",
-              deprecationMessage: runCountDeprecationMessage,
-              logger: this.logger
-            }
-          )
-        );
-      });
-      if (date && !(date instanceof Date)) {
-        date = new Date(date);
-      }
-      const time = !date ? 0 : date.getTime() - Date.now();
-      sleepUntilSpan?.update({
-        attributes: {
-          durationMs: Math.max(0, time)
-        }
-      });
-    }
-    if (!(date instanceof Date)) {
-      sleepUntilSpan?.end();
-      return;
-    }
-    try {
-      await this.inngestStep.sleepUntil(entry.id, date);
-      sleepUntilSpan?.end();
-    } catch (e) {
-      sleepUntilSpan?.error({ error: e });
-      throw e;
-    }
-  }
-  async executeStep({
-    step,
-    stepResults,
-    executionContext,
-    resume,
-    prevOutput,
-    emitter,
-    abortController,
-    requestContext,
-    tracingContext,
-    writableStream,
-    disableScorers
-  }) {
-    const stepSpan = tracingContext?.currentSpan?.createChildSpan({
-      name: `workflow step: '${step.id}'`,
-      type: SpanType.WORKFLOW_STEP,
-      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`,
-      async () => {
-        const startedAt2 = Date.now();
-        await emitter.emit("watch", {
-          type: "workflow-step-start",
-          payload: {
-            id: step.id,
-            status: "running",
-            payload: inputData,
-            startedAt: startedAt2
-          }
-        });
-        return startedAt2;
-      }
-    );
-    if (step instanceof InngestWorkflow) {
-      const isResume = !!resume?.steps?.length;
-      let result;
-      let runId;
-      try {
-        if (isResume) {
-          runId = stepResults[resume?.steps?.[0]]?.suspendPayload?.__workflow_meta?.runId ?? randomUUID();
-          const snapshot = await this.mastra?.getStorage()?.loadWorkflowSnapshot({
-            workflowName: step.id,
-            runId
-          });
-          const invokeResp = await this.inngestStep.invoke(`workflow.${executionContext.workflowId}.step.${step.id}`, {
-            function: step.getFunction(),
-            data: {
-              inputData,
-              initialState: executionContext.state ?? snapshot?.value ?? {},
-              runId,
-              resume: {
-                runId,
-                steps: resume.steps.slice(1),
-                stepResults: snapshot?.context,
-                resumePayload: resume.resumePayload,
-                // @ts-ignore
-                resumePath: snapshot?.suspendedPaths?.[resume.steps?.[1]]
-              },
-              outputOptions: { includeState: true }
-            }
-          });
-          result = invokeResp.result;
-          runId = invokeResp.runId;
-          executionContext.state = invokeResp.result.state;
-        } else {
-          const invokeResp = await this.inngestStep.invoke(`workflow.${executionContext.workflowId}.step.${step.id}`, {
-            function: step.getFunction(),
-            data: {
-              inputData,
-              initialState: executionContext.state ?? {},
-              outputOptions: { includeState: true }
-            }
-          });
-          result = invokeResp.result;
-          runId = invokeResp.runId;
-          executionContext.state = invokeResp.result.state;
-        }
-      } catch (e) {
-        const errorCause = e?.cause;
-        if (errorCause && typeof errorCause === "object") {
-          result = errorCause;
-          runId = errorCause.runId || randomUUID();
-        } else {
-          runId = randomUUID();
-          result = {
-            status: "failed",
-            error: e instanceof Error ? e : new Error(String(e)),
-            steps: {},
-            input: inputData
-          };
-        }
-      }
-      const res = await this.inngestStep.run(
-        `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
-              }
-            });
-            return { executionContext, result: { status: "failed", error: result?.error } };
-          } else if (result.status === "suspended") {
-            const suspendedSteps = Object.entries(result.steps).filter(([_stepName, stepResult]) => {
-              const stepRes2 = stepResult;
-              return stepRes2?.status === "suspended";
-            });
-            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"
-                }
-              });
-              return {
-                executionContext,
-                result: {
-                  status: "suspended",
-                  payload: stepResult.payload,
-                  suspendPayload: {
-                    ...stepResult?.suspendPayload,
-                    __workflow_meta: { runId, path: suspendPath }
-                  }
-                }
-              };
-            }
-            return {
-              executionContext,
-              result: {
-                status: "suspended",
-                payload: {}
-              }
-            };
-          }
-          await emitter.emit("watch", {
-            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: {}
-            }
-          });
-          return { executionContext, result: { status: "success", output: result?.result } };
-        }
-      );
-      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
-      };
-    }
-    const stepCallId = randomUUID();
-    let stepRes;
-    try {
-      stepRes = await this.inngestStep.run(`workflow.${executionContext.workflowId}.step.${step.id}`, async () => {
-        let execResults;
-        let suspended;
-        let bailed;
-        try {
-          if (validationError) {
-            throw validationError;
-          }
-          const result = await step.execute({
-            runId: executionContext.runId,
-            mastra: this.mastra,
-            requestContext,
-            writer: new ToolStream(
-              {
-                prefix: "workflow-step",
-                callId: stepCallId,
-                name: step.id,
-                runId: executionContext.runId
-              },
-              writableStream
-            ),
-            state: executionContext?.state ?? {},
-            setState: (state) => {
-              executionContext.state = state;
-            },
-            inputData,
-            resumeData: resume?.steps[0] === step.id ? resume?.resumePayload : void 0,
-            tracingContext: {
-              currentSpan: stepSpan
-            },
-            getInitData: () => stepResults?.input,
-            getStepResult: getStepResult.bind(this, stepResults),
-            suspend: async (suspendPayload, suspendOptions) => {
-              executionContext.suspendedPaths[step.id] = executionContext.executionPath;
-              if (suspendOptions?.resumeLabel) {
-                const resumeLabel = Array.isArray(suspendOptions.resumeLabel) ? suspendOptions.resumeLabel : [suspendOptions.resumeLabel];
-                for (const label of resumeLabel) {
-                  executionContext.resumeLabels[label] = {
-                    stepId: step.id,
-                    foreachIndex: executionContext.foreachIndex
-                  };
-                }
-              }
-              suspended = { payload: suspendPayload };
-            },
-            bail: (result2) => {
-              bailed = { payload: result2 };
-            },
-            resume: {
-              steps: resume?.steps?.slice(1) || [],
-              resumePayload: resume?.resumePayload,
-              // @ts-ignore
-              runId: stepResults[step.id]?.suspendPayload?.__workflow_meta?.runId
-            },
-            [EMITTER_SYMBOL]: emitter,
-            [STREAM_FORMAT_SYMBOL]: executionContext.format,
-            engine: {
-              step: this.inngestStep
-            },
-            abortSignal: abortController.signal
-          });
-          const endedAt = Date.now();
-          execResults = {
-            status: "success",
-            output: result,
-            startedAt,
-            endedAt,
-            payload: inputData,
-            resumedAt: resume?.steps[0] === step.id ? startedAt : void 0,
-            resumePayload: resume?.steps[0] === step.id ? resume?.resumePayload : void 0
-          };
-        } catch (e) {
-          const stepFailure = {
-            status: "failed",
-            payload: inputData,
-            error: e instanceof Error ? e.message : String(e),
-            endedAt: Date.now(),
-            startedAt,
-            resumedAt: resume?.steps[0] === step.id ? startedAt : void 0,
-            resumePayload: resume?.steps[0] === step.id ? resume?.resumePayload : void 0
-          };
-          execResults = stepFailure;
-          const fallbackErrorMessage = `Step ${step.id} failed`;
-          stepSpan?.error({ error: new Error(execResults.error ?? fallbackErrorMessage) });
-          throw new RetryAfterError(execResults.error ?? fallbackErrorMessage, executionContext.retryConfig.delay, {
-            cause: execResults
-          });
-        }
-        if (suspended) {
-          execResults = {
-            status: "suspended",
-            suspendPayload: suspended.payload,
-            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: inputData,
-            endedAt: Date.now(),
-            startedAt
-          };
-        }
-        if (execResults.status === "suspended") {
-          await emitter.emit("watch", {
-            type: "workflow-step-suspended",
-            payload: {
-              id: step.id,
-              ...execResults
-            }
-          });
-        } else {
-          await emitter.emit("watch", {
-            type: "workflow-step-result",
-            payload: {
-              id: step.id,
-              ...execResults
-            }
-          });
-          await emitter.emit("watch", {
-            type: "workflow-step-finish",
-            payload: {
-              id: step.id,
-              metadata: {}
-            }
-          });
-        }
-        stepSpan?.end({ output: execResults });
-        return { result: execResults, executionContext, stepResults };
-      });
-    } catch (e) {
-      const stepFailure = e instanceof Error ? e?.cause : {
-        status: "failed",
-        error: e instanceof Error ? e.message : String(e),
-        payload: inputData,
-        startedAt,
-        endedAt: Date.now()
-      };
-      stepRes = {
-        result: stepFailure,
-        executionContext,
-        stepResults: {
-          ...stepResults,
-          [step.id]: stepFailure
-        }
-      };
-    }
-    if (disableScorers !== false && stepRes.result.status === "success") {
-      await this.inngestStep.run(`workflow.${executionContext.workflowId}.step.${step.id}.score`, async () => {
-        if (step.scorers) {
-          await this.runScorers({
-            scorers: step.scorers,
-            runId: executionContext.runId,
-            input: inputData,
-            output: stepRes.result,
-            workflowId: executionContext.workflowId,
-            stepId: step.id,
-            requestContext,
-            disableScorers,
-            tracingContext: { currentSpan: stepSpan }
-          });
-        }
-      });
-    }
-    Object.assign(executionContext.suspendedPaths, stepRes.executionContext.suspendedPaths);
-    Object.assign(stepResults, stepRes.stepResults);
-    executionContext.state = stepRes.executionContext.state;
-    return stepRes.result;
-  }
-  async persistStepUpdate({
-    workflowId,
-    runId,
-    stepResults,
-    resourceId,
-    executionContext,
-    serializedStepGraph,
-    workflowStatus,
-    result,
-    error
-  }) {
-    await this.inngestStep.run(
-      `workflow.${workflowId}.run.${runId}.path.${JSON.stringify(executionContext.executionPath)}.stepUpdate`,
-      async () => {
-        const shouldPersistSnapshot = this.options.shouldPersistSnapshot({ stepResults, workflowStatus });
-        if (!shouldPersistSnapshot) {
-          return;
-        }
-        await this.mastra?.getStorage()?.persistWorkflowSnapshot({
-          workflowName: workflowId,
-          runId,
-          resourceId,
-          snapshot: {
-            runId,
-            value: executionContext.state,
-            context: stepResults,
-            activePaths: [],
-            suspendedPaths: executionContext.suspendedPaths,
-            resumeLabels: executionContext.resumeLabels,
-            waitingPaths: {},
-            serializedStepGraph,
-            status: workflowStatus,
-            result,
-            error,
-            // @ts-ignore
-            timestamp: Date.now()
-          }
-        });
-      }
-    );
-  }
-  async executeConditional({
-    workflowId,
-    runId,
-    entry,
-    prevOutput,
-    stepResults,
-    resume,
-    executionContext,
-    emitter,
-    abortController,
-    requestContext,
-    writableStream,
-    disableScorers,
-    tracingContext
-  }) {
-    const conditionalSpan = tracingContext?.currentSpan?.createChildSpan({
-      type: SpanType.WORKFLOW_CONDITIONAL,
-      name: `conditional: '${entry.conditions.length} conditions'`,
-      input: prevOutput,
-      attributes: {
-        conditionCount: entry.conditions.length
-      },
-      tracingPolicy: this.options?.tracingPolicy
-    });
-    let execResults;
-    const truthyIndexes = (await Promise.all(
-      entry.conditions.map(
-        (cond, index) => this.inngestStep.run(`workflow.${workflowId}.conditional.${index}`, async () => {
-          const evalSpan = conditionalSpan?.createChildSpan({
-            type: SpanType.WORKFLOW_CONDITIONAL_EVAL,
-            name: `condition: '${index}'`,
-            input: prevOutput,
-            attributes: {
-              conditionIndex: index
-            },
-            tracingPolicy: this.options?.tracingPolicy
-          });
-          try {
-            const result = await cond(
-              createDeprecationProxy(
-                {
-                  runId,
-                  workflowId,
-                  mastra: this.mastra,
-                  requestContext,
-                  retryCount: -1,
-                  inputData: prevOutput,
-                  state: executionContext.state,
-                  setState: (state) => {
-                    executionContext.state = state;
-                  },
-                  tracingContext: {
-                    currentSpan: evalSpan
-                  },
-                  getInitData: () => stepResults?.input,
-                  getStepResult: getStepResult.bind(this, stepResults),
-                  // TODO: this function shouldn't have suspend probably?
-                  suspend: async (_suspendPayload) => {
-                  },
-                  bail: () => {
-                  },
-                  abort: () => {
-                    abortController.abort();
-                  },
-                  [EMITTER_SYMBOL]: emitter,
-                  [STREAM_FORMAT_SYMBOL]: executionContext.format,
-                  engine: {
-                    step: this.inngestStep
-                  },
-                  abortSignal: abortController.signal,
-                  writer: new ToolStream(
-                    {
-                      prefix: "workflow-step",
-                      callId: randomUUID(),
-                      name: "conditional",
-                      runId
-                    },
-                    writableStream
-                  )
-                },
-                {
-                  paramName: "runCount",
-                  deprecationMessage: runCountDeprecationMessage,
-                  logger: this.logger
-                }
-              )
-            );
-            evalSpan?.end({
-              output: result,
-              attributes: {
-                result: !!result
-              }
-            });
-            return result ? index : null;
-          } catch (e) {
-            evalSpan?.error({
-              error: e instanceof Error ? e : new Error(String(e)),
-              attributes: {
-                result: false
-              }
-            });
-            return null;
-          }
-        })
-      )
-    )).filter((index) => index !== null);
-    const stepsToRun = entry.steps.filter((_, index) => truthyIndexes.includes(index));
-    conditionalSpan?.update({
-      attributes: {
-        truthyIndexes,
-        selectedSteps: stepsToRun.map((s) => s.type === "step" ? s.step.id : `control-${s.type}`)
-      }
-    });
-    const results = await Promise.all(
-      stepsToRun.map(async (step, index) => {
-        const currStepResult = stepResults[step.step.id];
-        if (currStepResult && currStepResult.status === "success") {
-          return currStepResult;
-        }
-        const result = await this.executeStep({
-          step: step.step,
-          prevOutput,
-          stepResults,
-          resume,
-          executionContext: {
-            workflowId,
-            runId,
-            executionPath: [...executionContext.executionPath, index],
-            suspendedPaths: executionContext.suspendedPaths,
-            resumeLabels: executionContext.resumeLabels,
-            retryConfig: executionContext.retryConfig,
-            state: executionContext.state
-          },
-          emitter,
-          abortController,
-          requestContext,
-          writableStream,
-          disableScorers,
-          tracingContext: {
-            currentSpan: conditionalSpan
-          }
-        });
-        stepResults[step.step.id] = result;
-        return result;
-      })
-    );
-    const hasFailed = results.find((result) => result.status === "failed");
-    const hasSuspended = results.find((result) => result.status === "suspended");
-    if (hasFailed) {
-      execResults = { status: "failed", error: hasFailed.error };
-    } else if (hasSuspended) {
-      execResults = { status: "suspended", suspendPayload: hasSuspended.suspendPayload };
-    } else {
-      execResults = {
-        status: "success",
-        output: results.reduce((acc, result, index) => {
-          if (result.status === "success") {
-            acc[stepsToRun[index].step.id] = result.output;
-          }
-          return acc;
-        }, {})
-      };
-    }
-    if (execResults.status === "failed") {
-      conditionalSpan?.error({
-        error: new Error(execResults.error)
-      });
-    } else {
-      conditionalSpan?.end({
-        output: execResults.output || execResults
-      });
-    }
-    return execResults;
-  }
-};
 
-export { InngestExecutionEngine, InngestRun, InngestWorkflow, createStep, init, serve };
+export { InngestExecutionEngine, InngestPubSub, InngestRun, InngestWorkflow, _compatibilityCheck, createStep, init, serve };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map