@mastra/inngest 0.0.0-fix-issue-10434-concurrent-write-corruption-20251124213939 → 0.0.0-fix-backport-setserver-20251201151948

package/dist/index.js

@@ -1,11 +1,11 @@
 import { randomUUID } from 'crypto';
-import { ReadableStream, WritableStream } from 'stream/web';
+import { ReadableStream } from 'stream/web';
 import { subscribe } from '@inngest/realtime';
-import { RequestContext } from '@mastra/core/di';
-import { SpanType } from '@mastra/core/observability';
+import { wrapMastra, AISpanType } from '@mastra/core/ai-tracing';
+import { RuntimeContext } from '@mastra/core/di';
 import { ChunkFrom, WorkflowRunOutput } from '@mastra/core/stream';
 import { ToolStream, Tool } from '@mastra/core/tools';
-import { Run, createTimeTravelExecutionParams, Workflow, DefaultExecutionEngine, createDeprecationProxy, getStepResult, runCountDeprecationMessage, validateStepInput, validateStepResumeData, validateStepSuspendData } from '@mastra/core/workflows';
+import { Run, Workflow, DefaultExecutionEngine, getStepResult, validateStepInput } from '@mastra/core/workflows';
 import { EMITTER_SYMBOL, STREAM_FORMAT_SYMBOL } from '@mastra/core/workflows/_constants';
 import { 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) => {
@@ -57,12 +57,11 @@ var InngestRun = class extends Run {
   }
   async getRunOutput(eventId) {
     let runs = await this.getRuns(eventId);
-    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);
       if (runs?.[0]?.status === "Failed") {
-        const snapshot = await storage?.loadWorkflowSnapshot({
+        const snapshot = await this.#mastra?.storage?.loadWorkflowSnapshot({
           workflowName: this.workflowId,
           runId: this.runId
         });
@@ -71,7 +70,7 @@ var InngestRun = class extends Run {
         };
       }
       if (runs?.[0]?.status === "Cancelled") {
-        const snapshot = await storage?.loadWorkflowSnapshot({
+        const snapshot = await this.#mastra?.storage?.loadWorkflowSnapshot({
           workflowName: this.workflowId,
           runId: this.runId
         });
@@ -80,40 +79,38 @@ var InngestRun = class extends Run {
     }
     return runs?.[0];
   }
+  async sendEvent(event, data) {
+    await this.inngest.send({
+      name: `user-event-${event}`,
+      data
+    });
+  }
   async cancel() {
-    const storage = this.#mastra?.getStorage();
     await this.inngest.send({
       name: `cancel.workflow.${this.workflowId}`,
       data: {
         runId: this.runId
       }
     });
-    const snapshot = await storage?.loadWorkflowSnapshot({
+    const snapshot = await this.#mastra?.storage?.loadWorkflowSnapshot({
       workflowName: this.workflowId,
       runId: this.runId
     });
     if (snapshot) {
-      await storage?.persistWorkflowSnapshot({
+      await this.#mastra?.storage?.persistWorkflowSnapshot({
         workflowName: this.workflowId,
         runId: this.runId,
         resourceId: this.resourceId,
         snapshot: {
           ...snapshot,
-          status: "canceled",
-          value: snapshot.value
+          status: "canceled"
         }
       });
     }
   }
-  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,
@@ -122,15 +119,14 @@ var InngestRun = class extends Run {
       snapshot: {
         runId: this.runId,
         serializedStepGraph: this.serializedStepGraph,
-        status: "running",
         value: {},
         context: {},
         activePaths: [],
         suspendedPaths: {},
-        activeStepsPath: {},
         resumeLabels: {},
         waitingPaths: {},
-        timestamp: Date.now()
+        timestamp: Date.now(),
+        status: "running"
       }
     });
     const inputDataToUse = await this._validateInput(inputData);
@@ -141,10 +137,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];
@@ -173,16 +166,10 @@ var InngestRun = class extends Run {
     return p;
   }
   async _resume(params) {
-    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({
+    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({
       workflowName: this.workflowId,
       runId: this.runId
     });
@@ -200,99 +187,9 @@ var InngestRun = class extends Run {
           steps,
           stepResults: snapshot?.context,
           resumePayload: resumeDataToUse,
-          resumePath: steps?.[0] ? snapshot?.suspendedPaths?.[steps?.[0]] : void 0
-        }
-      }
-    });
-    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;
-  }
-  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()
+          // @ts-ignore
+          resumePath: snapshot?.suspendedPaths?.[steps?.[0]]
         }
-      });
-    }
-    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];
@@ -306,12 +203,12 @@ var InngestRun = class extends Run {
     }
     return result;
   }
-  watch(cb) {
+  watch(cb, type = "watch") {
     let active = true;
     const streamPromise = subscribe(
       {
         channel: `workflow:${this.workflowId}:${this.runId}`,
-        topics: ["watch"],
+        topics: [type],
         app: this.inngest
       },
       (message) => {
@@ -329,35 +226,20 @@ var InngestRun = class extends Run {
       });
     };
   }
-  streamLegacy({ inputData, requestContext } = {}) {
+  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();
@@ -367,7 +249,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(() => {
         });
@@ -381,94 +263,11 @@ var InngestRun = class extends Run {
   }
   stream({
     inputData,
-    requestContext,
-    tracingOptions,
-    closeOnSuspend = true,
-    initialState,
-    outputOptions
+    runtimeContext,
+    closeOnSuspend = true
   } = {}) {
-    if (this.closeStreamAction && this.streamOutput) {
-      return this.streamOutput;
-    }
-    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 {
-            await controller.close();
-          } catch (err) {
-            console.error("Error closing stream:", err);
-          }
-        };
-        const executionResultsPromise = self._start({
-          inputData,
-          requestContext,
-          // tracingContext, // We are not able to pass a reference to a span here, what to do?
-          initialState,
-          tracingOptions,
-          outputOptions,
-          format: "vnext"
-        });
-        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
-            );
-          }
-        } catch (err) {
-          self.streamOutput?.rejectResults(err);
-          self.closeStreamAction?.().catch(() => {
-          });
-        }
-      }
-    });
-    this.streamOutput = new WorkflowRunOutput({
-      runId: this.runId,
-      workflowId: this.workflowId,
-      stream
-    });
-    return this.streamOutput;
-  }
-  streamVNext(args = {}) {
-    return this.stream(args);
-  }
-  timeTravelStream({
-    inputData,
-    resumeData,
-    initialState,
-    step,
-    context,
-    nestedStepsContext,
-    requestContext,
-    tracingOptions,
-    outputOptions
-  }) {
-    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 }) => {
@@ -477,11 +276,11 @@ var InngestRun = class extends Run {
             runId: self.runId,
             from,
             payload: {
-              stepName: payload?.id,
+              stepName: payload.id,
               ...payload
             }
           });
-        });
+        }, "watch-v2");
         self.closeStreamAction = async () => {
           unwatch();
           try {
@@ -490,39 +289,29 @@ var InngestRun = class extends Run {
             console.error("Error closing stream:", err);
           }
         };
-        const executionResultsPromise = self._timeTravel({
+        const executionResultsPromise = self.start({
           inputData,
-          step,
-          context,
-          nestedStepsContext,
-          resumeData,
-          initialState,
-          requestContext,
-          tracingOptions,
-          outputOptions
+          runtimeContext
         });
-        self.executionResults = executionResultsPromise;
-        let executionResults;
-        try {
-          executionResults = await executionResultsPromise;
+        const executionResults = await executionResultsPromise;
+        if (closeOnSuspend) {
           self.closeStreamAction?.().catch(() => {
           });
-          if (self.streamOutput) {
-            self.streamOutput.updateResults(executionResults);
-          }
-        } catch (err) {
-          self.streamOutput?.rejectResults(err);
+        } else if (executionResults.status !== "suspended") {
           self.closeStreamAction?.().catch(() => {
           });
         }
+        if (streamOutput) {
+          streamOutput.updateResults(executionResults);
+        }
       }
     });
-    this.streamOutput = new WorkflowRunOutput({
+    streamOutput = new WorkflowRunOutput({
       runId: this.runId,
       workflowId: this.workflowId,
       stream
     });
-    return this.streamOutput;
+    return streamOutput;
   }
 };
 var InngestWorkflow = class _InngestWorkflow extends Workflow {
@@ -533,7 +322,6 @@ 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
     );
@@ -541,13 +329,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();
@@ -576,7 +364,16 @@ var InngestWorkflow = class _InngestWorkflow extends Workflow {
       }
     }
   }
-  async createRun(options) {
+  /**
+   * @deprecated Use createRunAsync() instead.
+   * @throws {Error} Always throws an error directing users to use createRunAsync()
+   */
+  createRun(_options) {
+    throw new Error(
+      "createRun() has been deprecated. Please use createRunAsync() instead.\n\nMigration guide:\n  Before: const run = workflow.createRun();\n  After:  const run = await workflow.createRunAsync();\n\nNote: createRunAsync() is an async method, so make sure your calling function is async."
+    );
+  }
+  async createRunAsync(options) {
     const runIdToUse = options?.runId || randomUUID();
     const run = this.runs.get(runIdToUse) ?? new InngestRun(
       {
@@ -589,9 +386,7 @@ var InngestWorkflow = class _InngestWorkflow extends Workflow {
         mastra: this.#mastra,
         retryConfig: this.retryConfig,
         cleanup: () => this.runs.delete(runIdToUse),
-        workflowSteps: this.steps,
-        workflowEngineType: this.engineType,
-        validateInputs: this.options.validateInputs
+        workflowSteps: this.steps
       },
       this.inngest
     );
@@ -612,13 +407,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()
         }
       });
@@ -632,14 +427,15 @@ var InngestWorkflow = class _InngestWorkflow extends Workflow {
     this.function = this.inngest.createFunction(
       {
         id: `workflow.${this.id}`,
-        retries: Math.min(this.retryConfig?.attempts ?? 0, 20),
+        // @ts-ignore
+        retries: this.retryConfig?.attempts ?? 0,
         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, timeTravel } = event.data;
+        let { inputData, initialState, runId, resourceId, resume, outputOptions } = event.data;
         if (!runId) {
           runId = await step.run(`workflow.${this.id}.runIdGen`, async () => {
             return randomUUID();
@@ -678,20 +474,13 @@ var InngestWorkflow = class _InngestWorkflow extends Workflow {
           initialState,
           emitter,
           retryConfig: this.retryConfig,
-          requestContext: new RequestContext(),
+          runtimeContext: new RuntimeContext(),
           // TODO
           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(() => {
-              });
-            }
-          })
+          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") {
@@ -729,29 +518,20 @@ function isAgent(params) {
 function isTool(params) {
   return params instanceof Tool;
 }
-function createStep(params, agentOptions) {
+function createStep(params) {
   if (isAgent(params)) {
     return {
       id: params.name,
       description: params.getDescription(),
+      // @ts-ignore
       inputSchema: z.object({
         prompt: z.string()
-        // resourceId: z.string().optional(),
-        // threadId: z.string().optional(),
       }),
+      // @ts-ignore
       outputSchema: z.object({
         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;
@@ -761,60 +541,61 @@ 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") {
-          await emitter.emit("watch", {
+          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", {
+              await emitter.emit("watch-v2", {
                 type: "tool-call-delta",
                 ...toolData ?? {},
                 argsTextDelta: chunk.textDelta
               });
             }
           }
-          await emitter.emit("watch", {
-            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
         };
@@ -828,38 +609,20 @@ 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,
-      suspendSchema: params.suspendSchema,
-      resumeSchema: params.resumeSchema,
-      execute: async ({
-        inputData,
-        mastra,
-        requestContext,
-        tracingContext,
-        suspend,
-        resumeData,
-        runId,
-        workflowId,
-        state,
-        setState
-      }) => {
-        const toolContext = {
-          mastra,
-          requestContext,
+      execute: async ({ inputData, mastra, runtimeContext, tracingContext, suspend, resumeData }) => {
+        return params.execute({
+          context: inputData,
+          mastra: wrapMastra(mastra, tracingContext),
+          runtimeContext,
           tracingContext,
-          workflow: {
-            runId,
-            resumeData,
-            suspend,
-            workflowId,
-            state,
-            setState
-          }
-        };
-        return params.execute(inputData, toolContext);
+          suspend,
+          resumeData
+        });
       },
       component: "TOOL"
     };
@@ -893,8 +656,6 @@ function init(inngest) {
         suspendSchema: step.suspendSchema,
         stateSchema: step.stateSchema,
         execute: step.execute,
-        retries: step.retries,
-        scorers: step.scorers,
         component: step.component
       };
     },
@@ -920,16 +681,63 @@ 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
     };
     if (lastOutput.status === "success") {
+      await emitter.emit("watch", {
+        type: "watch",
+        payload: {
+          workflowState: {
+            status: lastOutput.status,
+            steps: stepResults,
+            result: lastOutput.output
+          }
+        },
+        eventTimestamp: Date.now()
+      });
       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";
+      await emitter.emit("watch", {
+        type: "watch",
+        payload: {
+          workflowState: {
+            status: lastOutput.status,
+            steps: stepResults,
+            result: null,
+            error: base.error
+          }
+        },
+        eventTimestamp: Date.now()
+      });
     } else if (lastOutput.status === "suspended") {
+      await emitter.emit("watch", {
+        type: "watch",
+        payload: {
+          workflowState: {
+            status: lastOutput.status,
+            steps: stepResults,
+            result: null,
+            error: null
+          }
+        },
+        eventTimestamp: Date.now()
+      });
       const suspendedStepIds = Object.entries(stepResults).flatMap(([stepId, stepResult]) => {
         if (stepResult?.status === "suspended") {
           const nestedPath = stepResult?.suspendPayload?.__workflow_meta?.path;
@@ -939,6 +747,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
       });
       base.suspended = suspendedStepIds;
     }
+    executionSpan?.end();
     return base;
   }
   // async executeSleep({ id, duration }: { id: string; duration: number }): Promise<void> {
@@ -952,14 +761,14 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
     stepResults,
     emitter,
     abortController,
-    requestContext,
+    runtimeContext,
     executionContext,
     writableStream,
     tracingContext
   }) {
     let { duration, fn } = entry;
     const sleepSpan = tracingContext?.currentSpan?.createChildSpan({
-      type: SpanType.WORKFLOW_SLEEP,
+      type: AISpanType.WORKFLOW_SLEEP,
       name: `sleep: ${duration ? `${duration}ms` : "dynamic"}`,
       attributes: {
         durationMs: duration,
@@ -970,53 +779,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;
-              },
-              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: {
@@ -1040,14 +841,14 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
     stepResults,
     emitter,
     abortController,
-    requestContext,
+    runtimeContext,
     executionContext,
     writableStream,
     tracingContext
   }) {
     let { date, fn } = entry;
     const sleepUntilSpan = tracingContext?.currentSpan?.createChildSpan({
-      type: SpanType.WORKFLOW_SLEEP,
+      type: AISpanType.WORKFLOW_SLEEP,
       name: `sleepUntil: ${date ? date.toISOString() : "dynamic"}`,
       attributes: {
         untilDate: date,
@@ -1059,53 +860,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;
-              },
-              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);
@@ -1129,23 +922,32 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
       throw e;
     }
   }
+  async executeWaitForEvent({ event, timeout }) {
+    const eventData = await this.inngestStep.waitForEvent(`user-event-${event}`, {
+      event: `user-event-${event}`,
+      timeout: timeout ?? 5e3
+    });
+    if (eventData === null) {
+      throw "Timeout waiting for event";
+    }
+    return eventData?.data;
+  }
   async executeStep({
     step,
     stepResults,
     executionContext,
     resume,
-    timeTravel,
     prevOutput,
     emitter,
     abortController,
-    requestContext,
+    runtimeContext,
     tracingContext,
     writableStream,
     disableScorers
   }) {
-    const stepSpan = tracingContext?.currentSpan?.createChildSpan({
+    const stepAISpan = tracingContext?.currentSpan?.createChildSpan({
       name: `workflow step: '${step.id}'`,
-      type: SpanType.WORKFLOW_STEP,
+      type: AISpanType.WORKFLOW_STEP,
       input: prevOutput,
       attributes: {
         stepId: step.id
@@ -1155,13 +957,34 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
     const { inputData, validationError } = await validateStepInput({
       prevOutput,
       step,
-      validateInputs: this.options?.validateInputs ?? true
+      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: "watch",
+          payload: {
+            currentStep: {
+              id: step.id,
+              status: "running"
+            },
+            workflowState: {
+              status: "running",
+              steps: {
+                ...stepResults,
+                [step.id]: {
+                  status: "running"
+                }
+              },
+              result: null,
+              error: null
+            }
+          },
+          eventTimestamp: Date.now()
+        });
+        await emitter.emit("watch-v2", {
           type: "workflow-step-start",
           payload: {
             id: step.id,
@@ -1177,10 +1000,9 @@ 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();
+          runId = stepResults[resume?.steps?.[0]]?.suspendPayload?.__workflow_meta?.runId ?? randomUUID();
           const snapshot = await this.mastra?.getStorage()?.loadWorkflowSnapshot({
             workflowName: step.id,
             runId
@@ -1196,7 +1018,8 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
                 steps: resume.steps.slice(1),
                 stepResults: snapshot?.context,
                 resumePayload: resume.resumePayload,
-                resumePath: resume.steps?.[1] ? snapshot?.suspendedPaths?.[resume.steps?.[1]] : void 0
+                // @ts-ignore
+                resumePath: snapshot?.suspendedPaths?.[resume.steps?.[1]]
               },
               outputOptions: { includeState: true }
             }
@@ -1204,32 +1027,6 @@ 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(),
@@ -1263,6 +1060,23 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
         async () => {
           if (result.status === "failed") {
             await emitter.emit("watch", {
+              type: "watch",
+              payload: {
+                currentStep: {
+                  id: step.id,
+                  status: "failed",
+                  error: result?.error
+                },
+                workflowState: {
+                  status: "running",
+                  steps: stepResults,
+                  result: null,
+                  error: null
+                }
+              },
+              eventTimestamp: Date.now()
+            });
+            await emitter.emit("watch-v2", {
               type: "workflow-step-result",
               payload: {
                 id: step.id,
@@ -1281,6 +1095,27 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
               const suspendPath = [stepName, ...stepResult?.suspendPayload?.__workflow_meta?.path ?? []];
               executionContext.suspendedPaths[step.id] = executionContext.executionPath;
               await emitter.emit("watch", {
+                type: "watch",
+                payload: {
+                  currentStep: {
+                    id: step.id,
+                    status: "suspended",
+                    payload: stepResult.payload,
+                    suspendPayload: {
+                      ...stepResult?.suspendPayload,
+                      __workflow_meta: { runId, path: suspendPath }
+                    }
+                  },
+                  workflowState: {
+                    status: "running",
+                    steps: stepResults,
+                    result: null,
+                    error: null
+                  }
+                },
+                eventTimestamp: Date.now()
+              });
+              await emitter.emit("watch-v2", {
                 type: "workflow-step-suspended",
                 payload: {
                   id: step.id,
@@ -1299,6 +1134,23 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
                 }
               };
             }
+            await emitter.emit("watch", {
+              type: "watch",
+              payload: {
+                currentStep: {
+                  id: step.id,
+                  status: "suspended",
+                  payload: {}
+                },
+                workflowState: {
+                  status: "running",
+                  steps: stepResults,
+                  result: null,
+                  error: null
+                }
+              },
+              eventTimestamp: Date.now()
+            });
             return {
               executionContext,
               result: {
@@ -1308,6 +1160,23 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
             };
           }
           await emitter.emit("watch", {
+            type: "watch",
+            payload: {
+              currentStep: {
+                id: step.id,
+                status: "success",
+                output: result?.result
+              },
+              workflowState: {
+                status: "running",
+                steps: stepResults,
+                result: null,
+                error: null
+              }
+            },
+            eventTimestamp: Date.now()
+          });
+          await emitter.emit("watch-v2", {
             type: "workflow-step-result",
             payload: {
               id: step.id,
@@ -1315,7 +1184,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
               output: result?.result
             }
           });
-          await emitter.emit("watch", {
+          await emitter.emit("watch-v2", {
             type: "workflow-step-finish",
             payload: {
               id: step.id,
@@ -1335,67 +1204,33 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
         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;
-        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;
           }
-          const retryCount = this.getOrGenerateRetryCount(step.id);
           const result = await step.execute({
             runId: executionContext.runId,
-            workflowId: executionContext.workflowId,
             mastra: this.mastra,
-            requestContext,
-            retryCount,
-            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: resumeDataToUse,
+            resumeData: resume?.steps[0] === step.id ? resume?.resumePayload : void 0,
             tracingContext: {
-              currentSpan: stepSpan
+              currentSpan: stepAISpan
             },
             getInitData: () => stepResults?.input,
             getStepResult: getStepResult.bind(this, stepResults),
             suspend: async (suspendPayload, suspendOptions) => {
-              const { suspendData, validationError: validationError2 } = await validateStepSuspendData({
-                suspendData: suspendPayload,
-                step
-              });
-              if (validationError2) {
-                throw validationError2;
-              }
               executionContext.suspendedPaths[step.id] = executionContext.executionPath;
               if (suspendOptions?.resumeLabel) {
                 const resumeLabel = Array.isArray(suspendOptions.resumeLabel) ? suspendOptions.resumeLabel : [suspendOptions.resumeLabel];
@@ -1406,16 +1241,18 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
                   };
                 }
               }
-              suspended = { payload: suspendData };
+              suspended = { payload: suspendPayload };
             },
             bail: (result2) => {
               bailed = { payload: result2 };
             },
-            abort: () => {
-              abortController?.abort();
+            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
             },
@@ -1428,22 +1265,22 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
             startedAt,
             endedAt,
             payload: inputData,
-            resumedAt: resumeDataToUse ? startedAt : void 0,
-            resumePayload: resumeDataToUse
+            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),
+            error: e instanceof Error ? e.stack ?? e.message : String(e),
             endedAt: Date.now(),
             startedAt,
-            resumedAt: resumeDataToUse ? startedAt : void 0,
-            resumePayload: resumeDataToUse
+            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) });
+          stepAISpan?.error({ error: new Error(execResults.error ?? fallbackErrorMessage) });
           throw new RetryAfterError(execResults.error ?? fallbackErrorMessage, executionContext.retryConfig.delay, {
             cause: execResults
           });
@@ -1452,12 +1289,11 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
           execResults = {
             status: "suspended",
             suspendPayload: suspended.payload,
-            ...execResults.output ? { suspendOutput: execResults.output } : {},
             payload: inputData,
             suspendedAt: Date.now(),
             startedAt,
-            resumedAt: resumeDataToUse ? startedAt : void 0,
-            resumePayload: resumeDataToUse
+            resumedAt: resume?.steps[0] === step.id ? startedAt : void 0,
+            resumePayload: resume?.steps[0] === step.id ? resume?.resumePayload : void 0
           };
         } else if (bailed) {
           execResults = {
@@ -1468,8 +1304,24 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
             startedAt
           };
         }
+        await emitter.emit("watch", {
+          type: "watch",
+          payload: {
+            currentStep: {
+              id: step.id,
+              ...execResults
+            },
+            workflowState: {
+              status: "running",
+              steps: { ...stepResults, [step.id]: execResults },
+              result: null,
+              error: null
+            }
+          },
+          eventTimestamp: Date.now()
+        });
         if (execResults.status === "suspended") {
-          await emitter.emit("watch", {
+          await emitter.emit("watch-v2", {
             type: "workflow-step-suspended",
             payload: {
               id: step.id,
@@ -1477,14 +1329,14 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
             }
           });
         } else {
-          await emitter.emit("watch", {
+          await emitter.emit("watch-v2", {
             type: "workflow-step-result",
             payload: {
               id: step.id,
               ...execResults
             }
           });
-          await emitter.emit("watch", {
+          await emitter.emit("watch-v2", {
             type: "workflow-step-finish",
             payload: {
               id: step.id,
@@ -1492,17 +1344,31 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
             }
           });
         }
-        stepSpan?.end({ output: execResults });
+        stepAISpan?.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),
+        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,
@@ -1522,14 +1388,15 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
             output: stepRes.result,
             workflowId: executionContext.workflowId,
             stepId: step.id,
-            requestContext,
+            runtimeContext,
             disableScorers,
-            tracingContext: { currentSpan: stepSpan }
+            tracingContext: { currentSpan: stepAISpan }
           });
         }
       });
     }
     Object.assign(executionContext.suspendedPaths, stepRes.executionContext.suspendedPaths);
+    Object.assign(stepResults, stepRes.stepResults);
     executionContext.state = stepRes.executionContext.state;
     return stepRes.result;
   }
@@ -1557,17 +1424,17 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
           resourceId,
           snapshot: {
             runId,
-            status: workflowStatus,
             value: executionContext.state,
             context: stepResults,
-            activePaths: executionContext.executionPath,
-            activeStepsPath: executionContext.activeStepsPath,
+            activePaths: [],
             suspendedPaths: executionContext.suspendedPaths,
             resumeLabels: executionContext.resumeLabels,
             waitingPaths: {},
             serializedStepGraph,
+            status: workflowStatus,
             result,
             error,
+            // @ts-ignore
             timestamp: Date.now()
           }
         });
@@ -1580,18 +1447,17 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
     entry,
     prevOutput,
     stepResults,
-    timeTravel,
     resume,
     executionContext,
     emitter,
     abortController,
-    requestContext,
+    runtimeContext,
     writableStream,
     disableScorers,
     tracingContext
   }) {
     const conditionalSpan = tracingContext?.currentSpan?.createChildSpan({
-      type: SpanType.WORKFLOW_CONDITIONAL,
+      type: AISpanType.WORKFLOW_CONDITIONAL,
       name: `conditional: '${entry.conditions.length} conditions'`,
       input: prevOutput,
       attributes: {
@@ -1604,7 +1470,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
       entry.conditions.map(
         (cond, index) => this.inngestStep.run(`workflow.${workflowId}.conditional.${index}`, async () => {
           const evalSpan = conditionalSpan?.createChildSpan({
-            type: SpanType.WORKFLOW_CONDITIONAL_EVAL,
+            type: AISpanType.WORKFLOW_CONDITIONAL_EVAL,
             name: `condition: '${index}'`,
             input: prevOutput,
             attributes: {
@@ -1613,55 +1479,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,
-                  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: {
@@ -1699,20 +1557,19 @@ 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: {
@@ -1728,19 +1585,13 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
     if (hasFailed) {
       execResults = { status: "failed", error: hasFailed.error };
     } else if (hasSuspended) {
-      execResults = {
-        status: "suspended",
-        suspendPayload: hasSuspended.suspendPayload,
-        ...hasSuspended.suspendOutput ? { suspendOutput: hasSuspended.suspendOutput } : {}
-      };
+      execResults = { status: "suspended", suspendPayload: hasSuspended.suspendPayload };
     } else {
       execResults = {
         status: "success",
         output: results.reduce((acc, result, index) => {
           if (result.status === "success") {
-            if ("step" in stepsToRun[index]) {
-              acc[stepsToRun[index].step.id] = result.output;
-            }
+            acc[stepsToRun[index].step.id] = result.output;
           }
           return acc;
         }, {})