@mastra/inngest 0.0.0-fix-multi-modal-for-cloud-20251028082043 → 0.0.0-fix-persist-session-cache-option-mcp-server-20251030161352

package/CHANGELOG.md

@@ -1,11 +1,17 @@
 # @mastra/inngest
 
-## 0.0.0-fix-multi-modal-for-cloud-20251028082043
+## 0.0.0-fix-persist-session-cache-option-mcp-server-20251030161352
 
 ### Major Changes
 
+- Rename RuntimeContext to RequestContext ([#9511](https://github.com/mastra-ai/mastra/pull/9511))
+
+- Changing getAgents -> listAgents, getTools -> listTools, getWorkflows -> listWorkflows ([#9495](https://github.com/mastra-ai/mastra/pull/9495))
+
 - Removed old tracing code based on OpenTelemetry ([#9237](https://github.com/mastra-ai/mastra/pull/9237))
 
+- Remove legacy evals from Mastra ([#9491](https://github.com/mastra-ai/mastra/pull/9491))
+
 ### Minor Changes
 
 - Update peer dependencies to match core package version bump (1.0.0) ([#9237](https://github.com/mastra-ai/mastra/pull/9237))
@@ -36,8 +42,12 @@
 
 - Add tool call approval ([#8649](https://github.com/mastra-ai/mastra/pull/8649))
 
-- Updated dependencies [[`f743dbb`](https://github.com/mastra-ai/mastra/commit/f743dbb8b40d1627b5c10c0e6fc154f4ebb6e394), [`6c049d9`](https://github.com/mastra-ai/mastra/commit/6c049d94063fdcbd5b81c4912a2bf82a92c9cc0b), [`9e1911d`](https://github.com/mastra-ai/mastra/commit/9e1911db2b4db85e0e768c3f15e0d61e319869f6), [`ebac155`](https://github.com/mastra-ai/mastra/commit/ebac15564a590117db7078233f927a7e28a85106), [`9d819d5`](https://github.com/mastra-ai/mastra/commit/9d819d54b61481639f4008e4694791bddf187edd), [`5df9cce`](https://github.com/mastra-ai/mastra/commit/5df9cce1a753438413f64c11eeef8f845745c2a8), [`c576fc0`](https://github.com/mastra-ai/mastra/commit/c576fc0b100b2085afded91a37c97a0ea0ec09c7), [`57d157f`](https://github.com/mastra-ai/mastra/commit/57d157f0b163a95c3e6c9eae31bdb11d1bfc64f9), [`d78b38d`](https://github.com/mastra-ai/mastra/commit/d78b38d898fce285260d3bbb4befade54331617f), [`cfae733`](https://github.com/mastra-ai/mastra/commit/cfae73394f4920635e6c919c8e95ff9a0788e2e5), [`e3dfda7`](https://github.com/mastra-ai/mastra/commit/e3dfda7b11bf3b8c4bb55637028befb5f387fc74), [`f0f8f12`](https://github.com/mastra-ai/mastra/commit/f0f8f125c308f2d0fd36942ef652fd852df7522f), [`d36cfbb`](https://github.com/mastra-ai/mastra/commit/d36cfbbb6565ba5f827883cc9bb648eb14befdc1), [`53d927c`](https://github.com/mastra-ai/mastra/commit/53d927cc6f03bff33655b7e2b788da445a08731d), [`bda6370`](https://github.com/mastra-ai/mastra/commit/bda637009360649aaf579919e7873e33553c273e), [`c7f1f7d`](https://github.com/mastra-ai/mastra/commit/c7f1f7d24f61f247f018cc2d1f33bf63212959a7), [`2c4438b`](https://github.com/mastra-ai/mastra/commit/2c4438b87817ab7eed818c7990fef010475af1a3), [`fa8409b`](https://github.com/mastra-ai/mastra/commit/fa8409bc39cfd8ba6643b9db5269b90b22e2a2f7), [`173c535`](https://github.com/mastra-ai/mastra/commit/173c535c0645b0da404fe09f003778f0b0d4e019)]:
-  - @mastra/core@0.0.0-fix-multi-modal-for-cloud-20251028082043
+- Added support for .streamVNext and .stream that uses it in the inngest execution engine ([#9434](https://github.com/mastra-ai/mastra/pull/9434))
+
+- Prevent changing workflow status to suspended when some parallel steps are still running ([#9431](https://github.com/mastra-ai/mastra/pull/9431))
+
+- Updated dependencies [[`f743dbb`](https://github.com/mastra-ai/mastra/commit/f743dbb8b40d1627b5c10c0e6fc154f4ebb6e394), [`0e8ed46`](https://github.com/mastra-ai/mastra/commit/0e8ed467c54d6901a6a365f270ec15d6faadb36c), [`6c049d9`](https://github.com/mastra-ai/mastra/commit/6c049d94063fdcbd5b81c4912a2bf82a92c9cc0b), [`3443770`](https://github.com/mastra-ai/mastra/commit/3443770662df8eb24c9df3589b2792d78cfcb811), [`9e1911d`](https://github.com/mastra-ai/mastra/commit/9e1911db2b4db85e0e768c3f15e0d61e319869f6), [`ebac155`](https://github.com/mastra-ai/mastra/commit/ebac15564a590117db7078233f927a7e28a85106), [`5948e6a`](https://github.com/mastra-ai/mastra/commit/5948e6a5146c83666ba3f294b2be576c82a513fb), [`8940859`](https://github.com/mastra-ai/mastra/commit/89408593658199b4ad67f7b65e888f344e64a442), [`e629310`](https://github.com/mastra-ai/mastra/commit/e629310f1a73fa236d49ec7a1d1cceb6229dc7cc), [`4c6b492`](https://github.com/mastra-ai/mastra/commit/4c6b492c4dd591c6a592520c1f6855d6e936d71f), [`9d819d5`](https://github.com/mastra-ai/mastra/commit/9d819d54b61481639f4008e4694791bddf187edd), [`71c8d6c`](https://github.com/mastra-ai/mastra/commit/71c8d6c161253207b2b9588bdadb7eed604f7253), [`6179a9b`](https://github.com/mastra-ai/mastra/commit/6179a9ba36ffac326de3cc3c43cdc8028d37c251), [`7051bf3`](https://github.com/mastra-ai/mastra/commit/7051bf38b3b122a069008f861f7bfc004a6d9f6e), [`5df9cce`](https://github.com/mastra-ai/mastra/commit/5df9cce1a753438413f64c11eeef8f845745c2a8), [`c576fc0`](https://github.com/mastra-ai/mastra/commit/c576fc0b100b2085afded91a37c97a0ea0ec09c7), [`9f4a683`](https://github.com/mastra-ai/mastra/commit/9f4a6833e88b52574665c028fd5508ad5c2f6004), [`57d157f`](https://github.com/mastra-ai/mastra/commit/57d157f0b163a95c3e6c9eae31bdb11d1bfc64f9), [`2a90c55`](https://github.com/mastra-ai/mastra/commit/2a90c55a86a9210697d5adaab5ee94584b079adc), [`d78b38d`](https://github.com/mastra-ai/mastra/commit/d78b38d898fce285260d3bbb4befade54331617f), [`c710c16`](https://github.com/mastra-ai/mastra/commit/c710c1652dccfdc4111c8412bca7a6bb1d48b441), [`cfae733`](https://github.com/mastra-ai/mastra/commit/cfae73394f4920635e6c919c8e95ff9a0788e2e5), [`e3dfda7`](https://github.com/mastra-ai/mastra/commit/e3dfda7b11bf3b8c4bb55637028befb5f387fc74), [`844ea5d`](https://github.com/mastra-ai/mastra/commit/844ea5dc0c248961e7bf73629ae7dcff503e853c), [`f0f8f12`](https://github.com/mastra-ai/mastra/commit/f0f8f125c308f2d0fd36942ef652fd852df7522f), [`7b763e5`](https://github.com/mastra-ai/mastra/commit/7b763e52fc3eaf699c2a99f2adf418dd46e4e9a5), [`d36cfbb`](https://github.com/mastra-ai/mastra/commit/d36cfbbb6565ba5f827883cc9bb648eb14befdc1), [`3697853`](https://github.com/mastra-ai/mastra/commit/3697853deeb72017d90e0f38a93c1e29221aeca0), [`a534e95`](https://github.com/mastra-ai/mastra/commit/a534e9591f83b3cc1ebff99c67edf4cda7bf81d3), [`9d0e7fe`](https://github.com/mastra-ai/mastra/commit/9d0e7feca8ed98de959f53476ee1456073673348), [`53d927c`](https://github.com/mastra-ai/mastra/commit/53d927cc6f03bff33655b7e2b788da445a08731d), [`22f64bc`](https://github.com/mastra-ai/mastra/commit/22f64bc1d37149480b58bf2fefe35b79a1e3e7d5), [`bda6370`](https://github.com/mastra-ai/mastra/commit/bda637009360649aaf579919e7873e33553c273e), [`c7f1f7d`](https://github.com/mastra-ai/mastra/commit/c7f1f7d24f61f247f018cc2d1f33bf63212959a7), [`735d8c1`](https://github.com/mastra-ai/mastra/commit/735d8c1c0d19fbc09e6f8b66cf41bc7655993838), [`c218bd3`](https://github.com/mastra-ai/mastra/commit/c218bd3759e32423735b04843a09404572631014), [`2c4438b`](https://github.com/mastra-ai/mastra/commit/2c4438b87817ab7eed818c7990fef010475af1a3), [`2b8893c`](https://github.com/mastra-ai/mastra/commit/2b8893cb108ef9acb72ee7835cd625610d2c1a4a), [`8e5c75b`](https://github.com/mastra-ai/mastra/commit/8e5c75bdb1d08a42d45309a4c72def4b6890230f), [`fa8409b`](https://github.com/mastra-ai/mastra/commit/fa8409bc39cfd8ba6643b9db5269b90b22e2a2f7), [`173c535`](https://github.com/mastra-ai/mastra/commit/173c535c0645b0da404fe09f003778f0b0d4e019)]:
+  - @mastra/core@0.0.0-fix-persist-session-cache-option-mcp-server-20251030161352
 
 ## 0.17.0
 

package/dist/index.cjs

@@ -20,7 +20,7 @@ function serve({
   functions: userFunctions = [],
   registerOptions
 }) {
-  const wfs = mastra.getWorkflows();
+  const wfs = mastra.listWorkflows();
   const workflowFunctions = Array.from(
     new Set(
       Object.values(wfs).flatMap((wf) => {
@@ -110,9 +110,15 @@ var InngestRun = class extends workflows.Run {
       });
     }
   }
-  async start({
+  async start(params) {
+    return this._start(params);
+  }
+  async _start({
     inputData,
-    initialState
+    initialState,
+    outputOptions,
+    tracingOptions,
+    format
   }) {
     await this.#mastra.getStorage()?.persistWorkflowSnapshot({
       workflowName: this.workflowId,
@@ -139,7 +145,10 @@ var InngestRun = class extends workflows.Run {
         inputData: inputDataToUse,
         initialState: initialStateToUse,
         runId: this.runId,
-        resourceId: this.resourceId
+        resourceId: this.resourceId,
+        outputOptions,
+        tracingOptions,
+        format
       }
     });
     const eventId = eventOutput.ids[0];
@@ -228,20 +237,35 @@ var InngestRun = class extends workflows.Run {
       });
     };
   }
-  streamLegacy({ inputData, runtimeContext } = {}) {
+  streamLegacy({ inputData, requestContext } = {}) {
     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();
@@ -251,7 +275,7 @@ var InngestRun = class extends workflows.Run {
         writer.releaseLock();
       }
     };
-    this.executionResults = this.start({ inputData, runtimeContext }).then((result) => {
+    this.executionResults = this._start({ inputData, requestContext, format: "legacy" }).then((result) => {
       if (result.status !== "suspended") {
         this.closeStreamAction?.().catch(() => {
         });
@@ -265,11 +289,18 @@ var InngestRun = class extends workflows.Run {
   }
   stream({
     inputData,
-    runtimeContext,
-    closeOnSuspend = true
+    requestContext,
+    tracingOptions,
+    closeOnSuspend = true,
+    initialState,
+    outputOptions
   } = {}) {
+    if (this.closeStreamAction && this.streamOutput) {
+      return this.streamOutput;
+    }
+    this.closeStreamAction = async () => {
+    };
     const self = this;
-    let streamOutput;
     const stream$1 = new web.ReadableStream({
       async start(controller) {
         const unwatch = self.watch(async ({ type, from = stream.ChunkFrom.WORKFLOW, payload }) => {
@@ -278,7 +309,7 @@ var InngestRun = class extends workflows.Run {
             runId: self.runId,
             from,
             payload: {
-              stepName: payload.id,
+              stepName: payload?.id,
               ...payload
             }
           });
@@ -291,29 +322,46 @@ var InngestRun = class extends workflows.Run {
             console.error("Error closing stream:", err);
           }
         };
-        const executionResultsPromise = self.start({
+        const executionResultsPromise = self._start({
           inputData,
-          runtimeContext
+          requestContext,
+          // tracingContext, // We are not able to pass a reference to a span here, what to do?
+          initialState,
+          tracingOptions,
+          outputOptions,
+          format: "vnext"
         });
-        const executionResults = await executionResultsPromise;
-        if (closeOnSuspend) {
-          self.closeStreamAction?.().catch(() => {
-          });
-        } else if (executionResults.status !== "suspended") {
+        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(() => {
           });
         }
-        if (streamOutput) {
-          streamOutput.updateResults(executionResults);
-        }
       }
     });
-    streamOutput = new stream.WorkflowRunOutput({
+    this.streamOutput = new stream.WorkflowRunOutput({
       runId: this.runId,
       workflowId: this.workflowId,
       stream: stream$1
     });
-    return streamOutput;
+    return this.streamOutput;
+  }
+  streamVNext(args = {}) {
+    return this.stream(args);
   }
 };
 var InngestWorkflow = class _InngestWorkflow extends workflows.Workflow {
@@ -437,7 +485,7 @@ var InngestWorkflow = class _InngestWorkflow extends workflows.Workflow {
       },
       { event: `workflow.${this.id}` },
       async ({ event, step, attempt, publish }) => {
-        let { inputData, initialState, runId, resourceId, resume, outputOptions } = event.data;
+        let { inputData, initialState, runId, resourceId, resume, outputOptions, format } = event.data;
         if (!runId) {
           runId = await step.run(`workflow.${this.id}.runIdGen`, async () => {
             return crypto.randomUUID();
@@ -476,13 +524,19 @@ var InngestWorkflow = class _InngestWorkflow extends workflows.Workflow {
           initialState,
           emitter,
           retryConfig: this.retryConfig,
-          runtimeContext: new di.RuntimeContext(),
+          requestContext: new di.RequestContext(),
           // TODO
           resume,
+          format,
           abortController: new AbortController(),
-          currentSpan: void 0,
-          // TODO: Pass actual parent AI span from workflow execution context
-          outputOptions
+          // 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(() => {
+              });
+            }
+          })
         });
         await step.run(`workflow.${this.id}.finalize`, async () => {
           if (result.status === "failed") {
@@ -520,7 +574,7 @@ function isAgent(params) {
 function isTool(params) {
   return params instanceof tools.Tool;
 }
-function createStep(params) {
+function createStep(params, agentOptions) {
   if (isAgent(params)) {
     return {
       id: params.name,
@@ -528,12 +582,23 @@ function createStep(params) {
       // @ts-ignore
       inputSchema: zod.z.object({
         prompt: zod.z.string()
+        // resourceId: z.string().optional(),
+        // threadId: z.string().optional(),
       }),
       // @ts-ignore
       outputSchema: zod.z.object({
         text: zod.z.string()
       }),
-      execute: async ({ inputData, [_constants.EMITTER_SYMBOL]: emitter, runtimeContext, abortSignal, abort, tracingContext }) => {
+      execute: async ({
+        inputData,
+        [_constants.EMITTER_SYMBOL]: emitter,
+        [_constants.STREAM_FORMAT_SYMBOL]: streamFormat,
+        requestContext,
+        tracingContext,
+        abortSignal,
+        abort,
+        writer
+      }) => {
         let streamPromise = {};
         streamPromise.promise = new Promise((resolve, reject) => {
           streamPromise.resolve = resolve;
@@ -543,48 +608,40 @@ function createStep(params) {
           name: params.name,
           args: inputData
         };
-        if ((await params.getLLM()).getModel().specificationVersion === `v2`) {
-          const { fullStream } = await params.stream(inputData.prompt, {
-            runtimeContext,
+        let stream;
+        if ((await params.getModel()).specificationVersion === "v1") {
+          const { fullStream } = await params.streamLegacy(inputData.prompt, {
+            ...agentOptions ?? {},
+            // resourceId: inputData.resourceId,
+            // threadId: inputData.threadId,
+            requestContext,
             tracingContext,
             onFinish: (result) => {
               streamPromise.resolve(result.text);
+              void agentOptions?.onFinish?.(result);
             },
             abortSignal
           });
-          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
-              });
-            }
-          }
+          stream = fullStream;
         } else {
-          const { fullStream } = await params.streamLegacy(inputData.prompt, {
-            runtimeContext,
+          const modelOutput = await params.stream(inputData.prompt, {
+            ...agentOptions ?? {},
+            requestContext,
             tracingContext,
             onFinish: (result) => {
               streamPromise.resolve(result.text);
+              void agentOptions?.onFinish?.(result);
             },
             abortSignal
           });
-          if (abortSignal.aborted) {
-            return abort();
-          }
+          stream = modelOutput.fullStream;
+        }
+        if (streamFormat === "legacy") {
           await emitter.emit("watch-v2", {
             type: "tool-call-streaming-start",
             ...toolData ?? {}
           });
-          for await (const chunk of fullStream) {
+          for await (const chunk of stream) {
             if (chunk.type === "text-delta") {
               await emitter.emit("watch-v2", {
                 type: "tool-call-delta",
@@ -593,11 +650,18 @@ function createStep(params) {
               });
             }
           }
+          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
         };
@@ -616,11 +680,11 @@ function createStep(params) {
       description: params.description,
       inputSchema: params.inputSchema,
       outputSchema: params.outputSchema,
-      execute: async ({ inputData, mastra, runtimeContext, tracingContext, suspend, resumeData }) => {
+      execute: async ({ inputData, mastra, requestContext, tracingContext, suspend, resumeData }) => {
         return params.execute({
           context: inputData,
           mastra: aiTracing.wrapMastra(mastra, tracingContext),
-          runtimeContext,
+          requestContext,
           tracingContext,
           suspend,
           resumeData
@@ -683,18 +747,6 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
     this.inngestStep = inngestStep;
     this.inngestAttempts = inngestAttempts;
   }
-  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(emitter, stepResults, lastOutput, error) {
     const base = {
       status: lastOutput.status,
@@ -762,7 +814,7 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
     stepResults,
     emitter,
     abortController,
-    runtimeContext,
+    requestContext,
     executionContext,
     writableStream,
     tracingContext
@@ -786,7 +838,7 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
               runId,
               workflowId,
               mastra: this.mastra,
-              runtimeContext,
+              requestContext,
               inputData: prevOutput,
               state: executionContext.state,
               setState: (state) => {
@@ -808,7 +860,6 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
                 abortController?.abort();
               },
               [_constants.EMITTER_SYMBOL]: emitter,
-              // TODO: add streamVNext support
               [_constants.STREAM_FORMAT_SYMBOL]: executionContext.format,
               engine: { step: this.inngestStep },
               abortSignal: abortController?.signal,
@@ -852,7 +903,7 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
     stepResults,
     emitter,
     abortController,
-    runtimeContext,
+    requestContext,
     executionContext,
     writableStream,
     tracingContext
@@ -877,7 +928,7 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
               runId,
               workflowId,
               mastra: this.mastra,
-              runtimeContext,
+              requestContext,
               inputData: prevOutput,
               state: executionContext.state,
               setState: (state) => {
@@ -900,7 +951,6 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
               },
               [_constants.EMITTER_SYMBOL]: emitter,
               [_constants.STREAM_FORMAT_SYMBOL]: executionContext.format,
-              // TODO: add streamVNext support
               engine: { step: this.inngestStep },
               abortSignal: abortController?.signal,
               writer: new tools.ToolStream(
@@ -961,7 +1011,7 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
     prevOutput,
     emitter,
     abortController,
-    runtimeContext,
+    requestContext,
     tracingContext,
     writableStream,
     disableScorers
@@ -1225,6 +1275,7 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
         resumePayload: resume?.steps[0] === step.id ? resume?.resumePayload : void 0
       };
     }
+    const stepCallId = crypto.randomUUID();
     let stepRes;
     try {
       stepRes = await this.inngestStep.run(`workflow.${executionContext.workflowId}.step.${step.id}`, async () => {
@@ -1238,8 +1289,16 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
           const result = await step.execute({
             runId: executionContext.runId,
             mastra: this.mastra,
-            runtimeContext,
-            writableStream,
+            requestContext,
+            writer: new tools.ToolStream(
+              {
+                prefix: "workflow-step",
+                callId: stepCallId,
+                name: step.id,
+                runId: executionContext.runId
+              },
+              writableStream
+            ),
             state: executionContext?.state ?? {},
             setState: (state) => {
               executionContext.state = state;
@@ -1274,6 +1333,7 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
               runId: stepResults[step.id]?.suspendPayload?.__workflow_meta?.runId
             },
             [_constants.EMITTER_SYMBOL]: emitter,
+            [_constants.STREAM_FORMAT_SYMBOL]: executionContext.format,
             engine: {
               step: this.inngestStep
             },
@@ -1395,7 +1455,7 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
             output: stepRes.result,
             workflowId: executionContext.workflowId,
             stepId: step.id,
-            runtimeContext,
+            requestContext,
             disableScorers,
             tracingContext: { currentSpan: stepAISpan }
           });
@@ -1453,14 +1513,12 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
     runId,
     entry,
     prevOutput,
-    prevStep,
     stepResults,
-    serializedStepGraph,
     resume,
     executionContext,
     emitter,
     abortController,
-    runtimeContext,
+    requestContext,
     writableStream,
     disableScorers,
     tracingContext
@@ -1494,7 +1552,7 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
                   runId,
                   workflowId,
                   mastra: this.mastra,
-                  runtimeContext,
+                  requestContext,
                   runCount: -1,
                   retryCount: -1,
                   inputData: prevOutput,
@@ -1517,7 +1575,6 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
                   },
                   [_constants.EMITTER_SYMBOL]: emitter,
                   [_constants.STREAM_FORMAT_SYMBOL]: executionContext.format,
-                  // TODO: add streamVNext support
                   engine: {
                     step: this.inngestStep
                   },
@@ -1566,13 +1623,14 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
       }
     });
     const results = await Promise.all(
-      stepsToRun.map(
-        (step, index) => this.executeEntry({
-          workflowId,
-          runId,
-          entry: step,
-          serializedStepGraph,
-          prevStep,
+      stepsToRun.map(async (step, index) => {
+        const currStepResult = stepResults[step.step.id];
+        if (currStepResult && currStepResult.status === "success") {
+          return currStepResult;
+        }
+        const result = await this.executeStep({
+          step: step.step,
+          prevOutput,
           stepResults,
           resume,
           executionContext: {
@@ -1586,26 +1644,28 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
           },
           emitter,
           abortController,
-          runtimeContext,
+          requestContext,
           writableStream,
           disableScorers,
           tracingContext: {
             currentSpan: conditionalSpan
           }
-        })
-      )
+        });
+        stepResults[step.step.id] = result;
+        return result;
+      })
     );
-    const hasFailed = results.find((result) => result.result.status === "failed");
-    const hasSuspended = results.find((result) => result.result.status === "suspended");
+    const hasFailed = results.find((result) => result.status === "failed");
+    const hasSuspended = results.find((result) => result.status === "suspended");
     if (hasFailed) {
-      execResults = { status: "failed", error: hasFailed.result.error };
+      execResults = { status: "failed", error: hasFailed.error };
     } else if (hasSuspended) {
-      execResults = { status: "suspended", suspendPayload: hasSuspended.result.suspendPayload };
+      execResults = { status: "suspended", suspendPayload: hasSuspended.suspendPayload };
     } else {
       execResults = {
         status: "success",
         output: results.reduce((acc, result, index) => {
-          if (result.result.status === "success") {
+          if (result.status === "success") {
             acc[stepsToRun[index].step.id] = result.output;
           }
           return acc;