@mastra/inngest 0.0.0-fix-model-router-machine-cache-20251021232825 → 0.0.0-fix-memory-search-fetch-20251027160505

package/CHANGELOG.md

@@ -1,9 +1,50 @@
 # @mastra/inngest
 
-## 0.0.0-fix-model-router-machine-cache-20251021232825
+## 0.0.0-fix-memory-search-fetch-20251027160505
+
+### Major Changes
+
+- Removed old tracing code based on OpenTelemetry ([#9237](https://github.com/mastra-ai/mastra/pull/9237))
+
+### Minor Changes
+
+- Update peer dependencies to match core package version bump (1.0.0) ([#9237](https://github.com/mastra-ai/mastra/pull/9237))
+
+- Update peer dependencies to match core package version bump (0.22.1) ([#8649](https://github.com/mastra-ai/mastra/pull/8649))
+
+- Update peer dependencies to match core package version bump (0.22.3) ([#9153](https://github.com/mastra-ai/mastra/pull/9153))
+
+### Patch Changes
+
+- Deprecate `runCount` parameter in favor of `retryCount` for better naming clarity. The name `runCount` was misleading as it doesn't represent the total number of times a step has run, but rather the number of retry attempts made for a step. ([#9153](https://github.com/mastra-ai/mastra/pull/9153))
+
+  `runCount` is available in `execute()` functions and methods that interact with the step execution. This also applies to condition functions and loop condition functions that use this parameter. If your code uses `runCount`, change the name to `retryCount`.
+
+  Here's an example migration:
+
+  ```diff
+  const myStep = createStep({
+    // Rest of step...
+  -  execute: async ({ runCount, ...params }) => {
+  +  execute: async ({ retryCount, ...params }) => {
+      // ... rest of your logic
+    }
+  });
+  ```
+
+- 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), [`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), [`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-memory-search-fetch-20251027160505
+
+## 0.17.0
 
 ### Minor Changes
 
+- Consolidate streamVNext logic into stream, move old stream function into streamLegacy ([#9092](https://github.com/mastra-ai/mastra/pull/9092))
+
+- Update peer dependencies to match core package version bump (0.22.0) ([#9092](https://github.com/mastra-ai/mastra/pull/9092))
+
 - Update peer dependencies to match core package version bump (0.21.2) ([#8941](https://github.com/mastra-ai/mastra/pull/8941))
 
 ### Patch Changes
@@ -14,8 +55,25 @@
 
 - Update peerdeps to 0.23.0-0 ([#9043](https://github.com/mastra-ai/mastra/pull/9043))
 
-- Updated dependencies [[`c67ca32`](https://github.com/mastra-ai/mastra/commit/c67ca32e3c2cf69bfc146580770c720220ca44ac), [`efb5ed9`](https://github.com/mastra-ai/mastra/commit/efb5ed946ae7f410bc68c9430beb4b010afd25ec), [`dbc9e12`](https://github.com/mastra-ai/mastra/commit/dbc9e1216ba575ba59ead4afb727a01215f7de4f), [`99e41b9`](https://github.com/mastra-ai/mastra/commit/99e41b94957cdd25137d3ac12e94e8b21aa01b68), [`c28833c`](https://github.com/mastra-ai/mastra/commit/c28833c5b6d8e10eeffd7f7d39129d53b8bca240), [`ba201b8`](https://github.com/mastra-ai/mastra/commit/ba201b8f8feac4c72350f2dbd52c13c7297ba7b0), [`f053e89`](https://github.com/mastra-ai/mastra/commit/f053e89160dbd0bd3333fc3492f68231b5c7c349), [`4fc4136`](https://github.com/mastra-ai/mastra/commit/4fc413652866a8d2240694fddb2562e9edbb70df), [`b78e04d`](https://github.com/mastra-ai/mastra/commit/b78e04d935a16ecb1e59c5c96e564903527edddd), [`d10baf5`](https://github.com/mastra-ai/mastra/commit/d10baf5a3c924f2a6654e23a3e318ed03f189b76), [`038c55a`](https://github.com/mastra-ai/mastra/commit/038c55a7090fc1b1513a966386d3072617f836ac), [`182f045`](https://github.com/mastra-ai/mastra/commit/182f0458f25bd70aa774e64fd923c8a483eddbf1), [`9a1a485`](https://github.com/mastra-ai/mastra/commit/9a1a4859b855e37239f652bf14b1ecd1029b8c4e), [`9257233`](https://github.com/mastra-ai/mastra/commit/9257233c4ffce09b2bedc2a9adbd70d7a83fa8e2), [`7620d2b`](https://github.com/mastra-ai/mastra/commit/7620d2bddeb4fae4c3c0a0b4e672969795fca11a), [`b2365f0`](https://github.com/mastra-ai/mastra/commit/b2365f038dd4c5f06400428b224af963f399ad50), [`0f1a4c9`](https://github.com/mastra-ai/mastra/commit/0f1a4c984fb4b104b2f0b63ba18c9fa77f567700), [`9029ba3`](https://github.com/mastra-ai/mastra/commit/9029ba34459c8859fed4c6b73efd8e2d0021e7ba), [`426cc56`](https://github.com/mastra-ai/mastra/commit/426cc561c85ae76a112ded2385532a91f9f9f074), [`00931fb`](https://github.com/mastra-ai/mastra/commit/00931fb1a21aa42c4fbc20c2c40dd62466b8fc8f), [`e473bfe`](https://github.com/mastra-ai/mastra/commit/e473bfe416c0b8e876973c2b6a6f13c394b7a93f), [`b78e04d`](https://github.com/mastra-ai/mastra/commit/b78e04d935a16ecb1e59c5c96e564903527edddd), [`2db6160`](https://github.com/mastra-ai/mastra/commit/2db6160e2022ff8827c15d30157e684683b934b5), [`8aeea37`](https://github.com/mastra-ai/mastra/commit/8aeea37efdde347c635a67fed56794943b7f74ec), [`02fe153`](https://github.com/mastra-ai/mastra/commit/02fe15351d6021d214da48ec982a0e9e4150bcee), [`648e2ca`](https://github.com/mastra-ai/mastra/commit/648e2ca42da54838c6ccbdaadc6fadd808fa6b86), [`74567b3`](https://github.com/mastra-ai/mastra/commit/74567b3d237ae3915cd0bca3cf55fa0a64e4e4a4), [`b65c5e0`](https://github.com/mastra-ai/mastra/commit/b65c5e0fe6f3c390a9a8bbcf69304d972c3a4afb), [`15a1733`](https://github.com/mastra-ai/mastra/commit/15a1733074cee8bd37370e1af34cd818e89fa7ac), [`fc2a774`](https://github.com/mastra-ai/mastra/commit/fc2a77468981aaddc3e77f83f0c4ad4a4af140da), [`4e08933`](https://github.com/mastra-ai/mastra/commit/4e08933625464dfde178347af5b6278fcf34188e)]:
-  - @mastra/core@0.0.0-fix-model-router-machine-cache-20251021232825
+- Updated dependencies [[`c67ca32`](https://github.com/mastra-ai/mastra/commit/c67ca32e3c2cf69bfc146580770c720220ca44ac), [`efb5ed9`](https://github.com/mastra-ai/mastra/commit/efb5ed946ae7f410bc68c9430beb4b010afd25ec), [`dbc9e12`](https://github.com/mastra-ai/mastra/commit/dbc9e1216ba575ba59ead4afb727a01215f7de4f), [`99e41b9`](https://github.com/mastra-ai/mastra/commit/99e41b94957cdd25137d3ac12e94e8b21aa01b68), [`c28833c`](https://github.com/mastra-ai/mastra/commit/c28833c5b6d8e10eeffd7f7d39129d53b8bca240), [`8ea07b4`](https://github.com/mastra-ai/mastra/commit/8ea07b4bdc73e4218437dbb6dcb0f4b23e745a44), [`ba201b8`](https://github.com/mastra-ai/mastra/commit/ba201b8f8feac4c72350f2dbd52c13c7297ba7b0), [`f053e89`](https://github.com/mastra-ai/mastra/commit/f053e89160dbd0bd3333fc3492f68231b5c7c349), [`4fc4136`](https://github.com/mastra-ai/mastra/commit/4fc413652866a8d2240694fddb2562e9edbb70df), [`b78e04d`](https://github.com/mastra-ai/mastra/commit/b78e04d935a16ecb1e59c5c96e564903527edddd), [`d10baf5`](https://github.com/mastra-ai/mastra/commit/d10baf5a3c924f2a6654e23a3e318ed03f189b76), [`038c55a`](https://github.com/mastra-ai/mastra/commit/038c55a7090fc1b1513a966386d3072617f836ac), [`182f045`](https://github.com/mastra-ai/mastra/commit/182f0458f25bd70aa774e64fd923c8a483eddbf1), [`9a1a485`](https://github.com/mastra-ai/mastra/commit/9a1a4859b855e37239f652bf14b1ecd1029b8c4e), [`9257233`](https://github.com/mastra-ai/mastra/commit/9257233c4ffce09b2bedc2a9adbd70d7a83fa8e2), [`7620d2b`](https://github.com/mastra-ai/mastra/commit/7620d2bddeb4fae4c3c0a0b4e672969795fca11a), [`b2365f0`](https://github.com/mastra-ai/mastra/commit/b2365f038dd4c5f06400428b224af963f399ad50), [`0f1a4c9`](https://github.com/mastra-ai/mastra/commit/0f1a4c984fb4b104b2f0b63ba18c9fa77f567700), [`9029ba3`](https://github.com/mastra-ai/mastra/commit/9029ba34459c8859fed4c6b73efd8e2d0021e7ba), [`426cc56`](https://github.com/mastra-ai/mastra/commit/426cc561c85ae76a112ded2385532a91f9f9f074), [`00931fb`](https://github.com/mastra-ai/mastra/commit/00931fb1a21aa42c4fbc20c2c40dd62466b8fc8f), [`e473bfe`](https://github.com/mastra-ai/mastra/commit/e473bfe416c0b8e876973c2b6a6f13c394b7a93f), [`b78e04d`](https://github.com/mastra-ai/mastra/commit/b78e04d935a16ecb1e59c5c96e564903527edddd), [`2db6160`](https://github.com/mastra-ai/mastra/commit/2db6160e2022ff8827c15d30157e684683b934b5), [`8aeea37`](https://github.com/mastra-ai/mastra/commit/8aeea37efdde347c635a67fed56794943b7f74ec), [`02fe153`](https://github.com/mastra-ai/mastra/commit/02fe15351d6021d214da48ec982a0e9e4150bcee), [`648e2ca`](https://github.com/mastra-ai/mastra/commit/648e2ca42da54838c6ccbdaadc6fadd808fa6b86), [`74567b3`](https://github.com/mastra-ai/mastra/commit/74567b3d237ae3915cd0bca3cf55fa0a64e4e4a4), [`b65c5e0`](https://github.com/mastra-ai/mastra/commit/b65c5e0fe6f3c390a9a8bbcf69304d972c3a4afb), [`15a1733`](https://github.com/mastra-ai/mastra/commit/15a1733074cee8bd37370e1af34cd818e89fa7ac), [`fc2a774`](https://github.com/mastra-ai/mastra/commit/fc2a77468981aaddc3e77f83f0c4ad4a4af140da), [`4e08933`](https://github.com/mastra-ai/mastra/commit/4e08933625464dfde178347af5b6278fcf34188e)]:
+  - @mastra/core@0.22.0
+
+## 0.17.0-alpha.1
+
+### Minor Changes
+
+- Consolidate streamVNext logic into stream, move old stream function into streamLegacy ([#9092](https://github.com/mastra-ai/mastra/pull/9092))
+
+- Update peer dependencies to match core package version bump (0.22.0) ([#9092](https://github.com/mastra-ai/mastra/pull/9092))
+
+### Patch Changes
+
+- Updated `watch` and `watchAsync` methods to use proper function overloads instead of generic conditional types, ensuring compatibility with the base Run class signatures. ([#9048](https://github.com/mastra-ai/mastra/pull/9048))
+
+- Update peerdeps to 0.23.0-0 ([#9043](https://github.com/mastra-ai/mastra/pull/9043))
+
+- Updated dependencies [[`efb5ed9`](https://github.com/mastra-ai/mastra/commit/efb5ed946ae7f410bc68c9430beb4b010afd25ec), [`8ea07b4`](https://github.com/mastra-ai/mastra/commit/8ea07b4bdc73e4218437dbb6dcb0f4b23e745a44), [`ba201b8`](https://github.com/mastra-ai/mastra/commit/ba201b8f8feac4c72350f2dbd52c13c7297ba7b0), [`4fc4136`](https://github.com/mastra-ai/mastra/commit/4fc413652866a8d2240694fddb2562e9edbb70df), [`b78e04d`](https://github.com/mastra-ai/mastra/commit/b78e04d935a16ecb1e59c5c96e564903527edddd), [`d10baf5`](https://github.com/mastra-ai/mastra/commit/d10baf5a3c924f2a6654e23a3e318ed03f189b76), [`038c55a`](https://github.com/mastra-ai/mastra/commit/038c55a7090fc1b1513a966386d3072617f836ac), [`182f045`](https://github.com/mastra-ai/mastra/commit/182f0458f25bd70aa774e64fd923c8a483eddbf1), [`7620d2b`](https://github.com/mastra-ai/mastra/commit/7620d2bddeb4fae4c3c0a0b4e672969795fca11a), [`b2365f0`](https://github.com/mastra-ai/mastra/commit/b2365f038dd4c5f06400428b224af963f399ad50), [`9029ba3`](https://github.com/mastra-ai/mastra/commit/9029ba34459c8859fed4c6b73efd8e2d0021e7ba), [`426cc56`](https://github.com/mastra-ai/mastra/commit/426cc561c85ae76a112ded2385532a91f9f9f074), [`00931fb`](https://github.com/mastra-ai/mastra/commit/00931fb1a21aa42c4fbc20c2c40dd62466b8fc8f), [`e473bfe`](https://github.com/mastra-ai/mastra/commit/e473bfe416c0b8e876973c2b6a6f13c394b7a93f), [`b78e04d`](https://github.com/mastra-ai/mastra/commit/b78e04d935a16ecb1e59c5c96e564903527edddd), [`648e2ca`](https://github.com/mastra-ai/mastra/commit/648e2ca42da54838c6ccbdaadc6fadd808fa6b86), [`b65c5e0`](https://github.com/mastra-ai/mastra/commit/b65c5e0fe6f3c390a9a8bbcf69304d972c3a4afb)]:
+  - @mastra/core@0.22.0-alpha.1
 
 ## 0.17.0-alpha.0
 

package/dist/index.cjs

@@ -1,9 +1,11 @@
 'use strict';
 
 var crypto = require('crypto');
+var web = require('stream/web');
 var realtime = require('@inngest/realtime');
 var aiTracing = require('@mastra/core/ai-tracing');
 var di = require('@mastra/core/di');
+var stream = require('@mastra/core/stream');
 var tools = require('@mastra/core/tools');
 var workflows = require('@mastra/core/workflows');
 var _constants = require('@mastra/core/workflows/_constants');
@@ -226,7 +228,7 @@ var InngestRun = class extends workflows.Run {
       });
     };
   }
-  stream({ inputData, runtimeContext } = {}) {
+  streamLegacy({ inputData, runtimeContext } = {}) {
     const { readable, writable } = new TransformStream();
     const writer = writable.getWriter();
     const unwatch = this.watch(async (event) => {
@@ -261,6 +263,58 @@ var InngestRun = class extends workflows.Run {
       getWorkflowState: () => this.executionResults
     };
   }
+  stream({
+    inputData,
+    runtimeContext,
+    closeOnSuspend = true
+  } = {}) {
+    const self = this;
+    let streamOutput;
+    const stream$1 = new web.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 stream.WorkflowRunOutput({
+      runId: this.runId,
+      workflowId: this.workflowId,
+      stream: stream$1
+    });
+    return streamOutput;
+  }
 };
 var InngestWorkflow = class _InngestWorkflow extends workflows.Workflow {
   #mastra;
@@ -641,7 +695,7 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
     });
     return result;
   }
-  async fmtReturnValue(executionSpan, emitter, stepResults, lastOutput, error) {
+  async fmtReturnValue(emitter, stepResults, lastOutput, error) {
     const base = {
       status: lastOutput.status,
       steps: stepResults
@@ -695,7 +749,6 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
       });
       base.suspended = suspendedStepIds;
     }
-    executionSpan?.end();
     return base;
   }
   // async executeSleep({ id, duration }: { id: string; duration: number }): Promise<void> {
@@ -727,45 +780,55 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
     if (fn) {
       const stepCallId = crypto.randomUUID();
       duration = await this.inngestStep.run(`workflow.${workflowId}.sleep.${entry.id}`, async () => {
-        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: workflows.getStepResult.bind(this, stepResults),
-          // TODO: this function shouldn't have suspend probably?
-          suspend: async (_suspendPayload) => {
-          },
-          bail: () => {
-          },
-          abort: () => {
-            abortController?.abort();
-          },
-          [_constants.EMITTER_SYMBOL]: emitter,
-          // TODO: add streamVNext support
-          [_constants.STREAM_FORMAT_SYMBOL]: executionContext.format,
-          engine: { step: this.inngestStep },
-          abortSignal: abortController?.signal,
-          writer: new tools.ToolStream(
+        return await fn(
+          workflows.createDeprecationProxy(
             {
-              prefix: "workflow-step",
-              callId: stepCallId,
-              name: "sleep",
-              runId
+              runId,
+              workflowId,
+              mastra: this.mastra,
+              runtimeContext,
+              inputData: prevOutput,
+              state: executionContext.state,
+              setState: (state) => {
+                executionContext.state = state;
+              },
+              runCount: -1,
+              retryCount: -1,
+              tracingContext: {
+                currentSpan: sleepSpan
+              },
+              getInitData: () => stepResults?.input,
+              getStepResult: workflows.getStepResult.bind(this, stepResults),
+              // TODO: this function shouldn't have suspend probably?
+              suspend: async (_suspendPayload) => {
+              },
+              bail: () => {
+              },
+              abort: () => {
+                abortController?.abort();
+              },
+              [_constants.EMITTER_SYMBOL]: emitter,
+              // TODO: add streamVNext support
+              [_constants.STREAM_FORMAT_SYMBOL]: executionContext.format,
+              engine: { step: this.inngestStep },
+              abortSignal: abortController?.signal,
+              writer: new tools.ToolStream(
+                {
+                  prefix: "workflow-step",
+                  callId: stepCallId,
+                  name: "sleep",
+                  runId
+                },
+                writableStream
+              )
             },
-            writableStream
+            {
+              paramName: "runCount",
+              deprecationMessage: workflows.runCountDeprecationMessage,
+              logger: this.logger
+            }
           )
-        });
+        );
       });
       sleepSpan?.update({
         attributes: {
@@ -808,45 +871,55 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
     if (fn) {
       date = await this.inngestStep.run(`workflow.${workflowId}.sleepUntil.${entry.id}`, async () => {
         const stepCallId = crypto.randomUUID();
-        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: workflows.getStepResult.bind(this, stepResults),
-          // TODO: this function shouldn't have suspend probably?
-          suspend: async (_suspendPayload) => {
-          },
-          bail: () => {
-          },
-          abort: () => {
-            abortController?.abort();
-          },
-          [_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(
+        return await fn(
+          workflows.createDeprecationProxy(
             {
-              prefix: "workflow-step",
-              callId: stepCallId,
-              name: "sleep",
-              runId
+              runId,
+              workflowId,
+              mastra: this.mastra,
+              runtimeContext,
+              inputData: prevOutput,
+              state: executionContext.state,
+              setState: (state) => {
+                executionContext.state = state;
+              },
+              runCount: -1,
+              retryCount: -1,
+              tracingContext: {
+                currentSpan: sleepUntilSpan
+              },
+              getInitData: () => stepResults?.input,
+              getStepResult: workflows.getStepResult.bind(this, stepResults),
+              // TODO: this function shouldn't have suspend probably?
+              suspend: async (_suspendPayload) => {
+              },
+              bail: () => {
+              },
+              abort: () => {
+                abortController?.abort();
+              },
+              [_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(
+                {
+                  prefix: "workflow-step",
+                  callId: stepCallId,
+                  name: "sleep",
+                  runId
+                },
+                writableStream
+              )
             },
-            writableStream
+            {
+              paramName: "runCount",
+              deprecationMessage: workflows.runCountDeprecationMessage,
+              logger: this.logger
+            }
           )
-        });
+        );
       });
       if (date && !(date instanceof Date)) {
         date = new Date(date);
@@ -1181,7 +1254,13 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
             suspend: async (suspendPayload, suspendOptions) => {
               executionContext.suspendedPaths[step.id] = executionContext.executionPath;
               if (suspendOptions?.resumeLabel) {
-                executionContext.resumeLabels[suspendOptions.resumeLabel] = step.id;
+                const resumeLabel = Array.isArray(suspendOptions.resumeLabel) ? suspendOptions.resumeLabel : [suspendOptions.resumeLabel];
+                for (const label of resumeLabel) {
+                  executionContext.resumeLabels[label] = {
+                    stepId: step.id,
+                    foreachIndex: executionContext.foreachIndex
+                  };
+                }
               }
               suspended = { payload: suspendPayload };
             },
@@ -1409,47 +1488,57 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
             tracingPolicy: this.options?.tracingPolicy
           });
           try {
-            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: workflows.getStepResult.bind(this, stepResults),
-              // TODO: this function shouldn't have suspend probably?
-              suspend: async (_suspendPayload) => {
-              },
-              bail: () => {
-              },
-              abort: () => {
-                abortController.abort();
-              },
-              [_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(
+            const result = await cond(
+              workflows.createDeprecationProxy(
                 {
-                  prefix: "workflow-step",
-                  callId: crypto.randomUUID(),
-                  name: "conditional",
-                  runId
+                  runId,
+                  workflowId,
+                  mastra: this.mastra,
+                  runtimeContext,
+                  runCount: -1,
+                  retryCount: -1,
+                  inputData: prevOutput,
+                  state: executionContext.state,
+                  setState: (state) => {
+                    executionContext.state = state;
+                  },
+                  tracingContext: {
+                    currentSpan: evalSpan
+                  },
+                  getInitData: () => stepResults?.input,
+                  getStepResult: workflows.getStepResult.bind(this, stepResults),
+                  // TODO: this function shouldn't have suspend probably?
+                  suspend: async (_suspendPayload) => {
+                  },
+                  bail: () => {
+                  },
+                  abort: () => {
+                    abortController.abort();
+                  },
+                  [_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(
+                    {
+                      prefix: "workflow-step",
+                      callId: crypto.randomUUID(),
+                      name: "conditional",
+                      runId
+                    },
+                    writableStream
+                  )
                 },
-                writableStream
+                {
+                  paramName: "runCount",
+                  deprecationMessage: workflows.runCountDeprecationMessage,
+                  logger: this.logger
+                }
               )
-            });
+            );
             evalSpan?.end({
               output: result,
               attributes: {
@@ -1493,7 +1582,6 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
             suspendedPaths: executionContext.suspendedPaths,
             resumeLabels: executionContext.resumeLabels,
             retryConfig: executionContext.retryConfig,
-            executionSpan: executionContext.executionSpan,
             state: executionContext.state
           },
           emitter,