@mastra/inngest 0.0.0-remove-unused-model-providers-api-20251030210744 → 0.0.0-safe-stringify-telemetry-20251205024938

package/dist/index.js

@@ -2,10 +2,10 @@ import { randomUUID } from 'crypto';
 import { ReadableStream } from 'stream/web';
 import { subscribe } from '@inngest/realtime';
 import { wrapMastra, AISpanType } from '@mastra/core/ai-tracing';
-import { RequestContext } from '@mastra/core/di';
+import { RuntimeContext } from '@mastra/core/di';
 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 { Run, createTimeTravelExecutionParams, Workflow, DefaultExecutionEngine, getStepResult, validateStepInput, validateStepResumeData } 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';
@@ -18,7 +18,7 @@ function serve({
   functions: userFunctions = [],
   registerOptions
 }) {
-  const wfs = mastra.listWorkflows();
+  const wfs = mastra.getWorkflows();
   const workflowFunctions = Array.from(
     new Set(
       Object.values(wfs).flatMap((wf) => {
@@ -103,20 +103,15 @@ var InngestRun = class extends Run {
         resourceId: this.resourceId,
         snapshot: {
           ...snapshot,
-          status: "canceled"
+          status: "canceled",
+          value: snapshot.value
         }
       });
     }
   }
-  async start(params) {
-    return this._start(params);
-  }
-  async _start({
+  async start({
     inputData,
-    initialState,
-    outputOptions,
-    tracingOptions,
-    format
+    initialState
   }) {
     await this.#mastra.getStorage()?.persistWorkflowSnapshot({
       workflowName: this.workflowId,
@@ -125,14 +120,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);
@@ -143,10 +139,7 @@ var InngestRun = class extends Run {
         inputData: inputDataToUse,
         initialState: initialStateToUse,
         runId: this.runId,
-        resourceId: this.resourceId,
-        outputOptions,
-        tracingOptions,
-        format
+        resourceId: this.resourceId
       }
     });
     const eventId = eventOutput.ids[0];
@@ -175,10 +168,16 @@ var InngestRun = class extends Run {
     return p;
   }
   async _resume(params) {
-    const steps = (Array.isArray(params.step) ? params.step : [params.step]).map(
-      (step) => typeof step === "string" ? step : step?.id
-    );
-    const snapshot = await this.#mastra?.storage?.loadWorkflowSnapshot({
+    const storage = this.#mastra?.getStorage();
+    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
     });
@@ -235,35 +234,111 @@ var InngestRun = class extends Run {
       });
     };
   }
-  streamLegacy({ inputData, requestContext } = {}) {
+  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
+      }
+    });
+    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;
+    if (result.status === "failed") {
+      result.error = new Error(result.error);
+    }
+    return result;
+  }
+  streamLegacy({ inputData, runtimeContext } = {}) {
     const { readable, writable } = new TransformStream();
     const writer = writable.getWriter();
     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-", "")
         };
-        if (e.type === "step-output") {
-          e.type = e.payload.output.type;
-          e.payload = e.payload.output.payload;
-        }
         await writer.write(e);
       } catch {
       }
     }, "watch-v2");
     this.closeStreamAction = async () => {
-      await writer.write({
-        type: "finish",
-        // @ts-ignore
-        payload: { runId: this.runId }
-      });
       unwatch();
       try {
         await writer.close();
@@ -273,7 +348,7 @@ var InngestRun = class extends Run {
         writer.releaseLock();
       }
     };
-    this.executionResults = this._start({ inputData, requestContext, format: "legacy" }).then((result) => {
+    this.executionResults = this.start({ inputData, runtimeContext }).then((result) => {
       if (result.status !== "suspended") {
         this.closeStreamAction?.().catch(() => {
         });
@@ -287,18 +362,69 @@ var InngestRun = class extends Run {
   }
   stream({
     inputData,
-    requestContext,
-    tracingOptions,
-    closeOnSuspend = true,
+    runtimeContext,
+    closeOnSuspend = true
+  } = {}) {
+    const self = this;
+    let streamOutput;
+    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
+            }
+          });
+        }, "watch-v2");
+        self.closeStreamAction = async () => {
+          unwatch();
+          try {
+            await controller.close();
+          } catch (err) {
+            console.error("Error closing stream:", err);
+          }
+        };
+        const executionResultsPromise = self.start({
+          inputData,
+          runtimeContext
+        });
+        const executionResults = await executionResultsPromise;
+        if (closeOnSuspend) {
+          self.closeStreamAction?.().catch(() => {
+          });
+        } else if (executionResults.status !== "suspended") {
+          self.closeStreamAction?.().catch(() => {
+          });
+        }
+        if (streamOutput) {
+          streamOutput.updateResults(executionResults);
+        }
+      }
+    });
+    streamOutput = new WorkflowRunOutput({
+      runId: this.runId,
+      workflowId: this.workflowId,
+      stream
+    });
+    return streamOutput;
+  }
+  timeTravelStream({
+    inputData,
+    resumeData,
     initialState,
+    step,
+    context,
+    nestedStepsContext,
+    runtimeContext,
+    tracingOptions,
     outputOptions
-  } = {}) {
-    if (this.closeStreamAction && this.streamOutput) {
-      return this.streamOutput;
-    }
-    this.closeStreamAction = async () => {
-    };
+  }) {
     const self = this;
+    let streamOutput;
     const stream = new ReadableStream({
       async start(controller) {
         const unwatch = self.watch(async ({ type, from = ChunkFrom.WORKFLOW, payload }) => {
@@ -320,46 +446,39 @@ var InngestRun = class extends Run {
             console.error("Error closing stream:", err);
           }
         };
-        const executionResultsPromise = self._start({
+        const executionResultsPromise = self._timeTravel({
           inputData,
-          requestContext,
-          // tracingContext, // We are not able to pass a reference to a span here, what to do?
+          step,
+          context,
+          nestedStepsContext,
+          resumeData,
           initialState,
+          runtimeContext,
           tracingOptions,
-          outputOptions,
-          format: "vnext"
+          outputOptions
         });
+        self.executionResults = executionResultsPromise;
         let executionResults;
         try {
           executionResults = await executionResultsPromise;
-          if (closeOnSuspend) {
-            self.closeStreamAction?.().catch(() => {
-            });
-          } else if (executionResults.status !== "suspended") {
-            self.closeStreamAction?.().catch(() => {
-            });
-          }
-          if (self.streamOutput) {
-            self.streamOutput.updateResults(
-              executionResults
-            );
+          self.closeStreamAction?.().catch(() => {
+          });
+          if (streamOutput) {
+            streamOutput.updateResults(executionResults);
           }
         } catch (err) {
-          self.streamOutput?.rejectResults(err);
+          streamOutput?.rejectResults(err);
           self.closeStreamAction?.().catch(() => {
           });
         }
       }
     });
-    this.streamOutput = new WorkflowRunOutput({
+    streamOutput = new WorkflowRunOutput({
       runId: this.runId,
       workflowId: this.workflowId,
       stream
     });
-    return this.streamOutput;
-  }
-  streamVNext(args = {}) {
-    return this.stream(args);
+    return streamOutput;
   }
 };
 var InngestWorkflow = class _InngestWorkflow extends Workflow {
@@ -370,6 +489,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
     );
@@ -377,13 +497,13 @@ var InngestWorkflow = class _InngestWorkflow extends Workflow {
     this.#mastra = params.mastra;
     this.inngest = inngest;
   }
-  async listWorkflowRuns(args) {
+  async getWorkflowRuns(args) {
     const storage = this.#mastra?.getStorage();
     if (!storage) {
       this.logger.debug("Cannot get workflow runs. Mastra engine is not initialized");
       return { runs: [], total: 0 };
     }
-    return storage.listWorkflowRuns({ workflowName: this.id, ...args ?? {} });
+    return storage.getWorkflowRuns({ workflowName: this.id, ...args ?? {} });
   }
   async getWorkflowRunById(runId) {
     const storage = this.#mastra?.getStorage();
@@ -434,7 +554,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
     );
@@ -455,6 +577,7 @@ var InngestWorkflow = class _InngestWorkflow extends Workflow {
           value: {},
           context: {},
           activePaths: [],
+          activeStepsPath: {},
           waitingPaths: {},
           serializedStepGraph: this.serializedStepGraph,
           suspendedPaths: {},
@@ -483,7 +606,7 @@ var InngestWorkflow = class _InngestWorkflow extends Workflow {
       },
       { 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, timeTravel } = event.data;
         if (!runId) {
           runId = await step.run(`workflow.${this.id}.runIdGen`, async () => {
             return randomUUID();
@@ -522,19 +645,14 @@ var InngestWorkflow = class _InngestWorkflow extends Workflow {
           initialState,
           emitter,
           retryConfig: this.retryConfig,
-          requestContext: new RequestContext(),
+          runtimeContext: new RuntimeContext(),
           // TODO
           resume,
-          format,
+          timeTravel,
           abortController: new AbortController(),
-          // currentSpan: undefined, // TODO: Pass actual parent AI span from workflow execution context
-          outputOptions,
-          writableStream: new WritableStream({
-            write(chunk) {
-              void emitter.emit("watch-v2", chunk).catch(() => {
-              });
-            }
-          })
+          currentSpan: void 0,
+          // TODO: Pass actual parent AI span from workflow execution context
+          outputOptions
         });
         await step.run(`workflow.${this.id}.finalize`, async () => {
           if (result.status === "failed") {
@@ -572,7 +690,7 @@ function isAgent(params) {
 function isTool(params) {
   return params instanceof Tool;
 }
-function createStep(params, agentOptions) {
+function createStep(params) {
   if (isAgent(params)) {
     return {
       id: params.name,
@@ -580,23 +698,12 @@ function createStep(params, agentOptions) {
       // @ts-ignore
       inputSchema: z.object({
         prompt: z.string()
-        // resourceId: z.string().optional(),
-        // threadId: z.string().optional(),
       }),
       // @ts-ignore
       outputSchema: z.object({
         text: z.string()
       }),
-      execute: async ({
-        inputData,
-        [EMITTER_SYMBOL]: emitter,
-        [STREAM_FORMAT_SYMBOL]: streamFormat,
-        requestContext,
-        tracingContext,
-        abortSignal,
-        abort,
-        writer
-      }) => {
+      execute: async ({ inputData, [EMITTER_SYMBOL]: emitter, runtimeContext, abortSignal, abort, tracingContext }) => {
         let streamPromise = {};
         streamPromise.promise = new Promise((resolve, reject) => {
           streamPromise.resolve = resolve;
@@ -606,40 +713,48 @@ function createStep(params, agentOptions) {
           name: params.name,
           args: inputData
         };
-        let stream;
-        if ((await params.getModel()).specificationVersion === "v1") {
-          const { fullStream } = await params.streamLegacy(inputData.prompt, {
-            ...agentOptions ?? {},
-            // resourceId: inputData.resourceId,
-            // threadId: inputData.threadId,
-            requestContext,
+        if ((await params.getLLM()).getModel().specificationVersion === `v2`) {
+          const { fullStream } = await params.stream(inputData.prompt, {
+            runtimeContext,
             tracingContext,
             onFinish: (result) => {
               streamPromise.resolve(result.text);
-              void agentOptions?.onFinish?.(result);
             },
             abortSignal
           });
-          stream = fullStream;
+          if (abortSignal.aborted) {
+            return abort();
+          }
+          await emitter.emit("watch-v2", {
+            type: "tool-call-streaming-start",
+            ...toolData ?? {}
+          });
+          for await (const chunk of fullStream) {
+            if (chunk.type === "text-delta") {
+              await emitter.emit("watch-v2", {
+                type: "tool-call-delta",
+                ...toolData ?? {},
+                argsTextDelta: chunk.payload.text
+              });
+            }
+          }
         } else {
-          const modelOutput = await params.stream(inputData.prompt, {
-            ...agentOptions ?? {},
-            requestContext,
+          const { fullStream } = await params.streamLegacy(inputData.prompt, {
+            runtimeContext,
             tracingContext,
             onFinish: (result) => {
               streamPromise.resolve(result.text);
-              void agentOptions?.onFinish?.(result);
             },
             abortSignal
           });
-          stream = modelOutput.fullStream;
-        }
-        if (streamFormat === "legacy") {
+          if (abortSignal.aborted) {
+            return abort();
+          }
           await emitter.emit("watch-v2", {
             type: "tool-call-streaming-start",
             ...toolData ?? {}
           });
-          for await (const chunk of stream) {
+          for await (const chunk of fullStream) {
             if (chunk.type === "text-delta") {
               await emitter.emit("watch-v2", {
                 type: "tool-call-delta",
@@ -648,18 +763,11 @@ function createStep(params, agentOptions) {
               });
             }
           }
-          await emitter.emit("watch-v2", {
-            type: "tool-call-streaming-finish",
-            ...toolData ?? {}
-          });
-        } else {
-          for await (const chunk of stream) {
-            await writer.write(chunk);
-          }
-        }
-        if (abortSignal.aborted) {
-          return abort();
         }
+        await emitter.emit("watch-v2", {
+          type: "tool-call-streaming-finish",
+          ...toolData ?? {}
+        });
         return {
           text: await streamPromise.promise
         };
@@ -678,11 +786,11 @@ function createStep(params, agentOptions) {
       description: params.description,
       inputSchema: params.inputSchema,
       outputSchema: params.outputSchema,
-      execute: async ({ inputData, mastra, requestContext, tracingContext, suspend, resumeData }) => {
+      execute: async ({ inputData, mastra, runtimeContext, tracingContext, suspend, resumeData }) => {
         return params.execute({
           context: inputData,
           mastra: wrapMastra(mastra, tracingContext),
-          requestContext,
+          runtimeContext,
           tracingContext,
           suspend,
           resumeData
@@ -745,7 +853,19 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
     this.inngestStep = inngestStep;
     this.inngestAttempts = inngestAttempts;
   }
-  async fmtReturnValue(emitter, stepResults, lastOutput, error) {
+  async execute(params) {
+    await params.emitter.emit("watch-v2", {
+      type: "workflow-start",
+      payload: { runId: params.runId }
+    });
+    const result = await super.execute(params);
+    await params.emitter.emit("watch-v2", {
+      type: "workflow-finish",
+      payload: { runId: params.runId }
+    });
+    return result;
+  }
+  async fmtReturnValue(executionSpan, emitter, stepResults, lastOutput, error) {
     const base = {
       status: lastOutput.status,
       steps: stepResults
@@ -799,6 +919,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
       });
       base.suspended = suspendedStepIds;
     }
+    executionSpan?.end();
     return base;
   }
   // async executeSleep({ id, duration }: { id: string; duration: number }): Promise<void> {
@@ -812,7 +933,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
     stepResults,
     emitter,
     abortController,
-    requestContext,
+    runtimeContext,
     executionContext,
     writableStream,
     tracingContext
@@ -830,54 +951,45 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
     if (fn) {
       const stepCallId = randomUUID();
       duration = await this.inngestStep.run(`workflow.${workflowId}.sleep.${entry.id}`, async () => {
-        return await fn(
-          createDeprecationProxy(
+        return await fn({
+          runId,
+          workflowId,
+          mastra: this.mastra,
+          runtimeContext,
+          inputData: prevOutput,
+          state: executionContext.state,
+          setState: (state) => {
+            executionContext.state = state;
+          },
+          runCount: -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,
+          // TODO: add streamVNext support
+          [STREAM_FORMAT_SYMBOL]: executionContext.format,
+          engine: { step: this.inngestStep },
+          abortSignal: abortController?.signal,
+          writer: new ToolStream(
             {
-              runId,
-              workflowId,
-              mastra: this.mastra,
-              requestContext,
-              inputData: prevOutput,
-              state: executionContext.state,
-              setState: (state) => {
-                executionContext.state = state;
-              },
-              runCount: -1,
-              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
-              )
+              prefix: "workflow-step",
+              callId: stepCallId,
+              name: "sleep",
+              runId
             },
-            {
-              paramName: "runCount",
-              deprecationMessage: runCountDeprecationMessage,
-              logger: this.logger
-            }
+            writableStream
           )
-        );
+        });
       });
       sleepSpan?.update({
         attributes: {
@@ -901,7 +1013,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
     stepResults,
     emitter,
     abortController,
-    requestContext,
+    runtimeContext,
     executionContext,
     writableStream,
     tracingContext
@@ -920,54 +1032,45 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
     if (fn) {
       date = await this.inngestStep.run(`workflow.${workflowId}.sleepUntil.${entry.id}`, async () => {
         const stepCallId = randomUUID();
-        return await fn(
-          createDeprecationProxy(
+        return await fn({
+          runId,
+          workflowId,
+          mastra: this.mastra,
+          runtimeContext,
+          inputData: prevOutput,
+          state: executionContext.state,
+          setState: (state) => {
+            executionContext.state = state;
+          },
+          runCount: -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,
+          // TODO: add streamVNext support
+          engine: { step: this.inngestStep },
+          abortSignal: abortController?.signal,
+          writer: new ToolStream(
             {
-              runId,
-              workflowId,
-              mastra: this.mastra,
-              requestContext,
-              inputData: prevOutput,
-              state: executionContext.state,
-              setState: (state) => {
-                executionContext.state = state;
-              },
-              runCount: -1,
-              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
-              )
+              prefix: "workflow-step",
+              callId: stepCallId,
+              name: "sleep",
+              runId
             },
-            {
-              paramName: "runCount",
-              deprecationMessage: runCountDeprecationMessage,
-              logger: this.logger
-            }
+            writableStream
           )
-        );
+        });
       });
       if (date && !(date instanceof Date)) {
         date = new Date(date);
@@ -1006,10 +1109,11 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
     stepResults,
     executionContext,
     resume,
+    timeTravel,
     prevOutput,
     emitter,
     abortController,
-    requestContext,
+    runtimeContext,
     tracingContext,
     writableStream,
     disableScorers
@@ -1069,6 +1173,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
       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();
@@ -1096,6 +1201,32 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
           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(),
@@ -1156,12 +1287,12 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
             });
             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;
+            const suspendedSteps = Object.entries(result.steps).filter(([_stepName, stepResult2]) => {
+              const stepRes2 = stepResult2;
               return stepRes2?.status === "suspended";
             });
-            for (const [stepName, stepResult] of suspendedSteps) {
-              const suspendPath = [stepName, ...stepResult?.suspendPayload?.__workflow_meta?.path ?? []];
+            for (const [stepName, stepResult2] of suspendedSteps) {
+              const suspendPath = [stepName, ...stepResult2?.suspendPayload?.__workflow_meta?.path ?? []];
               executionContext.suspendedPaths[step.id] = executionContext.executionPath;
               await emitter.emit("watch", {
                 type: "watch",
@@ -1169,9 +1300,9 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
                   currentStep: {
                     id: step.id,
                     status: "suspended",
-                    payload: stepResult.payload,
+                    payload: stepResult2.payload,
                     suspendPayload: {
-                      ...stepResult?.suspendPayload,
+                      ...stepResult2?.suspendPayload,
                       __workflow_meta: { runId, path: suspendPath }
                     }
                   },
@@ -1195,9 +1326,9 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
                 executionContext,
                 result: {
                   status: "suspended",
-                  payload: stepResult.payload,
+                  payload: stepResult2.payload,
                   suspendPayload: {
-                    ...stepResult?.suspendPayload,
+                    ...stepResult2?.suspendPayload,
                     __workflow_meta: { runId, path: suspendPath }
                   }
                 }
@@ -1264,7 +1395,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
         }
       );
       Object.assign(executionContext, res.executionContext);
-      return {
+      const stepResult = {
         ...res.result,
         startedAt,
         endedAt: Date.now(),
@@ -1272,14 +1403,29 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
         resumedAt: resume?.steps[0] === step.id ? startedAt : void 0,
         resumePayload: resume?.steps[0] === step.id ? resume?.resumePayload : void 0
       };
+      return { result: stepResult, executionContextState: executionContext.state };
     }
-    const stepCallId = randomUUID();
     let stepRes;
     try {
       stepRes = await this.inngestStep.run(`workflow.${executionContext.workflowId}.step.${step.id}`, async () => {
         let execResults;
         let suspended;
         let bailed;
+        const { resumeData: timeTravelResumeData, validationError: timeTravelResumeValidationError } = await validateStepResumeData({
+          resumeData: timeTravel?.stepResults[step.id]?.status === "suspended" ? timeTravel?.resumeData : void 0,
+          step
+        });
+        let resumeDataToUse;
+        if (timeTravelResumeData && !timeTravelResumeValidationError) {
+          resumeDataToUse = timeTravelResumeData;
+        } else if (timeTravelResumeData && timeTravelResumeValidationError) {
+          this.logger.warn("Time travel resume data validation failed", {
+            stepId: step.id,
+            error: timeTravelResumeValidationError.message
+          });
+        } else if (resume?.steps[0] === step.id) {
+          resumeDataToUse = resume?.resumePayload;
+        }
         try {
           if (validationError) {
             throw validationError;
@@ -1287,22 +1433,14 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
           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
-            ),
+            runtimeContext,
+            writableStream,
             state: executionContext?.state ?? {},
             setState: (state) => {
               executionContext.state = state;
             },
             inputData,
-            resumeData: resume?.steps[0] === step.id ? resume?.resumePayload : void 0,
+            resumeData: resumeDataToUse,
             tracingContext: {
               currentSpan: stepAISpan
             },
@@ -1331,7 +1469,6 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
               runId: stepResults[step.id]?.suspendPayload?.__workflow_meta?.runId
             },
             [EMITTER_SYMBOL]: emitter,
-            [STREAM_FORMAT_SYMBOL]: executionContext.format,
             engine: {
               step: this.inngestStep
             },
@@ -1344,18 +1481,18 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
             startedAt,
             endedAt,
             payload: inputData,
-            resumedAt: resume?.steps[0] === step.id ? startedAt : void 0,
-            resumePayload: resume?.steps[0] === step.id ? resume?.resumePayload : void 0
+            resumedAt: resumeDataToUse ? startedAt : void 0,
+            resumePayload: resumeDataToUse
           };
         } catch (e) {
           const stepFailure = {
             status: "failed",
             payload: inputData,
-            error: e instanceof Error ? e.message : String(e),
+            error: e instanceof Error ? e.stack ?? 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
+            resumedAt: resumeDataToUse ? startedAt : void 0,
+            resumePayload: resumeDataToUse
           };
           execResults = stepFailure;
           const fallbackErrorMessage = `Step ${step.id} failed`;
@@ -1371,8 +1508,8 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
             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
+            resumedAt: resumeDataToUse ? startedAt : void 0,
+            resumePayload: resumeDataToUse
           };
         } else if (bailed) {
           execResults = {
@@ -1429,11 +1566,25 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
     } catch (e) {
       const stepFailure = e instanceof Error ? e?.cause : {
         status: "failed",
-        error: e instanceof Error ? e.message : String(e),
+        error: e instanceof Error ? e.stack ?? e.message : String(e),
         payload: inputData,
         startedAt,
         endedAt: Date.now()
       };
+      await emitter.emit("watch-v2", {
+        type: "workflow-step-result",
+        payload: {
+          id: step.id,
+          ...stepFailure
+        }
+      });
+      await emitter.emit("watch-v2", {
+        type: "workflow-step-finish",
+        payload: {
+          id: step.id,
+          metadata: {}
+        }
+      });
       stepRes = {
         result: stepFailure,
         executionContext,
@@ -1453,7 +1604,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
             output: stepRes.result,
             workflowId: executionContext.workflowId,
             stepId: step.id,
-            requestContext,
+            runtimeContext,
             disableScorers,
             tracingContext: { currentSpan: stepAISpan }
           });
@@ -1461,9 +1612,11 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
       });
     }
     Object.assign(executionContext.suspendedPaths, stepRes.executionContext.suspendedPaths);
-    Object.assign(stepResults, stepRes.stepResults);
     executionContext.state = stepRes.executionContext.state;
-    return stepRes.result;
+    return {
+      result: stepRes.result,
+      executionContextState: stepRes.executionContext.state
+    };
   }
   async persistStepUpdate({
     workflowId,
@@ -1489,14 +1642,15 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
           resourceId,
           snapshot: {
             runId,
+            status: workflowStatus,
             value: executionContext.state,
             context: stepResults,
-            activePaths: [],
+            activePaths: executionContext.executionPath,
+            activeStepsPath: executionContext.activeStepsPath,
             suspendedPaths: executionContext.suspendedPaths,
             resumeLabels: executionContext.resumeLabels,
             waitingPaths: {},
             serializedStepGraph,
-            status: workflowStatus,
             result,
             error,
             // @ts-ignore
@@ -1512,11 +1666,12 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
     entry,
     prevOutput,
     stepResults,
+    timeTravel,
     resume,
     executionContext,
     emitter,
     abortController,
-    requestContext,
+    runtimeContext,
     writableStream,
     disableScorers,
     tracingContext
@@ -1544,56 +1699,47 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
             tracingPolicy: this.options?.tracingPolicy
           });
           try {
-            const result = await cond(
-              createDeprecationProxy(
+            const result = await cond({
+              runId,
+              workflowId,
+              mastra: this.mastra,
+              runtimeContext,
+              runCount: -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,
+              // TODO: add streamVNext support
+              engine: {
+                step: this.inngestStep
+              },
+              abortSignal: abortController.signal,
+              writer: new ToolStream(
                 {
-                  runId,
-                  workflowId,
-                  mastra: this.mastra,
-                  requestContext,
-                  runCount: -1,
-                  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
-                  )
+                  prefix: "workflow-step",
+                  callId: randomUUID(),
+                  name: "conditional",
+                  runId
                 },
-                {
-                  paramName: "runCount",
-                  deprecationMessage: runCountDeprecationMessage,
-                  logger: this.logger
-                }
+                writableStream
               )
-            );
+            });
             evalSpan?.end({
               output: result,
               attributes: {
@@ -1631,26 +1777,30 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
           prevOutput,
           stepResults,
           resume,
+          timeTravel,
           executionContext: {
             workflowId,
             runId,
             executionPath: [...executionContext.executionPath, index],
+            activeStepsPath: executionContext.activeStepsPath,
             suspendedPaths: executionContext.suspendedPaths,
             resumeLabels: executionContext.resumeLabels,
             retryConfig: executionContext.retryConfig,
+            executionSpan: executionContext.executionSpan,
             state: executionContext.state
           },
           emitter,
           abortController,
-          requestContext,
+          runtimeContext,
           writableStream,
           disableScorers,
           tracingContext: {
             currentSpan: conditionalSpan
           }
         });
-        stepResults[step.step.id] = result;
-        return result;
+        stepResults[step.step.id] = result.result;
+        executionContext.state = result.executionContextState;
+        return result.result;
       })
     );
     const hasFailed = results.find((result) => result.status === "failed");