@mastra/core 1.0.0-beta.11 → 1.0.0-beta.13

package/dist/{chunk-52RSUALV.cjs → chunk-R5AJGM55.cjs}

@@ -1,32 +1,33 @@
 'use strict';
 
-var chunk4JKEUSCC_cjs = require('./chunk-4JKEUSCC.cjs');
-var chunkABJOUEVA_cjs = require('./chunk-ABJOUEVA.cjs');
-var chunkBJXKH4LG_cjs = require('./chunk-BJXKH4LG.cjs');
-var chunk5Q6WAYEY_cjs = require('./chunk-5Q6WAYEY.cjs');
-var chunk3E3ILV6T_cjs = require('./chunk-3E3ILV6T.cjs');
-var chunkS73Z3PBJ_cjs = require('./chunk-S73Z3PBJ.cjs');
+var chunkH4VUIOWU_cjs = require('./chunk-H4VUIOWU.cjs');
+var chunkL3NKIMF5_cjs = require('./chunk-L3NKIMF5.cjs');
+var chunkLGB4VNZI_cjs = require('./chunk-LGB4VNZI.cjs');
+var chunkX6IBA7FP_cjs = require('./chunk-X6IBA7FP.cjs');
+var chunkNESKUIRE_cjs = require('./chunk-NESKUIRE.cjs');
+var chunkFVQTJUBD_cjs = require('./chunk-FVQTJUBD.cjs');
+var chunk4D4KB75Y_cjs = require('./chunk-4D4KB75Y.cjs');
 var chunkMR7ZWBL6_cjs = require('./chunk-MR7ZWBL6.cjs');
-var chunkPG5H6QIO_cjs = require('./chunk-PG5H6QIO.cjs');
-var chunk72YCRTEX_cjs = require('./chunk-72YCRTEX.cjs');
-var chunkTWH4PTDG_cjs = require('./chunk-TWH4PTDG.cjs');
+var chunkMXBVP7HX_cjs = require('./chunk-MXBVP7HX.cjs');
+var chunkSZYSDJTN_cjs = require('./chunk-SZYSDJTN.cjs');
+var chunkMLKE7HRS_cjs = require('./chunk-MLKE7HRS.cjs');
 var chunkKJBMTK5B_cjs = require('./chunk-KJBMTK5B.cjs');
-var chunkMGCGWPQJ_cjs = require('./chunk-MGCGWPQJ.cjs');
+var chunkZ55SJVEC_cjs = require('./chunk-Z55SJVEC.cjs');
+var chunk72YCRTEX_cjs = require('./chunk-72YCRTEX.cjs');
 var chunkUVHSM2GU_cjs = require('./chunk-UVHSM2GU.cjs');
+var chunkHWMMIRIF_cjs = require('./chunk-HWMMIRIF.cjs');
 var chunk4WQYXT2I_cjs = require('./chunk-4WQYXT2I.cjs');
 var chunkDGV2FWB4_cjs = require('./chunk-DGV2FWB4.cjs');
 var chunkAF74UXR5_cjs = require('./chunk-AF74UXR5.cjs');
-var chunkDZUJEN5N_cjs = require('./chunk-DZUJEN5N.cjs');
-var z7 = require('zod');
+var chunk6SZKM6EC_cjs = require('./chunk-6SZKM6EC.cjs');
+var z8 = require('zod');
 var crypto2 = require('crypto');
 var web = require('stream/web');
 var EventEmitter2 = require('events');
 var providerV5 = require('@ai-sdk/provider-v5');
-var aiV5 = require('ai-v5');
 var z4 = require('zod/v4');
 var schemaCompat = require('@mastra/schema-compat');
 var radash = require('radash');
-var providerUtilsV5 = require('@ai-sdk/provider-utils-v5');
 var lite = require('js-tiktoken/lite');
 var o200k_base = require('js-tiktoken/ranks/o200k_base');
 var lruCache = require('lru-cache');
@@ -53,7 +54,7 @@ function _interopNamespace(e) {
   return Object.freeze(n);
 }
 
-var z7__default = /*#__PURE__*/_interopDefault(z7);
+var z8__default = /*#__PURE__*/_interopDefault(z8);
 var crypto2__namespace = /*#__PURE__*/_interopNamespace(crypto2);
 var EventEmitter2__default = /*#__PURE__*/_interopDefault(EventEmitter2);
 var z4__default = /*#__PURE__*/_interopDefault(z4);
@@ -61,7 +62,7 @@ var o200k_base__default = /*#__PURE__*/_interopDefault(o200k_base);
 var xxhash__default = /*#__PURE__*/_interopDefault(xxhash);
 
 // ../../node_modules/.pnpm/fast-deep-equal@3.1.3/node_modules/fast-deep-equal/index.js
-var require_fast_deep_equal = chunkDZUJEN5N_cjs.__commonJS({
+var require_fast_deep_equal = chunk6SZKM6EC_cjs.__commonJS({
   "../../node_modules/.pnpm/fast-deep-equal@3.1.3/node_modules/fast-deep-equal/index.js"(exports, module) {
     module.exports = function equal(a, b) {
       if (a === b) return true;
@@ -454,6 +455,8 @@ var DelayedPromise = class {
     }
   }
 };
+
+// src/stream/aisdk/v5/compat/prepare-tools.ts
 function prepareToolsAndToolChoice({
   tools,
   toolChoice,
@@ -467,17 +470,17 @@ function prepareToolsAndToolChoice({
   }
   const filteredTools = activeTools != null ? Object.entries(tools || {}).filter(([name]) => activeTools.includes(name)) : Object.entries(tools || {});
   return {
-    tools: filteredTools.map(([name, tool]) => {
+    tools: filteredTools.map(([name, tool2]) => {
       try {
         let inputSchema;
-        if ("inputSchema" in tool) {
-          inputSchema = tool.inputSchema;
-        } else if ("parameters" in tool) {
-          inputSchema = tool.parameters;
+        if ("inputSchema" in tool2) {
+          inputSchema = tool2.inputSchema;
+        } else if ("parameters" in tool2) {
+          inputSchema = tool2.parameters;
         }
-        const sdkTool = aiV5.tool({
+        const sdkTool = chunkFVQTJUBD_cjs.tool({
           type: "function",
-          ...tool,
+          ...tool2,
           inputSchema
         });
         const toolType = sdkTool?.type ?? "function";
@@ -489,7 +492,7 @@ function prepareToolsAndToolChoice({
               type: "function",
               name,
               description: sdkTool.description,
-              inputSchema: aiV5.asSchema(sdkTool.inputSchema).jsonSchema,
+              inputSchema: chunkFVQTJUBD_cjs.asSchema(sdkTool.inputSchema).jsonSchema,
               providerOptions: sdkTool.providerOptions
             };
           case "provider-defined": {
@@ -517,7 +520,7 @@ function prepareToolsAndToolChoice({
         console.error("Error preparing tool", e);
         return null;
       }
-    }).filter((tool) => tool !== null),
+    }).filter((tool2) => tool2 !== null),
     toolChoice: toolChoice == null ? { type: "auto" } : typeof toolChoice === "string" ? { type: toolChoice } : { type: "tool", toolName: toolChoice.toolName }
   };
 }
@@ -555,7 +558,7 @@ var StructuredOutputProcessor = class {
   providerOptions;
   constructor(options) {
     if (!options.schema) {
-      throw new chunkTWH4PTDG_cjs.MastraError({
+      throw new chunkHWMMIRIF_cjs.MastraError({
         id: "STRUCTURED_OUTPUT_PROCESSOR_SCHEMA_REQUIRED",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
@@ -563,7 +566,7 @@ var StructuredOutputProcessor = class {
       });
     }
     if (!options.model) {
-      throw new chunkTWH4PTDG_cjs.MastraError({
+      throw new chunkHWMMIRIF_cjs.MastraError({
         id: "STRUCTURED_OUTPUT_PROCESSOR_MODEL_REQUIRED",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
@@ -833,7 +836,7 @@ var ProcessorRunner = class _ProcessorRunner {
       );
     }
     if (result.status !== "success") {
-      throw new chunkTWH4PTDG_cjs.MastraError({
+      throw new chunkHWMMIRIF_cjs.MastraError({
         category: "USER",
         domain: "AGENT",
         id: "PROCESSOR_WORKFLOW_FAILED",
@@ -845,7 +848,7 @@ var ProcessorRunner = class _ProcessorRunner {
       return input;
     }
     if (!("phase" in output) || !("messages" in output || "part" in output || "messageList" in output)) {
-      throw new chunkTWH4PTDG_cjs.MastraError({
+      throw new chunkHWMMIRIF_cjs.MastraError({
         category: "USER",
         domain: "AGENT",
         id: "PROCESSOR_WORKFLOW_INVALID_OUTPUT",
@@ -925,9 +928,9 @@ var ProcessorRunner = class _ProcessorRunner {
         retryCount
       });
       const mutations = messageList.stopRecording();
-      if (result instanceof chunk5Q6WAYEY_cjs.MessageList) {
+      if (result instanceof chunkX6IBA7FP_cjs.MessageList) {
         if (result !== messageList) {
-          throw new chunkTWH4PTDG_cjs.MastraError({
+          throw new chunkHWMMIRIF_cjs.MastraError({
             category: "USER",
             domain: "AGENT",
             id: "PROCESSOR_RETURNED_EXTERNAL_MESSAGE_LIST",
@@ -1207,9 +1210,9 @@ var ProcessorRunner = class _ProcessorRunner {
         retryCount
       });
       let mutations;
-      if (result instanceof chunk5Q6WAYEY_cjs.MessageList) {
+      if (result instanceof chunkX6IBA7FP_cjs.MessageList) {
         if (result !== messageList) {
-          throw new chunkTWH4PTDG_cjs.MastraError({
+          throw new chunkHWMMIRIF_cjs.MastraError({
             category: "USER",
             domain: "AGENT",
             id: "PROCESSOR_RETURNED_EXTERNAL_MESSAGE_LIST",
@@ -1557,9 +1560,9 @@ var ProcessorRunner = class _ProcessorRunner {
           retryCount
         });
         const mutations = messageList.stopRecording();
-        if (result instanceof chunk5Q6WAYEY_cjs.MessageList) {
+        if (result instanceof chunkX6IBA7FP_cjs.MessageList) {
           if (result !== messageList) {
-            throw new chunkTWH4PTDG_cjs.MastraError({
+            throw new chunkHWMMIRIF_cjs.MastraError({
               category: "USER",
               domain: "AGENT",
               id: "PROCESSOR_RETURNED_EXTERNAL_MESSAGE_LIST",
@@ -1627,9 +1630,9 @@ var ProcessorRunner = class _ProcessorRunner {
     processor,
     stepNumber
   }) {
-    if (result instanceof chunk5Q6WAYEY_cjs.MessageList) {
+    if (result instanceof chunkX6IBA7FP_cjs.MessageList) {
       if (result !== messageList) {
-        throw new chunkTWH4PTDG_cjs.MastraError({
+        throw new chunkHWMMIRIF_cjs.MastraError({
           category: "USER",
           domain: "AGENT",
           id: "PROCESSOR_RETURNED_EXTERNAL_MESSAGE_LIST",
@@ -1645,7 +1648,7 @@ var ProcessorRunner = class _ProcessorRunner {
       };
     } else if (result) {
       if (result.messageList && result.messageList !== messageList) {
-        throw new chunkTWH4PTDG_cjs.MastraError({
+        throw new chunkHWMMIRIF_cjs.MastraError({
           category: "USER",
           domain: "AGENT",
           id: "PROCESSOR_RETURNED_EXTERNAL_MESSAGE_LIST",
@@ -1653,7 +1656,7 @@ var ProcessorRunner = class _ProcessorRunner {
         });
       }
       if (result.messages && result.messageList) {
-        throw new chunkTWH4PTDG_cjs.MastraError({
+        throw new chunkHWMMIRIF_cjs.MastraError({
           category: "USER",
           domain: "AGENT",
           id: "PROCESSOR_RETURNED_MESSAGES_AND_MESSAGE_LIST",
@@ -1662,9 +1665,9 @@ var ProcessorRunner = class _ProcessorRunner {
       }
       const { model: _model, ...rest } = result;
       if (result.model) {
-        const resolvedModel = await chunk3E3ILV6T_cjs.resolveModelConfig(result.model);
+        const resolvedModel = await chunkMXBVP7HX_cjs.resolveModelConfig(result.model);
         if (resolvedModel.specificationVersion === "v1") {
-          throw new chunkTWH4PTDG_cjs.MastraError({
+          throw new chunkHWMMIRIF_cjs.MastraError({
             category: "USER",
             domain: "AGENT",
             id: "PROCESSOR_RETURNED_V1_MODEL",
@@ -1983,7 +1986,7 @@ function convertMastraChunkToAISDKv5({
       if (mode === "generate") {
         return {
           type: "file",
-          file: new chunk5Q6WAYEY_cjs.DefaultGeneratedFile({
+          file: new chunkX6IBA7FP_cjs.DefaultGeneratedFile({
             data: chunk.payload.data,
             mediaType: chunk.payload.mimeType
           })
@@ -1991,7 +1994,7 @@ function convertMastraChunkToAISDKv5({
       }
       return {
         type: "file",
-        file: new chunk5Q6WAYEY_cjs.DefaultGeneratedFileWithType({
+        file: new chunkX6IBA7FP_cjs.DefaultGeneratedFileWithType({
           data: chunk.payload.data,
           mediaType: chunk.payload.mimeType
         })
@@ -2126,7 +2129,7 @@ var AISDKV5OutputStream = class {
     this.traceId = options.tracingContext?.currentSpan?.externalTraceId;
   }
   toTextStreamResponse(init) {
-    return aiV5.createTextStreamResponse({
+    return chunkNESKUIRE_cjs.createTextStreamResponse({
       // Type assertion needed due to ReadableStream type mismatch between Node.js (stream/web) and DOM types
       // Both have the same interface but TypeScript treats them as incompatible
       textStream: this.#modelOutput.textStream,
@@ -2145,7 +2148,7 @@ var AISDKV5OutputStream = class {
     onFinish,
     ...init
   } = {}) {
-    return aiV5.createUIMessageStreamResponse({
+    return chunkNESKUIRE_cjs.createUIMessageStreamResponse({
       stream: this.toUIMessageStream({
         generateMessageId,
         originalMessages,
@@ -2175,10 +2178,10 @@ var AISDKV5OutputStream = class {
       originalMessages,
       responseMessageId: generateMessageId
     }) : void 0;
-    return aiV5.createUIMessageStream({
+    return chunkNESKUIRE_cjs.createUIMessageStream({
       onError,
       onFinish,
-      generateId: () => responseMessageId ?? generateMessageId?.() ?? aiV5.generateId(),
+      generateId: () => responseMessageId ?? generateMessageId?.() ?? chunkFVQTJUBD_cjs.generateId(),
       execute: async ({ writer }) => {
         for await (const part of this.fullStream) {
           const messageMetadataValue = messageMetadata?.({ part });
@@ -2394,6 +2397,8 @@ var AISDKV5OutputStream = class {
     return this.#modelOutput.object;
   }
 };
+
+// src/stream/base/schema.ts
 function asJsonSchema(schema) {
   if (!schema) {
     return void 0;
@@ -2401,7 +2406,7 @@ function asJsonSchema(schema) {
   if (schema && typeof schema === "object" && !schema.safeParse && !schema.jsonSchema) {
     return schema;
   }
-  return aiV5.asSchema(schema).jsonSchema;
+  return chunkFVQTJUBD_cjs.asSchema(schema).jsonSchema;
 }
 function getTransformedSchema(schema) {
   let jsonSchema2;
@@ -2544,7 +2549,7 @@ var BaseFormatHandler = class {
         } else {
           return {
             success: false,
-            error: new chunkTWH4PTDG_cjs.MastraError(
+            error: new chunkHWMMIRIF_cjs.MastraError(
               {
                 domain: "AGENT" /* AGENT */,
                 category: "SYSTEM" /* SYSTEM */,
@@ -2569,7 +2574,7 @@ ${z4__default.default.prettifyError(result.error)}
     }
     try {
       if (typeof this.schema === "object" && !this.schema.jsonSchema) {
-        const result = await safeValidateTypes({ value, schema: aiV5.jsonSchema(this.schema) });
+        const result = await safeValidateTypes({ value, schema: chunkFVQTJUBD_cjs.jsonSchema(this.schema) });
         return result;
       } else if (this.schema.jsonSchema) {
         const result = await safeValidateTypes({
@@ -2624,10 +2629,10 @@ var ObjectFormatHandler = class extends BaseFormatHandler {
     previousObject
   }) {
     const processedAccumulatedText = this.preprocessText(accumulatedText);
-    const { value: currentObjectJson, state } = await aiV5.parsePartialJson(processedAccumulatedText);
+    const { value: currentObjectJson, state } = await chunkNESKUIRE_cjs.parsePartialJson(processedAccumulatedText);
     if (this.validatePartialChunks && this.partialSchema) {
       const result = this.partialSchema?.safeParse(currentObjectJson);
-      if (result.success && result.data && result.data !== void 0 && !aiV5.isDeepEqualData(previousObject, result.data)) {
+      if (result.success && result.data && result.data !== void 0 && !chunkNESKUIRE_cjs.isDeepEqualData(previousObject, result.data)) {
         return {
           shouldEmit: true,
           emitValue: result.data,
@@ -2636,7 +2641,7 @@ var ObjectFormatHandler = class extends BaseFormatHandler {
       }
       return { shouldEmit: false };
     }
-    if (currentObjectJson !== void 0 && currentObjectJson !== null && typeof currentObjectJson === "object" && !aiV5.isDeepEqualData(previousObject, currentObjectJson)) {
+    if (currentObjectJson !== void 0 && currentObjectJson !== null && typeof currentObjectJson === "object" && !chunkNESKUIRE_cjs.isDeepEqualData(previousObject, currentObjectJson)) {
       return {
         shouldEmit: ["successful-parse", "repaired-parse"].includes(state),
         emitValue: currentObjectJson,
@@ -2653,7 +2658,7 @@ var ObjectFormatHandler = class extends BaseFormatHandler {
       };
     }
     const rawValue = this.preprocessText(finalRawValue);
-    const { value } = await aiV5.parsePartialJson(rawValue);
+    const { value } = await chunkNESKUIRE_cjs.parsePartialJson(rawValue);
     return this.validateValue(value);
   }
 };
@@ -2668,8 +2673,8 @@ var ArrayFormatHandler = class extends BaseFormatHandler {
     previousObject
   }) {
     const processedAccumulatedText = this.preprocessText(accumulatedText);
-    const { value: currentObjectJson, state: parseState } = await aiV5.parsePartialJson(processedAccumulatedText);
-    if (currentObjectJson !== void 0 && !aiV5.isDeepEqualData(previousObject, currentObjectJson)) {
+    const { value: currentObjectJson, state: parseState } = await chunkNESKUIRE_cjs.parsePartialJson(processedAccumulatedText);
+    if (currentObjectJson !== void 0 && !chunkNESKUIRE_cjs.isDeepEqualData(previousObject, currentObjectJson)) {
       const rawElements = currentObjectJson?.elements || [];
       const filteredElements = [];
       for (let i = 0; i < rawElements.length; i++) {
@@ -2695,7 +2700,7 @@ var ArrayFormatHandler = class extends BaseFormatHandler {
           };
         }
       }
-      if (!aiV5.isDeepEqualData(this.textPreviousFilteredArray, filteredElements)) {
+      if (!chunkNESKUIRE_cjs.isDeepEqualData(this.textPreviousFilteredArray, filteredElements)) {
         this.textPreviousFilteredArray = [...filteredElements];
         return {
           shouldEmit: true,
@@ -2733,10 +2738,10 @@ var EnumFormatHandler = class extends BaseFormatHandler {
     }
     let enumValues;
     if (this.isZodSchema(this.schema)) {
-      const wrappedSchema = aiV5.asSchema(this.schema);
+      const wrappedSchema = chunkFVQTJUBD_cjs.asSchema(this.schema);
       enumValues = wrappedSchema.jsonSchema?.enum;
     } else if (typeof this.schema === "object" && !this.schema.jsonSchema) {
-      const wrappedSchema = aiV5.jsonSchema(this.schema);
+      const wrappedSchema = chunkFVQTJUBD_cjs.jsonSchema(this.schema);
       enumValues = wrappedSchema.jsonSchema?.enum;
     } else {
       enumValues = this.schema.jsonSchema?.enum;
@@ -2756,8 +2761,8 @@ var EnumFormatHandler = class extends BaseFormatHandler {
     previousObject
   }) {
     const processedAccumulatedText = this.preprocessText(accumulatedText);
-    const { value: currentObjectJson } = await aiV5.parsePartialJson(processedAccumulatedText);
-    if (currentObjectJson !== void 0 && currentObjectJson !== null && typeof currentObjectJson === "object" && !Array.isArray(currentObjectJson) && "result" in currentObjectJson && typeof currentObjectJson.result === "string" && !aiV5.isDeepEqualData(previousObject, currentObjectJson)) {
+    const { value: currentObjectJson } = await chunkNESKUIRE_cjs.parsePartialJson(processedAccumulatedText);
+    if (currentObjectJson !== void 0 && currentObjectJson !== null && typeof currentObjectJson === "object" && !Array.isArray(currentObjectJson) && "result" in currentObjectJson && typeof currentObjectJson.result === "string" && !chunkNESKUIRE_cjs.isDeepEqualData(previousObject, currentObjectJson)) {
       const partialResult = currentObjectJson.result;
       const bestMatch = this.findBestEnumMatch(partialResult);
       if (partialResult.length > 0 && bestMatch && bestMatch !== this.textPreviousEnumResult) {
@@ -2773,7 +2778,7 @@ var EnumFormatHandler = class extends BaseFormatHandler {
   }
   async validateAndTransformFinal(rawFinalValue) {
     const processedValue = this.preprocessText(rawFinalValue);
-    const { value } = await aiV5.parsePartialJson(processedValue);
+    const { value } = await chunkNESKUIRE_cjs.parsePartialJson(processedValue);
     if (!(typeof value === "object" && value !== null && "result" in value)) {
       return {
         success: false,
@@ -3425,7 +3430,7 @@ var MastraModelOutput = class extends chunkDGV2FWB4_cjs.MastraBase {
                   );
                   const responseMessages = self.messageList.get.response.aiV4.core();
                   const lastResponseMessage = responseMessages[responseMessages.length - 1];
-                  const outputText = lastResponseMessage ? chunk5Q6WAYEY_cjs.MessageList.coreContentToString(lastResponseMessage.content) : "";
+                  const outputText = lastResponseMessage ? chunkX6IBA7FP_cjs.MessageList.coreContentToString(lastResponseMessage.content) : "";
                   if (lastStep && outputText && outputText !== originalText) {
                     lastStep.text = outputText;
                   }
@@ -3455,7 +3460,7 @@ var MastraModelOutput = class extends chunkDGV2FWB4_cjs.MastraBase {
                   self.#delayedPromises.finishReason.resolve("other");
                   self.#delayedPromises.text.resolve("");
                 } else {
-                  self.#error = chunkTWH4PTDG_cjs.getErrorFromUnknown(error2, {
+                  self.#error = chunkHWMMIRIF_cjs.getErrorFromUnknown(error2, {
                     fallbackMessage: "Unknown error in stream"
                   });
                   self.#delayedPromises.finishReason.resolve("error");
@@ -3528,7 +3533,7 @@ var MastraModelOutput = class extends chunkDGV2FWB4_cjs.MastraBase {
               }
               break;
             case "error":
-              const error = chunkTWH4PTDG_cjs.getErrorFromUnknown(chunk.payload.error, {
+              const error = chunkHWMMIRIF_cjs.getErrorFromUnknown(chunk.payload.error, {
                 fallbackMessage: "Unknown error chunk in stream"
               });
               self.#error = error;
@@ -4619,59 +4624,89 @@ function runScorer({
 function isV2Model(model) {
   return model.specificationVersion === "v2";
 }
-var TextPartSchema = z7.z.object({
-  type: z7.z.literal("text"),
-  text: z7.z.string()
+var EventEmitterPubSub = class extends chunk4D4KB75Y_cjs.PubSub {
+  emitter;
+  constructor(existingEmitter) {
+    super();
+    this.emitter = existingEmitter ?? new EventEmitter2__default.default();
+  }
+  async publish(topic, event) {
+    const id = crypto.randomUUID();
+    const createdAt = /* @__PURE__ */ new Date();
+    this.emitter.emit(topic, {
+      ...event,
+      id,
+      createdAt
+    });
+  }
+  async subscribe(topic, cb) {
+    this.emitter.on(topic, cb);
+  }
+  async unsubscribe(topic, cb) {
+    this.emitter.off(topic, cb);
+  }
+  async flush() {
+  }
+  /**
+   * Clean up all listeners during graceful shutdown.
+   */
+  async close() {
+    this.emitter.removeAllListeners();
+  }
+};
+var TextPartSchema = z8.z.object({
+  type: z8.z.literal("text"),
+  text: z8.z.string()
 }).passthrough();
-var ImagePartSchema = z7.z.object({
-  type: z7.z.literal("image"),
-  image: z7.z.union([z7.z.string(), z7.z.instanceof(URL), z7.z.instanceof(Uint8Array)]),
-  mimeType: z7.z.string().optional()
+var ImagePartSchema = z8.z.object({
+  type: z8.z.literal("image"),
+  image: z8.z.union([z8.z.string(), z8.z.instanceof(URL), z8.z.instanceof(Uint8Array)]),
+  mimeType: z8.z.string().optional()
 }).passthrough();
-var FilePartSchema = z7.z.object({
-  type: z7.z.literal("file"),
-  data: z7.z.union([z7.z.string(), z7.z.instanceof(URL), z7.z.instanceof(Uint8Array)]),
-  mimeType: z7.z.string()
+var FilePartSchema = z8.z.object({
+  type: z8.z.literal("file"),
+  data: z8.z.union([z8.z.string(), z8.z.instanceof(URL), z8.z.instanceof(Uint8Array)]),
+  mimeType: z8.z.string()
 }).passthrough();
-var ToolInvocationPartSchema = z7.z.object({
-  type: z7.z.literal("tool-invocation"),
-  toolInvocation: z7.z.object({
-    toolCallId: z7.z.string(),
-    toolName: z7.z.string(),
-    args: z7.z.unknown(),
-    state: z7.z.enum(["partial-call", "call", "result"]),
-    result: z7.z.unknown().optional()
+var ToolInvocationPartSchema = z8.z.object({
+  type: z8.z.literal("tool-invocation"),
+  toolInvocation: z8.z.object({
+    toolCallId: z8.z.string(),
+    toolName: z8.z.string(),
+    args: z8.z.unknown(),
+    state: z8.z.enum(["partial-call", "call", "result"]),
+    result: z8.z.unknown().optional()
   })
 }).passthrough();
-var ReasoningPartSchema = z7.z.object({
-  type: z7.z.literal("reasoning"),
-  reasoning: z7.z.string(),
-  details: z7.z.array(
-    z7.z.object({
-      type: z7.z.enum(["text", "redacted"]),
-      text: z7.z.string().optional(),
-      data: z7.z.string().optional()
+var ReasoningPartSchema = z8.z.object({
+  type: z8.z.literal("reasoning"),
+  reasoning: z8.z.string(),
+  details: z8.z.array(
+    z8.z.object({
+      type: z8.z.enum(["text", "redacted"]),
+      text: z8.z.string().optional(),
+      data: z8.z.string().optional()
     })
   )
 }).passthrough();
-var SourcePartSchema = z7.z.object({
-  type: z7.z.literal("source"),
-  source: z7.z.object({
-    sourceType: z7.z.string(),
-    id: z7.z.string(),
-    url: z7.z.string().optional(),
-    title: z7.z.string().optional()
+var SourcePartSchema = z8.z.object({
+  type: z8.z.literal("source"),
+  source: z8.z.object({
+    sourceType: z8.z.string(),
+    id: z8.z.string(),
+    url: z8.z.string().optional(),
+    title: z8.z.string().optional()
   })
 }).passthrough();
-var StepStartPartSchema = z7.z.object({
-  type: z7.z.literal("step-start")
+var StepStartPartSchema = z8.z.object({
+  type: z8.z.literal("step-start")
 }).passthrough();
-var DataPartSchema = z7.z.object({
-  type: z7.z.string().refine((t) => t.startsWith("data-"), { message: 'Type must start with "data-"' }),
-  id: z7.z.string().optional(),
-  data: z7.z.unknown()
+var DataPartSchema = z8.z.object({
+  type: z8.z.string().refine((t) => t.startsWith("data-"), { message: 'Type must start with "data-"' }),
+  id: z8.z.string().optional(),
+  data: z8.z.unknown()
 }).passthrough();
-var MessagePartSchema = z7.z.union([
+var MessagePartSchema = z8.z.union([
   TextPartSchema,
   ImagePartSchema,
   FilePartSchema,
@@ -4681,153 +4716,153 @@ var MessagePartSchema = z7.z.union([
   StepStartPartSchema,
   DataPartSchema
 ]);
-var MessageContentSchema = z7.z.object({
+var MessageContentSchema = z8.z.object({
   /** Format version - 2 corresponds to AI SDK v4 UIMessage format */
-  format: z7.z.literal(2),
+  format: z8.z.literal(2),
   /** Array of message parts (text, images, tool calls, etc.) */
-  parts: z7.z.array(MessagePartSchema),
+  parts: z8.z.array(MessagePartSchema),
   /** Legacy content field for backwards compatibility */
-  content: z7.z.string().optional(),
+  content: z8.z.string().optional(),
   /** Additional metadata */
-  metadata: z7.z.record(z7.z.unknown()).optional(),
+  metadata: z8.z.record(z8.z.unknown()).optional(),
   /** Provider-specific metadata */
-  providerMetadata: z7.z.record(z7.z.unknown()).optional()
+  providerMetadata: z8.z.record(z8.z.unknown()).optional()
 });
-var ProcessorMessageContentSchema = z7.z.object({
+var ProcessorMessageContentSchema = z8.z.object({
   /** Format version - 2 corresponds to AI SDK v4 UIMessage format */
-  format: z7.z.literal(2),
+  format: z8.z.literal(2),
   /** Array of message parts (text, images, tool calls, etc.) */
-  parts: z7.z.array(MessagePartSchema),
+  parts: z8.z.array(MessagePartSchema),
   /** Legacy content field for backwards compatibility */
-  content: z7.z.string().optional(),
+  content: z8.z.string().optional(),
   /** Additional metadata */
-  metadata: z7.z.record(z7.z.unknown()).optional(),
+  metadata: z8.z.record(z8.z.unknown()).optional(),
   /** Provider-specific metadata */
-  providerMetadata: z7.z.record(z7.z.unknown()).optional()
+  providerMetadata: z8.z.record(z8.z.unknown()).optional()
 }).passthrough();
-var ProcessorMessageSchema = z7.z.object({
+var ProcessorMessageSchema = z8.z.object({
   /** Unique message identifier */
-  id: z7.z.string(),
+  id: z8.z.string(),
   /** Message role */
-  role: z7.z.enum(["user", "assistant", "system", "tool"]),
+  role: z8.z.enum(["user", "assistant", "system", "tool"]),
   /** When the message was created */
-  createdAt: z7.z.coerce.date(),
+  createdAt: z8.z.coerce.date(),
   /** Thread identifier for conversation grouping */
-  threadId: z7.z.string().optional(),
+  threadId: z8.z.string().optional(),
   /** Resource identifier */
-  resourceId: z7.z.string().optional(),
+  resourceId: z8.z.string().optional(),
   /** Message type */
-  type: z7.z.string().optional(),
+  type: z8.z.string().optional(),
   /** Message content with parts */
   content: ProcessorMessageContentSchema
 }).passthrough();
-var messageListSchema = z7.z.custom();
-var messagesSchema = z7.z.array(ProcessorMessageSchema);
-var SystemMessageTextPartSchema = z7.z.object({
-  type: z7.z.literal("text"),
-  text: z7.z.string()
+var messageListSchema = z8.z.custom();
+var messagesSchema = z8.z.array(ProcessorMessageSchema);
+var SystemMessageTextPartSchema = z8.z.object({
+  type: z8.z.literal("text"),
+  text: z8.z.string()
 }).passthrough();
-z7.z.object({
-  role: z7.z.literal("system"),
-  content: z7.z.union([z7.z.string(), z7.z.array(SystemMessageTextPartSchema)]),
+z8.z.object({
+  role: z8.z.literal("system"),
+  content: z8.z.union([z8.z.string(), z8.z.array(SystemMessageTextPartSchema)]),
   /** Optional experimental provider-specific extensions */
-  experimental_providerMetadata: z7.z.record(z7.z.unknown()).optional()
+  experimental_providerMetadata: z8.z.record(z8.z.unknown()).optional()
 }).passthrough();
-var CoreMessageSchema = z7.z.object({
-  role: z7.z.enum(["system", "user", "assistant", "tool"]),
-  content: z7.z.unknown()
+var CoreMessageSchema = z8.z.object({
+  role: z8.z.enum(["system", "user", "assistant", "tool"]),
+  content: z8.z.unknown()
 }).passthrough();
-var systemMessagesSchema = z7.z.array(CoreMessageSchema);
-var toolCallSchema = z7.z.object({
-  toolName: z7.z.string(),
-  toolCallId: z7.z.string(),
-  args: z7.z.unknown()
+var systemMessagesSchema = z8.z.array(CoreMessageSchema);
+var toolCallSchema = z8.z.object({
+  toolName: z8.z.string(),
+  toolCallId: z8.z.string(),
+  args: z8.z.unknown()
 });
-var retryCountSchema = z7.z.number().optional();
-var ProcessorInputPhaseSchema = z7.z.object({
-  phase: z7.z.literal("input"),
+var retryCountSchema = z8.z.number().optional();
+var ProcessorInputPhaseSchema = z8.z.object({
+  phase: z8.z.literal("input"),
   messages: messagesSchema,
   messageList: messageListSchema,
   systemMessages: systemMessagesSchema.optional(),
   retryCount: retryCountSchema
 });
-var ProcessorInputStepPhaseSchema = z7.z.object({
-  phase: z7.z.literal("inputStep"),
+var ProcessorInputStepPhaseSchema = z8.z.object({
+  phase: z8.z.literal("inputStep"),
   messages: messagesSchema,
   messageList: messageListSchema,
-  stepNumber: z7.z.number().describe("The current step number (0-indexed)"),
+  stepNumber: z8.z.number().describe("The current step number (0-indexed)"),
   systemMessages: systemMessagesSchema.optional(),
   retryCount: retryCountSchema,
   // Model and tools configuration (can be modified by processors)
-  model: z7.z.custom().optional().describe("Current model for this step"),
-  tools: z7.z.custom().optional().describe("Current tools available for this step"),
-  toolChoice: z7.z.custom().optional().describe("Current tool choice setting"),
-  activeTools: z7.z.array(z7.z.string()).optional().describe("Currently active tools"),
-  providerOptions: z7.z.custom().optional().describe("Provider-specific options"),
-  modelSettings: z7.z.custom().optional().describe("Model settings (temperature, etc.)"),
-  structuredOutput: z7.z.custom().optional().describe("Structured output configuration"),
-  steps: z7.z.custom().optional().describe("Results from previous steps")
+  model: z8.z.custom().optional().describe("Current model for this step"),
+  tools: z8.z.custom().optional().describe("Current tools available for this step"),
+  toolChoice: z8.z.custom().optional().describe("Current tool choice setting"),
+  activeTools: z8.z.array(z8.z.string()).optional().describe("Currently active tools"),
+  providerOptions: z8.z.custom().optional().describe("Provider-specific options"),
+  modelSettings: z8.z.custom().optional().describe("Model settings (temperature, etc.)"),
+  structuredOutput: z8.z.custom().optional().describe("Structured output configuration"),
+  steps: z8.z.custom().optional().describe("Results from previous steps")
 });
-var ProcessorOutputStreamPhaseSchema = z7.z.object({
-  phase: z7.z.literal("outputStream"),
-  part: z7.z.unknown().nullable().describe("The current chunk being processed. Can be null to skip."),
-  streamParts: z7.z.array(z7.z.unknown()).describe("All chunks seen so far"),
-  state: z7.z.record(z7.z.unknown()).describe("Mutable state object that persists across chunks"),
+var ProcessorOutputStreamPhaseSchema = z8.z.object({
+  phase: z8.z.literal("outputStream"),
+  part: z8.z.unknown().nullable().describe("The current chunk being processed. Can be null to skip."),
+  streamParts: z8.z.array(z8.z.unknown()).describe("All chunks seen so far"),
+  state: z8.z.record(z8.z.unknown()).describe("Mutable state object that persists across chunks"),
   messageList: messageListSchema.optional(),
   retryCount: retryCountSchema
 });
-var ProcessorOutputResultPhaseSchema = z7.z.object({
-  phase: z7.z.literal("outputResult"),
+var ProcessorOutputResultPhaseSchema = z8.z.object({
+  phase: z8.z.literal("outputResult"),
   messages: messagesSchema,
   messageList: messageListSchema,
   retryCount: retryCountSchema
 });
-var ProcessorOutputStepPhaseSchema = z7.z.object({
-  phase: z7.z.literal("outputStep"),
+var ProcessorOutputStepPhaseSchema = z8.z.object({
+  phase: z8.z.literal("outputStep"),
   messages: messagesSchema,
   messageList: messageListSchema,
-  stepNumber: z7.z.number().describe("The current step number (0-indexed)"),
-  finishReason: z7.z.string().optional().describe("The finish reason from the LLM (stop, tool-use, length, etc.)"),
-  toolCalls: z7.z.array(toolCallSchema).optional().describe("Tool calls made in this step (if any)"),
-  text: z7.z.string().optional().describe("Generated text from this step"),
+  stepNumber: z8.z.number().describe("The current step number (0-indexed)"),
+  finishReason: z8.z.string().optional().describe("The finish reason from the LLM (stop, tool-use, length, etc.)"),
+  toolCalls: z8.z.array(toolCallSchema).optional().describe("Tool calls made in this step (if any)"),
+  text: z8.z.string().optional().describe("Generated text from this step"),
   systemMessages: systemMessagesSchema.optional(),
   retryCount: retryCountSchema
 });
-var ProcessorStepInputSchema = z7.z.discriminatedUnion("phase", [
+var ProcessorStepInputSchema = z8.z.discriminatedUnion("phase", [
   ProcessorInputPhaseSchema,
   ProcessorInputStepPhaseSchema,
   ProcessorOutputStreamPhaseSchema,
   ProcessorOutputResultPhaseSchema,
   ProcessorOutputStepPhaseSchema
 ]);
-var ProcessorStepOutputSchema = z7.z.object({
+var ProcessorStepOutputSchema = z8.z.object({
   // Phase field
-  phase: z7.z.enum(["input", "inputStep", "outputStream", "outputResult", "outputStep"]),
+  phase: z8.z.enum(["input", "inputStep", "outputStream", "outputResult", "outputStep"]),
   // Message-based fields (used by most phases)
   messages: messagesSchema.optional(),
   messageList: messageListSchema.optional(),
   systemMessages: systemMessagesSchema.optional(),
   // Step-based fields
-  stepNumber: z7.z.number().optional(),
+  stepNumber: z8.z.number().optional(),
   // Stream-based fields
-  part: z7.z.unknown().nullable().optional(),
-  streamParts: z7.z.array(z7.z.unknown()).optional(),
-  state: z7.z.record(z7.z.unknown()).optional(),
+  part: z8.z.unknown().nullable().optional(),
+  streamParts: z8.z.array(z8.z.unknown()).optional(),
+  state: z8.z.record(z8.z.unknown()).optional(),
   // Output step fields
-  finishReason: z7.z.string().optional(),
-  toolCalls: z7.z.array(toolCallSchema).optional(),
-  text: z7.z.string().optional(),
+  finishReason: z8.z.string().optional(),
+  toolCalls: z8.z.array(toolCallSchema).optional(),
+  text: z8.z.string().optional(),
   // Retry count
-  retryCount: z7.z.number().optional(),
+  retryCount: z8.z.number().optional(),
   // Model and tools configuration (for inputStep phase)
-  model: z7.z.custom().optional(),
-  tools: z7.z.custom().optional(),
-  toolChoice: z7.z.custom().optional(),
-  activeTools: z7.z.array(z7.z.string()).optional(),
-  providerOptions: z7.z.custom().optional(),
-  modelSettings: z7.z.custom().optional(),
-  structuredOutput: z7.z.custom().optional(),
-  steps: z7.z.custom().optional()
+  model: z8.z.custom().optional(),
+  tools: z8.z.custom().optional(),
+  toolChoice: z8.z.custom().optional(),
+  activeTools: z8.z.array(z8.z.string()).optional(),
+  providerOptions: z8.z.custom().optional(),
+  modelSettings: z8.z.custom().optional(),
+  structuredOutput: z8.z.custom().optional(),
+  steps: z8.z.custom().optional()
 });
 var ProcessorStepSchema = ProcessorStepInputSchema;
 
@@ -4846,6 +4881,43 @@ var ExecutionEngine = class extends chunkDGV2FWB4_cjs.MastraBase {
   getLogger() {
     return this.logger;
   }
+  /**
+   * Invokes the onFinish and onError lifecycle callbacks if they are defined.
+   * Errors in callbacks are caught and logged, not propagated.
+   * @param result The workflow result containing status, result, error, steps, and tripwire info
+   */
+  async invokeLifecycleCallbacks(result) {
+    const { onFinish, onError } = this.options;
+    if (onFinish) {
+      try {
+        await Promise.resolve(
+          onFinish({
+            status: result.status,
+            result: result.result,
+            error: result.error,
+            steps: result.steps,
+            tripwire: result.tripwire
+          })
+        );
+      } catch (err) {
+        this.logger.error("Error in onFinish callback", { error: err });
+      }
+    }
+    if (onError && (result.status === "failed" || result.status === "tripwire")) {
+      try {
+        await Promise.resolve(
+          onError({
+            status: result.status,
+            error: result.error,
+            steps: result.steps,
+            tripwire: result.tripwire
+          })
+        );
+      } catch (err) {
+        this.logger.error("Error in onError callback", { error: err });
+      }
+    }
+  }
 };
 
 // src/workflows/step.ts
@@ -4878,7 +4950,16 @@ async function validateStepInput({
     if (!validatedInput.success) {
       const errors = getZodErrors(validatedInput.error);
       const errorMessages = errors.map((e) => `- ${e.path?.join(".")}: ${e.message}`).join("\n");
-      validationError = new Error("Step input validation failed: \n" + errorMessages);
+      validationError = new chunkHWMMIRIF_cjs.MastraError(
+        {
+          id: "WORKFLOW_STEP_INPUT_VALIDATION_FAILED",
+          domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
+          category: "USER" /* USER */,
+          text: "Step input validation failed: \n" + errorMessages
+        },
+        // keep the original zod error as the cause for consumers
+        validatedInput.error
+      );
     } else {
       const isEmptyData = radash.isEmpty(validatedInput.data);
       inputData = isEmptyData ? prevOutput : validatedInput.data;
@@ -4897,7 +4978,16 @@ async function validateStepResumeData({ resumeData, step }) {
     if (!validatedResumeData.success) {
       const errors = getZodErrors(validatedResumeData.error);
       const errorMessages = errors.map((e) => `- ${e.path?.join(".")}: ${e.message}`).join("\n");
-      validationError = new Error("Step resume data validation failed: \n" + errorMessages);
+      validationError = new chunkHWMMIRIF_cjs.MastraError(
+        {
+          id: "WORKFLOW_STEP_RESUME_DATA_VALIDATION_FAILED",
+          domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
+          category: "USER" /* USER */,
+          text: "Step resume data validation failed: \n" + errorMessages
+        },
+        // keep the original zod error as the cause for consumers
+        validatedResumeData.error
+      );
     } else {
       resumeData = validatedResumeData.data;
     }
@@ -4919,7 +5009,16 @@ async function validateStepSuspendData({
     if (!validatedSuspendData.success) {
       const errors = getZodErrors(validatedSuspendData.error);
       const errorMessages = errors.map((e) => `- ${e.path?.join(".")}: ${e.message}`).join("\n");
-      validationError = new Error("Step suspend data validation failed: \n" + errorMessages);
+      validationError = new chunkHWMMIRIF_cjs.MastraError(
+        {
+          id: "WORKFLOW_STEP_SUSPEND_DATA_VALIDATION_FAILED",
+          domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
+          category: "USER" /* USER */,
+          text: "Step suspend data validation failed: \n" + errorMessages
+        },
+        // keep the original zod error as the cause for consumers
+        validatedSuspendData.error
+      );
     } else {
       suspendData = validatedSuspendData.data;
     }
@@ -5062,7 +5161,7 @@ var createTimeTravelExecutionParams = (params) => {
         result = void 0;
       }
       if (result) {
-        const formattedResult = chunkPG5H6QIO_cjs.removeUndefinedValues(result);
+        const formattedResult = chunkMLKE7HRS_cjs.removeUndefinedValues(result);
         stepResults[stepId] = formattedResult;
       }
     });
@@ -5083,6 +5182,16 @@ var createTimeTravelExecutionParams = (params) => {
   };
   return timeTravelData;
 };
+function hydrateSerializedStepErrors(steps) {
+  if (steps) {
+    for (const step of Object.values(steps)) {
+      if (step.status === "failed" && "error" in step && step.error) {
+        step.error = chunkHWMMIRIF_cjs.getErrorFromUnknown(step.error, { serializeStack: false });
+      }
+    }
+  }
+  return steps;
+}
 
 // src/workflows/handlers/control-flow.ts
 async function executeParallel(engine, params) {
@@ -5099,7 +5208,7 @@ async function executeParallel(engine, params) {
     timeTravel,
     executionContext,
     tracingContext,
-    emitter,
+    pubsub,
     abortController,
     requestContext,
     outputWriter,
@@ -5172,7 +5281,7 @@ async function executeParallel(engine, params) {
         tracingContext: {
           currentSpan: parallelSpan
         },
-        emitter,
+        pubsub,
         abortController,
         requestContext,
         outputWriter,
@@ -5211,9 +5320,7 @@ async function executeParallel(engine, params) {
     };
   }
   if (execResults.status === "failed") {
-    parallelSpan?.error({
-      error: new Error(execResults.error)
-    });
+    parallelSpan?.error({ error: execResults.error });
   } else {
     parallelSpan?.end({
       output: execResults.output || execResults
@@ -5235,7 +5342,7 @@ async function executeConditional(engine, params) {
     timeTravel,
     executionContext,
     tracingContext,
-    emitter,
+    pubsub,
     abortController,
     requestContext,
     outputWriter,
@@ -5282,8 +5389,8 @@ async function executeConditional(engine, params) {
           abort: () => {
             abortController?.abort();
           },
-          [chunkABJOUEVA_cjs.EMITTER_SYMBOL]: emitter,
-          [chunkABJOUEVA_cjs.STREAM_FORMAT_SYMBOL]: executionContext.format,
+          [chunkL3NKIMF5_cjs.PUBSUB_SYMBOL]: pubsub,
+          [chunkL3NKIMF5_cjs.STREAM_FORMAT_SYMBOL]: executionContext.format,
           engine: engine.getEngineContext(),
           abortSignal: abortController?.signal,
           writer: new chunkKJBMTK5B_cjs.ToolStream(
@@ -5312,18 +5419,20 @@ async function executeConditional(engine, params) {
         });
         return result;
       } catch (e) {
-        const error = engine.preprocessExecutionError(
-          e,
+        const errorInstance = chunkHWMMIRIF_cjs.getErrorFromUnknown(e, { serializeStack: false });
+        const mastraError = new chunkHWMMIRIF_cjs.MastraError(
           {
             id: "WORKFLOW_CONDITION_EVALUATION_FAILED",
-            domain: "MASTRA_WORKFLOW",
-            category: "USER",
+            domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
+            category: "USER" /* USER */,
             details: { workflowId, runId }
           },
-          "Error evaluating condition: "
+          errorInstance
         );
+        engine.getLogger()?.trackException(mastraError);
+        engine.getLogger()?.error("Error evaluating condition: " + errorInstance.stack);
         evalSpan?.error({
-          error,
+          error: mastraError,
           attributes: {
             result: false
           }
@@ -5375,7 +5484,7 @@ async function executeConditional(engine, params) {
         tracingContext: {
           currentSpan: conditionalSpan
         },
-        emitter,
+        pubsub,
         abortController,
         requestContext,
         outputWriter,
@@ -5415,9 +5524,7 @@ async function executeConditional(engine, params) {
     };
   }
   if (execResults.status === "failed") {
-    conditionalSpan?.error({
-      error: new Error(execResults.error)
-    });
+    conditionalSpan?.error({ error: execResults.error });
   } else {
     conditionalSpan?.end({
       output: execResults.output || execResults
@@ -5438,7 +5545,7 @@ async function executeLoop(engine, params) {
     timeTravel,
     executionContext,
     tracingContext,
-    emitter,
+    pubsub,
     abortController,
     requestContext,
     outputWriter,
@@ -5478,7 +5585,7 @@ async function executeLoop(engine, params) {
       tracingContext: {
         currentSpan: loopSpan
       },
-      emitter,
+      pubsub,
       abortController,
       requestContext,
       outputWriter,
@@ -5505,7 +5612,7 @@ async function executeLoop(engine, params) {
     const evalSpan = loopSpan?.createChildSpan({
       type: "workflow_conditional_eval" /* WORKFLOW_CONDITIONAL_EVAL */,
       name: `condition: '${entry.loopType}'`,
-      input: chunkPG5H6QIO_cjs.selectFields(result.output, ["stepResult", "output.text", "output.object", "messages"]),
+      input: chunkMLKE7HRS_cjs.selectFields(result.output, ["stepResult", "output.text", "output.object", "messages"]),
       attributes: {
         conditionIndex: iteration
       },
@@ -5532,8 +5639,8 @@ async function executeLoop(engine, params) {
           abort: () => {
             abortController?.abort();
           },
-          [chunkABJOUEVA_cjs.EMITTER_SYMBOL]: emitter,
-          [chunkABJOUEVA_cjs.STREAM_FORMAT_SYMBOL]: executionContext.format,
+          [chunkL3NKIMF5_cjs.PUBSUB_SYMBOL]: pubsub,
+          [chunkL3NKIMF5_cjs.STREAM_FORMAT_SYMBOL]: executionContext.format,
           engine: engine.getEngineContext(),
           abortSignal: abortController?.signal,
           writer: new chunkKJBMTK5B_cjs.ToolStream(
@@ -5579,7 +5686,7 @@ async function executeForeach(engine, params) {
     timeTravel,
     executionContext,
     tracingContext,
-    emitter,
+    pubsub,
     abortController,
     requestContext,
     outputWriter,
@@ -5607,12 +5714,16 @@ async function executeForeach(engine, params) {
     },
     tracingPolicy: engine.options?.tracingPolicy
   });
-  await emitter.emit("watch", {
-    type: "workflow-step-start",
-    payload: {
-      id: step.id,
-      ...stepInfo,
-      status: "running"
+  await pubsub.publish(`workflow.events.v2.${runId}`, {
+    type: "watch",
+    runId,
+    data: {
+      type: "workflow-step-start",
+      payload: {
+        id: step.id,
+        ...stepInfo,
+        status: "running"
+      }
     }
   });
   const prevPayload = stepResults[step.id];
@@ -5651,7 +5762,7 @@ async function executeForeach(engine, params) {
           resume: resumeToUse,
           prevOutput: item,
           tracingContext: { currentSpan: loopSpan },
-          emitter,
+          pubsub,
           abortController,
           requestContext,
           skipEmits: true,
@@ -5671,18 +5782,26 @@ async function executeForeach(engine, params) {
         if (execResults.status === "suspended") {
           foreachIndexObj[i + resultIndex] = execResults;
         } else {
-          await emitter.emit("watch", {
-            type: "workflow-step-result",
-            payload: {
-              id: step.id,
-              ...execResults
+          await pubsub.publish(`workflow.events.v2.${runId}`, {
+            type: "watch",
+            runId,
+            data: {
+              type: "workflow-step-result",
+              payload: {
+                id: step.id,
+                ...execResults
+              }
             }
           });
-          await emitter.emit("watch", {
-            type: "workflow-step-finish",
-            payload: {
-              id: step.id,
-              metadata: {}
+          await pubsub.publish(`workflow.events.v2.${runId}`, {
+            type: "watch",
+            runId,
+            data: {
+              type: "workflow-step-finish",
+              payload: {
+                id: step.id,
+                metadata: {}
+              }
             }
           });
           return result;
@@ -5701,11 +5820,15 @@ async function executeForeach(engine, params) {
     if (Object.keys(foreachIndexObj).length > 0) {
       const suspendedIndices = Object.keys(foreachIndexObj).map(Number);
       const foreachIndex = suspendedIndices[0];
-      await emitter.emit("watch", {
-        type: "workflow-step-suspended",
-        payload: {
-          id: step.id,
-          ...foreachIndexObj[foreachIndex]
+      await pubsub.publish(`workflow.events.v2.${runId}`, {
+        type: "watch",
+        runId,
+        data: {
+          type: "workflow-step-suspended",
+          payload: {
+            id: step.id,
+            ...foreachIndexObj[foreachIndex]
+          }
         }
       });
       executionContext.suspendedPaths[step.id] = executionContext.executionPath;
@@ -5727,20 +5850,28 @@ async function executeForeach(engine, params) {
       };
     }
   }
-  await emitter.emit("watch", {
-    type: "workflow-step-result",
-    payload: {
-      id: step.id,
-      status: "success",
-      output: results,
-      endedAt: Date.now()
+  await pubsub.publish(`workflow.events.v2.${runId}`, {
+    type: "watch",
+    runId,
+    data: {
+      type: "workflow-step-result",
+      payload: {
+        id: step.id,
+        status: "success",
+        output: results,
+        endedAt: Date.now()
+      }
     }
   });
-  await emitter.emit("watch", {
-    type: "workflow-step-finish",
-    payload: {
-      id: step.id,
-      metadata: {}
+  await pubsub.publish(`workflow.events.v2.${runId}`, {
+    type: "watch",
+    runId,
+    data: {
+      type: "workflow-step-finish",
+      payload: {
+        id: step.id,
+        metadata: {}
+      }
     }
   });
   loopSpan?.end({
@@ -5817,7 +5948,7 @@ async function executeEntry(engine, params) {
     resume,
     executionContext,
     tracingContext,
-    emitter,
+    pubsub,
     abortController,
     requestContext,
     outputWriter,
@@ -5840,7 +5971,7 @@ async function executeEntry(engine, params) {
       resume,
       prevOutput,
       tracingContext,
-      emitter,
+      pubsub,
       abortController,
       requestContext,
       outputWriter,
@@ -5873,7 +6004,7 @@ async function executeEntry(engine, params) {
         state: executionContext.state
       },
       tracingContext,
-      emitter,
+      pubsub,
       abortController,
       requestContext,
       outputWriter,
@@ -5943,7 +6074,7 @@ async function executeEntry(engine, params) {
       resume,
       executionContext,
       tracingContext,
-      emitter,
+      pubsub,
       abortController,
       requestContext,
       outputWriter,
@@ -5962,7 +6093,7 @@ async function executeEntry(engine, params) {
       resume,
       executionContext,
       tracingContext,
-      emitter,
+      pubsub,
       abortController,
       requestContext,
       outputWriter,
@@ -5981,7 +6112,7 @@ async function executeEntry(engine, params) {
       resume,
       executionContext,
       tracingContext,
-      emitter,
+      pubsub,
       abortController,
       requestContext,
       outputWriter,
@@ -6001,7 +6132,7 @@ async function executeEntry(engine, params) {
       resume,
       executionContext,
       tracingContext,
-      emitter,
+      pubsub,
       abortController,
       requestContext,
       outputWriter,
@@ -6012,13 +6143,17 @@ async function executeEntry(engine, params) {
     const startedAt = Date.now();
     const sleepWaitingOperationId = `workflow.${workflowId}.run.${runId}.sleep.${entry.id}.waiting_ev`;
     await engine.wrapDurableOperation(sleepWaitingOperationId, async () => {
-      await emitter.emit("watch", {
-        type: "workflow-step-waiting",
-        payload: {
-          id: entry.id,
-          payload: prevOutput,
-          startedAt,
-          status: "waiting"
+      await pubsub.publish(`workflow.events.v2.${runId}`, {
+        type: "watch",
+        runId,
+        data: {
+          type: "workflow-step-waiting",
+          payload: {
+            id: entry.id,
+            payload: prevOutput,
+            startedAt,
+            status: "waiting"
+          }
         }
       });
     });
@@ -6049,7 +6184,7 @@ async function executeEntry(engine, params) {
       resume,
       executionContext,
       tracingContext,
-      emitter,
+      pubsub,
       abortController,
       requestContext,
       outputWriter
@@ -6075,20 +6210,28 @@ async function executeEntry(engine, params) {
     stepResults[entry.id] = { ...stepInfo, status: "success", output: prevOutput };
     const sleepResultOperationId = `workflow.${workflowId}.run.${runId}.sleep.${entry.id}.result_ev`;
     await engine.wrapDurableOperation(sleepResultOperationId, async () => {
-      await emitter.emit("watch", {
-        type: "workflow-step-result",
-        payload: {
-          id: entry.id,
-          endedAt,
-          status: "success",
-          output: prevOutput
+      await pubsub.publish(`workflow.events.v2.${runId}`, {
+        type: "watch",
+        runId,
+        data: {
+          type: "workflow-step-result",
+          payload: {
+            id: entry.id,
+            endedAt,
+            status: "success",
+            output: prevOutput
+          }
         }
       });
-      await emitter.emit("watch", {
-        type: "workflow-step-finish",
-        payload: {
-          id: entry.id,
-          metadata: {}
+      await pubsub.publish(`workflow.events.v2.${runId}`, {
+        type: "watch",
+        runId,
+        data: {
+          type: "workflow-step-finish",
+          payload: {
+            id: entry.id,
+            metadata: {}
+          }
         }
       });
     });
@@ -6096,13 +6239,17 @@ async function executeEntry(engine, params) {
     const startedAt = Date.now();
     const sleepUntilWaitingOperationId = `workflow.${workflowId}.run.${runId}.sleepUntil.${entry.id}.waiting_ev`;
     await engine.wrapDurableOperation(sleepUntilWaitingOperationId, async () => {
-      await emitter.emit("watch", {
-        type: "workflow-step-waiting",
-        payload: {
-          id: entry.id,
-          payload: prevOutput,
-          startedAt,
-          status: "waiting"
+      await pubsub.publish(`workflow.events.v2.${runId}`, {
+        type: "watch",
+        runId,
+        data: {
+          type: "workflow-step-waiting",
+          payload: {
+            id: entry.id,
+            payload: prevOutput,
+            startedAt,
+            status: "waiting"
+          }
         }
       });
     });
@@ -6133,7 +6280,7 @@ async function executeEntry(engine, params) {
       resume,
       executionContext,
       tracingContext,
-      emitter,
+      pubsub,
       abortController,
       requestContext,
       outputWriter
@@ -6159,20 +6306,28 @@ async function executeEntry(engine, params) {
     stepResults[entry.id] = { ...stepInfo, status: "success", output: prevOutput };
     const sleepUntilResultOperationId = `workflow.${workflowId}.run.${runId}.sleepUntil.${entry.id}.result_ev`;
     await engine.wrapDurableOperation(sleepUntilResultOperationId, async () => {
-      await emitter.emit("watch", {
-        type: "workflow-step-result",
-        payload: {
-          id: entry.id,
-          endedAt,
-          status: "success",
-          output: prevOutput
+      await pubsub.publish(`workflow.events.v2.${runId}`, {
+        type: "watch",
+        runId,
+        data: {
+          type: "workflow-step-result",
+          payload: {
+            id: entry.id,
+            endedAt,
+            status: "success",
+            output: prevOutput
+          }
         }
       });
-      await emitter.emit("watch", {
-        type: "workflow-step-finish",
-        payload: {
-          id: entry.id,
-          metadata: {}
+      await pubsub.publish(`workflow.events.v2.${runId}`, {
+        type: "watch",
+        runId,
+        data: {
+          type: "workflow-step-finish",
+          payload: {
+            id: entry.id,
+            metadata: {}
+          }
         }
       });
     });
@@ -6194,9 +6349,10 @@ async function executeEntry(engine, params) {
     requestContext
   });
   if (execResults.status === "canceled") {
-    await emitter.emit("watch", {
-      type: "workflow-canceled",
-      payload: {}
+    await pubsub.publish(`workflow.events.v2.${runId}`, {
+      type: "watch",
+      runId,
+      data: { type: "workflow-canceled", payload: {} }
     });
   }
   return {
@@ -6213,7 +6369,7 @@ async function executeSleep(engine, params) {
     entry,
     prevOutput,
     stepResults,
-    emitter,
+    pubsub,
     abortController,
     requestContext,
     executionContext,
@@ -6257,8 +6413,8 @@ async function executeSleep(engine, params) {
         abort: () => {
           abortController?.abort();
         },
-        [chunkABJOUEVA_cjs.EMITTER_SYMBOL]: emitter,
-        [chunkABJOUEVA_cjs.STREAM_FORMAT_SYMBOL]: executionContext.format,
+        [chunkL3NKIMF5_cjs.PUBSUB_SYMBOL]: pubsub,
+        [chunkL3NKIMF5_cjs.STREAM_FORMAT_SYMBOL]: executionContext.format,
         engine: engine.getEngineContext(),
         abortSignal: abortController?.signal,
         writer: new chunkKJBMTK5B_cjs.ToolStream(
@@ -6293,7 +6449,7 @@ async function executeSleepUntil(engine, params) {
     entry,
     prevOutput,
     stepResults,
-    emitter,
+    pubsub,
     abortController,
     requestContext,
     executionContext,
@@ -6338,8 +6494,8 @@ async function executeSleepUntil(engine, params) {
         abort: () => {
           abortController?.abort();
         },
-        [chunkABJOUEVA_cjs.EMITTER_SYMBOL]: emitter,
-        [chunkABJOUEVA_cjs.STREAM_FORMAT_SYMBOL]: executionContext.format,
+        [chunkL3NKIMF5_cjs.PUBSUB_SYMBOL]: pubsub,
+        [chunkL3NKIMF5_cjs.STREAM_FORMAT_SYMBOL]: executionContext.format,
         engine: engine.getEngineContext(),
         abortSignal: abortController?.signal,
         writer: new chunkKJBMTK5B_cjs.ToolStream(
@@ -6385,7 +6541,7 @@ async function executeStep(engine, params) {
     resume,
     timeTravel,
     prevOutput,
-    emitter,
+    pubsub,
     abortController,
     requestContext,
     skipEmits = false,
@@ -6445,7 +6601,7 @@ async function executeStep(engine, params) {
   await engine.onStepExecutionStart({
     step,
     inputData,
-    emitter,
+    pubsub,
     executionContext,
     stepCallId,
     stepInfo,
@@ -6474,7 +6630,7 @@ async function executeStep(engine, params) {
       timeTravel,
       prevOutput,
       inputData,
-      emitter,
+      pubsub,
       startedAt: startTime ?? Date.now(),
       abortController,
       requestContext,
@@ -6596,8 +6752,8 @@ async function executeStep(engine, params) {
           nestedStepResults: timeTravel?.nestedStepResults,
           resumeData: timeTravel?.resumeData
         } : void 0,
-        [chunkABJOUEVA_cjs.EMITTER_SYMBOL]: emitter,
-        [chunkABJOUEVA_cjs.STREAM_FORMAT_SYMBOL]: executionContext.format,
+        [chunkL3NKIMF5_cjs.PUBSUB_SYMBOL]: pubsub,
+        [chunkL3NKIMF5_cjs.STREAM_FORMAT_SYMBOL]: executionContext.format,
         engine: engine.getEngineContext(),
         abortSignal: abortController?.signal,
         writer: new chunkKJBMTK5B_cjs.ToolStream(
@@ -6668,7 +6824,8 @@ async function executeStep(engine, params) {
         stepId: step.id,
         stepCallId,
         execResults: { ...stepInfo, ...execResults },
-        emitter
+        pubsub,
+        runId
       });
     });
   }
@@ -6699,9 +6856,9 @@ async function runScorersForStep(params) {
       scorersToUse = await scorersToUse({
         requestContext
       });
-    } catch (error) {
-      engine.preprocessExecutionError(
-        error,
+    } catch (e) {
+      const errorInstance = chunkHWMMIRIF_cjs.getErrorFromUnknown(e, { serializeStack: false });
+      const mastraError = new chunkHWMMIRIF_cjs.MastraError(
         {
           id: "WORKFLOW_FAILED_TO_FETCH_SCORERS",
           domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
@@ -6712,8 +6869,10 @@ async function runScorersForStep(params) {
             stepId
           }
         },
-        "Error fetching scorers: "
+        errorInstance
       );
+      engine.getLogger()?.trackException(mastraError);
+      engine.getLogger()?.error("Error fetching scorers: " + errorInstance?.stack);
     }
   }
   if (!disableScorers && scorersToUse && Object.keys(scorersToUse || {}).length > 0) {
@@ -6738,42 +6897,30 @@ async function runScorersForStep(params) {
   }
 }
 async function emitStepResultEvents(params) {
-  const { stepId, stepCallId, execResults, emitter } = params;
+  const { stepId, stepCallId, execResults, pubsub, runId } = params;
   const payloadBase = stepCallId ? { id: stepId, stepCallId } : { id: stepId };
   if (execResults.status === "suspended") {
-    await emitter.emit("watch", {
-      type: "workflow-step-suspended",
-      payload: { ...payloadBase, ...execResults }
+    await pubsub.publish(`workflow.events.v2.${runId}`, {
+      type: "watch",
+      runId,
+      data: { type: "workflow-step-suspended", payload: { ...payloadBase, ...execResults } }
     });
   } else {
-    await emitter.emit("watch", {
-      type: "workflow-step-result",
-      payload: { ...payloadBase, ...execResults }
+    await pubsub.publish(`workflow.events.v2.${runId}`, {
+      type: "watch",
+      runId,
+      data: { type: "workflow-step-result", payload: { ...payloadBase, ...execResults } }
     });
-    await emitter.emit("watch", {
-      type: "workflow-step-finish",
-      payload: { ...payloadBase, metadata: {} }
+    await pubsub.publish(`workflow.events.v2.${runId}`, {
+      type: "watch",
+      runId,
+      data: { type: "workflow-step-finish", payload: { ...payloadBase, metadata: {} } }
     });
   }
 }
 
 // src/workflows/default.ts
 var DefaultExecutionEngine = class extends ExecutionEngine {
-  /**
-   * Preprocesses an error caught during workflow execution.
-   *
-   * - Wraps a non-MastraError exception
-   * - Logs error details
-   */
-  preprocessExecutionError(e, errorDefinition, logPrefix) {
-    const error = e instanceof chunkTWH4PTDG_cjs.MastraError ? e : new chunkTWH4PTDG_cjs.MastraError(errorDefinition, e);
-    if (!(e instanceof chunkTWH4PTDG_cjs.MastraError) && e instanceof Error && e.stack) {
-      error.stack = e.stack;
-    }
-    this.logger?.trackException(error);
-    this.logger?.error(logPrefix + error?.stack);
-    return error;
-  }
   /**
    * The retryCounts map is used to keep track of the retry count for each step.
    * The step id is used as the key and the retry count is the value.
@@ -6880,12 +7027,16 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
     return this.wrapDurableOperation(params.operationId, async () => {
       const startedAt = Date.now();
       if (!params.skipEmits) {
-        await params.emitter.emit("watch", {
-          type: "workflow-step-start",
-          payload: {
-            id: params.step.id,
-            stepCallId: params.stepCallId,
-            ...params.stepInfo
+        await params.pubsub.publish(`workflow.events.v2.${params.executionContext.runId}`, {
+          type: "watch",
+          runId: params.executionContext.runId,
+          data: {
+            type: "workflow-step-start",
+            payload: {
+              id: params.step.id,
+              stepCallId: params.stepCallId,
+              ...params.stepInfo
+            }
           }
         });
       }
@@ -6925,29 +7076,30 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         return { ok: true, result };
       } catch (e) {
         if (i === params.retries) {
-          const processedError = this.preprocessExecutionError(
-            e,
+          const errorInstance = chunkHWMMIRIF_cjs.getErrorFromUnknown(e, {
+            serializeStack: false,
+            fallbackMessage: "Unknown step execution error"
+          });
+          const mastraError = new chunkHWMMIRIF_cjs.MastraError(
             {
               id: "WORKFLOW_STEP_INVOKE_FAILED",
               domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
               category: "USER" /* USER */,
               details: { workflowId: params.workflowId, runId: params.runId, stepId }
             },
-            `Error executing step ${stepId}: `
+            errorInstance
           );
+          this.logger?.trackException(mastraError);
+          this.logger?.error(`Error executing step ${stepId}: ` + errorInstance?.stack);
           params.stepSpan?.error({
-            error: processedError,
+            error: mastraError,
             attributes: { status: "failed" }
           });
-          const errorInstance = chunkTWH4PTDG_cjs.getErrorFromUnknown(processedError, {
-            includeStack: false,
-            fallbackMessage: "Unknown step execution error"
-          });
           return {
             ok: false,
             error: {
               status: "failed",
-              error: `Error: ${errorInstance.message}`,
+              error: errorInstance,
               endedAt: Date.now(),
               // Preserve TripWire data as plain object for proper serialization
               tripwire: e instanceof TripWire ? {
@@ -6961,7 +7113,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         }
       }
     }
-    return { ok: false, error: { status: "failed", error: "Unknown error", endedAt: Date.now() } };
+    return { ok: false, error: { status: "failed", error: new Error("Unknown error"), endedAt: Date.now() } };
   }
   /**
    * Format an error for the workflow result.
@@ -6970,13 +7122,13 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
   formatResultError(error, lastOutput) {
     const outputError = lastOutput?.error;
     const errorSource = error || outputError;
-    const errorInstance = chunkTWH4PTDG_cjs.getErrorFromUnknown(errorSource, {
-      includeStack: false,
+    const errorInstance = chunkHWMMIRIF_cjs.getErrorFromUnknown(errorSource, {
+      serializeStack: false,
       fallbackMessage: "Unknown workflow error"
     });
-    return typeof errorSource === "string" ? errorInstance.message : `Error: ${errorInstance.message}`;
+    return errorInstance.toJSON();
   }
-  async fmtReturnValue(emitter, stepResults, lastOutput, error) {
+  async fmtReturnValue(_pubsub, stepResults, lastOutput, error) {
     const base = {
       status: lastOutput.status,
       steps: stepResults,
@@ -7001,14 +7153,18 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         base.error = this.formatResultError(error, lastOutput);
       }
     } else if (lastOutput.status === "suspended") {
+      const suspendPayload = {};
       const suspendedStepIds = Object.entries(stepResults).flatMap(([stepId, stepResult]) => {
         if (stepResult?.status === "suspended") {
-          const nestedPath = stepResult?.suspendPayload?.__workflow_meta?.path;
+          const { __workflow_meta, ...rest } = stepResult?.suspendPayload ?? {};
+          suspendPayload[stepId] = rest;
+          const nestedPath = __workflow_meta?.path;
           return nestedPath ? [[stepId, ...nestedPath]] : [[stepId]];
         }
         return [];
       });
       base.suspended = suspendedStepIds;
+      base.suspendPayload = suspendPayload;
     }
     return base;
   }
@@ -7085,7 +7241,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
     const steps = graph.steps;
     this.retryCounts.clear();
     if (steps.length === 0) {
-      const empty_graph_error = new chunkTWH4PTDG_cjs.MastraError({
+      const empty_graph_error = new chunkHWMMIRIF_cjs.MastraError({
         id: "WORKFLOW_EXECUTE_EMPTY_GRAPH",
         text: "Workflow must have at least one step",
         domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
@@ -7140,7 +7296,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
           currentSpan: workflowSpan
         },
         abortController: params.abortController,
-        emitter: params.emitter,
+        pubsub: params.pubsub,
         requestContext: currentRequestContext,
         outputWriter: params.outputWriter,
         disableScorers
@@ -7154,7 +7310,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         if (lastOutput.result.status === "bailed") {
           lastOutput.result.status = "success";
         }
-        const result2 = await this.fmtReturnValue(params.emitter, stepResults, lastOutput.result);
+        const result2 = await this.fmtReturnValue(params.pubsub, stepResults, lastOutput.result);
         await this.persistStepUpdate({
           workflowId,
           runId,
@@ -7182,6 +7338,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
             }
           });
         }
+        await this.invokeLifecycleCallbacks(result2);
         return {
           ...result2,
           ...lastOutput.result.status === "suspended" && params.outputOptions?.includeResumeLabels ? { resumeLabels: lastOutput.mutableContext.resumeLabels } : {},
@@ -7189,7 +7346,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         };
       }
     }
-    const result = await this.fmtReturnValue(params.emitter, stepResults, lastOutput.result);
+    const result = await this.fmtReturnValue(params.pubsub, stepResults, lastOutput.result);
     await this.persistStepUpdate({
       workflowId,
       runId,
@@ -7208,6 +7365,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         status: result.status
       }
     });
+    await this.invokeLifecycleCallbacks(result);
     if (params.outputOptions?.includeState) {
       return { ...result, state: lastState };
     }
@@ -7269,13 +7427,13 @@ function mapVariable(config) {
 }
 function createStep(params, agentOptions) {
   if (params instanceof Agent) {
-    const outputSchema = agentOptions?.structuredOutput?.schema ?? z7.z.object({ text: z7.z.string() });
+    const outputSchema = agentOptions?.structuredOutput?.schema ?? z8.z.object({ text: z8.z.string() });
     return {
       id: params.id,
       description: params.getDescription(),
       // @ts-ignore
-      inputSchema: z7.z.object({
-        prompt: z7.z.string()
+      inputSchema: z8.z.object({
+        prompt: z8.z.string()
         // resourceId: z.string().optional(),
         // threadId: z.string().optional(),
       }),
@@ -7283,8 +7441,9 @@ function createStep(params, agentOptions) {
       outputSchema,
       execute: async ({
         inputData,
-        [chunkABJOUEVA_cjs.EMITTER_SYMBOL]: emitter,
-        [chunkABJOUEVA_cjs.STREAM_FORMAT_SYMBOL]: streamFormat,
+        runId,
+        [chunkL3NKIMF5_cjs.PUBSUB_SYMBOL]: pubsub,
+        [chunkL3NKIMF5_cjs.STREAM_FORMAT_SYMBOL]: streamFormat,
         requestContext,
         tracingContext,
         abortSignal,
@@ -7339,9 +7498,10 @@ function createStep(params, agentOptions) {
         }
         let tripwireChunk = null;
         if (streamFormat === "legacy") {
-          await emitter.emit("watch", {
-            type: "tool-call-streaming-start",
-            ...toolData ?? {}
+          await pubsub.publish(`workflow.events.v2.${runId}`, {
+            type: "watch",
+            runId,
+            data: { type: "tool-call-streaming-start", ...toolData ?? {} }
           });
           for await (const chunk of stream) {
             if (chunk.type === "tripwire") {
@@ -7349,16 +7509,17 @@ function createStep(params, agentOptions) {
               break;
             }
             if (chunk.type === "text-delta") {
-              await emitter.emit("watch", {
-                type: "tool-call-delta",
-                ...toolData ?? {},
-                argsTextDelta: chunk.textDelta
+              await pubsub.publish(`workflow.events.v2.${runId}`, {
+                type: "watch",
+                runId,
+                data: { type: "tool-call-delta", ...toolData ?? {}, argsTextDelta: chunk.textDelta }
               });
             }
           }
-          await emitter.emit("watch", {
-            type: "tool-call-streaming-finish",
-            ...toolData ?? {}
+          await pubsub.publish(`workflow.events.v2.${runId}`, {
+            type: "watch",
+            runId,
+            data: { type: "tool-call-streaming-finish", ...toolData ?? {} }
           });
         } else {
           for await (const chunk of stream) {
@@ -7392,7 +7553,7 @@ function createStep(params, agentOptions) {
       component: params.component
     };
   }
-  if (params instanceof chunkMGCGWPQJ_cjs.Tool) {
+  if (params instanceof chunkZ55SJVEC_cjs.Tool) {
     if (!params.inputSchema || !params.outputSchema) {
       throw new Error("Tool must have input and output schemas defined");
     }
@@ -7486,7 +7647,7 @@ function createStep(params, agentOptions) {
           phase,
           // Auto-create MessageList from messages if not provided
           // This enables running processor workflows from the UI where messageList can't be serialized
-          messageList: messageList ?? (Array.isArray(messages) ? new chunk5Q6WAYEY_cjs.MessageList().add(messages, "input").addSystem(systemMessages ?? []) : void 0),
+          messageList: messageList ?? (Array.isArray(messages) ? new chunkX6IBA7FP_cjs.MessageList().add(messages, "input").addSystem(systemMessages ?? []) : void 0),
           stepNumber,
           systemMessages,
           streamParts,
@@ -7509,7 +7670,7 @@ function createStep(params, agentOptions) {
           case "input": {
             if (processor.processInput) {
               if (!passThrough.messageList) {
-                throw new chunkTWH4PTDG_cjs.MastraError({
+                throw new chunkHWMMIRIF_cjs.MastraError({
                   category: "USER" /* USER */,
                   domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
                   id: "PROCESSOR_MISSING_MESSAGE_LIST",
@@ -7539,9 +7700,9 @@ function createStep(params, agentOptions) {
                   }
                 }
               };
-              if (result instanceof chunk5Q6WAYEY_cjs.MessageList) {
+              if (result instanceof chunkX6IBA7FP_cjs.MessageList) {
                 if (result !== passThrough.messageList) {
-                  throw new chunkTWH4PTDG_cjs.MastraError({
+                  throw new chunkHWMMIRIF_cjs.MastraError({
                     category: "USER" /* USER */,
                     domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
                     id: "PROCESSOR_RETURNED_EXTERNAL_MESSAGE_LIST",
@@ -7573,7 +7734,7 @@ function createStep(params, agentOptions) {
           case "inputStep": {
             if (processor.processInputStep) {
               if (!passThrough.messageList) {
-                throw new chunkTWH4PTDG_cjs.MastraError({
+                throw new chunkHWMMIRIF_cjs.MastraError({
                   category: "USER" /* USER */,
                   domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
                   id: "PROCESSOR_MISSING_MESSAGE_LIST",
@@ -7635,7 +7796,7 @@ function createStep(params, agentOptions) {
           case "outputResult": {
             if (processor.processOutputResult) {
               if (!passThrough.messageList) {
-                throw new chunkTWH4PTDG_cjs.MastraError({
+                throw new chunkHWMMIRIF_cjs.MastraError({
                   category: "USER" /* USER */,
                   domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
                   id: "PROCESSOR_MISSING_MESSAGE_LIST",
@@ -7664,9 +7825,9 @@ function createStep(params, agentOptions) {
                   }
                 }
               };
-              if (result instanceof chunk5Q6WAYEY_cjs.MessageList) {
+              if (result instanceof chunkX6IBA7FP_cjs.MessageList) {
                 if (result !== passThrough.messageList) {
-                  throw new chunkTWH4PTDG_cjs.MastraError({
+                  throw new chunkHWMMIRIF_cjs.MastraError({
                     category: "USER" /* USER */,
                     domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
                     id: "PROCESSOR_RETURNED_EXTERNAL_MESSAGE_LIST",
@@ -7698,7 +7859,7 @@ function createStep(params, agentOptions) {
           case "outputStep": {
             if (processor.processOutputStep) {
               if (!passThrough.messageList) {
-                throw new chunkTWH4PTDG_cjs.MastraError({
+                throw new chunkHWMMIRIF_cjs.MastraError({
                   category: "USER" /* USER */,
                   domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
                   id: "PROCESSOR_MISSING_MESSAGE_LIST",
@@ -7732,9 +7893,9 @@ function createStep(params, agentOptions) {
                   }
                 }
               };
-              if (result instanceof chunk5Q6WAYEY_cjs.MessageList) {
+              if (result instanceof chunkX6IBA7FP_cjs.MessageList) {
                 if (result !== passThrough.messageList) {
-                  throw new chunkTWH4PTDG_cjs.MastraError({
+                  throw new chunkHWMMIRIF_cjs.MastraError({
                     category: "USER" /* USER */,
                     domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
                     id: "PROCESSOR_RETURNED_EXTERNAL_MESSAGE_LIST",
@@ -7799,7 +7960,7 @@ function cloneStep(step, opts) {
   };
 }
 function isProcessor(obj) {
-  return obj !== null && typeof obj === "object" && "id" in obj && typeof obj.id === "string" && !(obj instanceof Agent) && !(obj instanceof chunkMGCGWPQJ_cjs.Tool) && (typeof obj.processInput === "function" || typeof obj.processInputStep === "function" || typeof obj.processOutputStream === "function" || typeof obj.processOutputResult === "function" || typeof obj.processOutputStep === "function");
+  return obj !== null && typeof obj === "object" && "id" in obj && typeof obj.id === "string" && !(obj instanceof Agent) && !(obj instanceof chunkZ55SJVEC_cjs.Tool) && (typeof obj.processInput === "function" || typeof obj.processInputStep === "function" || typeof obj.processOutputStream === "function" || typeof obj.processOutputResult === "function" || typeof obj.processOutputStep === "function");
 }
 function createWorkflow(params) {
   return new Workflow(params);
@@ -7868,7 +8029,9 @@ var Workflow = class extends chunkDGV2FWB4_cjs.MastraBase {
     this.#options = {
       validateInputs: options.validateInputs ?? true,
       shouldPersistSnapshot: options.shouldPersistSnapshot ?? (() => true),
-      tracingPolicy: options.tracingPolicy
+      tracingPolicy: options.tracingPolicy,
+      onFinish: options.onFinish,
+      onError: options.onError
     };
     if (!executionEngine) {
       this.executionEngine = new DefaultExecutionEngine({
@@ -7935,8 +8098,8 @@ var Workflow = class extends chunkDGV2FWB4_cjs.MastraBase {
     this.serializedStepFlow.push(serializedOpts);
     this.steps[id] = createStep({
       id,
-      inputSchema: z7.z.object({}),
-      outputSchema: z7.z.object({}),
+      inputSchema: z8.z.object({}),
+      outputSchema: z8.z.object({}),
       execute: async () => {
         return {};
       }
@@ -7956,8 +8119,8 @@ var Workflow = class extends chunkDGV2FWB4_cjs.MastraBase {
     this.serializedStepFlow.push(serializedOpts);
     this.steps[id] = createStep({
       id,
-      inputSchema: z7.z.object({}),
-      outputSchema: z7.z.object({}),
+      inputSchema: z8.z.object({}),
+      outputSchema: z8.z.object({}),
       execute: async () => {
         return {};
       }
@@ -7968,7 +8131,7 @@ var Workflow = class extends chunkDGV2FWB4_cjs.MastraBase {
    * @deprecated waitForEvent has been removed. Please use suspend/resume instead.
    */
   waitForEvent(_event, _step, _opts) {
-    throw new chunkTWH4PTDG_cjs.MastraError({
+    throw new chunkHWMMIRIF_cjs.MastraError({
       id: "WORKFLOW_WAIT_FOR_EVENT_REMOVED",
       domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
       category: "USER" /* USER */,
@@ -7979,8 +8142,8 @@ var Workflow = class extends chunkDGV2FWB4_cjs.MastraBase {
     if (typeof mappingConfig === "function") {
       const mappingStep2 = createStep({
         id: stepOptions?.id || `mapping_${this.#mastra?.generateId() || crypto2.randomUUID()}`,
-        inputSchema: z7.z.object({}),
-        outputSchema: z7.z.object({}),
+        inputSchema: z8.z.object({}),
+        outputSchema: z8.z.object({}),
         execute: mappingConfig
       });
       this.stepFlow.push({ type: "step", step: mappingStep2 });
@@ -7988,7 +8151,7 @@ var Workflow = class extends chunkDGV2FWB4_cjs.MastraBase {
         type: "step",
         step: {
           id: mappingStep2.id,
-          mapConfig: mappingConfig.toString()
+          mapConfig: mappingConfig.toString()?.length > 1e3 ? mappingConfig.toString().slice(0, 1e3) + "...\n}" : mappingConfig.toString()
         }
       });
       return this;
@@ -8017,8 +8180,8 @@ var Workflow = class extends chunkDGV2FWB4_cjs.MastraBase {
     );
     const mappingStep = createStep({
       id: stepOptions?.id || `mapping_${this.#mastra?.generateId() || crypto2.randomUUID()}`,
-      inputSchema: z7.z.any(),
-      outputSchema: z7.z.any(),
+      inputSchema: z8.z.any(),
+      outputSchema: z8.z.any(),
       execute: async (ctx) => {
         const { getStepResult: getStepResult2, getInitData, requestContext } = ctx;
         const result = {};
@@ -8060,7 +8223,7 @@ var Workflow = class extends chunkDGV2FWB4_cjs.MastraBase {
       type: "step",
       step: {
         id: mappingStep.id,
-        mapConfig: JSON.stringify(newMappingConfig, null, 2)
+        mapConfig: JSON.stringify(newMappingConfig, null, 2)?.length > 1e3 ? JSON.stringify(newMappingConfig, null, 2).slice(0, 1e3) + "...\n}" : JSON.stringify(newMappingConfig, null, 2)
       }
     });
     return this;
@@ -8309,7 +8472,7 @@ var Workflow = class extends chunkDGV2FWB4_cjs.MastraBase {
     restart,
     resume,
     timeTravel,
-    [chunkABJOUEVA_cjs.EMITTER_SYMBOL]: emitter,
+    [chunkL3NKIMF5_cjs.PUBSUB_SYMBOL]: pubsub,
     mastra,
     requestContext,
     abort,
@@ -8344,7 +8507,11 @@ var Workflow = class extends chunkDGV2FWB4_cjs.MastraBase {
       await run.cancel();
     });
     const unwatch = run.watch((event) => {
-      emitter.emit("nested-watch", { event, workflowId: this.id });
+      void pubsub.publish("nested-watch", {
+        type: "nested-watch",
+        runId: run.runId,
+        data: { event, workflowId: this.id }
+      });
     });
     if (retryCount && retryCount > 0 && isResume && requestContext) {
       requestContext.set("__mastraWorflowInputData", inputData);
@@ -8541,7 +8708,7 @@ var Workflow = class extends chunkDGV2FWB4_cjs.MastraBase {
 };
 var Run = class {
   #abortController;
-  emitter;
+  pubsub;
   /**
    * Unique identifier for this workflow
    */
@@ -8611,7 +8778,7 @@ var Run = class {
     this.executionEngine = params.executionEngine;
     this.executionGraph = params.executionGraph;
     this.#mastra = params.mastra;
-    this.emitter = new EventEmitter2__default.default();
+    this.pubsub = new EventEmitterPubSub();
     this.retryConfig = params.retryConfig;
     this.cleanup = params.cleanup;
     this.disableScorers = params.disableScorers;
@@ -8630,10 +8797,22 @@ var Run = class {
     return this.#abortController;
   }
   /**
-   * Cancels the workflow execution
+   * Cancels the workflow execution.
+   * This aborts any running execution and updates the workflow status to 'canceled' in storage.
    */
   async cancel() {
-    this.abortController?.abort();
+    this.abortController.abort();
+    this.workflowRunStatus = "canceled";
+    try {
+      await this.mastra?.getStorage()?.updateWorkflowState({
+        workflowName: this.workflowId,
+        runId: this.runId,
+        opts: {
+          status: "canceled"
+        }
+      });
+    } catch {
+    }
   }
   async _validateInput(inputData) {
     let inputDataToUse = inputData;
@@ -8734,20 +8913,7 @@ var Run = class {
       serializedStepGraph: this.serializedStepGraph,
       input: inputDataToUse,
       initialState: initialStateToUse,
-      emitter: {
-        emit: async (event, data) => {
-          this.emitter.emit(event, data);
-        },
-        on: (event, callback) => {
-          this.emitter.on(event, callback);
-        },
-        off: (event, callback) => {
-          this.emitter.off(event, callback);
-        },
-        once: (event, callback) => {
-          this.emitter.once(event, callback);
-        }
-      },
+      pubsub: this.pubsub,
       retryConfig: this.retryConfig,
       requestContext: requestContext ?? new chunkUVHSM2GU_cjs.RequestContext(),
       abortController: this.abortController,
@@ -8770,6 +8936,19 @@ var Run = class {
   async start(args) {
     return this._start(args);
   }
+  /**
+   * Starts the workflow execution without waiting for completion (fire-and-forget).
+   * Returns immediately with the runId. The workflow executes in the background.
+   * Use this when you don't need to wait for the result or want to avoid polling failures.
+   * @param args The input data and configuration for the workflow
+   * @returns A promise that resolves immediately with the runId
+   */
+  async startAsync(args) {
+    this._start(args).catch((err) => {
+      console.error(`[Workflow ${this.workflowId}] Background execution failed:`, err);
+    });
+    return { runId: this.runId };
+  }
   /**
    * Starts the workflow execution with the provided input as a stream
    * @param input The input data for the workflow
@@ -8804,9 +8983,10 @@ var Run = class {
       }
     });
     this.closeStreamAction = async () => {
-      this.emitter.emit("watch", {
-        type: "workflow-finish",
-        payload: { runId: this.runId }
+      await this.pubsub.publish(`workflow.events.v2.${this.runId}`, {
+        type: "watch",
+        runId: this.runId,
+        data: { type: "workflow-finish", payload: { runId: this.runId } }
       });
       unwatch();
       await Promise.all(this.#observerHandlers.map((handler) => handler()));
@@ -8819,9 +8999,10 @@ var Run = class {
         writer.releaseLock();
       }
     };
-    this.emitter.emit("watch", {
-      type: "workflow-start",
-      payload: { runId: this.runId }
+    void this.pubsub.publish(`workflow.events.v2.${this.runId}`, {
+      type: "watch",
+      runId: this.runId,
+      data: { type: "workflow-start", payload: { runId: this.runId } }
     });
     this.executionResults = this._start({
       inputData,
@@ -8957,7 +9138,9 @@ var Run = class {
         self.closeStreamAction = async () => {
           unwatch();
           try {
-            await controller.close();
+            if (controller.desiredSize !== null) {
+              controller.close();
+            }
           } catch (err) {
             console.error("Error closing stream:", err);
           }
@@ -8970,7 +9153,11 @@ var Run = class {
           initialState,
           outputOptions,
           outputWriter: async (chunk) => {
-            void self.emitter.emit("watch", chunk);
+            void self.pubsub.publish(`workflow.events.v2.${self.runId}`, {
+              type: "watch",
+              runId: self.runId,
+              data: chunk
+            });
           }
         });
         let executionResults;
@@ -9068,7 +9255,9 @@ var Run = class {
         self.closeStreamAction = async () => {
           unwatch();
           try {
-            await controller.close();
+            if (controller.desiredSize !== null) {
+              controller.close();
+            }
           } catch (err) {
             console.error("Error closing stream:", err);
           }
@@ -9113,20 +9302,29 @@ var Run = class {
    * @internal
    */
   watch(cb) {
-    const nestedWatchCb = ({
-      event,
-      workflowId
-    }) => {
-      this.emitter.emit("watch", {
-        ...event,
-        ...event.payload?.id ? { payload: { ...event.payload, id: `${workflowId}.${event.payload.id}` } } : {}
-      });
+    const wrappedCb = (event) => {
+      if (event.runId === this.runId) {
+        cb(event.data);
+      }
+    };
+    const nestedWatchCb = (event) => {
+      if (event.runId === this.runId) {
+        const { event: nestedEvent, workflowId } = event.data;
+        void this.pubsub.publish(`workflow.events.v2.${this.runId}`, {
+          type: "watch",
+          runId: this.runId,
+          data: {
+            ...nestedEvent,
+            ...nestedEvent.payload?.id ? { payload: { ...nestedEvent.payload, id: `${workflowId}.${nestedEvent.payload.id}` } } : {}
+          }
+        });
+      }
     };
-    this.emitter.on("watch", cb);
-    this.emitter.on("nested-watch", nestedWatchCb);
+    void this.pubsub.subscribe(`workflow.events.v2.${this.runId}`, wrappedCb);
+    void this.pubsub.subscribe("nested-watch", nestedWatchCb);
     return () => {
-      this.emitter.off("watch", cb);
-      this.emitter.off("nested-watch", nestedWatchCb);
+      void this.pubsub.unsubscribe(`workflow.events.v2.${this.runId}`, wrappedCb);
+      void this.pubsub.unsubscribe("nested-watch", nestedWatchCb);
     };
   }
   /**
@@ -9254,21 +9452,7 @@ var Run = class {
         label: params.label
       },
       format: params.format,
-      emitter: {
-        emit: (event, data) => {
-          this.emitter.emit(event, data);
-          return Promise.resolve();
-        },
-        on: (event, callback) => {
-          this.emitter.on(event, callback);
-        },
-        off: (event, callback) => {
-          this.emitter.off(event, callback);
-        },
-        once: (event, callback) => {
-          this.emitter.once(event, callback);
-        }
-      },
+      pubsub: this.pubsub,
       requestContext: requestContextToUse,
       abortController: this.abortController,
       workflowSpan,
@@ -9368,20 +9552,7 @@ var Run = class {
       graph: this.executionGraph,
       serializedStepGraph: this.serializedStepGraph,
       restart: restartData,
-      emitter: {
-        emit: async (event, data) => {
-          this.emitter.emit(event, data);
-        },
-        on: (event, callback) => {
-          this.emitter.on(event, callback);
-        },
-        off: (event, callback) => {
-          this.emitter.off(event, callback);
-        },
-        once: (event, callback) => {
-          this.emitter.once(event, callback);
-        }
-      },
+      pubsub: this.pubsub,
       retryConfig: this.retryConfig,
       requestContext: requestContextToUse,
       abortController: this.abortController,
@@ -9474,20 +9645,7 @@ var Run = class {
       graph: this.executionGraph,
       timeTravel: timeTravelData,
       serializedStepGraph: this.serializedStepGraph,
-      emitter: {
-        emit: async (event, data) => {
-          this.emitter.emit(event, data);
-        },
-        on: (event, callback) => {
-          this.emitter.on(event, callback);
-        },
-        off: (event, callback) => {
-          this.emitter.off(event, callback);
-        },
-        once: (event, callback) => {
-          this.emitter.once(event, callback);
-        }
-      },
+      pubsub: this.pubsub,
       retryConfig: this.retryConfig,
       requestContext: requestContextToUse,
       abortController: this.abortController,
@@ -9535,7 +9693,9 @@ var Run = class {
         self.closeStreamAction = async () => {
           unwatch();
           try {
-            await controller.close();
+            if (controller.desiredSize !== null) {
+              controller.close();
+            }
           } catch (err) {
             console.error("Error closing stream:", err);
           }
@@ -9586,80 +9746,80 @@ var Run = class {
     return this.executionResults ?? this.streamOutput?.result;
   }
 };
-var languageModelUsageSchema = z7__default.default.object({
-  inputTokens: z7__default.default.number(),
-  outputTokens: z7__default.default.number(),
-  totalTokens: z7__default.default.number(),
-  reasoningTokens: z7__default.default.number().optional(),
-  cachedInputTokens: z7__default.default.number().optional()
+var languageModelUsageSchema = z8__default.default.object({
+  inputTokens: z8__default.default.number(),
+  outputTokens: z8__default.default.number(),
+  totalTokens: z8__default.default.number(),
+  reasoningTokens: z8__default.default.number().optional(),
+  cachedInputTokens: z8__default.default.number().optional()
 });
-var llmIterationStepResultSchema = z7__default.default.object({
-  reason: z7__default.default.string(),
-  warnings: z7__default.default.array(z7__default.default.any()),
-  isContinued: z7__default.default.boolean(),
-  logprobs: z7__default.default.any().optional(),
+var llmIterationStepResultSchema = z8__default.default.object({
+  reason: z8__default.default.string(),
+  warnings: z8__default.default.array(z8__default.default.any()),
+  isContinued: z8__default.default.boolean(),
+  logprobs: z8__default.default.any().optional(),
   totalUsage: languageModelUsageSchema.optional(),
-  headers: z7__default.default.record(z7__default.default.string()).optional(),
-  messageId: z7__default.default.string().optional(),
-  request: z7__default.default.record(z7__default.default.any()).optional()
+  headers: z8__default.default.record(z8__default.default.string()).optional(),
+  messageId: z8__default.default.string().optional(),
+  request: z8__default.default.record(z8__default.default.any()).optional()
 });
-var llmIterationOutputSchema = z7__default.default.object({
-  messageId: z7__default.default.string(),
-  messages: z7__default.default.object({
-    all: z7__default.default.array(z7__default.default.any()),
+var llmIterationOutputSchema = z8__default.default.object({
+  messageId: z8__default.default.string(),
+  messages: z8__default.default.object({
+    all: z8__default.default.array(z8__default.default.any()),
     // ModelMessage[] but too complex to validate at runtime
-    user: z7__default.default.array(z7__default.default.any()),
-    nonUser: z7__default.default.array(z7__default.default.any())
+    user: z8__default.default.array(z8__default.default.any()),
+    nonUser: z8__default.default.array(z8__default.default.any())
   }),
-  output: z7__default.default.object({
-    text: z7__default.default.string().optional(),
-    reasoning: z7__default.default.array(z7__default.default.any()).optional(),
-    reasoningText: z7__default.default.string().optional(),
-    files: z7__default.default.array(z7__default.default.any()).optional(),
+  output: z8__default.default.object({
+    text: z8__default.default.string().optional(),
+    reasoning: z8__default.default.array(z8__default.default.any()).optional(),
+    reasoningText: z8__default.default.string().optional(),
+    files: z8__default.default.array(z8__default.default.any()).optional(),
     // GeneratedFile[]
-    toolCalls: z7__default.default.array(z7__default.default.any()).optional(),
+    toolCalls: z8__default.default.array(z8__default.default.any()).optional(),
     // TypedToolCall[]
-    toolResults: z7__default.default.array(z7__default.default.any()).optional(),
+    toolResults: z8__default.default.array(z8__default.default.any()).optional(),
     // TypedToolResult[]
-    sources: z7__default.default.array(z7__default.default.any()).optional(),
+    sources: z8__default.default.array(z8__default.default.any()).optional(),
     // LanguageModelV2Source[]
-    staticToolCalls: z7__default.default.array(z7__default.default.any()).optional(),
-    dynamicToolCalls: z7__default.default.array(z7__default.default.any()).optional(),
-    staticToolResults: z7__default.default.array(z7__default.default.any()).optional(),
-    dynamicToolResults: z7__default.default.array(z7__default.default.any()).optional(),
+    staticToolCalls: z8__default.default.array(z8__default.default.any()).optional(),
+    dynamicToolCalls: z8__default.default.array(z8__default.default.any()).optional(),
+    staticToolResults: z8__default.default.array(z8__default.default.any()).optional(),
+    dynamicToolResults: z8__default.default.array(z8__default.default.any()).optional(),
     usage: languageModelUsageSchema,
-    steps: z7__default.default.array(z7__default.default.any())
+    steps: z8__default.default.array(z8__default.default.any())
     // StepResult[]
   }),
-  metadata: z7__default.default.object({
-    id: z7__default.default.string().optional(),
-    model: z7__default.default.string().optional(),
-    modelId: z7__default.default.string().optional(),
-    modelMetadata: z7__default.default.object({
-      modelId: z7__default.default.string(),
-      modelVersion: z7__default.default.string(),
-      modelProvider: z7__default.default.string()
+  metadata: z8__default.default.object({
+    id: z8__default.default.string().optional(),
+    model: z8__default.default.string().optional(),
+    modelId: z8__default.default.string().optional(),
+    modelMetadata: z8__default.default.object({
+      modelId: z8__default.default.string(),
+      modelVersion: z8__default.default.string(),
+      modelProvider: z8__default.default.string()
     }).optional(),
-    timestamp: z7__default.default.date().optional(),
-    providerMetadata: z7__default.default.record(z7__default.default.any()).optional(),
-    headers: z7__default.default.record(z7__default.default.string()).optional(),
-    request: z7__default.default.record(z7__default.default.any()).optional()
+    timestamp: z8__default.default.date().optional(),
+    providerMetadata: z8__default.default.record(z8__default.default.any()).optional(),
+    headers: z8__default.default.record(z8__default.default.string()).optional(),
+    request: z8__default.default.record(z8__default.default.any()).optional()
   }),
   stepResult: llmIterationStepResultSchema,
-  processorRetryCount: z7__default.default.number().optional(),
-  processorRetryFeedback: z7__default.default.string().optional()
+  processorRetryCount: z8__default.default.number().optional(),
+  processorRetryFeedback: z8__default.default.string().optional()
 });
-var toolCallInputSchema = z7__default.default.object({
-  toolCallId: z7__default.default.string(),
-  toolName: z7__default.default.string(),
-  args: z7__default.default.record(z7__default.default.any()),
-  providerMetadata: z7__default.default.record(z7__default.default.any()).optional(),
-  providerExecuted: z7__default.default.boolean().optional(),
-  output: z7__default.default.any().optional()
+var toolCallInputSchema = z8__default.default.object({
+  toolCallId: z8__default.default.string(),
+  toolName: z8__default.default.string(),
+  args: z8__default.default.record(z8__default.default.any()),
+  providerMetadata: z8__default.default.record(z8__default.default.any()).optional(),
+  providerExecuted: z8__default.default.boolean().optional(),
+  output: z8__default.default.any().optional()
 });
 var toolCallOutputSchema = toolCallInputSchema.extend({
-  result: z7__default.default.any(),
-  error: z7__default.default.any().optional()
+  result: z8__default.default.any(),
+  error: z8__default.default.any().optional()
 });
 
 // src/processors/processors/prepare-step.ts
@@ -9712,10 +9872,10 @@ var AISDKV5InputStream = class extends MastraModelInput {
   constructor({
     component,
     name,
-    generateId: generateId3
+    generateId: generateId2
   }) {
     super({ component, name });
-    this.#generateId = generateId3 ?? aiV5.generateId;
+    this.#generateId = generateId2 ?? chunkFVQTJUBD_cjs.generateId;
   }
   async transform({
     runId,
@@ -9767,12 +9927,12 @@ function execute({
   headers,
   shouldThrowError,
   methodType,
-  generateId: generateId3
+  generateId: generateId2
 }) {
   const v5 = new AISDKV5InputStream({
     component: "LLM",
     name: model.modelId,
-    generateId: generateId3
+    generateId: generateId2
   });
   const toolsAndToolChoice = prepareToolsAndToolChoice({
     tools,
@@ -9783,13 +9943,13 @@ function execute({
   const responseFormat = structuredOutput?.schema ? getResponseFormat(structuredOutput?.schema) : void 0;
   let prompt = inputMessages;
   if (structuredOutputMode === "direct" && responseFormat?.type === "json" && structuredOutput?.jsonPromptInjection) {
-    prompt = providerUtilsV5.injectJsonInstructionIntoMessages({
+    prompt = chunkX6IBA7FP_cjs.injectJsonInstructionIntoMessages({
       messages: inputMessages,
       schema: responseFormat.schema
     });
   }
   if (structuredOutputMode === "processor" && responseFormat?.type === "json" && responseFormat?.schema) {
-    prompt = providerUtilsV5.injectJsonInstructionIntoMessages({
+    prompt = chunkX6IBA7FP_cjs.injectJsonInstructionIntoMessages({
       messages: inputMessages,
       schema: responseFormat.schema,
       schemaPrefix: `Your response will be processed by another agent to extract structured data. Please ensure your response contains comprehensive information for all the following fields that will be extracted:
@@ -9833,7 +9993,7 @@ You don't need to format your response as JSON unless the user asks you to. Just
             retries: modelSettings?.maxRetries ?? 2,
             signal: abortSignal,
             shouldRetry(context) {
-              if (aiV5.APICallError.isInstance(context.error)) {
+              if (chunkFVQTJUBD_cjs.APICallError.isInstance(context.error)) {
                 return context.error.isRetryable;
               }
               return true;
@@ -10055,10 +10215,10 @@ async function processOutputStream({
         break;
       }
       case "tool-call-input-streaming-start": {
-        const tool = tools?.[chunk.payload.toolName] || Object.values(tools || {})?.find((tool2) => `id` in tool2 && tool2.id === chunk.payload.toolName);
-        if (tool && "onInputStart" in tool) {
+        const tool2 = tools?.[chunk.payload.toolName] || Object.values(tools || {})?.find((tool3) => `id` in tool3 && tool3.id === chunk.payload.toolName);
+        if (tool2 && "onInputStart" in tool2) {
           try {
-            await tool?.onInputStart?.({
+            await tool2?.onInputStart?.({
               toolCallId: chunk.payload.toolCallId,
               messages: messageList.get.input.aiV5.model(),
               abortSignal: options?.abortSignal
@@ -10073,10 +10233,10 @@ async function processOutputStream({
         break;
       }
       case "tool-call-delta": {
-        const tool = tools?.[chunk.payload.toolName || ""] || Object.values(tools || {})?.find((tool2) => `id` in tool2 && tool2.id === chunk.payload.toolName);
-        if (tool && "onInputDelta" in tool) {
+        const tool2 = tools?.[chunk.payload.toolName || ""] || Object.values(tools || {})?.find((tool3) => `id` in tool3 && tool3.id === chunk.payload.toolName);
+        if (tool2 && "onInputDelta" in tool2) {
           try {
-            await tool?.onInputDelta?.({
+            await tool2?.onInputDelta?.({
               inputTextDelta: chunk.payload.argsTextDelta,
               toolCallId: chunk.payload.toolCallId,
               messages: messageList.get.input.aiV5.model(),
@@ -10230,7 +10390,7 @@ async function processOutputStream({
         });
         break;
       case "error":
-        if (providerUtilsV5.isAbortError(chunk.payload.error) && options?.abortSignal?.aborted) {
+        if (chunkX6IBA7FP_cjs.isAbortError(chunk.payload.error) && options?.abortSignal?.aborted) {
           break;
         }
         runState.setState({
@@ -10242,7 +10402,7 @@ async function processOutputStream({
             reason: "error"
           }
         });
-        const error = chunkTWH4PTDG_cjs.getErrorFromUnknown(chunk.payload.error, {
+        const error = chunkHWMMIRIF_cjs.getErrorFromUnknown(chunk.payload.error, {
           fallbackMessage: "Unknown error in agent stream"
         });
         controller.enqueue({ ...chunk, payload: { ...chunk.payload, error } });
@@ -10336,6 +10496,7 @@ function createLLMExecutionStep({
   requestContext,
   methodType,
   modelSpanTracker,
+  autoResumeSuspendedTools,
   maxProcessorRetries
 }) {
   const initialSystemMessages = messageList.getAllSystemMessages();
@@ -10406,7 +10567,33 @@ function createLLMExecutionStep({
           downloadConcurrency,
           supportedUrls: currentStep.model?.supportedUrls
         };
-        const inputMessages = await messageList.get.all.aiV5.llmPrompt(messageListPromptArgs);
+        let inputMessages = await messageList.get.all.aiV5.llmPrompt(messageListPromptArgs);
+        if (autoResumeSuspendedTools) {
+          const messages2 = messageList.get.all.db();
+          const assistantMessages = [...messages2].reverse().filter((message) => message.role === "assistant");
+          const suspendedToolsMessage = assistantMessages.find(
+            (message) => message.content.metadata?.suspendedTools || message.content.metadata?.pendingToolApprovals
+          );
+          if (suspendedToolsMessage) {
+            const metadata = suspendedToolsMessage.content.metadata;
+            const suspendedToolObj = metadata?.suspendedTools || metadata?.pendingToolApprovals;
+            const suspendedTools = Object.values(suspendedToolObj);
+            if (suspendedTools.length > 0) {
+              inputMessages = inputMessages.map((message, index) => {
+                if (message.role === "system" && index === 0) {
+                  message.content = message.content + `
+
+Analyse the suspended tools: ${JSON.stringify(suspendedTools)}, using the messages available to you and the resumeSchema of each suspended tool, find the tool whose resumeData you can construct properly.
+                      resumeData can not be an empty object nor null/undefined.
+                      When you find that and call that tool, add the resumeData to the tool call arguments/input.
+                      Also, add the runId of the suspended tool as suspendedToolRunId to the tool call arguments/input.
+                      If the suspendedTool.type is 'approval', resumeData will be an object that contains 'approved' which can either be true or false depending on the user's message.`;
+                }
+                return message;
+              });
+            }
+          }
+        }
         switch (currentStep.model.specificationVersion) {
           case "v2": {
             modelResult = chunk72YCRTEX_cjs.executeWithContextSync({
@@ -10496,7 +10683,7 @@ function createLLMExecutionStep({
           });
         } catch (error) {
           console.error("Error in LLM Execution Step", error);
-          if (providerUtilsV5.isAbortError(error) && options?.abortSignal?.aborted) {
+          if (chunkX6IBA7FP_cjs.isAbortError(error) && options?.abortSignal?.aborted) {
             await options?.onAbort?.({
               steps: inputData?.output?.steps ?? []
             });
@@ -10767,11 +10954,11 @@ function createLLMMappingStep({ models, _internal, ...rest }, llmExecutionStep)
   }
   return createStep({
     id: "llmExecutionMappingStep",
-    inputSchema: z7__default.default.array(toolCallOutputSchema),
+    inputSchema: z8__default.default.array(toolCallOutputSchema),
     outputSchema: llmIterationOutputSchema,
     execute: async ({ inputData, getStepResult: getStepResult2, bail }) => {
       const initialResult = getStepResult2(llmExecutionStep);
-      if (inputData?.every((toolCall) => toolCall?.result === void 0)) {
+      if (inputData?.some((toolCall) => toolCall?.result === void 0)) {
         const errorResults = inputData.filter((toolCall) => toolCall?.error);
         const toolResultMessageId = rest.experimental_generateMessageId?.() || _internal?.generateId?.();
         if (errorResults?.length) {
@@ -10816,7 +11003,14 @@ function createLLMMappingStep({ models, _internal, ...rest }, llmExecutionStep)
         if (initialResult.stepResult.reason !== "retry") {
           initialResult.stepResult.isContinued = false;
         }
-        return bail(initialResult);
+        return bail({
+          ...initialResult,
+          messages: {
+            all: rest.messageList.get.all.aiV5.model(),
+            user: rest.messageList.get.input.aiV5.model(),
+            nonUser: rest.messageList.get.response.aiV5.model()
+          }
+        });
       }
       if (inputData?.length) {
         for (const toolCall of inputData) {
@@ -10874,11 +11068,10 @@ function createLLMMappingStep({ models, _internal, ...rest }, llmExecutionStep)
           }
         };
       }
+      return initialResult;
     }
   });
 }
-
-// src/loop/workflows/agentic-execution/tool-call-step.ts
 function createToolCallStep({
   tools,
   messageList,
@@ -10894,28 +11087,39 @@ function createToolCallStep({
     id: "toolCallStep",
     inputSchema: toolCallInputSchema,
     outputSchema: toolCallOutputSchema,
-    execute: async ({ inputData, suspend, resumeData, requestContext }) => {
+    execute: async ({ inputData, suspend, resumeData: workflowResumeData, requestContext }) => {
       const stepTools = _internal?.stepTools || tools;
-      const tool = stepTools?.[inputData.toolName] || Object.values(stepTools || {})?.find((t) => `id` in t && t.id === inputData.toolName);
-      const addToolApprovalMetadata = (toolCallId, toolName, args) => {
+      const tool2 = stepTools?.[inputData.toolName] || Object.values(stepTools || {})?.find((t) => `id` in t && t.id === inputData.toolName);
+      const addToolMetadata = ({
+        toolCallId,
+        toolName,
+        args,
+        suspendPayload,
+        resumeSchema,
+        type
+      }) => {
+        const metadataKey = type === "suspension" ? "suspendedTools" : "pendingToolApprovals";
         const responseMessages = messageList.get.response.db();
         const lastAssistantMessage = [...responseMessages].reverse().find((msg) => msg.role === "assistant");
         if (lastAssistantMessage) {
           const content = lastAssistantMessage.content;
           if (!content) return;
           const metadata = typeof lastAssistantMessage.content.metadata === "object" && lastAssistantMessage.content.metadata !== null ? lastAssistantMessage.content.metadata : {};
-          metadata.pendingToolApprovals = metadata.pendingToolApprovals || {};
-          metadata.pendingToolApprovals[toolCallId] = {
+          metadata[metadataKey] = metadata[metadataKey] || {};
+          metadata[metadataKey][toolName] = {
+            toolCallId,
             toolName,
             args,
-            type: "approval",
-            runId
+            type,
+            runId,
             // Store the runId so we can resume after page refresh
+            ...type === "suspension" ? { suspendPayload } : {},
+            resumeSchema
           };
           lastAssistantMessage.content.metadata = metadata;
         }
       };
-      const removeToolApprovalMetadata = async (toolCallId) => {
+      const removeToolMetadata = async (toolName, type) => {
         const { saveQueueManager, memoryConfig, threadId } = _internal || {};
         if (!saveQueueManager || !threadId) {
           return;
@@ -10926,24 +11130,25 @@ function createToolCallStep({
           const metadata = typeof content.metadata === "object" && content.metadata !== null ? content.metadata : void 0;
           return metadata;
         };
+        const metadataKey = type === "suspension" ? "suspendedTools" : "pendingToolApprovals";
         const allMessages = messageList.get.all.db();
         const lastAssistantMessage = [...allMessages].reverse().find((msg) => {
           const metadata = getMetadata(msg);
-          const pendingToolApprovals = metadata?.pendingToolApprovals;
-          return !!pendingToolApprovals?.[toolCallId];
+          const suspendedTools = metadata?.[metadataKey];
+          return !!suspendedTools?.[toolName];
         });
         if (lastAssistantMessage) {
           const metadata = getMetadata(lastAssistantMessage);
-          const pendingToolApprovals = metadata?.pendingToolApprovals;
-          if (pendingToolApprovals && typeof pendingToolApprovals === "object") {
-            delete pendingToolApprovals[toolCallId];
-            if (metadata && Object.keys(pendingToolApprovals).length === 0) {
-              delete metadata.pendingToolApprovals;
+          const suspendedTools = metadata?.[metadataKey];
+          if (suspendedTools && typeof suspendedTools === "object") {
+            delete suspendedTools[toolName];
+            if (metadata && Object.keys(suspendedTools).length === 0) {
+              delete metadata[metadataKey];
             }
             try {
               await saveQueueManager.flushMessages(messageList, threadId, memoryConfig);
             } catch (error) {
-              console.error("Error removing tool approval metadata:", error);
+              console.error("Error removing tool suspension metadata:", error);
             }
           }
         }
@@ -10976,12 +11181,12 @@ function createToolCallStep({
           result: inputData.output
         };
       }
-      if (!tool) {
+      if (!tool2) {
         throw new Error(`Tool ${inputData.toolName} not found`);
       }
-      if (tool && "onInputAvailable" in tool) {
+      if (tool2 && "onInputAvailable" in tool2) {
         try {
-          await tool?.onInputAvailable?.({
+          await tool2?.onInputAvailable?.({
             toolCallId: inputData.toolCallId,
             input: inputData.args,
             messages: messageList.get.input.aiV5.model(),
@@ -10991,12 +11196,21 @@ function createToolCallStep({
           console.error("Error calling onInputAvailable", error);
         }
       }
-      if (!tool.execute) {
+      if (!tool2.execute) {
         return inputData;
       }
       try {
         const requireToolApproval = requestContext.get("__mastra_requireToolApproval");
-        if (requireToolApproval || tool.requireApproval) {
+        let resumeDataFromArgs = void 0;
+        let args = inputData.args;
+        if (typeof inputData.args === "object" && inputData.args !== null) {
+          const { resumeData: resumeDataFromInput, ...argsFromInput } = inputData.args;
+          args = argsFromInput;
+          resumeDataFromArgs = resumeDataFromInput;
+        }
+        const resumeData = resumeDataFromArgs ?? workflowResumeData;
+        const isResumeToolCall = !!resumeDataFromArgs;
+        if (requireToolApproval || tool2.requireApproval) {
           if (!resumeData) {
             controller.enqueue({
               type: "tool-call-approval",
@@ -11008,7 +11222,17 @@ function createToolCallStep({
                 args: inputData.args
               }
             });
-            addToolApprovalMetadata(inputData.toolCallId, inputData.toolName, inputData.args);
+            addToolMetadata({
+              toolCallId: inputData.toolCallId,
+              toolName: inputData.toolName,
+              args: inputData.args,
+              type: "approval",
+              resumeSchema: z8__default.default.object({
+                approved: z8__default.default.boolean().describe(
+                  "Controls if the tool call is approved or not, should be true when approved and false when declined"
+                )
+              })
+            });
             await flushMessagesBeforeSuspension();
             return suspend(
               {
@@ -11024,7 +11248,7 @@ function createToolCallStep({
               }
             );
           } else {
-            await removeToolApprovalMetadata(inputData.toolCallId);
+            await removeToolMetadata(inputData.toolName, "approval");
             if (!resumeData.approved) {
               return {
                 result: "Tool call was not approved by the user",
@@ -11032,6 +11256,8 @@ function createToolCallStep({
               };
             }
           }
+        } else if (isResumeToolCall) {
+          await removeToolMetadata(inputData.toolName, "suspension");
         }
         const toolOptions = {
           abortSignal: options?.abortSignal,
@@ -11040,18 +11266,33 @@ function createToolCallStep({
           outputWriter,
           // Pass current step span as parent for tool call spans
           tracingContext: modelSpanTracker?.getTracingContext(),
-          suspend: async (suspendPayload) => {
+          suspend: async (suspendPayload, options2) => {
             controller.enqueue({
               type: "tool-call-suspended",
               runId,
               from: "AGENT" /* AGENT */,
-              payload: { toolCallId: inputData.toolCallId, toolName: inputData.toolName, suspendPayload }
+              payload: {
+                toolCallId: inputData.toolCallId,
+                toolName: inputData.toolName,
+                suspendPayload,
+                args: inputData.args
+              }
+            });
+            addToolMetadata({
+              toolCallId: inputData.toolCallId,
+              toolName: inputData.toolName,
+              args,
+              suspendPayload,
+              type: "suspension",
+              resumeSchema: options2?.resumeSchema
             });
             await flushMessagesBeforeSuspension();
             return await suspend(
               {
                 toolCallSuspended: suspendPayload,
-                __streamState: streamState.serialize()
+                __streamState: streamState.serialize(),
+                toolName: inputData.toolName,
+                resumeLabel: options2?.resumeLabel
               },
               {
                 resumeLabel: inputData.toolCallId
@@ -11060,10 +11301,10 @@ function createToolCallStep({
           },
           resumeData
         };
-        const result = await tool.execute(inputData.args, toolOptions);
-        if (tool && "onOutput" in tool && typeof tool.onOutput === "function") {
+        const result = await tool2.execute(args, toolOptions);
+        if (tool2 && "onOutput" in tool2 && typeof tool2.onOutput === "function") {
           try {
-            await tool.onOutput({
+            await tool2.onOutput({
               toolCallId: inputData.toolCallId,
               toolName: inputData.toolName,
               output: result,
@@ -11103,6 +11344,25 @@ function createAgenticExecutionWorkflow({ models, _internal, ...rest }) {
     },
     llmExecutionStep
   );
+  let toolCallConcurrency = 10;
+  if (rest?.toolCallConcurrency) {
+    toolCallConcurrency = rest.toolCallConcurrency > 0 ? rest.toolCallConcurrency : 10;
+  }
+  const hasRequireToolApproval = !!rest.requireToolApproval;
+  let hasSuspendSchema = false;
+  let hasRequireApproval = false;
+  if (rest.tools) {
+    for (const tool2 of Object.values(rest.tools)) {
+      if (tool2?.hasSuspendSchema) {
+        hasSuspendSchema = true;
+      }
+      if (tool2?.requireApproval) {
+        hasRequireApproval = true;
+      }
+      if (hasSuspendSchema || hasRequireApproval) break;
+    }
+  }
+  const sequentialExecutionRequired = hasRequireToolApproval || hasSuspendSchema || hasRequireApproval;
   return createWorkflow({
     id: "executionWorkflow",
     inputSchema: llmIterationOutputSchema,
@@ -11132,7 +11392,7 @@ function createAgenticExecutionWorkflow({ models, _internal, ...rest }) {
       return typedInputData.output.toolCalls || [];
     },
     { id: "map-tool-calls" }
-  ).foreach(toolCallStep, { concurrency: 10 }).then(llmMappingStep).commit();
+  ).foreach(toolCallStep, { concurrency: sequentialExecutionRequired ? 1 : toolCallConcurrency }).then(llmMappingStep).commit();
 }
 
 // src/loop/workflows/agentic-loop/index.ts
@@ -11265,6 +11525,7 @@ function workflowLoopStream({
   streamState,
   agentId,
   toolCallId,
+  toolCallConcurrency,
   ...rest
 }) {
   return new web.ReadableStream({
@@ -11282,7 +11543,9 @@ function workflowLoopStream({
               format: 2,
               parts: [dataPart]
             },
-            createdAt: /* @__PURE__ */ new Date()
+            createdAt: /* @__PURE__ */ new Date(),
+            threadId: _internal?.threadId,
+            resourceId: _internal?.resourceId
           };
           messageList.add(message, "response");
         }
@@ -11302,6 +11565,8 @@ function workflowLoopStream({
         startTimestamp,
         streamState,
         agentId,
+        requireToolApproval,
+        toolCallConcurrency,
         ...rest
       });
       if (rest.mastra) {
@@ -11332,7 +11597,8 @@ function workflowLoopStream({
           runId,
           from: "AGENT" /* AGENT */,
           payload: {
-            id: agentId
+            id: agentId,
+            messageId
           }
         });
       }
@@ -11354,18 +11620,7 @@ function workflowLoopStream({
       });
       if (executionResult.status !== "success") {
         if (executionResult.status === "failed") {
-          let executionResultError = executionResult.error;
-          if (typeof executionResult.error === "string") {
-            const prependedErrorString = "Error: ";
-            if (executionResult.error.startsWith(`${prependedErrorString}${prependedErrorString}`)) {
-              executionResultError = executionResult.error.substring(
-                `${prependedErrorString}${prependedErrorString}`.length
-              );
-            } else if (executionResult.error.startsWith(prependedErrorString)) {
-              executionResultError = executionResult.error.substring(prependedErrorString.length);
-            }
-          }
-          const error = chunkTWH4PTDG_cjs.getErrorFromUnknown(executionResultError, {
+          const error = chunkHWMMIRIF_cjs.getErrorFromUnknown(executionResult.error, {
             fallbackMessage: "Unknown error in agent workflow stream"
           });
           controller.enqueue({
@@ -11378,9 +11633,13 @@ function workflowLoopStream({
             await rest.options?.onError?.({ error });
           }
         }
+        if (executionResult.status !== "suspended") {
+          await agenticLoopWorkflow.deleteWorkflowRunById(runId);
+        }
         controller.close();
         return;
       }
+      await agenticLoopWorkflow.deleteWorkflowRunById(runId);
       controller.enqueue({
         type: "finish",
         runId,
@@ -11415,13 +11674,14 @@ function loop({
   returnScorerData,
   requireToolApproval,
   agentId,
+  toolCallConcurrency,
   ...rest
 }) {
   let loggerToUse = logger || new chunkAF74UXR5_cjs.ConsoleLogger({
     level: "debug"
   });
   if (models.length === 0 || !models[0]) {
-    const mastraError = new chunkTWH4PTDG_cjs.MastraError({
+    const mastraError = new chunkHWMMIRIF_cjs.MastraError({
       id: "LOOP_MODELS_EMPTY",
       domain: "LLM" /* LLM */,
       category: "USER" /* USER */
@@ -11437,7 +11697,7 @@ function loop({
   }
   const internalToUse = {
     now: _internal?.now || (() => Date.now()),
-    generateId: _internal?.generateId || (() => aiV5.generateId()),
+    generateId: _internal?.generateId || (() => chunkFVQTJUBD_cjs.generateId()),
     currentDate: _internal?.currentDate || (() => /* @__PURE__ */ new Date()),
     saveQueueManager: _internal?.saveQueueManager,
     memoryConfig: _internal?.memoryConfig,
@@ -11471,6 +11731,7 @@ function loop({
     messageId,
     agentId,
     requireToolApproval,
+    toolCallConcurrency,
     streamState: {
       serialize: serializeStreamState,
       deserialize: deserializeStreamState
@@ -11537,7 +11798,7 @@ var MastraLLMVNext = class extends chunkDGV2FWB4_cjs.MastraBase {
       }
     }
     if (models.length === 0 || !models[0]) {
-      const mastraError = new chunkTWH4PTDG_cjs.MastraError({
+      const mastraError = new chunkHWMMIRIF_cjs.MastraError({
         id: "LLM_LOOP_MODELS_EMPTY",
         domain: "LLM" /* LLM */,
         category: "USER" /* USER */
@@ -11613,7 +11874,7 @@ var MastraLLMVNext = class extends chunkDGV2FWB4_cjs.MastraBase {
   stream({
     resumeContext,
     runId,
-    stopWhen = aiV5.stepCountIs(5),
+    stopWhen = chunkNESKUIRE_cjs.stepCountIs(5),
     maxSteps,
     tools = {},
     modelSettings,
@@ -11629,6 +11890,7 @@ var MastraLLMVNext = class extends chunkDGV2FWB4_cjs.MastraBase {
     tracingContext,
     messageList,
     requireToolApproval,
+    toolCallConcurrency,
     _internal,
     agentId,
     agentName,
@@ -11636,11 +11898,12 @@ var MastraLLMVNext = class extends chunkDGV2FWB4_cjs.MastraBase {
     requestContext,
     methodType,
     includeRawChunks,
+    autoResumeSuspendedTools,
     maxProcessorRetries
   }) {
     let stopWhenToUse;
     if (maxSteps && typeof maxSteps === "number") {
-      stopWhenToUse = aiV5.stepCountIs(maxSteps);
+      stopWhenToUse = chunkNESKUIRE_cjs.stepCountIs(maxSteps);
     } else {
       stopWhenToUse = stopWhen;
     }
@@ -11695,11 +11958,13 @@ var MastraLLMVNext = class extends chunkDGV2FWB4_cjs.MastraBase {
         returnScorerData,
         modelSpanTracker,
         requireToolApproval,
+        toolCallConcurrency,
         agentId,
         agentName,
         requestContext,
         methodType,
         includeRawChunks,
+        autoResumeSuspendedTools,
         maxProcessorRetries,
         options: {
           ...options,
@@ -11707,7 +11972,7 @@ var MastraLLMVNext = class extends chunkDGV2FWB4_cjs.MastraBase {
             try {
               await options?.onStepFinish?.({ ...props, runId });
             } catch (e) {
-              const mastraError = new chunkTWH4PTDG_cjs.MastraError(
+              const mastraError = new chunkHWMMIRIF_cjs.MastraError(
                 {
                   id: "LLM_STREAM_ON_STEP_FINISH_CALLBACK_EXECUTION_FAILED",
                   domain: "LLM" /* LLM */,
@@ -11741,7 +12006,7 @@ var MastraLLMVNext = class extends chunkDGV2FWB4_cjs.MastraBase {
             const remainingTokens = parseInt(props?.response?.headers?.["x-ratelimit-remaining-tokens"] ?? "", 10);
             if (!isNaN(remainingTokens) && remainingTokens > 0 && remainingTokens < 2e3) {
               this.logger.warn("Rate limit approaching, waiting 10 seconds", { runId });
-              await chunkPG5H6QIO_cjs.delay(10 * 1e3);
+              await chunkMLKE7HRS_cjs.delay(10 * 1e3);
             }
           },
           onFinish: async (props) => {
@@ -11766,7 +12031,7 @@ var MastraLLMVNext = class extends chunkDGV2FWB4_cjs.MastraBase {
             try {
               await options?.onFinish?.({ ...props, runId });
             } catch (e) {
-              const mastraError = new chunkTWH4PTDG_cjs.MastraError(
+              const mastraError = new chunkHWMMIRIF_cjs.MastraError(
                 {
                   id: "LLM_STREAM_ON_FINISH_CALLBACK_EXECUTION_FAILED",
                   domain: "LLM" /* LLM */,
@@ -11804,7 +12069,7 @@ var MastraLLMVNext = class extends chunkDGV2FWB4_cjs.MastraBase {
       };
       return loop(loopOptions);
     } catch (e) {
-      const mastraError = new chunkTWH4PTDG_cjs.MastraError(
+      const mastraError = new chunkHWMMIRIF_cjs.MastraError(
         {
           id: "LLM_STREAM_TEXT_AI_SDK_EXECUTION_FAILED",
           domain: "LLM" /* LLM */,
@@ -11824,7 +12089,7 @@ var MastraLLMVNext = class extends chunkDGV2FWB4_cjs.MastraBase {
     }
   }
 };
-var PRIMITIVE_TYPES = z7__default.default.enum(["agent", "workflow", "none", "tool"]);
+var PRIMITIVE_TYPES = z8__default.default.enum(["agent", "workflow", "none", "tool"]);
 
 // src/loop/network/index.ts
 async function getRoutingAgent({ requestContext, agent }) {
@@ -11843,9 +12108,9 @@ async function getRoutingAgent({ requestContext, agent }) {
     )}`;
   }).join("\n");
   const memoryTools = await memoryToUse?.listTools?.();
-  const toolList = Object.entries({ ...toolsToUse, ...memoryTools }).map(([name, tool]) => {
-    return ` - **${name}**: ${tool.description}, input schema: ${JSON.stringify(
-      chunk4WQYXT2I_cjs.zodToJsonSchema(tool.inputSchema || z7__default.default.object({}))
+  const toolList = Object.entries({ ...toolsToUse, ...memoryTools }).map(([name, tool2]) => {
+    return ` - **${name}**: ${tool2.description}, input schema: ${JSON.stringify(
+      chunk4WQYXT2I_cjs.zodToJsonSchema(tool2.inputSchema || z8__default.default.object({}))
     )}`;
   }).join("\n");
   const instructions = `
@@ -11916,7 +12181,7 @@ async function prepareMemoryStep({
   messages,
   routingAgent,
   requestContext,
-  generateId: generateId3,
+  generateId: generateId2,
   tracingContext,
   memoryConfig
 }) {
@@ -11938,7 +12203,7 @@ async function prepareMemoryStep({
         memory.saveMessages({
           messages: [
             {
-              id: generateId3(),
+              id: generateId2(),
               type: "text",
               role: "user",
               content: { parts: [{ type: "text", text: messages }], format: 2 },
@@ -11951,7 +12216,7 @@ async function prepareMemoryStep({
       );
     }
   } else {
-    const messageList = new chunk5Q6WAYEY_cjs.MessageList({
+    const messageList = new chunkX6IBA7FP_cjs.MessageList({
       threadId: thread?.id,
       resourceId: thread?.resourceId
     });
@@ -12005,43 +12270,43 @@ async function createNetworkLoop({
   requestContext,
   runId,
   agent,
-  generateId: generateId3,
+  generateId: generateId2,
   routingAgentOptions
 }) {
   const routingStep = createStep({
     id: "routing-agent-step",
-    inputSchema: z7__default.default.object({
-      task: z7__default.default.string(),
-      primitiveId: z7__default.default.string(),
+    inputSchema: z8__default.default.object({
+      task: z8__default.default.string(),
+      primitiveId: z8__default.default.string(),
       primitiveType: PRIMITIVE_TYPES,
-      result: z7__default.default.string().optional(),
-      iteration: z7__default.default.number(),
-      threadId: z7__default.default.string().optional(),
-      threadResourceId: z7__default.default.string().optional(),
-      isOneOff: z7__default.default.boolean(),
-      verboseIntrospection: z7__default.default.boolean()
+      result: z8__default.default.string().optional(),
+      iteration: z8__default.default.number(),
+      threadId: z8__default.default.string().optional(),
+      threadResourceId: z8__default.default.string().optional(),
+      isOneOff: z8__default.default.boolean(),
+      verboseIntrospection: z8__default.default.boolean()
     }),
-    outputSchema: z7__default.default.object({
-      task: z7__default.default.string(),
-      primitiveId: z7__default.default.string(),
+    outputSchema: z8__default.default.object({
+      task: z8__default.default.string(),
+      primitiveId: z8__default.default.string(),
       primitiveType: PRIMITIVE_TYPES,
-      prompt: z7__default.default.string(),
-      result: z7__default.default.string(),
-      isComplete: z7__default.default.boolean().optional(),
-      selectionReason: z7__default.default.string(),
-      iteration: z7__default.default.number()
+      prompt: z8__default.default.string(),
+      result: z8__default.default.string(),
+      isComplete: z8__default.default.boolean().optional(),
+      selectionReason: z8__default.default.string(),
+      iteration: z8__default.default.number()
     }),
     execute: async ({ inputData, getInitData, writer }) => {
       const initData = await getInitData();
-      const completionSchema = z7__default.default.object({
-        isComplete: z7__default.default.boolean(),
-        finalResult: z7__default.default.string(),
-        completionReason: z7__default.default.string()
+      const completionSchema = z8__default.default.object({
+        isComplete: z8__default.default.boolean(),
+        finalResult: z8__default.default.string(),
+        completionReason: z8__default.default.string()
       });
       const routingAgent = await getRoutingAgent({ requestContext, agent });
       let completionResult;
       const iterationCount = (inputData.iteration ?? -1) + 1;
-      const stepId = generateId3();
+      const stepId = generateId2();
       await writer.write({
         type: "routing-agent-start",
         payload: {
@@ -12177,7 +12442,7 @@ async function createNetworkLoop({
           await memory?.saveMessages({
             messages: [
               {
-                id: generateId3(),
+                id: generateId2(),
                 type: "text",
                 role: "assistant",
                 content: {
@@ -12237,11 +12502,11 @@ ${completionResult?.object?.finalResult}` : ""}
       ];
       const options = {
         structuredOutput: {
-          schema: z7__default.default.object({
-            primitiveId: z7__default.default.string().describe("The id of the primitive to be called"),
+          schema: z8__default.default.object({
+            primitiveId: z8__default.default.string().describe("The id of the primitive to be called"),
             primitiveType: PRIMITIVE_TYPES.describe("The type of the primitive to be called"),
-            prompt: z7__default.default.string().describe("The json string or text value to be sent to the primitive"),
-            selectionReason: z7__default.default.string().describe("The reason you picked the primitive")
+            prompt: z8__default.default.string().describe("The json string or text value to be sent to the primitive"),
+            selectionReason: z8__default.default.string().describe("The reason you picked the primitive")
           })
         },
         requestContext,
@@ -12285,29 +12550,29 @@ ${completionResult?.object?.finalResult}` : ""}
   });
   const agentStep = createStep({
     id: "agent-execution-step",
-    inputSchema: z7__default.default.object({
-      task: z7__default.default.string(),
-      primitiveId: z7__default.default.string(),
+    inputSchema: z8__default.default.object({
+      task: z8__default.default.string(),
+      primitiveId: z8__default.default.string(),
       primitiveType: PRIMITIVE_TYPES,
-      prompt: z7__default.default.string(),
-      result: z7__default.default.string(),
-      isComplete: z7__default.default.boolean().optional(),
-      selectionReason: z7__default.default.string(),
-      iteration: z7__default.default.number()
+      prompt: z8__default.default.string(),
+      result: z8__default.default.string(),
+      isComplete: z8__default.default.boolean().optional(),
+      selectionReason: z8__default.default.string(),
+      iteration: z8__default.default.number()
     }),
-    outputSchema: z7__default.default.object({
-      task: z7__default.default.string(),
-      primitiveId: z7__default.default.string(),
+    outputSchema: z8__default.default.object({
+      task: z8__default.default.string(),
+      primitiveId: z8__default.default.string(),
       primitiveType: PRIMITIVE_TYPES,
-      result: z7__default.default.string(),
-      isComplete: z7__default.default.boolean().optional(),
-      iteration: z7__default.default.number()
+      result: z8__default.default.string(),
+      isComplete: z8__default.default.boolean().optional(),
+      iteration: z8__default.default.number()
     }),
     execute: async ({ inputData, writer, getInitData }) => {
       const agentsMap = await agent.listAgents({ requestContext });
       const agentForStep = agentsMap[inputData.primitiveId];
       if (!agentForStep) {
-        const mastraError = new chunkTWH4PTDG_cjs.MastraError({
+        const mastraError = new chunkHWMMIRIF_cjs.MastraError({
           id: "AGENT_NETWORK_AGENT_EXECUTION_STEP_INVALID_TASK_INPUT",
           domain: "AGENT_NETWORK" /* AGENT_NETWORK */,
           category: "USER" /* USER */,
@@ -12316,7 +12581,7 @@ ${completionResult?.object?.finalResult}` : ""}
         throw mastraError;
       }
       const agentId = agentForStep.id;
-      const stepId = generateId3();
+      const stepId = generateId2();
       await writer.write({
         type: "agent-execution-start",
         payload: {
@@ -12357,7 +12622,7 @@ ${completionResult?.object?.finalResult}` : ""}
       await memory?.saveMessages({
         messages: [
           {
-            id: generateId3(),
+            id: generateId2(),
             type: "text",
             role: "assistant",
             content: {
@@ -12370,7 +12635,7 @@ ${completionResult?.object?.finalResult}` : ""}
                     primitiveType: inputData.primitiveType,
                     primitiveId: inputData.primitiveId,
                     input: inputData.prompt,
-                    finalResult: { text: await result.text, toolCalls: await result.toolCalls, messages }
+                    finalResult: { text: await result.text, messages }
                   })
                 }
               ],
@@ -12411,30 +12676,30 @@ ${completionResult?.object?.finalResult}` : ""}
   });
   const workflowStep = createStep({
     id: "workflow-execution-step",
-    inputSchema: z7__default.default.object({
-      task: z7__default.default.string(),
-      primitiveId: z7__default.default.string(),
+    inputSchema: z8__default.default.object({
+      task: z8__default.default.string(),
+      primitiveId: z8__default.default.string(),
       primitiveType: PRIMITIVE_TYPES,
-      prompt: z7__default.default.string(),
-      result: z7__default.default.string(),
-      isComplete: z7__default.default.boolean().optional(),
-      selectionReason: z7__default.default.string(),
-      iteration: z7__default.default.number()
+      prompt: z8__default.default.string(),
+      result: z8__default.default.string(),
+      isComplete: z8__default.default.boolean().optional(),
+      selectionReason: z8__default.default.string(),
+      iteration: z8__default.default.number()
     }),
-    outputSchema: z7__default.default.object({
-      task: z7__default.default.string(),
-      primitiveId: z7__default.default.string(),
+    outputSchema: z8__default.default.object({
+      task: z8__default.default.string(),
+      primitiveId: z8__default.default.string(),
       primitiveType: PRIMITIVE_TYPES,
-      result: z7__default.default.string(),
-      isComplete: z7__default.default.boolean().optional(),
-      iteration: z7__default.default.number()
+      result: z8__default.default.string(),
+      isComplete: z8__default.default.boolean().optional(),
+      iteration: z8__default.default.number()
     }),
     execute: async ({ inputData, writer, getInitData }) => {
       const workflowsMap = await agent.listWorkflows({ requestContext });
       const workflowId = inputData.primitiveId;
       const wf = workflowsMap[workflowId];
       if (!wf) {
-        const mastraError = new chunkTWH4PTDG_cjs.MastraError({
+        const mastraError = new chunkHWMMIRIF_cjs.MastraError({
           id: "AGENT_NETWORK_WORKFLOW_EXECUTION_STEP_INVALID_TASK_INPUT",
           domain: "AGENT_NETWORK" /* AGENT_NETWORK */,
           category: "USER" /* USER */,
@@ -12446,7 +12711,7 @@ ${completionResult?.object?.finalResult}` : ""}
       try {
         input = JSON.parse(inputData.prompt);
       } catch (e) {
-        const mastraError = new chunkTWH4PTDG_cjs.MastraError(
+        const mastraError = new chunkHWMMIRIF_cjs.MastraError(
           {
             id: "WORKFLOW_EXECUTION_STEP_INVALID_TASK_INPUT",
             domain: "AGENT_NETWORK" /* AGENT_NETWORK */,
@@ -12457,7 +12722,7 @@ ${completionResult?.object?.finalResult}` : ""}
         );
         throw mastraError;
       }
-      const stepId = generateId3();
+      const stepId = generateId2();
       const run = await wf.createRun({ runId });
       const toolData = {
         workflowId: wf.id,
@@ -12510,7 +12775,7 @@ ${completionResult?.object?.finalResult}` : ""}
       await memory?.saveMessages({
         messages: [
           {
-            id: generateId3(),
+            id: generateId2(),
             type: "text",
             role: "assistant",
             content: { parts: [{ type: "text", text: finalResult }], format: 2 },
@@ -12545,23 +12810,23 @@ ${completionResult?.object?.finalResult}` : ""}
   });
   const toolStep = createStep({
     id: "tool-execution-step",
-    inputSchema: z7__default.default.object({
-      task: z7__default.default.string(),
-      primitiveId: z7__default.default.string(),
+    inputSchema: z8__default.default.object({
+      task: z8__default.default.string(),
+      primitiveId: z8__default.default.string(),
       primitiveType: PRIMITIVE_TYPES,
-      prompt: z7__default.default.string(),
-      result: z7__default.default.string(),
-      isComplete: z7__default.default.boolean().optional(),
-      selectionReason: z7__default.default.string(),
-      iteration: z7__default.default.number()
+      prompt: z8__default.default.string(),
+      result: z8__default.default.string(),
+      isComplete: z8__default.default.boolean().optional(),
+      selectionReason: z8__default.default.string(),
+      iteration: z8__default.default.number()
     }),
-    outputSchema: z7__default.default.object({
-      task: z7__default.default.string(),
-      primitiveId: z7__default.default.string(),
+    outputSchema: z8__default.default.object({
+      task: z8__default.default.string(),
+      primitiveId: z8__default.default.string(),
       primitiveType: PRIMITIVE_TYPES,
-      result: z7__default.default.string(),
-      isComplete: z7__default.default.boolean().optional(),
-      iteration: z7__default.default.number()
+      result: z8__default.default.string(),
+      isComplete: z8__default.default.boolean().optional(),
+      iteration: z8__default.default.number()
     }),
     execute: async ({ inputData, getInitData, writer }) => {
       const initData = await getInitData();
@@ -12569,9 +12834,9 @@ ${completionResult?.object?.finalResult}` : ""}
       const memory = await agent.getMemory({ requestContext });
       const memoryTools = await memory?.listTools?.();
       const toolsMap = { ...agentTools, ...memoryTools };
-      let tool = toolsMap[inputData.primitiveId];
-      if (!tool) {
-        const mastraError = new chunkTWH4PTDG_cjs.MastraError({
+      let tool2 = toolsMap[inputData.primitiveId];
+      if (!tool2) {
+        const mastraError = new chunkHWMMIRIF_cjs.MastraError({
           id: "AGENT_NETWORK_TOOL_EXECUTION_STEP_INVALID_TASK_INPUT",
           domain: "AGENT_NETWORK" /* AGENT_NETWORK */,
           category: "USER" /* USER */,
@@ -12579,8 +12844,8 @@ ${completionResult?.object?.finalResult}` : ""}
         });
         throw mastraError;
       }
-      if (!tool.execute) {
-        const mastraError = new chunkTWH4PTDG_cjs.MastraError({
+      if (!tool2.execute) {
+        const mastraError = new chunkHWMMIRIF_cjs.MastraError({
           id: "AGENT_NETWORK_TOOL_EXECUTION_STEP_INVALID_TASK_INPUT",
           domain: "AGENT_NETWORK" /* AGENT_NETWORK */,
           category: "USER" /* USER */,
@@ -12588,12 +12853,12 @@ ${completionResult?.object?.finalResult}` : ""}
         });
         throw mastraError;
       }
-      const toolId = tool.id;
+      const toolId = tool2.id;
       let inputDataToUse;
       try {
         inputDataToUse = JSON.parse(inputData.prompt);
       } catch (e) {
-        const mastraError = new chunkTWH4PTDG_cjs.MastraError(
+        const mastraError = new chunkHWMMIRIF_cjs.MastraError(
           {
             id: "AGENT_NETWORK_TOOL_EXECUTION_STEP_INVALID_TASK_INPUT",
             domain: "AGENT_NETWORK" /* AGENT_NETWORK */,
@@ -12604,7 +12869,7 @@ ${completionResult?.object?.finalResult}` : ""}
         );
         throw mastraError;
       }
-      const toolCallId = generateId3();
+      const toolCallId = generateId2();
       await writer?.write({
         type: "tool-execution-start",
         payload: {
@@ -12619,7 +12884,7 @@ ${completionResult?.object?.finalResult}` : ""}
         from: "NETWORK" /* NETWORK */,
         runId
       });
-      const finalResult = await tool.execute(
+      const finalResult = await tool2.execute(
         inputDataToUse,
         {
           requestContext,
@@ -12641,7 +12906,7 @@ ${completionResult?.object?.finalResult}` : ""}
       await memory?.saveMessages({
         messages: [
           {
-            id: generateId3(),
+            id: generateId2(),
             type: "text",
             role: "assistant",
             content: {
@@ -12687,21 +12952,21 @@ ${completionResult?.object?.finalResult}` : ""}
   });
   const finishStep = createStep({
     id: "finish-step",
-    inputSchema: z7__default.default.object({
-      task: z7__default.default.string(),
-      primitiveId: z7__default.default.string(),
+    inputSchema: z8__default.default.object({
+      task: z8__default.default.string(),
+      primitiveId: z8__default.default.string(),
       primitiveType: PRIMITIVE_TYPES,
-      prompt: z7__default.default.string(),
-      result: z7__default.default.string(),
-      isComplete: z7__default.default.boolean().optional(),
-      selectionReason: z7__default.default.string(),
-      iteration: z7__default.default.number()
+      prompt: z8__default.default.string(),
+      result: z8__default.default.string(),
+      isComplete: z8__default.default.boolean().optional(),
+      selectionReason: z8__default.default.string(),
+      iteration: z8__default.default.number()
     }),
-    outputSchema: z7__default.default.object({
-      task: z7__default.default.string(),
-      result: z7__default.default.string(),
-      isComplete: z7__default.default.boolean(),
-      iteration: z7__default.default.number()
+    outputSchema: z8__default.default.object({
+      task: z8__default.default.string(),
+      result: z8__default.default.string(),
+      isComplete: z8__default.default.boolean(),
+      iteration: z8__default.default.number()
     }),
     execute: async ({ inputData, writer }) => {
       let endResult = inputData.result;
@@ -12726,29 +12991,29 @@ ${completionResult?.object?.finalResult}` : ""}
   });
   const networkWorkflow = createWorkflow({
     id: "Agent-Network-Outer-Workflow",
-    inputSchema: z7__default.default.object({
-      task: z7__default.default.string(),
-      primitiveId: z7__default.default.string(),
+    inputSchema: z8__default.default.object({
+      task: z8__default.default.string(),
+      primitiveId: z8__default.default.string(),
       primitiveType: PRIMITIVE_TYPES,
-      result: z7__default.default.string().optional(),
-      iteration: z7__default.default.number(),
-      threadId: z7__default.default.string().optional(),
-      threadResourceId: z7__default.default.string().optional(),
-      isOneOff: z7__default.default.boolean(),
-      verboseIntrospection: z7__default.default.boolean()
+      result: z8__default.default.string().optional(),
+      iteration: z8__default.default.number(),
+      threadId: z8__default.default.string().optional(),
+      threadResourceId: z8__default.default.string().optional(),
+      isOneOff: z8__default.default.boolean(),
+      verboseIntrospection: z8__default.default.boolean()
     }),
-    outputSchema: z7__default.default.object({
-      task: z7__default.default.string(),
-      primitiveId: z7__default.default.string(),
+    outputSchema: z8__default.default.object({
+      task: z8__default.default.string(),
+      primitiveId: z8__default.default.string(),
       primitiveType: PRIMITIVE_TYPES,
-      prompt: z7__default.default.string(),
-      result: z7__default.default.string(),
-      isComplete: z7__default.default.boolean().optional(),
-      completionReason: z7__default.default.string().optional(),
-      iteration: z7__default.default.number(),
-      threadId: z7__default.default.string().optional(),
-      threadResourceId: z7__default.default.string().optional(),
-      isOneOff: z7__default.default.boolean()
+      prompt: z8__default.default.string(),
+      result: z8__default.default.string(),
+      isComplete: z8__default.default.boolean().optional(),
+      completionReason: z8__default.default.string().optional(),
+      iteration: z8__default.default.number(),
+      threadId: z8__default.default.string().optional(),
+      threadResourceId: z8__default.default.string().optional(),
+      isOneOff: z8__default.default.boolean()
     }),
     options: {
       shouldPersistSnapshot: ({ workflowStatus }) => workflowStatus === "suspended",
@@ -12810,7 +13075,7 @@ async function networkLoop({
   runId,
   routingAgent,
   routingAgentOptions,
-  generateId: generateId3,
+  generateId: generateId2,
   maxIterations,
   threadId,
   resourceId,
@@ -12818,7 +13083,7 @@ async function networkLoop({
 }) {
   const memoryToUse = await routingAgent.getMemory({ requestContext });
   if (!memoryToUse) {
-    throw new chunkTWH4PTDG_cjs.MastraError({
+    throw new chunkHWMMIRIF_cjs.MastraError({
       id: "AGENT_NETWORK_MEMORY_REQUIRED",
       domain: "AGENT_NETWORK" /* AGENT_NETWORK */,
       category: "USER" /* USER */,
@@ -12835,7 +13100,7 @@ async function networkLoop({
     runId,
     agent: routingAgent,
     routingAgentOptions: routingAgentOptionsWithoutMemory,
-    generateId: generateId3
+    generateId: generateId2
   });
   const finalStep = createStep({
     id: "final-step",
@@ -12857,26 +13122,26 @@ async function networkLoop({
   });
   const mainWorkflow = createWorkflow({
     id: "agent-loop-main-workflow",
-    inputSchema: z7__default.default.object({
-      iteration: z7__default.default.number(),
-      task: z7__default.default.string(),
-      primitiveId: z7__default.default.string(),
+    inputSchema: z8__default.default.object({
+      iteration: z8__default.default.number(),
+      task: z8__default.default.string(),
+      primitiveId: z8__default.default.string(),
       primitiveType: PRIMITIVE_TYPES,
-      result: z7__default.default.string().optional(),
-      threadId: z7__default.default.string().optional(),
-      threadResourceId: z7__default.default.string().optional(),
-      isOneOff: z7__default.default.boolean(),
-      verboseIntrospection: z7__default.default.boolean()
+      result: z8__default.default.string().optional(),
+      threadId: z8__default.default.string().optional(),
+      threadResourceId: z8__default.default.string().optional(),
+      isOneOff: z8__default.default.boolean(),
+      verboseIntrospection: z8__default.default.boolean()
     }),
-    outputSchema: z7__default.default.object({
-      task: z7__default.default.string(),
-      primitiveId: z7__default.default.string(),
+    outputSchema: z8__default.default.object({
+      task: z8__default.default.string(),
+      primitiveId: z8__default.default.string(),
       primitiveType: PRIMITIVE_TYPES,
-      prompt: z7__default.default.string(),
-      result: z7__default.default.string(),
-      isComplete: z7__default.default.boolean().optional(),
-      completionReason: z7__default.default.string().optional(),
-      iteration: z7__default.default.number()
+      prompt: z8__default.default.string(),
+      result: z8__default.default.string(),
+      isComplete: z8__default.default.boolean().optional(),
+      completionReason: z8__default.default.string().optional(),
+      iteration: z8__default.default.number()
     }),
     options: {
       shouldPersistSnapshot: ({ workflowStatus }) => workflowStatus === "suspended",
@@ -12894,7 +13159,7 @@ async function networkLoop({
     resourceId: resourceId || networkName,
     messages,
     routingAgent,
-    generateId: generateId3,
+    generateId: generateId2,
     tracingContext: routingAgentOptions?.tracingContext,
     memoryConfig: routingAgentMemoryOptions?.options
   });
@@ -12920,12 +13185,12 @@ async function networkLoop({
 }
 
 // src/agent/agent-legacy.ts
-var import_fast_deep_equal = chunkDZUJEN5N_cjs.__toESM(require_fast_deep_equal(), 1);
+var import_fast_deep_equal = chunk6SZKM6EC_cjs.__toESM(require_fast_deep_equal(), 1);
 
 // src/agent/utils.ts
 async function tryGenerateWithJsonFallback(agent, prompt, options) {
   if (!options.structuredOutput?.schema) {
-    throw new chunkTWH4PTDG_cjs.MastraError({
+    throw new chunkHWMMIRIF_cjs.MastraError({
       id: "STRUCTURED_OUTPUT_OPTIONS_REQUIRED",
       domain: "AGENT" /* AGENT */,
       category: "USER" /* USER */,
@@ -12944,7 +13209,7 @@ async function tryGenerateWithJsonFallback(agent, prompt, options) {
 }
 async function tryStreamWithJsonFallback(agent, prompt, options) {
   if (!options.structuredOutput?.schema) {
-    throw new chunkTWH4PTDG_cjs.MastraError({
+    throw new chunkHWMMIRIF_cjs.MastraError({
       id: "STRUCTURED_OUTPUT_OPTIONS_REQUIRED",
       domain: "AGENT" /* AGENT */,
       category: "USER" /* USER */,
@@ -12955,7 +13220,7 @@ async function tryStreamWithJsonFallback(agent, prompt, options) {
     const result = await agent.stream(prompt, options);
     const object = await result.object;
     if (!object) {
-      throw new chunkTWH4PTDG_cjs.MastraError({
+      throw new chunkHWMMIRIF_cjs.MastraError({
         id: "STRUCTURED_OUTPUT_OBJECT_UNDEFINED",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
@@ -13066,7 +13331,7 @@ var AgentLegacyHandler = class {
           methodType: methodType === "generate" ? "generateLegacy" : "streamLegacy",
           memoryConfig
         });
-        let messageList = new chunk5Q6WAYEY_cjs.MessageList({
+        let messageList = new chunkX6IBA7FP_cjs.MessageList({
           threadId,
           resourceId,
           generateMessageId: this.capabilities.mastra?.generateId?.bind(this.capabilities.mastra),
@@ -13091,7 +13356,7 @@ var AgentLegacyHandler = class {
           };
         }
         if (!threadId || !resourceId) {
-          const mastraError = new chunkTWH4PTDG_cjs.MastraError({
+          const mastraError = new chunkHWMMIRIF_cjs.MastraError({
             id: "AGENT_MEMORY_MISSING_RESOURCE_ID",
             domain: "AGENT" /* AGENT */,
             category: "USER" /* USER */,
@@ -13197,7 +13462,7 @@ var AgentLegacyHandler = class {
           result: resToLog,
           threadId
         });
-        const messageListResponses = new chunk5Q6WAYEY_cjs.MessageList({
+        const messageListResponses = new chunkX6IBA7FP_cjs.MessageList({
           threadId,
           resourceId,
           generateMessageId: this.capabilities.mastra?.generateId?.bind(this.capabilities.mastra),
@@ -13267,11 +13532,11 @@ var AgentLegacyHandler = class {
               await Promise.all(promises);
             }
           } catch (e) {
-            if (e instanceof chunkTWH4PTDG_cjs.MastraError) {
+            if (e instanceof chunkHWMMIRIF_cjs.MastraError) {
               agentSpan?.error({ error: e });
               throw e;
             }
-            const mastraError = new chunkTWH4PTDG_cjs.MastraError(
+            const mastraError = new chunkHWMMIRIF_cjs.MastraError(
               {
                 id: "AGENT_MEMORY_PERSIST_RESPONSE_MESSAGES_FAILED",
                 domain: "AGENT" /* AGENT */,
@@ -13473,7 +13738,7 @@ var AgentLegacyHandler = class {
    */
   async generateLegacy(messages, generateOptions = {}) {
     if ("structuredOutput" in generateOptions && generateOptions.structuredOutput) {
-      throw new chunkTWH4PTDG_cjs.MastraError({
+      throw new chunkHWMMIRIF_cjs.MastraError({
         id: "AGENT_GENERATE_LEGACY_STRUCTURED_OUTPUT_NOT_SUPPORTED",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
@@ -13495,7 +13760,7 @@ var AgentLegacyHandler = class {
       this.capabilities.logger.error("V2 models are not supported for generateLegacy. Please use generate instead.", {
         modelId: llm.getModel().modelId
       });
-      throw new chunkTWH4PTDG_cjs.MastraError({
+      throw new chunkHWMMIRIF_cjs.MastraError({
         id: "AGENT_GENERATE_V2_MODEL_NOT_SUPPORTED",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
@@ -13715,7 +13980,7 @@ var AgentLegacyHandler = class {
       this.capabilities.logger.error("V2 models are not supported for streamLegacy. Please use stream instead.", {
         modelId: llm.getModel().modelId
       });
-      throw new chunkTWH4PTDG_cjs.MastraError({
+      throw new chunkHWMMIRIF_cjs.MastraError({
         id: "AGENT_STREAM_V2_MODEL_NOT_SUPPORTED",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
@@ -13999,7 +14264,7 @@ function getModelMethodFromAgentMethod(methodType) {
   } else if (methodType === "stream" || methodType === "streamLegacy") {
     return "stream";
   } else {
-    throw new chunkTWH4PTDG_cjs.MastraError({
+    throw new chunkHWMMIRIF_cjs.MastraError({
       id: "INVALID_METHOD_TYPE",
       domain: "AGENT" /* AGENT */,
       category: "USER" /* USER */
@@ -14161,42 +14426,42 @@ function createMapResultsStep({
 }
 
 // src/agent/workflows/prepare-stream/prepare-memory-step.ts
-var import_fast_deep_equal2 = chunkDZUJEN5N_cjs.__toESM(require_fast_deep_equal(), 1);
-var coreToolSchema = z7.z.object({
-  id: z7.z.string().optional(),
-  description: z7.z.string().optional(),
-  parameters: z7.z.union([
-    z7.z.record(z7.z.string(), z7.z.any()),
+var import_fast_deep_equal2 = chunk6SZKM6EC_cjs.__toESM(require_fast_deep_equal(), 1);
+var coreToolSchema = z8.z.object({
+  id: z8.z.string().optional(),
+  description: z8.z.string().optional(),
+  parameters: z8.z.union([
+    z8.z.record(z8.z.string(), z8.z.any()),
     // JSON Schema as object
-    z7.z.any()
+    z8.z.any()
     // Zod schema or other schema types - validated at tool execution
   ]),
-  outputSchema: z7.z.union([z7.z.record(z7.z.string(), z7.z.any()), z7.z.any()]).optional(),
-  execute: z7.z.function(z7.z.tuple([z7.z.any(), z7.z.any()]), z7.z.promise(z7.z.any())).optional(),
-  type: z7.z.union([z7.z.literal("function"), z7.z.literal("provider-defined"), z7.z.undefined()]).optional(),
-  args: z7.z.record(z7.z.string(), z7.z.any()).optional()
+  outputSchema: z8.z.union([z8.z.record(z8.z.string(), z8.z.any()), z8.z.any()]).optional(),
+  execute: z8.z.function(z8.z.tuple([z8.z.any(), z8.z.any()]), z8.z.promise(z8.z.any())).optional(),
+  type: z8.z.union([z8.z.literal("function"), z8.z.literal("provider-defined"), z8.z.undefined()]).optional(),
+  args: z8.z.record(z8.z.string(), z8.z.any()).optional()
 });
-var storageThreadSchema = z7.z.object({
-  id: z7.z.string(),
-  title: z7.z.string().optional(),
-  resourceId: z7.z.string(),
-  createdAt: z7.z.date(),
-  updatedAt: z7.z.date(),
-  metadata: z7.z.record(z7.z.string(), z7.z.any()).optional()
+var storageThreadSchema = z8.z.object({
+  id: z8.z.string(),
+  title: z8.z.string().optional(),
+  resourceId: z8.z.string(),
+  createdAt: z8.z.date(),
+  updatedAt: z8.z.date(),
+  metadata: z8.z.record(z8.z.string(), z8.z.any()).optional()
 });
-var prepareToolsStepOutputSchema = z7.z.object({
-  convertedTools: z7.z.record(z7.z.string(), coreToolSchema)
+var prepareToolsStepOutputSchema = z8.z.object({
+  convertedTools: z8.z.record(z8.z.string(), coreToolSchema)
 });
-var prepareMemoryStepOutputSchema = z7.z.object({
-  threadExists: z7.z.boolean(),
+var prepareMemoryStepOutputSchema = z8.z.object({
+  threadExists: z8.z.boolean(),
   thread: storageThreadSchema.optional(),
-  messageList: z7.z.instanceof(chunk5Q6WAYEY_cjs.MessageList),
+  messageList: z8.z.instanceof(chunkX6IBA7FP_cjs.MessageList),
   /** Tripwire data when input processor triggered abort */
-  tripwire: z7.z.object({
-    reason: z7.z.string(),
-    retry: z7.z.boolean().optional(),
-    metadata: z7.z.unknown().optional(),
-    processorId: z7.z.string().optional()
+  tripwire: z8.z.object({
+    reason: z8.z.string(),
+    retry: z8.z.boolean().optional(),
+    metadata: z8.z.unknown().optional(),
+    processorId: z8.z.string().optional()
   }).optional()
 });
 
@@ -14224,11 +14489,11 @@ function createPrepareMemoryStep({
 }) {
   return createStep({
     id: "prepare-memory-step",
-    inputSchema: z7.z.object({}),
+    inputSchema: z8.z.object({}),
     outputSchema: prepareMemoryStepOutputSchema,
     execute: async ({ tracingContext }) => {
       const thread = threadFromArgs;
-      const messageList = new chunk5Q6WAYEY_cjs.MessageList({
+      const messageList = new chunkX6IBA7FP_cjs.MessageList({
         threadId: thread?.id,
         resourceId,
         generateMessageId: capabilities.generateMessageId,
@@ -14254,7 +14519,7 @@ function createPrepareMemoryStep({
         };
       }
       if (!thread?.id || !resourceId) {
-        const mastraError = new chunkTWH4PTDG_cjs.MastraError({
+        const mastraError = new chunkHWMMIRIF_cjs.MastraError({
           id: "AGENT_MEMORY_MISSING_RESOURCE_ID",
           domain: "AGENT" /* AGENT */,
           category: "USER" /* USER */,
@@ -14334,7 +14599,7 @@ function createPrepareToolsStep({
 }) {
   return createStep({
     id: "prepare-tools-step",
-    inputSchema: z7.z.object({}),
+    inputSchema: z8.z.object({}),
     outputSchema: prepareToolsStepOutputSchema,
     execute: async () => {
       const toolEnhancements = [
@@ -14359,7 +14624,8 @@ function createPrepareToolsStep({
         tracingContext: { currentSpan: agentSpan },
         outputWriter: options.outputWriter,
         methodType,
-        memoryConfig: options.memory?.options
+        memoryConfig: options.memory?.options,
+        autoResumeSuspendedTools: options.autoResumeSuspendedTools
       });
       return {
         convertedTools
@@ -14372,6 +14638,7 @@ function createStreamStep({
   runId,
   returnScorerData,
   requireToolApproval,
+  toolCallConcurrency,
   resumeContext,
   agentId,
   agentName,
@@ -14380,15 +14647,16 @@ function createStreamStep({
   saveQueueManager,
   memoryConfig,
   memory,
-  resourceId
+  resourceId,
+  autoResumeSuspendedTools
 }) {
   return createStep({
     id: "stream-text-step",
-    inputSchema: z7.z.any(),
+    inputSchema: z8.z.any(),
     // tried to type this in various ways but it's too complex
-    outputSchema: z7.z.union([
-      z7.z.instanceof(MastraModelOutput),
-      z7.z.instanceof(AISDKV5OutputStream)
+    outputSchema: z8.z.union([
+      z8.z.instanceof(MastraModelOutput),
+      z8.z.instanceof(AISDKV5OutputStream)
     ]),
     execute: async ({ inputData, tracingContext }) => {
       const validatedInputData = inputData;
@@ -14405,6 +14673,7 @@ function createStreamStep({
         returnScorerData,
         tracingContext,
         requireToolApproval,
+        toolCallConcurrency,
         resumeContext,
         _internal: {
           generateId: capabilities.generateMessageId,
@@ -14417,7 +14686,8 @@ function createStreamStep({
         agentId,
         agentName,
         toolCallId,
-        methodType: modelMethodType
+        methodType: modelMethodType,
+        autoResumeSuspendedTools
       });
       return streamResult;
     }
@@ -14440,6 +14710,7 @@ function createPrepareStreamWorkflow({
   returnScorerData,
   saveQueueManager,
   requireToolApproval,
+  toolCallConcurrency,
   resumeContext,
   agentId,
   agentName,
@@ -14472,6 +14743,7 @@ function createPrepareStreamWorkflow({
     runId,
     returnScorerData,
     requireToolApproval,
+    toolCallConcurrency,
     resumeContext,
     agentId,
     agentName,
@@ -14480,7 +14752,8 @@ function createPrepareStreamWorkflow({
     saveQueueManager,
     memoryConfig,
     memory,
-    resourceId
+    resourceId,
+    autoResumeSuspendedTools: options.autoResumeSuspendedTools
   });
   const mapResultsStep = createMapResultsStep({
     capabilities,
@@ -14496,10 +14769,10 @@ function createPrepareStreamWorkflow({
   });
   return createWorkflow({
     id: "execution-workflow",
-    inputSchema: z7.z.object({}),
-    outputSchema: z7.z.union([
-      z7.z.instanceof(MastraModelOutput),
-      z7.z.instanceof(AISDKV5OutputStream)
+    inputSchema: z8.z.object({}),
+    outputSchema: z8.z.union([
+      z8.z.instanceof(MastraModelOutput),
+      z8.z.instanceof(AISDKV5OutputStream)
     ]),
     steps: [prepareToolsStep, prepareMemoryStep2, streamStep],
     options: {
@@ -14570,7 +14843,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     this.#description = config.description;
     this.#options = config.options;
     if (!config.model) {
-      const mastraError = new chunkTWH4PTDG_cjs.MastraError({
+      const mastraError = new chunkHWMMIRIF_cjs.MastraError({
         id: "AGENT_CONSTRUCTOR_MODEL_REQUIRED",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
@@ -14585,7 +14858,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     }
     if (Array.isArray(config.model)) {
       if (config.model.length === 0) {
-        const mastraError = new chunkTWH4PTDG_cjs.MastraError({
+        const mastraError = new chunkHWMMIRIF_cjs.MastraError({
           id: "AGENT_CONSTRUCTOR_MODEL_ARRAY_EMPTY",
           domain: "AGENT" /* AGENT */,
           category: "USER" /* USER */,
@@ -14637,7 +14910,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
         this.#voice?.addInstructions(config.instructions);
       }
     } else {
-      this.#voice = new chunk4JKEUSCC_cjs.DefaultVoice();
+      this.#voice = new chunkH4VUIOWU_cjs.DefaultVoice();
     }
     if (config.inputProcessors) {
       this.#inputProcessors = config.inputProcessors;
@@ -14667,7 +14940,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     const agentsToUse = this.#agents ? typeof this.#agents === "function" ? this.#agents({ requestContext }) : this.#agents : {};
     return resolveMaybePromise(agentsToUse, (agents) => {
       if (!agents) {
-        const mastraError = new chunkTWH4PTDG_cjs.MastraError({
+        const mastraError = new chunkHWMMIRIF_cjs.MastraError({
           id: "AGENT_GET_AGENTS_FUNCTION_EMPTY_RETURN",
           domain: "AGENT" /* AGENT */,
           category: "USER" /* USER */,
@@ -14734,7 +15007,8 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
       id: workflowId,
       inputSchema: ProcessorStepSchema,
       outputSchema: ProcessorStepSchema,
-      type: "processor"
+      type: "processor",
+      options: { validateInputs: false }
     });
     for (const processorOrWorkflow of validProcessors) {
       const step = isProcessorWorkflow(processorOrWorkflow) ? processorOrWorkflow : createStep(processorOrWorkflow);
@@ -14841,7 +15115,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
       const result = this.#memory({ requestContext, mastra: this.#mastra });
       resolvedMemory = await Promise.resolve(result);
       if (!resolvedMemory) {
-        const mastraError = new chunkTWH4PTDG_cjs.MastraError({
+        const mastraError = new chunkHWMMIRIF_cjs.MastraError({
           id: "AGENT_GET_MEMORY_FUNCTION_EMPTY_RETURN",
           domain: "AGENT" /* AGENT */,
           category: "USER" /* USER */,
@@ -14868,7 +15142,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
   }
   get voice() {
     if (typeof this.#instructions === "function") {
-      const mastraError = new chunkTWH4PTDG_cjs.MastraError({
+      const mastraError = new chunkHWMMIRIF_cjs.MastraError({
         id: "AGENT_VOICE_INCOMPATIBLE_WITH_FUNCTION_INSTRUCTIONS",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
@@ -14918,7 +15192,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     const result = this.#scorers({ requestContext, mastra: this.#mastra });
     return resolveMaybePromise(result, (scorers) => {
       if (!scorers) {
-        const mastraError = new chunkTWH4PTDG_cjs.MastraError({
+        const mastraError = new chunkHWMMIRIF_cjs.MastraError({
           id: "AGENT_GET_SCORERS_FUNCTION_EMPTY_RETURN",
           domain: "AGENT" /* AGENT */,
           category: "USER" /* USER */,
@@ -14952,7 +15226,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
       voice?.addInstructions(this.#convertInstructionsToString(instructions));
       return voice;
     } else {
-      return new chunk4JKEUSCC_cjs.DefaultVoice();
+      return new chunkH4VUIOWU_cjs.DefaultVoice();
     }
   }
   /**
@@ -14970,7 +15244,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
       const result = this.#instructions({ requestContext, mastra: this.#mastra });
       return resolveMaybePromise(result, (instructions) => {
         if (!instructions) {
-          const mastraError = new chunkTWH4PTDG_cjs.MastraError({
+          const mastraError = new chunkHWMMIRIF_cjs.MastraError({
             id: "AGENT_GET_INSTRUCTIONS_FUNCTION_EMPTY_RETURN",
             domain: "AGENT" /* AGENT */,
             category: "USER" /* USER */,
@@ -15075,7 +15349,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     const result = this.#defaultGenerateOptionsLegacy({ requestContext, mastra: this.#mastra });
     return resolveMaybePromise(result, (options) => {
       if (!options) {
-        const mastraError = new chunkTWH4PTDG_cjs.MastraError({
+        const mastraError = new chunkHWMMIRIF_cjs.MastraError({
           id: "AGENT_GET_DEFAULT_GENERATE_OPTIONS_FUNCTION_EMPTY_RETURN",
           domain: "AGENT" /* AGENT */,
           category: "USER" /* USER */,
@@ -15110,7 +15384,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     const result = this.#defaultStreamOptionsLegacy({ requestContext, mastra: this.#mastra });
     return resolveMaybePromise(result, (options) => {
       if (!options) {
-        const mastraError = new chunkTWH4PTDG_cjs.MastraError({
+        const mastraError = new chunkHWMMIRIF_cjs.MastraError({
           id: "AGENT_GET_DEFAULT_STREAM_OPTIONS_FUNCTION_EMPTY_RETURN",
           domain: "AGENT" /* AGENT */,
           category: "USER" /* USER */,
@@ -15145,7 +15419,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     const result = this.#defaultOptions({ requestContext, mastra: this.#mastra });
     return resolveMaybePromise(result, (options) => {
       if (!options) {
-        const mastraError = new chunkTWH4PTDG_cjs.MastraError({
+        const mastraError = new chunkHWMMIRIF_cjs.MastraError({
           id: "AGENT_GET_DEFAULT_OPTIONS_FUNCTION_EMPTY_RETURN",
           domain: "AGENT" /* AGENT */,
           category: "USER" /* USER */,
@@ -15173,12 +15447,12 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
    */
   listTools({ requestContext = new chunkUVHSM2GU_cjs.RequestContext() } = {}) {
     if (typeof this.#tools !== "function") {
-      return chunkPG5H6QIO_cjs.ensureToolProperties(this.#tools);
+      return chunkMLKE7HRS_cjs.ensureToolProperties(this.#tools);
     }
     const result = this.#tools({ requestContext, mastra: this.#mastra });
     return resolveMaybePromise(result, (tools) => {
       if (!tools) {
-        const mastraError = new chunkTWH4PTDG_cjs.MastraError({
+        const mastraError = new chunkHWMMIRIF_cjs.MastraError({
           id: "AGENT_GET_TOOLS_FUNCTION_EMPTY_RETURN",
           domain: "AGENT" /* AGENT */,
           category: "USER" /* USER */,
@@ -15191,7 +15465,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
         this.logger.error(mastraError.toString());
         throw mastraError;
       }
-      return chunkPG5H6QIO_cjs.ensureToolProperties(tools);
+      return chunkMLKE7HRS_cjs.ensureToolProperties(tools);
     });
   }
   /**
@@ -15223,7 +15497,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           });
         });
       } else {
-        llm = new chunkS73Z3PBJ_cjs.MastraLLMV1({
+        llm = new chunkSZYSDJTN_cjs.MastraLLMV1({
           model: resolvedModel,
           mastra: this.#mastra,
           options: { tracingPolicy: this.#options?.tracingPolicy }
@@ -15248,9 +15522,9 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
    */
   async resolveModelConfig(modelConfig, requestContext) {
     try {
-      return await chunk3E3ILV6T_cjs.resolveModelConfig(modelConfig, requestContext, this.#mastra);
+      return await chunkMXBVP7HX_cjs.resolveModelConfig(modelConfig, requestContext, this.#mastra);
     } catch (error) {
-      const mastraError = new chunkTWH4PTDG_cjs.MastraError({
+      const mastraError = new chunkHWMMIRIF_cjs.MastraError({
         id: "AGENT_GET_MODEL_MISSING_MODEL_INSTANCE",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
@@ -15284,7 +15558,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
   } = {}) {
     if (!Array.isArray(modelConfig)) return this.resolveModelConfig(modelConfig, requestContext);
     if (modelConfig.length === 0 || !modelConfig[0]) {
-      const mastraError = new chunkTWH4PTDG_cjs.MastraError({
+      const mastraError = new chunkHWMMIRIF_cjs.MastraError({
         id: "AGENT_GET_MODEL_MISSING_MODEL_INSTANCE",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
@@ -15401,14 +15675,14 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
   __registerMastra(mastra) {
     this.#mastra = mastra;
     if (this.#tools && typeof this.#tools === "object") {
-      Object.entries(this.#tools).forEach(([key, tool]) => {
+      Object.entries(this.#tools).forEach(([key, tool2]) => {
         try {
-          if (tool && typeof tool === "object" && "id" in tool) {
-            const toolKey = typeof tool.id === "string" ? tool.id : key;
-            mastra.addTool(tool, toolKey);
+          if (tool2 && typeof tool2 === "object" && "id" in tool2) {
+            const toolKey = typeof tool2.id === "string" ? tool2.id : key;
+            mastra.addTool(tool2, toolKey);
           }
         } catch (error) {
-          if (error instanceof chunkTWH4PTDG_cjs.MastraError && error.id !== "MASTRA_ADD_TOOL_DUPLICATE_KEY") {
+          if (error instanceof chunkHWMMIRIF_cjs.MastraError && error.id !== "MASTRA_ADD_TOOL_DUPLICATE_KEY") {
             throw error;
           }
         }
@@ -15419,7 +15693,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
         try {
           mastra.addProcessor(processor);
         } catch (error) {
-          if (error instanceof chunkTWH4PTDG_cjs.MastraError && error.id !== "MASTRA_ADD_PROCESSOR_DUPLICATE_KEY") {
+          if (error instanceof chunkHWMMIRIF_cjs.MastraError && error.id !== "MASTRA_ADD_PROCESSOR_DUPLICATE_KEY") {
             throw error;
           }
         }
@@ -15430,7 +15704,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
         try {
           mastra.addProcessor(processor);
         } catch (error) {
-          if (error instanceof chunkTWH4PTDG_cjs.MastraError && error.id !== "MASTRA_ADD_PROCESSOR_DUPLICATE_KEY") {
+          if (error instanceof chunkHWMMIRIF_cjs.MastraError && error.id !== "MASTRA_ADD_PROCESSOR_DUPLICATE_KEY") {
             throw error;
           }
         }
@@ -15454,7 +15728,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     instructions
   }) {
     const llm = await this.getLLM({ requestContext, model });
-    const normMessage = new chunk5Q6WAYEY_cjs.MessageList().add(message, "user").get.all.ui().at(-1);
+    const normMessage = new chunkX6IBA7FP_cjs.MessageList().add(message, "user").get.all.ui().at(-1);
     if (!normMessage) {
       throw new Error(`Could not generate title from input ${JSON.stringify(message)}`);
     }
@@ -15477,7 +15751,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     const systemInstructions = await this.resolveTitleInstructions(requestContext, instructions);
     let text = "";
     if (llm.getModel().specificationVersion === "v2") {
-      const messageList = new chunk5Q6WAYEY_cjs.MessageList().add(
+      const messageList = new chunkX6IBA7FP_cjs.MessageList().add(
         [
           {
             role: "system",
@@ -15530,7 +15804,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
   async genTitle(userMessage, requestContext, tracingContext, model, instructions) {
     try {
       if (userMessage) {
-        const normMessage = new chunk5Q6WAYEY_cjs.MessageList().add(userMessage, "user").get.all.ui().at(-1);
+        const normMessage = new chunkX6IBA7FP_cjs.MessageList().add(userMessage, "user").get.all.ui().at(-1);
         if (normMessage) {
           return await this.generateTitleFromUserMessage({
             message: normMessage,
@@ -15561,7 +15835,8 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     requestContext,
     tracingContext,
     mastraProxy,
-    memoryConfig
+    memoryConfig,
+    autoResumeSuspendedTools
   }) {
     let convertedMemoryTools = {};
     if (this._agentNetworkAppend) {
@@ -15577,8 +15852,8 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           runId
         }
       );
-      for (const [toolName, tool] of Object.entries(memoryTools)) {
-        const toolObj = tool;
+      for (const [toolName, tool2] of Object.entries(memoryTools)) {
+        const toolObj = tool2;
         const options = {
           name: toolName,
           runId,
@@ -15594,7 +15869,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           tracingPolicy: this.#options?.tracingPolicy,
           requireApproval: toolObj.requireApproval
         };
-        const convertedToCoreTool = chunkPG5H6QIO_cjs.makeCoreTool(toolObj, options);
+        const convertedToCoreTool = chunkMLKE7HRS_cjs.makeCoreTool(toolObj, options, void 0, autoResumeSuspendedTools);
         convertedMemoryTools[toolName] = convertedToCoreTool;
       }
     }
@@ -15627,7 +15902,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
             processorId: error.processorId
           };
         } else {
-          throw new chunkTWH4PTDG_cjs.MastraError(
+          throw new chunkHWMMIRIF_cjs.MastraError(
             {
               id: "AGENT_INPUT_PROCESSOR_ERROR",
               domain: "AGENT" /* AGENT */,
@@ -15720,7 +15995,8 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     requestContext,
     tracingContext,
     mastraProxy,
-    outputWriter
+    outputWriter,
+    autoResumeSuspendedTools
   }) {
     let toolsForRequest = {};
     this.logger.debug(`[Agents:${this.name}] - Assembling assigned tools`, { runId, threadId, resourceId });
@@ -15728,8 +16004,8 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     const assignedTools = await this.listTools({ requestContext });
     const assignedToolEntries = Object.entries(assignedTools || {});
     const assignedCoreToolEntries = await Promise.all(
-      assignedToolEntries.map(async ([k, tool]) => {
-        if (!tool) {
+      assignedToolEntries.map(async ([k, tool2]) => {
+        if (!tool2) {
           return;
         }
         const options = {
@@ -15746,9 +16022,9 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           model: await this.getModel({ requestContext }),
           outputWriter,
           tracingPolicy: this.#options?.tracingPolicy,
-          requireApproval: tool.requireApproval
+          requireApproval: tool2.requireApproval
         };
-        return [k, chunkPG5H6QIO_cjs.makeCoreTool(tool, options)];
+        return [k, chunkMLKE7HRS_cjs.makeCoreTool(tool2, options, void 0, autoResumeSuspendedTools)];
       })
     );
     const assignedToolEntriesConverted = Object.fromEntries(
@@ -15770,7 +16046,8 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     toolsets,
     requestContext,
     tracingContext,
-    mastraProxy
+    mastraProxy,
+    autoResumeSuspendedTools
   }) {
     let toolsForRequest = {};
     const memory = await this.getMemory({ requestContext });
@@ -15780,8 +16057,8 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
         runId
       });
       for (const toolset of toolsFromToolsets) {
-        for (const [toolName, tool] of Object.entries(toolset)) {
-          const toolObj = tool;
+        for (const [toolName, tool2] of Object.entries(toolset)) {
+          const toolObj = tool2;
           const options = {
             name: toolName,
             runId,
@@ -15797,7 +16074,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
             tracingPolicy: this.#options?.tracingPolicy,
             requireApproval: toolObj.requireApproval
           };
-          const convertedToCoreTool = chunkPG5H6QIO_cjs.makeCoreTool(toolObj, options, "toolset");
+          const convertedToCoreTool = chunkMLKE7HRS_cjs.makeCoreTool(toolObj, options, "toolset", autoResumeSuspendedTools);
           toolsForRequest[toolName] = convertedToCoreTool;
         }
       }
@@ -15815,7 +16092,8 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     requestContext,
     tracingContext,
     mastraProxy,
-    clientTools
+    clientTools,
+    autoResumeSuspendedTools
   }) {
     let toolsForRequest = {};
     const memory = await this.getMemory({ requestContext });
@@ -15824,8 +16102,8 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
       this.logger.debug(`[Agent:${this.name}] - Adding client tools ${Object.keys(clientTools || {}).join(", ")}`, {
         runId
       });
-      for (const [toolName, tool] of clientToolsForInput) {
-        const { execute: execute2, ...rest } = tool;
+      for (const [toolName, tool2] of clientToolsForInput) {
+        const { execute: execute2, ...rest } = tool2;
         const options = {
           name: toolName,
           runId,
@@ -15839,9 +16117,9 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           tracingContext,
           model: await this.getModel({ requestContext }),
           tracingPolicy: this.#options?.tracingPolicy,
-          requireApproval: tool.requireApproval
+          requireApproval: tool2.requireApproval
         };
-        const convertedToCoreTool = chunkPG5H6QIO_cjs.makeCoreTool(rest, options, "client-tool");
+        const convertedToCoreTool = chunkMLKE7HRS_cjs.makeCoreTool(rest, options, "client-tool", autoResumeSuspendedTools);
         toolsForRequest[toolName] = convertedToCoreTool;
       }
     }
@@ -15857,28 +16135,29 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     resourceId,
     requestContext,
     tracingContext,
-    methodType
+    methodType,
+    autoResumeSuspendedTools
   }) {
     const convertedAgentTools = {};
     const agents = await this.listAgents({ requestContext });
     if (Object.keys(agents).length > 0) {
       for (const [agentName, agent] of Object.entries(agents)) {
-        const agentInputSchema = z7.z.object({
-          prompt: z7.z.string().describe("The prompt to send to the agent"),
-          threadId: z7.z.string().optional().describe("Thread ID for conversation continuity for memory messages"),
-          resourceId: z7.z.string().optional().describe("Resource/user identifier for memory messages"),
-          instructions: z7.z.string().optional().describe("Custom instructions to override agent defaults"),
-          maxSteps: z7.z.number().min(3).optional().describe("Maximum number of execution steps for the sub-agent")
+        const agentInputSchema = z8.z.object({
+          prompt: z8.z.string().describe("The prompt to send to the agent"),
+          threadId: z8.z.string().optional().describe("Thread ID for conversation continuity for memory messages"),
+          resourceId: z8.z.string().optional().describe("Resource/user identifier for memory messages"),
+          instructions: z8.z.string().optional().describe("Custom instructions to override agent defaults"),
+          maxSteps: z8.z.number().min(3).optional().describe("Maximum number of execution steps for the sub-agent")
           // using minimum of 3 to ensure if the agent has a tool call, the llm gets executed again after the tool call step, using the tool call result
           // to return a proper llm response
         });
-        const agentOutputSchema = z7.z.object({
-          text: z7.z.string().describe("The response from the agent"),
-          subAgentThreadId: z7.z.string().describe("The thread ID of the agent").optional(),
-          subAgentResourceId: z7.z.string().describe("The resource ID of the agent").optional()
+        const agentOutputSchema = z8.z.object({
+          text: z8.z.string().describe("The response from the agent"),
+          subAgentThreadId: z8.z.string().describe("The thread ID of the agent").optional(),
+          subAgentResourceId: z8.z.string().describe("The resource ID of the agent").optional()
         });
         const modelVersion = (await agent.getModel({ requestContext })).specificationVersion;
-        const toolObj = chunkMGCGWPQJ_cjs.createTool({
+        const toolObj = chunkZ55SJVEC_cjs.createTool({
           id: `agent-${agentName}`,
           description: agent.getDescription() || `Agent: ${agentName}`,
           inputSchema: agentInputSchema,
@@ -15974,7 +16253,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
               }
               return result;
             } catch (err) {
-              const mastraError = new chunkTWH4PTDG_cjs.MastraError(
+              const mastraError = new chunkHWMMIRIF_cjs.MastraError(
                 {
                   id: "AGENT_AGENT_TOOL_EXECUTION_FAILED",
                   domain: "AGENT" /* AGENT */,
@@ -16010,7 +16289,12 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           tracingContext,
           tracingPolicy: this.#options?.tracingPolicy
         };
-        convertedAgentTools[`agent-${agentName}`] = chunkPG5H6QIO_cjs.makeCoreTool(toolObj, options);
+        convertedAgentTools[`agent-${agentName}`] = chunkMLKE7HRS_cjs.makeCoreTool(
+          toolObj,
+          options,
+          void 0,
+          autoResumeSuspendedTools
+        );
       }
     }
     return convertedAgentTools;
@@ -16025,28 +16309,29 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     resourceId,
     requestContext,
     tracingContext,
-    methodType
+    methodType,
+    autoResumeSuspendedTools
   }) {
     const convertedWorkflowTools = {};
     const workflows = await this.listWorkflows({ requestContext });
     if (Object.keys(workflows).length > 0) {
       for (const [workflowName, workflow] of Object.entries(workflows)) {
-        const extendedInputSchema = z7.z.object({
+        const extendedInputSchema = z8.z.object({
           inputData: workflow.inputSchema,
           ...workflow.stateSchema ? { initialState: workflow.stateSchema } : {}
         });
-        const toolObj = chunkMGCGWPQJ_cjs.createTool({
+        const toolObj = chunkZ55SJVEC_cjs.createTool({
           id: `workflow-${workflowName}`,
           description: workflow.description || `Workflow: ${workflowName}`,
           inputSchema: extendedInputSchema,
-          outputSchema: z7.z.union([
-            z7.z.object({
+          outputSchema: z8.z.union([
+            z8.z.object({
               result: workflow.outputSchema,
-              runId: z7.z.string().describe("Unique identifier for the workflow run")
+              runId: z8.z.string().describe("Unique identifier for the workflow run")
             }),
-            z7.z.object({
-              runId: z7.z.string().describe("Unique identifier for the workflow run"),
-              error: z7.z.string().describe("Error message if workflow execution failed")
+            z8.z.object({
+              runId: z8.z.string().describe("Unique identifier for the workflow run"),
+              error: z8.z.string().describe("Error message if workflow execution failed")
             })
           ]),
           mastra: this.#mastra,
@@ -16054,16 +16339,17 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           // current tool span onto the workflow to maintain continuity of the trace
           execute: async (inputData, context) => {
             try {
+              const { initialState, inputData: workflowInputData, suspendedToolRunId } = inputData;
+              const runIdToUse = suspendedToolRunId ?? runId;
               this.logger.debug(`[Agent:${this.name}] - Executing workflow as tool ${workflowName}`, {
                 name: workflowName,
                 description: workflow.description,
                 args: inputData,
-                runId,
+                runId: runIdToUse,
                 threadId,
                 resourceId
               });
-              const run = await workflow.createRun({ runId });
-              const { initialState, inputData: workflowInputData } = inputData;
+              const run = await workflow.createRun({ runId: runIdToUse });
               const { resumeData, suspend } = context?.agent ?? {};
               let result = void 0;
               if (methodType === "generate" || methodType === "generateLegacy") {
@@ -16122,10 +16408,24 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
               } else if (result?.status === "suspended") {
                 const suspendedStep = result?.suspended?.[0]?.[0];
                 const suspendPayload = result?.steps?.[suspendedStep]?.suspendPayload;
+                const suspendedStepIds = result?.suspended?.map((stepPath) => stepPath.join("."));
+                const firstSuspendedStepPath = [...result?.suspended?.[0] ?? []];
+                let wflowStep = workflow;
+                while (firstSuspendedStepPath.length > 0) {
+                  const key = firstSuspendedStepPath.shift();
+                  if (key) {
+                    if (!workflow.steps[key]) {
+                      this.logger.warn(`Suspended step '${key}' not found in workflow '${workflowName}'`);
+                      break;
+                    }
+                    wflowStep = workflow.steps[key];
+                  }
+                }
+                const resumeSchema = wflowStep?.resumeSchema;
                 if (suspendPayload?.__workflow_meta) {
                   delete suspendPayload.__workflow_meta;
                 }
-                return suspend?.(suspendPayload);
+                return suspend?.(suspendPayload, { resumeLabel: suspendedStepIds, resumeSchema });
               } else {
                 return {
                   error: `Workflow should never reach this path, workflow returned no status`,
@@ -16133,14 +16433,14 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
                 };
               }
             } catch (err) {
-              const mastraError = new chunkTWH4PTDG_cjs.MastraError(
+              const mastraError = new chunkHWMMIRIF_cjs.MastraError(
                 {
                   id: "AGENT_WORKFLOW_TOOL_EXECUTION_FAILED",
                   domain: "AGENT" /* AGENT */,
                   category: "USER" /* USER */,
                   details: {
                     agentName: this.name,
-                    runId: runId || "",
+                    runId: inputData.suspendedToolRunId || runId || "",
                     threadId: threadId || "",
                     resourceId: resourceId || ""
                   },
@@ -16168,7 +16468,12 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           tracingContext,
           tracingPolicy: this.#options?.tracingPolicy
         };
-        convertedWorkflowTools[`workflow-${workflowName}`] = chunkPG5H6QIO_cjs.makeCoreTool(toolObj, options);
+        convertedWorkflowTools[`workflow-${workflowName}`] = chunkMLKE7HRS_cjs.makeCoreTool(
+          toolObj,
+          options,
+          void 0,
+          autoResumeSuspendedTools
+        );
       }
     }
     return convertedWorkflowTools;
@@ -16187,12 +16492,13 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     tracingContext,
     outputWriter,
     methodType,
-    memoryConfig
+    memoryConfig,
+    autoResumeSuspendedTools
   }) {
     let mastraProxy = void 0;
     const logger = this.logger;
     if (this.#mastra) {
-      mastraProxy = chunkPG5H6QIO_cjs.createMastraProxy({ mastra: this.#mastra, logger });
+      mastraProxy = chunkMLKE7HRS_cjs.createMastraProxy({ mastra: this.#mastra, logger });
     }
     const assignedTools = await this.listAssignedTools({
       runId,
@@ -16201,7 +16507,8 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
       requestContext,
       tracingContext,
       mastraProxy,
-      outputWriter
+      outputWriter,
+      autoResumeSuspendedTools
     });
     const memoryTools = await this.listMemoryTools({
       runId,
@@ -16210,7 +16517,8 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
       requestContext,
       tracingContext,
       mastraProxy,
-      memoryConfig
+      memoryConfig,
+      autoResumeSuspendedTools
     });
     const toolsetTools = await this.listToolsets({
       runId,
@@ -16219,7 +16527,8 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
       requestContext,
       tracingContext,
       mastraProxy,
-      toolsets
+      toolsets,
+      autoResumeSuspendedTools
     });
     const clientSideTools = await this.listClientTools({
       runId,
@@ -16228,7 +16537,8 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
       requestContext,
       tracingContext,
       mastraProxy,
-      clientTools
+      clientTools,
+      autoResumeSuspendedTools
     });
     const agentTools = await this.listAgentTools({
       runId,
@@ -16236,7 +16546,8 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
       threadId,
       requestContext,
       methodType,
-      tracingContext
+      tracingContext,
+      autoResumeSuspendedTools
     });
     const workflowTools = await this.listWorkflowTools({
       runId,
@@ -16244,7 +16555,8 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
       threadId,
       requestContext,
       methodType,
-      tracingContext
+      tracingContext,
+      autoResumeSuspendedTools
     });
     return this.formatTools({
       ...assignedTools,
@@ -16270,7 +16582,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
         }
         newKey = newKey.slice(0, 63);
         if (tools[newKey]) {
-          const mastraError = new chunkTWH4PTDG_cjs.MastraError({
+          const mastraError = new chunkHWMMIRIF_cjs.MastraError({
             id: "AGENT_TOOL_NAME_COLLISION",
             domain: "AGENT" /* AGENT */,
             category: "USER" /* USER */,
@@ -16374,7 +16686,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
       if (typeof scorerObject.scorer === "string") {
         try {
           if (!this.#mastra) {
-            throw new chunkTWH4PTDG_cjs.MastraError({
+            throw new chunkHWMMIRIF_cjs.MastraError({
               id: "AGENT_GENEREATE_SCORER_NOT_FOUND",
               domain: "AGENT" /* AGENT */,
               category: "USER" /* USER */,
@@ -16391,7 +16703,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
       }
     }
     if (Object.keys(result).length === 0) {
-      throw new chunkTWH4PTDG_cjs.MastraError({
+      throw new chunkHWMMIRIF_cjs.MastraError({
         id: "AGENT_GENEREATE_SCORER_NOT_FOUND",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
@@ -16409,7 +16721,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
       const modelToUse = model ?? this.model;
       const resolvedModel = typeof modelToUse === "function" ? await modelToUse({ requestContext, mastra: this.#mastra }) : modelToUse;
       if (resolvedModel?.specificationVersion !== "v2") {
-        const mastraError = new chunkTWH4PTDG_cjs.MastraError({
+        const mastraError = new chunkHWMMIRIF_cjs.MastraError({
           id: "AGENT_PREPARE_MODELS_INCOMPATIBLE_WITH_MODEL_ARRAY_V1",
           domain: "AGENT" /* AGENT */,
           category: "USER" /* USER */,
@@ -16436,7 +16748,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
       this.model.map(async (modelConfig) => {
         const model2 = await this.resolveModelConfig(modelConfig.model, requestContext);
         if (!isV2Model(model2)) {
-          const mastraError = new chunkTWH4PTDG_cjs.MastraError({
+          const mastraError = new chunkHWMMIRIF_cjs.MastraError({
             id: "AGENT_PREPARE_MODELS_INCOMPATIBLE_WITH_MODEL_ARRAY_V1",
             domain: "AGENT" /* AGENT */,
             category: "USER" /* USER */,
@@ -16451,7 +16763,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
         }
         const modelId = modelConfig.id || model2.modelId;
         if (!modelId) {
-          const mastraError = new chunkTWH4PTDG_cjs.MastraError({
+          const mastraError = new chunkHWMMIRIF_cjs.MastraError({
             id: "AGENT_PREPARE_MODELS_MISSING_MODEL_ID",
             domain: "AGENT" /* AGENT */,
             category: "USER" /* USER */,
@@ -16516,7 +16828,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
       const targetProvider = structuredOutputModel.provider;
       const targetModelId = structuredOutputModel.modelId;
       if (targetProvider.includes("openai") || targetModelId.includes("openai")) {
-        if (chunkPG5H6QIO_cjs.isZodType(options.structuredOutput.schema) && targetModelId) {
+        if (chunkMLKE7HRS_cjs.isZodType(options.structuredOutput.schema) && targetModelId) {
           const modelInfo = {
             provider: targetProvider,
             modelId: targetModelId,
@@ -16595,6 +16907,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
       saveQueueManager,
       returnScorerData: options.returnScorerData,
       requireToolApproval: options.requireToolApproval,
+      toolCallConcurrency: options.toolCallConcurrency,
       resumeContext,
       agentId: this.id,
       agentName: this.name,
@@ -16710,10 +17023,10 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           }
         }
       } catch (e) {
-        if (e instanceof chunkTWH4PTDG_cjs.MastraError) {
+        if (e instanceof chunkHWMMIRIF_cjs.MastraError) {
           throw e;
         }
-        const mastraError = new chunkTWH4PTDG_cjs.MastraError(
+        const mastraError = new chunkHWMMIRIF_cjs.MastraError(
           {
             id: "AGENT_MEMORY_PERSIST_RESPONSE_MESSAGES_FAILED",
             domain: "AGENT" /* AGENT */,
@@ -16792,6 +17105,10 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
   async network(messages, options) {
     const runId = options?.runId || this.#mastra?.generateId() || crypto2.randomUUID();
     const requestContextToUse = options?.requestContext || new chunkUVHSM2GU_cjs.RequestContext();
+    const resourceIdFromContext = requestContextToUse.get(chunkUVHSM2GU_cjs.MASTRA_RESOURCE_ID_KEY);
+    const threadIdFromContext = requestContextToUse.get(chunkUVHSM2GU_cjs.MASTRA_THREAD_ID_KEY);
+    const threadId = threadIdFromContext || (typeof options?.memory?.thread === "string" ? options?.memory?.thread : options?.memory?.thread?.id);
+    const resourceId = resourceIdFromContext || options?.memory?.resource;
     return await networkLoop({
       networkName: this.name,
       requestContext: requestContextToUse,
@@ -16804,8 +17121,8 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
       generateId: () => this.#mastra?.generateId() || crypto2.randomUUID(),
       maxIterations: options?.maxSteps || 1,
       messages,
-      threadId: typeof options?.memory?.thread === "string" ? options?.memory?.thread : options?.memory?.thread?.id,
-      resourceId: options?.memory?.resource
+      threadId,
+      resourceId
     });
   }
   async generate(messages, options) {
@@ -16823,7 +17140,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     if (modelInfo.specificationVersion !== "v2") {
       const modelId = modelInfo.modelId || "unknown";
       const provider = modelInfo.provider || "unknown";
-      throw new chunkTWH4PTDG_cjs.MastraError({
+      throw new chunkHWMMIRIF_cjs.MastraError({
         id: "AGENT_GENERATE_V1_MODEL_NOT_SUPPORTED",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
@@ -16846,7 +17163,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     const result = await this.#execute(executeOptions);
     if (result.status !== "success") {
       if (result.status === "failed") {
-        throw new chunkTWH4PTDG_cjs.MastraError(
+        throw new chunkHWMMIRIF_cjs.MastraError(
           {
             id: "AGENT_GENERATE_FAILED",
             domain: "AGENT" /* AGENT */,
@@ -16856,7 +17173,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           result.error
         );
       }
-      throw new chunkTWH4PTDG_cjs.MastraError({
+      throw new chunkHWMMIRIF_cjs.MastraError({
         id: "AGENT_GENERATE_UNKNOWN_ERROR",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
@@ -16885,7 +17202,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     if (modelInfo.specificationVersion !== "v2") {
       const modelId = modelInfo.modelId || "unknown";
       const provider = modelInfo.provider || "unknown";
-      throw new chunkTWH4PTDG_cjs.MastraError({
+      throw new chunkHWMMIRIF_cjs.MastraError({
         id: "AGENT_STREAM_V1_MODEL_NOT_SUPPORTED",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
@@ -16908,7 +17225,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     const result = await this.#execute(executeOptions);
     if (result.status !== "success") {
       if (result.status === "failed") {
-        throw new chunkTWH4PTDG_cjs.MastraError(
+        throw new chunkHWMMIRIF_cjs.MastraError(
           {
             id: "AGENT_STREAM_FAILED",
             domain: "AGENT" /* AGENT */,
@@ -16918,7 +17235,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           result.error
         );
       }
-      throw new chunkTWH4PTDG_cjs.MastraError({
+      throw new chunkHWMMIRIF_cjs.MastraError({
         id: "AGENT_STREAM_UNKNOWN_ERROR",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
@@ -16952,7 +17269,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
       requestContext: mergedStreamOptions.requestContext
     });
     if (llm.getModel().specificationVersion !== "v2") {
-      throw new chunkTWH4PTDG_cjs.MastraError({
+      throw new chunkHWMMIRIF_cjs.MastraError({
         id: "AGENT_STREAM_V1_MODEL_NOT_SUPPORTED",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
@@ -16974,7 +17291,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     });
     if (result.status !== "success") {
       if (result.status === "failed") {
-        throw new chunkTWH4PTDG_cjs.MastraError(
+        throw new chunkHWMMIRIF_cjs.MastraError(
           {
             id: "AGENT_STREAM_FAILED",
             domain: "AGENT" /* AGENT */,
@@ -16984,7 +17301,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           result.error
         );
       }
-      throw new chunkTWH4PTDG_cjs.MastraError({
+      throw new chunkHWMMIRIF_cjs.MastraError({
         id: "AGENT_STREAM_UNKNOWN_ERROR",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
@@ -17181,14 +17498,14 @@ var ModerationProcessor = class _ModerationProcessor {
     const prompt = this.createModerationPrompt(content, isStream);
     try {
       const model = await this.moderationAgent.getModel();
-      const schema = z7__default.default.object({
-        category_scores: z7__default.default.array(
-          z7__default.default.object({
-            category: z7__default.default.enum(this.categories).describe("The moderation category being evaluated"),
-            score: z7__default.default.number().min(0).max(1).describe("Confidence score between 0 and 1 indicating how strongly the content matches this category")
+      const schema = z8__default.default.object({
+        category_scores: z8__default.default.array(
+          z8__default.default.object({
+            category: z8__default.default.enum(this.categories).describe("The moderation category being evaluated"),
+            score: z8__default.default.number().min(0).max(1).describe("Confidence score between 0 and 1 indicating how strongly the content matches this category")
           })
         ).describe("Array of flagged categories with their confidence scores").nullable(),
-        reason: z7__default.default.string().describe("Brief explanation of why content was flagged").nullable()
+        reason: z8__default.default.string().describe("Brief explanation of why content was flagged").nullable()
       });
       let response;
       if (model.specificationVersion === "v2") {
@@ -17396,19 +17713,19 @@ var PromptInjectionDetector = class _PromptInjectionDetector {
     try {
       const model = await this.detectionAgent.getModel();
       let response;
-      const baseSchema = z7__default.default.object({
-        categories: z7__default.default.array(
-          z7__default.default.object({
-            type: z7__default.default.enum(this.detectionTypes).describe("The type of attack detected from the list of detection types"),
-            score: z7__default.default.number().min(0).max(1).describe("Confidence level between 0 and 1 indicating how certain the detection is")
+      const baseSchema = z8__default.default.object({
+        categories: z8__default.default.array(
+          z8__default.default.object({
+            type: z8__default.default.enum(this.detectionTypes).describe("The type of attack detected from the list of detection types"),
+            score: z8__default.default.number().min(0).max(1).describe("Confidence level between 0 and 1 indicating how certain the detection is")
           })
         ).nullable(),
-        reason: z7__default.default.string().describe("The reason for the detection").nullable()
+        reason: z8__default.default.string().describe("The reason for the detection").nullable()
       });
       let schema = baseSchema;
       if (this.strategy === "rewrite") {
         schema = baseSchema.extend({
-          rewritten_content: z7__default.default.string().describe("The rewritten content that neutralizes the attack while preserving any legitimate user intent").nullable()
+          rewritten_content: z8__default.default.string().describe("The rewritten content that neutralizes the attack while preserving any legitimate user intent").nullable()
         });
       }
       if (model.specificationVersion === "v2") {
@@ -17636,27 +17953,27 @@ var PIIDetector = class _PIIDetector {
     const prompt = this.createDetectionPrompt(content);
     try {
       const model = await this.detectionAgent.getModel();
-      const baseDetectionSchema = z7__default.default.object({
-        type: z7__default.default.string().describe("Type of PII detected"),
-        value: z7__default.default.string().describe("The actual PII value found"),
-        confidence: z7__default.default.number().min(0).max(1).describe("Confidence of this detection"),
-        start: z7__default.default.number().describe("Start position in the text"),
-        end: z7__default.default.number().describe("End position in the text")
+      const baseDetectionSchema = z8__default.default.object({
+        type: z8__default.default.string().describe("Type of PII detected"),
+        value: z8__default.default.string().describe("The actual PII value found"),
+        confidence: z8__default.default.number().min(0).max(1).describe("Confidence of this detection"),
+        start: z8__default.default.number().describe("Start position in the text"),
+        end: z8__default.default.number().describe("End position in the text")
       });
       const detectionSchema = this.strategy === "redact" ? baseDetectionSchema.extend({
-        redacted_value: z7__default.default.string().describe("Redacted version of the value").nullable()
+        redacted_value: z8__default.default.string().describe("Redacted version of the value").nullable()
       }) : baseDetectionSchema;
-      const baseSchema = z7__default.default.object({
-        categories: z7__default.default.array(
-          z7__default.default.object({
-            type: z7__default.default.enum(this.detectionTypes).describe("The type of PII detected from the list of detection types"),
-            score: z7__default.default.number().min(0).max(1).describe("Confidence level between 0 and 1 indicating how certain the detection is")
+      const baseSchema = z8__default.default.object({
+        categories: z8__default.default.array(
+          z8__default.default.object({
+            type: z8__default.default.enum(this.detectionTypes).describe("The type of PII detected from the list of detection types"),
+            score: z8__default.default.number().min(0).max(1).describe("Confidence level between 0 and 1 indicating how certain the detection is")
           })
         ).describe("Array of detected PII types with their confidence scores").nullable(),
-        detections: z7__default.default.array(detectionSchema).describe("Array of specific PII detections with locations").nullable()
+        detections: z8__default.default.array(detectionSchema).describe("Array of specific PII detections with locations").nullable()
       });
       const schema = this.strategy === "redact" ? baseSchema.extend({
-        redacted_content: z7__default.default.string().describe("The content with all PII redacted according to the redaction method").nullable()
+        redacted_content: z8__default.default.string().describe("The content with all PII redacted according to the redaction method").nullable()
       }) : baseSchema;
       let response;
       if (model.specificationVersion === "v2") {
@@ -18114,12 +18431,12 @@ var LanguageDetector = class _LanguageDetector {
     try {
       const model = await this.detectionAgent.getModel();
       let response;
-      const baseSchema = z7__default.default.object({
-        iso_code: z7__default.default.string().describe("ISO language code").nullable(),
-        confidence: z7__default.default.number().min(0).max(1).describe("Detection confidence").nullable()
+      const baseSchema = z8__default.default.object({
+        iso_code: z8__default.default.string().describe("ISO language code").nullable(),
+        confidence: z8__default.default.number().min(0).max(1).describe("Detection confidence").nullable()
       });
       const schema = this.strategy === "translate" ? baseSchema.extend({
-        translated_text: z7__default.default.string().describe("Translated text").nullable()
+        translated_text: z8__default.default.string().describe("Translated text").nullable()
       }) : baseSchema;
       if (model.specificationVersion === "v2") {
         response = await this.detectionAgent.generate(prompt, {
@@ -18782,22 +19099,22 @@ var SystemPromptScrubber = class {
     try {
       const model = await this.detectionAgent.getModel();
       let result;
-      const baseDetectionSchema = z7.z.object({
-        type: z7.z.string().describe("Type of system prompt detected"),
-        value: z7.z.string().describe("The detected content"),
-        confidence: z7.z.number().min(0).max(1).describe("Confidence score"),
-        start: z7.z.number().describe("Start position in text"),
-        end: z7.z.number().describe("End position in text")
+      const baseDetectionSchema = z8.z.object({
+        type: z8.z.string().describe("Type of system prompt detected"),
+        value: z8.z.string().describe("The detected content"),
+        confidence: z8.z.number().min(0).max(1).describe("Confidence score"),
+        start: z8.z.number().describe("Start position in text"),
+        end: z8.z.number().describe("End position in text")
       });
       const detectionSchema = this.strategy === "redact" ? baseDetectionSchema.extend({
-        redacted_value: z7.z.string().describe("Redacted value if available").nullable()
+        redacted_value: z8.z.string().describe("Redacted value if available").nullable()
       }) : baseDetectionSchema;
-      const baseSchema = z7.z.object({
-        detections: z7.z.array(detectionSchema).describe("Array of system prompt detections").nullable(),
-        reason: z7.z.string().describe("Reason for detection").nullable()
+      const baseSchema = z8.z.object({
+        detections: z8.z.array(detectionSchema).describe("Array of system prompt detections").nullable(),
+        reason: z8.z.string().describe("Reason for detection").nullable()
       });
       const schema = this.strategy === "redact" ? baseSchema.extend({
-        redacted_content: z7.z.string().describe("Redacted content").nullable()
+        redacted_content: z8.z.string().describe("Redacted content").nullable()
       }) : baseSchema;
       if (model.specificationVersion === "v2") {
         result = await this.detectionAgent.generate(text, {
@@ -19368,7 +19685,7 @@ var SemanticRecall = class {
    */
   formatCrossThreadMessages(messages, currentThreadId) {
     let result = ``;
-    const v1Messages = new chunk5Q6WAYEY_cjs.MessageList().add(messages, "memory").get.all.v1();
+    const v1Messages = new chunkX6IBA7FP_cjs.MessageList().add(messages, "memory").get.all.v1();
     let lastYmd = null;
     for (const msg of v1Messages) {
       const date = msg.createdAt;
@@ -19773,7 +20090,7 @@ https://mastra.ai/en/docs/memory/semantic-recall`
         );
       }
       if (typeof config.embedder === "string") {
-        this.embedder = new chunk3E3ILV6T_cjs.ModelRouterEmbeddingModel(config.embedder);
+        this.embedder = new chunkMXBVP7HX_cjs.ModelRouterEmbeddingModel(config.embedder);
       } else {
         this.embedder = config.embedder;
       }
@@ -19869,7 +20186,7 @@ https://mastra.ai/en/docs/memory/overview`
         "The threads.generateTitle option has been moved. Use the top-level generateTitle option instead."
       );
     }
-    const mergedConfig = chunkPG5H6QIO_cjs.deepMerge(this.threadConfig, config || {});
+    const mergedConfig = chunkMLKE7HRS_cjs.deepMerge(this.threadConfig, config || {});
     if (typeof config?.workingMemory === "object" && config.workingMemory?.schema && typeof mergedConfig.workingMemory === "object") {
       mergedConfig.workingMemory.schema = config.workingMemory.schema;
     }
@@ -19938,7 +20255,7 @@ https://mastra.ai/en/docs/memory/overview`
     const isWorkingMemoryEnabled = typeof effectiveConfig.workingMemory === "object" && effectiveConfig.workingMemory.enabled !== false;
     if (isWorkingMemoryEnabled) {
       if (!this.storage?.stores?.memory)
-        throw new chunkTWH4PTDG_cjs.MastraError({
+        throw new chunkHWMMIRIF_cjs.MastraError({
           category: "USER",
           domain: "STORAGE" /* STORAGE */,
           id: "WORKING_MEMORY_MISSING_STORAGE_ADAPTER",
@@ -19967,7 +20284,7 @@ https://mastra.ai/en/docs/memory/overview`
     const lastMessages = effectiveConfig.lastMessages;
     if (lastMessages) {
       if (!this.storage?.stores?.memory)
-        throw new chunkTWH4PTDG_cjs.MastraError({
+        throw new chunkHWMMIRIF_cjs.MastraError({
           category: "USER",
           domain: "STORAGE" /* STORAGE */,
           id: "MESSAGE_HISTORY_MISSING_STORAGE_ADAPTER",
@@ -19985,21 +20302,21 @@ https://mastra.ai/en/docs/memory/overview`
     }
     if (effectiveConfig.semanticRecall) {
       if (!this.storage?.stores?.memory)
-        throw new chunkTWH4PTDG_cjs.MastraError({
+        throw new chunkHWMMIRIF_cjs.MastraError({
           category: "USER",
           domain: "STORAGE" /* STORAGE */,
           id: "SEMANTIC_RECALL_MISSING_STORAGE_ADAPTER",
           text: "Using Mastra Memory semantic recall requires a storage adapter but no attached adapter was detected."
         });
       if (!this.vector)
-        throw new chunkTWH4PTDG_cjs.MastraError({
+        throw new chunkHWMMIRIF_cjs.MastraError({
           category: "USER",
           domain: "MASTRA_VECTOR" /* MASTRA_VECTOR */,
           id: "SEMANTIC_RECALL_MISSING_VECTOR_ADAPTER",
           text: "Using Mastra Memory semantic recall requires a vector adapter but no attached adapter was detected."
         });
       if (!this.embedder)
-        throw new chunkTWH4PTDG_cjs.MastraError({
+        throw new chunkHWMMIRIF_cjs.MastraError({
           category: "USER",
           domain: "MASTRA_VECTOR" /* MASTRA_VECTOR */,
           id: "SEMANTIC_RECALL_MISSING_EMBEDDER",
@@ -20038,21 +20355,21 @@ https://mastra.ai/en/docs/memory/overview`
     }
     if (effectiveConfig.semanticRecall) {
       if (!this.storage?.stores?.memory)
-        throw new chunkTWH4PTDG_cjs.MastraError({
+        throw new chunkHWMMIRIF_cjs.MastraError({
           category: "USER",
           domain: "STORAGE" /* STORAGE */,
           id: "SEMANTIC_RECALL_MISSING_STORAGE_ADAPTER",
           text: "Using Mastra Memory semantic recall requires a storage adapter but no attached adapter was detected."
         });
       if (!this.vector)
-        throw new chunkTWH4PTDG_cjs.MastraError({
+        throw new chunkHWMMIRIF_cjs.MastraError({
           category: "USER",
           domain: "MASTRA_VECTOR" /* MASTRA_VECTOR */,
           id: "SEMANTIC_RECALL_MISSING_VECTOR_ADAPTER",
           text: "Using Mastra Memory semantic recall requires a vector adapter but no attached adapter was detected."
         });
       if (!this.embedder)
-        throw new chunkTWH4PTDG_cjs.MastraError({
+        throw new chunkHWMMIRIF_cjs.MastraError({
           category: "USER",
           domain: "MASTRA_VECTOR" /* MASTRA_VECTOR */,
           id: "SEMANTIC_RECALL_MISSING_EMBEDDER",
@@ -20076,7 +20393,7 @@ https://mastra.ai/en/docs/memory/overview`
     const lastMessages = effectiveConfig.lastMessages;
     if (lastMessages) {
       if (!this.storage?.stores?.memory)
-        throw new chunkTWH4PTDG_cjs.MastraError({
+        throw new chunkHWMMIRIF_cjs.MastraError({
           category: "USER",
           domain: "STORAGE" /* STORAGE */,
           id: "MESSAGE_HISTORY_MISSING_STORAGE_ADAPTER",
@@ -20095,7 +20412,7 @@ https://mastra.ai/en/docs/memory/overview`
     return processors;
   }
 };
-var isZodObject = (v) => v instanceof z7.ZodObject;
+var isZodObject = (v) => v instanceof z8.ZodObject;
 var MockMemory = class extends MastraMemory {
   constructor({
     storage,
@@ -20105,7 +20422,7 @@ var MockMemory = class extends MastraMemory {
   } = {}) {
     super({
       name: "mock",
-      storage: storage || new chunkBJXKH4LG_cjs.InMemoryStore(),
+      storage: storage || new chunkLGB4VNZI_cjs.InMemoryStore(),
       options: {
         workingMemory: enableWorkingMemory ? { enabled: true, template: workingMemoryTemplate } : void 0,
         lastMessages: enableMessageHistory ? 10 : void 0
@@ -20166,10 +20483,10 @@ var MockMemory = class extends MastraMemory {
   }
   listTools(_config) {
     return {
-      updateWorkingMemory: chunkMGCGWPQJ_cjs.createTool({
+      updateWorkingMemory: chunkZ55SJVEC_cjs.createTool({
         id: "update-working-memory",
         description: `Update the working memory with new information. Any data not included will be overwritten.`,
-        inputSchema: z7__default.default.object({ memory: z7__default.default.string() }),
+        inputSchema: z8__default.default.object({ memory: z8__default.default.string() }),
         execute: async (inputData, context) => {
           const threadId = context?.agent?.threadId;
           const resourceId = context?.agent?.resourceId;
@@ -20283,6 +20600,7 @@ exports.Agent = Agent;
 exports.BatchPartsProcessor = BatchPartsProcessor;
 exports.ChunkFrom = ChunkFrom;
 exports.DefaultExecutionEngine = DefaultExecutionEngine;
+exports.EventEmitterPubSub = EventEmitterPubSub;
 exports.ExecutionEngine = ExecutionEngine;
 exports.FilePartSchema = FilePartSchema;
 exports.ImagePartSchema = ImagePartSchema;
@@ -20340,6 +20658,7 @@ exports.getResumeLabelsByStepId = getResumeLabelsByStepId;
 exports.getStepIds = getStepIds;
 exports.getStepResult = getStepResult;
 exports.getZodErrors = getZodErrors;
+exports.hydrateSerializedStepErrors = hydrateSerializedStepErrors;
 exports.isProcessor = isProcessor;
 exports.isProcessorWorkflow = isProcessorWorkflow;
 exports.loop = loop;
@@ -20354,5 +20673,5 @@ exports.validateStepInput = validateStepInput;
 exports.validateStepResumeData = validateStepResumeData;
 exports.validateStepStateData = validateStepStateData;
 exports.validateStepSuspendData = validateStepSuspendData;
-//# sourceMappingURL=chunk-52RSUALV.cjs.map
-//# sourceMappingURL=chunk-52RSUALV.cjs.map
+//# sourceMappingURL=chunk-R5AJGM55.cjs.map
+//# sourceMappingURL=chunk-R5AJGM55.cjs.map