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

package/dist/{chunk-R5AJGM55.cjs → chunk-DDK3URK2.cjs}

@@ -1,21 +1,21 @@
 'use strict';
 
-var chunkH4VUIOWU_cjs = require('./chunk-H4VUIOWU.cjs');
+var chunkSSB4AVHU_cjs = require('./chunk-SSB4AVHU.cjs');
 var chunkL3NKIMF5_cjs = require('./chunk-L3NKIMF5.cjs');
-var chunkLGB4VNZI_cjs = require('./chunk-LGB4VNZI.cjs');
-var chunkX6IBA7FP_cjs = require('./chunk-X6IBA7FP.cjs');
+var chunkLOV5NNGK_cjs = require('./chunk-LOV5NNGK.cjs');
+var chunkEMLEZXTQ_cjs = require('./chunk-EMLEZXTQ.cjs');
 var chunkNESKUIRE_cjs = require('./chunk-NESKUIRE.cjs');
 var chunkFVQTJUBD_cjs = require('./chunk-FVQTJUBD.cjs');
+var chunkGXMJ5URG_cjs = require('./chunk-GXMJ5URG.cjs');
+var chunkT2LVULCK_cjs = require('./chunk-T2LVULCK.cjs');
 var chunk4D4KB75Y_cjs = require('./chunk-4D4KB75Y.cjs');
 var chunkMR7ZWBL6_cjs = require('./chunk-MR7ZWBL6.cjs');
-var chunkMXBVP7HX_cjs = require('./chunk-MXBVP7HX.cjs');
-var chunkSZYSDJTN_cjs = require('./chunk-SZYSDJTN.cjs');
-var chunkMLKE7HRS_cjs = require('./chunk-MLKE7HRS.cjs');
+var chunkBC2VKOH4_cjs = require('./chunk-BC2VKOH4.cjs');
+var chunkO2CAMK4A_cjs = require('./chunk-O2CAMK4A.cjs');
+var chunk4U7ZLI36_cjs = require('./chunk-4U7ZLI36.cjs');
 var chunkKJBMTK5B_cjs = require('./chunk-KJBMTK5B.cjs');
-var chunkZ55SJVEC_cjs = require('./chunk-Z55SJVEC.cjs');
-var chunk72YCRTEX_cjs = require('./chunk-72YCRTEX.cjs');
+var chunk6HJFCSJ4_cjs = require('./chunk-6HJFCSJ4.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');
@@ -28,6 +28,7 @@ var providerV5 = require('@ai-sdk/provider-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');
@@ -558,7 +559,7 @@ var StructuredOutputProcessor = class {
   providerOptions;
   constructor(options) {
     if (!options.schema) {
-      throw new chunkHWMMIRIF_cjs.MastraError({
+      throw new chunk4U7ZLI36_cjs.MastraError({
         id: "STRUCTURED_OUTPUT_PROCESSOR_SCHEMA_REQUIRED",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
@@ -566,7 +567,7 @@ var StructuredOutputProcessor = class {
       });
     }
     if (!options.model) {
-      throw new chunkHWMMIRIF_cjs.MastraError({
+      throw new chunk4U7ZLI36_cjs.MastraError({
         id: "STRUCTURED_OUTPUT_PROCESSOR_MODEL_REQUIRED",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
@@ -756,6 +757,69 @@ The input text may be in any format (sentences, bullet points, paragraphs, etc.)
   }
 };
 
+// src/agent/utils.ts
+var supportedLanguageModelSpecifications = ["v2", "v3"];
+var isSupportedLanguageModel = (model) => {
+  return supportedLanguageModelSpecifications.includes(model.specificationVersion);
+};
+async function tryGenerateWithJsonFallback(agent, prompt, options) {
+  if (!options.structuredOutput?.schema) {
+    throw new chunk4U7ZLI36_cjs.MastraError({
+      id: "STRUCTURED_OUTPUT_OPTIONS_REQUIRED",
+      domain: "AGENT" /* AGENT */,
+      category: "USER" /* USER */,
+      text: "structuredOutput is required to use tryGenerateWithJsonFallback"
+    });
+  }
+  try {
+    return await agent.generate(prompt, options);
+  } catch (error) {
+    console.warn("Error in tryGenerateWithJsonFallback. Attempting fallback.", error);
+    return await agent.generate(prompt, {
+      ...options,
+      structuredOutput: { ...options.structuredOutput, jsonPromptInjection: true }
+    });
+  }
+}
+async function tryStreamWithJsonFallback(agent, prompt, options) {
+  if (!options.structuredOutput?.schema) {
+    throw new chunk4U7ZLI36_cjs.MastraError({
+      id: "STRUCTURED_OUTPUT_OPTIONS_REQUIRED",
+      domain: "AGENT" /* AGENT */,
+      category: "USER" /* USER */,
+      text: "structuredOutput is required to use tryStreamWithJsonFallback"
+    });
+  }
+  try {
+    const result = await agent.stream(prompt, options);
+    const object = await result.object;
+    if (!object) {
+      throw new chunk4U7ZLI36_cjs.MastraError({
+        id: "STRUCTURED_OUTPUT_OBJECT_UNDEFINED",
+        domain: "AGENT" /* AGENT */,
+        category: "USER" /* USER */,
+        text: "structuredOutput object is undefined"
+      });
+    }
+    return result;
+  } catch (error) {
+    console.warn("Error in tryStreamWithJsonFallback. Attempting fallback.", error);
+    return await agent.stream(prompt, {
+      ...options,
+      structuredOutput: { ...options.structuredOutput, jsonPromptInjection: true }
+    });
+  }
+}
+function resolveThreadIdFromArgs(args) {
+  if (args?.memory?.thread) {
+    if (typeof args.memory.thread === "string") return { id: args.memory.thread };
+    if (typeof args.memory.thread === "object" && args.memory.thread.id)
+      return args.memory.thread;
+  }
+  if (args?.threadId) return { id: args.threadId };
+  return void 0;
+}
+
 // src/processors/runner.ts
 var ProcessorState = class {
   accumulatedText = "";
@@ -769,8 +833,9 @@ var ProcessorState = class {
     this.span = parentSpan?.createChildSpan({
       type: "processor_run" /* PROCESSOR_RUN */,
       name: `output processor: ${processorName}`,
+      entityType: "output_processor" /* OUTPUT_PROCESSOR */,
+      entityName: processorName,
       attributes: {
-        processorName,
         processorType: "output",
         processorIndex: processorIndex ?? 0
       },
@@ -836,7 +901,7 @@ var ProcessorRunner = class _ProcessorRunner {
       );
     }
     if (result.status !== "success") {
-      throw new chunkHWMMIRIF_cjs.MastraError({
+      throw new chunk4U7ZLI36_cjs.MastraError({
         category: "USER",
         domain: "AGENT",
         id: "PROCESSOR_WORKFLOW_FAILED",
@@ -848,7 +913,7 @@ var ProcessorRunner = class _ProcessorRunner {
       return input;
     }
     if (!("phase" in output) || !("messages" in output || "part" in output || "messageList" in output)) {
-      throw new chunkHWMMIRIF_cjs.MastraError({
+      throw new chunk4U7ZLI36_cjs.MastraError({
         category: "USER",
         domain: "AGENT",
         id: "PROCESSOR_WORKFLOW_INVALID_OUTPUT",
@@ -869,8 +934,10 @@ var ProcessorRunner = class _ProcessorRunner {
         const processorSpan2 = parentSpan2?.createChildSpan({
           type: "processor_run" /* PROCESSOR_RUN */,
           name: `output processor workflow: ${processorOrWorkflow.id}`,
+          entityType: "output_processor" /* OUTPUT_PROCESSOR */,
+          entityId: processorOrWorkflow.id,
+          entityName: processorOrWorkflow.name,
           attributes: {
-            processorName: processorOrWorkflow.id,
             processorType: "output",
             processorIndex: index
           },
@@ -911,8 +978,10 @@ var ProcessorRunner = class _ProcessorRunner {
       const processorSpan = parentSpan?.createChildSpan({
         type: "processor_run" /* PROCESSOR_RUN */,
         name: `output processor: ${processor.id}`,
+        entityType: "output_processor" /* OUTPUT_PROCESSOR */,
+        entityId: processor.id,
+        entityName: processor.name,
         attributes: {
-          processorName: processor.name ?? processor.id,
           processorType: "output",
           processorIndex: index
         },
@@ -928,9 +997,9 @@ var ProcessorRunner = class _ProcessorRunner {
         retryCount
       });
       const mutations = messageList.stopRecording();
-      if (result instanceof chunkX6IBA7FP_cjs.MessageList) {
+      if (result instanceof chunkEMLEZXTQ_cjs.MessageList) {
         if (result !== messageList) {
-          throw new chunkHWMMIRIF_cjs.MastraError({
+          throw new chunk4U7ZLI36_cjs.MastraError({
             category: "USER",
             domain: "AGENT",
             id: "PROCESSOR_RETURNED_EXTERNAL_MESSAGE_LIST",
@@ -1147,8 +1216,10 @@ var ProcessorRunner = class _ProcessorRunner {
         const processorSpan2 = parentSpan2?.createChildSpan({
           type: "processor_run" /* PROCESSOR_RUN */,
           name: `input processor workflow: ${processorOrWorkflow.id}`,
+          entityType: "input_processor" /* INPUT_PROCESSOR */,
+          entityId: processorOrWorkflow.id,
+          entityName: processorOrWorkflow.name,
           attributes: {
-            processorName: processorOrWorkflow.id,
             processorType: "input",
             processorIndex: index
           },
@@ -1191,8 +1262,10 @@ var ProcessorRunner = class _ProcessorRunner {
       const processorSpan = parentSpan?.createChildSpan({
         type: "processor_run" /* PROCESSOR_RUN */,
         name: `input processor: ${processor.id}`,
+        entityType: "input_processor" /* INPUT_PROCESSOR */,
+        entityId: processor.id,
+        entityName: processor.name,
         attributes: {
-          processorName: processor.name ?? processor.id,
           processorType: "input",
           processorIndex: index
         },
@@ -1210,9 +1283,9 @@ var ProcessorRunner = class _ProcessorRunner {
         retryCount
       });
       let mutations;
-      if (result instanceof chunkX6IBA7FP_cjs.MessageList) {
+      if (result instanceof chunkEMLEZXTQ_cjs.MessageList) {
         if (result !== messageList) {
-          throw new chunkHWMMIRIF_cjs.MastraError({
+          throw new chunk4U7ZLI36_cjs.MastraError({
             category: "USER",
             domain: "AGENT",
             id: "PROCESSOR_RETURNED_EXTERNAL_MESSAGE_LIST",
@@ -1315,8 +1388,10 @@ var ProcessorRunner = class _ProcessorRunner {
         const processorSpan2 = parentSpan?.createChildSpan({
           type: "processor_run" /* PROCESSOR_RUN */,
           name: `input step processor workflow: ${processorOrWorkflow.id}`,
+          entityType: "input_processor" /* INPUT_PROCESSOR */,
+          entityId: processorOrWorkflow.id,
+          entityName: processorOrWorkflow.name,
           attributes: {
-            processorName: processorOrWorkflow.id,
             processorType: "input",
             processorIndex: index
           },
@@ -1375,8 +1450,10 @@ var ProcessorRunner = class _ProcessorRunner {
       const processorSpan = currentSpan?.createChildSpan({
         type: "processor_run" /* PROCESSOR_RUN */,
         name: `input step processor: ${processor.id}`,
+        entityType: "input_processor" /* INPUT_PROCESSOR */,
+        entityId: processor.id,
+        entityName: processor.name,
         attributes: {
-          processorName: processor.name ?? processor.id,
           processorType: "input",
           processorIndex: index
         },
@@ -1469,6 +1546,7 @@ var ProcessorRunner = class _ProcessorRunner {
    */
   async runProcessOutputStep(args) {
     const {
+      steps,
       messageList,
       stepNumber,
       finishReason,
@@ -1488,8 +1566,10 @@ var ProcessorRunner = class _ProcessorRunner {
         const processorSpan2 = parentSpan2?.createChildSpan({
           type: "processor_run" /* PROCESSOR_RUN */,
           name: `output step processor workflow: ${processorOrWorkflow.id}`,
+          entityType: "output_processor" /* OUTPUT_PROCESSOR */,
+          entityId: processorOrWorkflow.id,
+          entityName: processorOrWorkflow.name,
           attributes: {
-            processorName: processorOrWorkflow.id,
             processorType: "output",
             processorIndex: index
           },
@@ -1508,6 +1588,7 @@ var ProcessorRunner = class _ProcessorRunner {
               toolCalls,
               text,
               systemMessages: currentSystemMessages2,
+              steps,
               retryCount
             },
             tracingContext,
@@ -1536,8 +1617,10 @@ var ProcessorRunner = class _ProcessorRunner {
       const processorSpan = parentSpan?.createChildSpan({
         type: "processor_run" /* PROCESSOR_RUN */,
         name: `output step processor: ${processor.id}`,
+        entityType: "output_processor" /* OUTPUT_PROCESSOR */,
+        entityId: processor.id,
+        entityName: processor.name,
         attributes: {
-          processorName: processor.name ?? processor.id,
           processorType: "output",
           processorIndex: index
         },
@@ -1554,15 +1637,16 @@ var ProcessorRunner = class _ProcessorRunner {
           toolCalls,
           text,
           systemMessages: currentSystemMessages,
+          steps,
           abort,
           tracingContext: { currentSpan: processorSpan },
           requestContext,
           retryCount
         });
         const mutations = messageList.stopRecording();
-        if (result instanceof chunkX6IBA7FP_cjs.MessageList) {
+        if (result instanceof chunkEMLEZXTQ_cjs.MessageList) {
           if (result !== messageList) {
-            throw new chunkHWMMIRIF_cjs.MastraError({
+            throw new chunk4U7ZLI36_cjs.MastraError({
               category: "USER",
               domain: "AGENT",
               id: "PROCESSOR_RETURNED_EXTERNAL_MESSAGE_LIST",
@@ -1630,9 +1714,9 @@ var ProcessorRunner = class _ProcessorRunner {
     processor,
     stepNumber
   }) {
-    if (result instanceof chunkX6IBA7FP_cjs.MessageList) {
+    if (result instanceof chunkEMLEZXTQ_cjs.MessageList) {
       if (result !== messageList) {
-        throw new chunkHWMMIRIF_cjs.MastraError({
+        throw new chunk4U7ZLI36_cjs.MastraError({
           category: "USER",
           domain: "AGENT",
           id: "PROCESSOR_RETURNED_EXTERNAL_MESSAGE_LIST",
@@ -1648,7 +1732,7 @@ var ProcessorRunner = class _ProcessorRunner {
       };
     } else if (result) {
       if (result.messageList && result.messageList !== messageList) {
-        throw new chunkHWMMIRIF_cjs.MastraError({
+        throw new chunk4U7ZLI36_cjs.MastraError({
           category: "USER",
           domain: "AGENT",
           id: "PROCESSOR_RETURNED_EXTERNAL_MESSAGE_LIST",
@@ -1656,7 +1740,7 @@ var ProcessorRunner = class _ProcessorRunner {
         });
       }
       if (result.messages && result.messageList) {
-        throw new chunkHWMMIRIF_cjs.MastraError({
+        throw new chunk4U7ZLI36_cjs.MastraError({
           category: "USER",
           domain: "AGENT",
           id: "PROCESSOR_RETURNED_MESSAGES_AND_MESSAGE_LIST",
@@ -1665,13 +1749,14 @@ var ProcessorRunner = class _ProcessorRunner {
       }
       const { model: _model, ...rest } = result;
       if (result.model) {
-        const resolvedModel = await chunkMXBVP7HX_cjs.resolveModelConfig(result.model);
-        if (resolvedModel.specificationVersion === "v1") {
-          throw new chunkHWMMIRIF_cjs.MastraError({
+        const resolvedModel = await chunkGXMJ5URG_cjs.resolveModelConfig(result.model);
+        const isSupported = isSupportedLanguageModel(resolvedModel);
+        if (!isSupported) {
+          throw new chunk4U7ZLI36_cjs.MastraError({
             category: "USER",
             domain: "AGENT",
-            id: "PROCESSOR_RETURNED_V1_MODEL",
-            text: `Processor ${processor.id} returned a v1 model in step ${stepNumber}. v1 models are not supported in processInputStep.`
+            id: "PROCESSOR_RETURNED_UNSUPPORTED_MODEL",
+            text: `Processor ${processor.id} returned an unsupported model version ${resolvedModel.specificationVersion} in step ${stepNumber}. Only ${supportedLanguageModelSpecifications.join(", ")} models are supported in processInputStep.`
           });
         }
         return {
@@ -1867,13 +1952,11 @@ function convertFullStreamChunkToMastra(value, ctx) {
         from: "AGENT" /* AGENT */,
         payload: {
           stepResult: {
-            reason: value.finishReason
+            reason: normalizeFinishReason(value.finishReason)
           },
           output: {
-            usage: {
-              ...value.usage ?? {},
-              totalTokens: value?.usage?.totalTokens ?? (value.usage?.inputTokens ?? 0) + (value.usage?.outputTokens ?? 0)
-            }
+            // Normalize usage to handle both V2 (flat) and V3 (nested) formats
+            usage: normalizeUsage(value.usage)
           },
           metadata: {
             providerMetadata: value.providerMetadata
@@ -1925,6 +2008,7 @@ function convertMastraChunkToAISDKv5({
         type: "finish",
         // Cast needed: Mastra extends reason with 'tripwire' | 'retry' for processor scenarios
         finishReason: chunk.payload.stepResult.reason,
+        // Cast needed: Mastra's LanguageModelUsage has optional properties, V2 has required-but-nullable
         totalUsage: chunk.payload.output.usage
       };
     }
@@ -1943,18 +2027,8 @@ function convertMastraChunkToAISDKv5({
       };
     case "reasoning-signature":
       throw new Error('AISDKv5 chunk type "reasoning-signature" not supported');
-    // return {
-    //   type: 'reasoning-signature' as const,
-    //   id: chunk.payload.id,
-    //   signature: chunk.payload.signature,
-    // };
     case "redacted-reasoning":
       throw new Error('AISDKv5 chunk type "redacted-reasoning" not supported');
-    // return {
-    //   type: 'redacted-reasoning',
-    //   id: chunk.payload.id,
-    //   data: chunk.payload.data,
-    // };
     case "reasoning-end":
       return {
         type: "reasoning-end",
@@ -1986,7 +2060,7 @@ function convertMastraChunkToAISDKv5({
       if (mode === "generate") {
         return {
           type: "file",
-          file: new chunkX6IBA7FP_cjs.DefaultGeneratedFile({
+          file: new chunkEMLEZXTQ_cjs.DefaultGeneratedFile({
             data: chunk.payload.data,
             mediaType: chunk.payload.mimeType
           })
@@ -1994,7 +2068,7 @@ function convertMastraChunkToAISDKv5({
       }
       return {
         type: "file",
-        file: new chunkX6IBA7FP_cjs.DefaultGeneratedFileWithType({
+        file: new chunkEMLEZXTQ_cjs.DefaultGeneratedFileWithType({
           data: chunk.payload.data,
           mediaType: chunk.payload.mimeType
         })
@@ -2108,6 +2182,59 @@ function convertMastraChunkToAISDKv5({
       return;
   }
 }
+function isV3Usage(usage) {
+  if (!usage || typeof usage !== "object") return false;
+  const u = usage;
+  return typeof u.inputTokens === "object" && u.inputTokens !== null && "total" in u.inputTokens && typeof u.outputTokens === "object" && u.outputTokens !== null && "total" in u.outputTokens;
+}
+function normalizeUsage(usage) {
+  if (!usage) {
+    return {
+      inputTokens: void 0,
+      outputTokens: void 0,
+      totalTokens: void 0,
+      reasoningTokens: void 0,
+      cachedInputTokens: void 0,
+      raw: void 0
+    };
+  }
+  if (isV3Usage(usage)) {
+    const inputTokens = usage.inputTokens.total;
+    const outputTokens = usage.outputTokens.total;
+    return {
+      inputTokens,
+      outputTokens,
+      totalTokens: (inputTokens ?? 0) + (outputTokens ?? 0),
+      reasoningTokens: usage.outputTokens.reasoning,
+      cachedInputTokens: usage.inputTokens.cacheRead,
+      raw: usage
+    };
+  }
+  const v2Usage = usage;
+  return {
+    inputTokens: v2Usage.inputTokens,
+    outputTokens: v2Usage.outputTokens,
+    totalTokens: v2Usage.totalTokens ?? (v2Usage.inputTokens ?? 0) + (v2Usage.outputTokens ?? 0),
+    reasoningTokens: v2Usage.reasoningTokens,
+    cachedInputTokens: v2Usage.cachedInputTokens,
+    raw: usage
+  };
+}
+function isV3FinishReason(finishReason) {
+  return typeof finishReason === "object" && finishReason !== null && "unified" in finishReason;
+}
+function normalizeFinishReason(finishReason) {
+  if (!finishReason) {
+    return "other";
+  }
+  if (finishReason === "tripwire" || finishReason === "retry") {
+    return finishReason;
+  }
+  if (isV3FinishReason(finishReason)) {
+    return finishReason.unified;
+  }
+  return finishReason === "unknown" ? "other" : finishReason;
+}
 
 // src/stream/aisdk/v5/output.ts
 var AISDKV5OutputStream = class {
@@ -2549,7 +2676,7 @@ var BaseFormatHandler = class {
         } else {
           return {
             success: false,
-            error: new chunkHWMMIRIF_cjs.MastraError(
+            error: new chunk4U7ZLI36_cjs.MastraError(
               {
                 domain: "AGENT" /* AGENT */,
                 category: "SYSTEM" /* SYSTEM */,
@@ -3003,7 +3130,11 @@ var MastraModelOutput = class extends chunkDGV2FWB4_cjs.MastraBase {
   #warnings = [];
   #finishReason = void 0;
   #request = {};
-  #usageCount = { inputTokens: void 0, outputTokens: void 0, totalTokens: void 0 };
+  #usageCount = {
+    inputTokens: void 0,
+    outputTokens: void 0,
+    totalTokens: void 0
+  };
   #tripwire = void 0;
   #delayedPromises = {
     suspendPayload: new DelayedPromise(),
@@ -3350,23 +3481,25 @@ var MastraModelOutput = class extends chunkDGV2FWB4_cjs.MastraBase {
               };
               self.#finishReason = "other";
               self.#streamFinished = true;
-              self.#delayedPromises.text.resolve(self.#bufferedText.join(""));
-              self.#delayedPromises.finishReason.resolve("other");
-              self.#delayedPromises.object.resolve(void 0);
-              self.#delayedPromises.usage.resolve(self.#usageCount);
-              self.#delayedPromises.warnings.resolve(self.#warnings);
-              self.#delayedPromises.providerMetadata.resolve(void 0);
-              self.#delayedPromises.response.resolve({});
-              self.#delayedPromises.request.resolve({});
-              self.#delayedPromises.reasoning.resolve([]);
-              self.#delayedPromises.reasoningText.resolve(void 0);
-              self.#delayedPromises.sources.resolve([]);
-              self.#delayedPromises.files.resolve([]);
-              self.#delayedPromises.toolCalls.resolve([]);
-              self.#delayedPromises.toolResults.resolve([]);
-              self.#delayedPromises.steps.resolve(self.#bufferedSteps);
-              self.#delayedPromises.totalUsage.resolve(self.#usageCount);
-              self.#delayedPromises.content.resolve([]);
+              self.resolvePromises({
+                text: self.#bufferedText.join(""),
+                finishReason: "other",
+                object: void 0,
+                usage: self.#usageCount,
+                warnings: self.#warnings,
+                providerMetadata: void 0,
+                response: {},
+                request: {},
+                reasoning: [],
+                reasoningText: void 0,
+                sources: [],
+                files: [],
+                toolCalls: [],
+                toolResults: [],
+                steps: self.#bufferedSteps,
+                totalUsage: self.#usageCount,
+                content: []
+              });
               self.#emitChunk(chunk);
               controller.enqueue(chunk);
               self.#emitter.emit("finish");
@@ -3430,12 +3563,14 @@ var MastraModelOutput = class extends chunkDGV2FWB4_cjs.MastraBase {
                   );
                   const responseMessages = self.messageList.get.response.aiV4.core();
                   const lastResponseMessage = responseMessages[responseMessages.length - 1];
-                  const outputText = lastResponseMessage ? chunkX6IBA7FP_cjs.MessageList.coreContentToString(lastResponseMessage.content) : "";
+                  const outputText = lastResponseMessage ? chunkEMLEZXTQ_cjs.MessageList.coreContentToString(lastResponseMessage.content) : "";
                   if (lastStep && outputText && outputText !== originalText) {
                     lastStep.text = outputText;
                   }
-                  self.#delayedPromises.text.resolve(outputText || originalText);
-                  self.#delayedPromises.finishReason.resolve(self.#finishReason);
+                  this.resolvePromises({
+                    text: outputText || originalText,
+                    finishReason: self.#finishReason
+                  });
                   if (chunk.payload.metadata) {
                     const { providerMetadata, request, ...otherMetadata } = chunk.payload.metadata;
                     response = {
@@ -3445,9 +3580,10 @@ var MastraModelOutput = class extends chunkDGV2FWB4_cjs.MastraBase {
                     };
                   }
                 } else if (!self.#options.isLLMExecutionStep) {
-                  const textContent = self.#bufferedText.join("");
-                  self.#delayedPromises.text.resolve(textContent);
-                  self.#delayedPromises.finishReason.resolve(self.#finishReason);
+                  this.resolvePromises({
+                    text: self.#bufferedText.join(""),
+                    finishReason: self.#finishReason
+                  });
                 }
               } catch (error2) {
                 if (error2 instanceof TripWire) {
@@ -3457,35 +3593,41 @@ var MastraModelOutput = class extends chunkDGV2FWB4_cjs.MastraBase {
                     metadata: error2.options?.metadata,
                     processorId: error2.processorId
                   };
-                  self.#delayedPromises.finishReason.resolve("other");
-                  self.#delayedPromises.text.resolve("");
+                  self.resolvePromises({
+                    finishReason: "other",
+                    text: ""
+                  });
                 } else {
-                  self.#error = chunkHWMMIRIF_cjs.getErrorFromUnknown(error2, {
+                  self.#error = chunk4U7ZLI36_cjs.getErrorFromUnknown(error2, {
                     fallbackMessage: "Unknown error in stream"
                   });
-                  self.#delayedPromises.finishReason.resolve("error");
-                  self.#delayedPromises.text.resolve("");
+                  self.resolvePromises({
+                    finishReason: "error",
+                    text: ""
+                  });
                 }
                 if (self.#delayedPromises.object.status.type !== "resolved") {
                   self.#delayedPromises.object.resolve(void 0);
                 }
               }
-              self.#delayedPromises.usage.resolve(self.#usageCount);
-              self.#delayedPromises.warnings.resolve(self.#warnings);
-              self.#delayedPromises.providerMetadata.resolve(chunk.payload.metadata?.providerMetadata);
-              self.#delayedPromises.response.resolve(response);
-              self.#delayedPromises.request.resolve(self.#request || {});
               const reasoningText = self.#bufferedReasoning.length > 0 ? self.#bufferedReasoning.map((reasoningPart) => reasoningPart.payload.text).join("") : void 0;
-              self.#delayedPromises.reasoningText.resolve(reasoningText);
-              self.#delayedPromises.reasoning.resolve(Object.values(self.#bufferedReasoningDetails || {}));
-              self.#delayedPromises.sources.resolve(self.#bufferedSources);
-              self.#delayedPromises.files.resolve(self.#bufferedFiles);
-              self.#delayedPromises.toolCalls.resolve(self.#toolCalls);
-              self.#delayedPromises.toolResults.resolve(self.#toolResults);
-              self.#delayedPromises.steps.resolve(self.#bufferedSteps);
-              self.#delayedPromises.totalUsage.resolve(self.#getTotalUsage());
-              self.#delayedPromises.content.resolve(messageList.get.response.aiV5.stepContent());
-              self.#delayedPromises.suspendPayload.resolve(void 0);
+              this.resolvePromises({
+                usage: self.#usageCount,
+                warnings: self.#warnings,
+                providerMetadata: chunk.payload.metadata?.providerMetadata,
+                response,
+                request: self.#request || {},
+                reasoningText,
+                reasoning: Object.values(self.#bufferedReasoningDetails || {}),
+                sources: self.#bufferedSources,
+                files: self.#bufferedFiles,
+                toolCalls: self.#toolCalls,
+                toolResults: self.#toolResults,
+                steps: self.#bufferedSteps,
+                totalUsage: self.#getTotalUsage(),
+                content: messageList.get.response.aiV5.stepContent(),
+                suspendPayload: void 0
+              });
               const baseFinishStep = self.#bufferedSteps[self.#bufferedSteps.length - 1];
               if (baseFinishStep) {
                 const onFinishPayload = {
@@ -3533,7 +3675,7 @@ var MastraModelOutput = class extends chunkDGV2FWB4_cjs.MastraBase {
               }
               break;
             case "error":
-              const error = chunkHWMMIRIF_cjs.getErrorFromUnknown(chunk.payload.error, {
+              const error = chunk4U7ZLI36_cjs.getErrorFromUnknown(chunk.payload.error, {
                 fallbackMessage: "Unknown error chunk in stream"
               });
               self.#error = error;
@@ -3553,6 +3695,28 @@ var MastraModelOutput = class extends chunkDGV2FWB4_cjs.MastraBase {
           if (self.#delayedPromises.object.status.type === "pending") {
             self.#delayedPromises.object.resolve(void 0);
           }
+          if (self.#status === "suspended") {
+            const reasoningText = self.#bufferedReasoning.length > 0 ? self.#bufferedReasoning.map((reasoningPart) => reasoningPart.payload.text).join("") : void 0;
+            self.resolvePromises({
+              toolResults: self.#toolResults,
+              toolCalls: self.#toolCalls,
+              text: self.#bufferedText.join(""),
+              reasoning: Object.values(self.#bufferedReasoningDetails || {}),
+              reasoningText,
+              sources: self.#bufferedSources,
+              files: self.#bufferedFiles,
+              steps: self.#bufferedSteps,
+              usage: self.#usageCount,
+              totalUsage: self.#getTotalUsage(),
+              warnings: self.#warnings,
+              finishReason: "other",
+              content: self.messageList.get.response.aiV5.stepContent(),
+              object: void 0,
+              request: self.#request,
+              response: {},
+              providerMetadata: void 0
+            });
+          }
           Object.entries(self.#delayedPromises).forEach(([key, promise]) => {
             if (promise.status.type === "pending") {
               promise.reject(new Error(`promise '${key}' was not resolved or rejected when stream finished`));
@@ -3576,6 +3740,23 @@ var MastraModelOutput = class extends chunkDGV2FWB4_cjs.MastraBase {
       this.deserializeState(initialState);
     }
   }
+  resolvePromise(key, value) {
+    if (!(key in this.#delayedPromises)) {
+      throw new chunk4U7ZLI36_cjs.MastraError({
+        id: "MASTRA_MODEL_OUTPUT_INVALID_PROMISE_KEY",
+        domain: "LLM" /* LLM */,
+        category: "SYSTEM" /* SYSTEM */,
+        text: `Attempted to resolve invalid promise key '${key}' with value '${typeof value === "object" ? JSON.stringify(value, null, 2) : value}'`
+      });
+    }
+    this.#delayedPromises[key].resolve(value);
+  }
+  resolvePromises(data) {
+    for (const keyString in data) {
+      const key = keyString;
+      this.resolvePromise(key, data[key]);
+    }
+  }
   #getDelayedPromise(promise) {
     if (!this.#consumptionStarted) {
       void this.consumeStream();
@@ -4226,6 +4407,8 @@ var WorkflowRunOutput = class {
             } else {
               self.#status = "failed";
             }
+          } else if (chunk.type === "workflow-paused") {
+            self.#status = "paused";
           }
         },
         close() {
@@ -4361,6 +4544,8 @@ var WorkflowRunOutput = class {
             } else {
               self.#status = "failed";
             }
+          } else if (chunk.type === "workflow-paused") {
+            self.#status = "paused";
           }
         },
         close() {
@@ -4548,7 +4733,7 @@ var getModelOutputForTripwire = async ({
     model: {
       modelId: model.modelId,
       provider: model.provider,
-      version: model.specificationVersion || "v2"
+      version: model.specificationVersion
     },
     stream: tripwireStream,
     messageList,
@@ -4619,11 +4804,6 @@ function runScorer({
   };
   chunkMR7ZWBL6_cjs.executeHook("onScorerRun" /* ON_SCORER_RUN */, payload);
 }
-
-// src/llm/model/is-v2-model.ts
-function isV2Model(model) {
-  return model.specificationVersion === "v2";
-}
 var EventEmitterPubSub = class extends chunk4D4KB75Y_cjs.PubSub {
   emitter;
   constructor(existingEmitter) {
@@ -4950,7 +5130,7 @@ 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 chunkHWMMIRIF_cjs.MastraError(
+      validationError = new chunk4U7ZLI36_cjs.MastraError(
         {
           id: "WORKFLOW_STEP_INPUT_VALIDATION_FAILED",
           domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
@@ -4978,7 +5158,7 @@ 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 chunkHWMMIRIF_cjs.MastraError(
+      validationError = new chunk4U7ZLI36_cjs.MastraError(
         {
           id: "WORKFLOW_STEP_RESUME_DATA_VALIDATION_FAILED",
           domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
@@ -5009,7 +5189,7 @@ 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 chunkHWMMIRIF_cjs.MastraError(
+      validationError = new chunk4U7ZLI36_cjs.MastraError(
         {
           id: "WORKFLOW_STEP_SUSPEND_DATA_VALIDATION_FAILED",
           domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
@@ -5090,7 +5270,7 @@ var getStepIds = (entry) => {
   return [];
 };
 var createTimeTravelExecutionParams = (params) => {
-  const { steps, inputData, resumeData, context, nestedStepsContext, snapshot, initialState, graph } = params;
+  const { steps, inputData, resumeData, context, nestedStepsContext, snapshot, initialState, graph, perStep } = params;
   const firstStepId = steps[0];
   let executionPath = [];
   const stepResults = {};
@@ -5157,11 +5337,12 @@ var createTimeTravelExecutionParams = (params) => {
         suspendedAt: stepContext?.suspendedAt,
         resumedAt: stepContext?.resumedAt
       };
-      if (currentExecPathLength > 0 && (!snapshotContext[stepId] || snapshotContext[stepId] && snapshotContext[stepId].status !== "suspended")) {
+      const execPathLengthToUse = perStep ? executionPath.length : currentExecPathLength;
+      if (execPathLengthToUse > 0 && !steps?.includes(stepId) && !context?.[stepId] && (!snapshotContext[stepId] || snapshotContext[stepId] && snapshotContext[stepId].status !== "suspended")) {
         result = void 0;
       }
       if (result) {
-        const formattedResult = chunkMLKE7HRS_cjs.removeUndefinedValues(result);
+        const formattedResult = chunkBC2VKOH4_cjs.removeUndefinedValues(result);
         stepResults[stepId] = formattedResult;
       }
     });
@@ -5186,7 +5367,7 @@ 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 });
+        step.error = chunk4U7ZLI36_cjs.getErrorFromUnknown(step.error, { serializeStack: false });
       }
     }
   }
@@ -5212,7 +5393,8 @@ async function executeParallel(engine, params) {
     abortController,
     requestContext,
     outputWriter,
-    disableScorers
+    disableScorers,
+    perStep
   } = params;
   const parallelSpan = tracingContext.currentSpan?.createChildSpan({
     type: "workflow_parallel" /* WORKFLOW_PARALLEL */,
@@ -5234,7 +5416,7 @@ async function executeParallel(engine, params) {
       makeStepRunning = timeTravel.steps[0] === step.step.id;
     }
     if (!makeStepRunning) {
-      continue;
+      break;
     }
     const startTime = resume?.steps[0] === step.step.id ? void 0 : Date.now();
     const resumeTime = resume?.steps[0] === step.step.id ? Date.now() : void 0;
@@ -5246,6 +5428,9 @@ async function executeParallel(engine, params) {
       ...resumeTime ? { resumedAt: resumeTime } : {}
     };
     executionContext.activeStepsPath[step.step.id] = [...executionContext.executionPath, stepIndex];
+    if (perStep) {
+      break;
+    }
   }
   if (timeTravel && timeTravel.executionPath.length > 0) {
     timeTravel.executionPath.shift();
@@ -5257,6 +5442,9 @@ async function executeParallel(engine, params) {
       if (currStepResult && currStepResult.status !== "running") {
         return currStepResult;
       }
+      if (!currStepResult && (perStep || timeTravel)) {
+        return {};
+      }
       const stepExecResult = await engine.executeStep({
         workflowId,
         runId,
@@ -5285,7 +5473,8 @@ async function executeParallel(engine, params) {
         abortController,
         requestContext,
         outputWriter,
-        disableScorers
+        disableScorers,
+        perStep
       });
       engine.applyMutableContext(executionContext, stepExecResult.mutableContext);
       Object.assign(stepResults, stepExecResult.stepResults);
@@ -5346,7 +5535,8 @@ async function executeConditional(engine, params) {
     abortController,
     requestContext,
     outputWriter,
-    disableScorers
+    disableScorers,
+    perStep
   } = params;
   const conditionalSpan = tracingContext.currentSpan?.createChildSpan({
     type: "workflow_conditional" /* WORKFLOW_CONDITIONAL */,
@@ -5419,8 +5609,8 @@ async function executeConditional(engine, params) {
         });
         return result;
       } catch (e) {
-        const errorInstance = chunkHWMMIRIF_cjs.getErrorFromUnknown(e, { serializeStack: false });
-        const mastraError = new chunkHWMMIRIF_cjs.MastraError(
+        const errorInstance = chunk4U7ZLI36_cjs.getErrorFromUnknown(e, { serializeStack: false });
+        const mastraError = new chunk4U7ZLI36_cjs.MastraError(
           {
             id: "WORKFLOW_CONDITION_EVALUATION_FAILED",
             domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
@@ -5441,7 +5631,18 @@ async function executeConditional(engine, params) {
       }
     })
   )).filter((index) => index !== null);
-  const stepsToRun = entry.steps.filter((_, index) => truthyIndexes.includes(index));
+  let stepsToRun = entry.steps.filter((_, index) => truthyIndexes.includes(index));
+  if (perStep || timeTravel && timeTravel.executionPath.length > 0) {
+    const possibleStepsToRun = stepsToRun.filter((s) => {
+      const currStepResult = stepResults[s.step.id];
+      if (timeTravel && timeTravel.executionPath.length > 0) {
+        return timeTravel.steps[0] === s.step.id;
+      }
+      return !currStepResult;
+    });
+    const possibleStepToRun = possibleStepsToRun?.[0];
+    stepsToRun = possibleStepToRun ? [possibleStepToRun] : stepsToRun;
+  }
   conditionalSpan?.update({
     attributes: {
       truthyIndexes,
@@ -5488,7 +5689,8 @@ async function executeConditional(engine, params) {
         abortController,
         requestContext,
         outputWriter,
-        disableScorers
+        disableScorers,
+        perStep
       });
       engine.applyMutableContext(executionContext, stepExecResult.mutableContext);
       Object.assign(stepResults, stepExecResult.stepResults);
@@ -5550,7 +5752,8 @@ async function executeLoop(engine, params) {
     requestContext,
     outputWriter,
     disableScorers,
-    serializedStepGraph
+    serializedStepGraph,
+    perStep
   } = params;
   const { step, condition } = entry;
   const loopSpan = tracingContext.currentSpan?.createChildSpan({
@@ -5591,7 +5794,8 @@ async function executeLoop(engine, params) {
       outputWriter,
       disableScorers,
       serializedStepGraph,
-      iterationCount: iteration + 1
+      iterationCount: iteration + 1,
+      perStep
     });
     engine.applyMutableContext(executionContext, stepExecResult.mutableContext);
     Object.assign(stepResults, stepExecResult.stepResults);
@@ -5612,7 +5816,7 @@ async function executeLoop(engine, params) {
     const evalSpan = loopSpan?.createChildSpan({
       type: "workflow_conditional_eval" /* WORKFLOW_CONDITIONAL_EVAL */,
       name: `condition: '${entry.loopType}'`,
-      input: chunkMLKE7HRS_cjs.selectFields(result.output, ["stepResult", "output.text", "output.object", "messages"]),
+      input: chunkBC2VKOH4_cjs.selectFields(result.output, ["stepResult", "output.text", "output.object", "messages"]),
       attributes: {
         conditionIndex: iteration
       },
@@ -5691,7 +5895,8 @@ async function executeForeach(engine, params) {
     requestContext,
     outputWriter,
     disableScorers,
-    serializedStepGraph
+    serializedStepGraph,
+    perStep
   } = params;
   const { step, opts } = entry;
   const results = [];
@@ -5768,7 +5973,8 @@ async function executeForeach(engine, params) {
           skipEmits: true,
           outputWriter,
           disableScorers,
-          serializedStepGraph
+          serializedStepGraph,
+          perStep
         });
         engine.applyMutableContext(executionContext, stepExecResult.mutableContext);
         Object.assign(stepResults, stepExecResult.stepResults);
@@ -5910,7 +6116,8 @@ async function persistStepUpdate(engine, params) {
     requestContext.forEach((value, key) => {
       requestContextObj[key] = value;
     });
-    await engine.mastra?.getStorage()?.persistWorkflowSnapshot({
+    const workflowsStore = await engine.mastra?.getStorage()?.getStore("workflows");
+    await workflowsStore?.persistWorkflowSnapshot({
       workflowName: workflowId,
       runId,
       resourceId,
@@ -5952,7 +6159,8 @@ async function executeEntry(engine, params) {
     abortController,
     requestContext,
     outputWriter,
-    disableScorers
+    disableScorers,
+    perStep
   } = params;
   const prevOutput = engine.getStepOutput(stepResults, prevStep);
   let execResults;
@@ -5976,7 +6184,8 @@ async function executeEntry(engine, params) {
       requestContext,
       outputWriter,
       disableScorers,
-      serializedStepGraph
+      serializedStepGraph,
+      perStep
     });
     execResults = stepExecResult.result;
     engine.applyMutableContext(executionContext, stepExecResult.mutableContext);
@@ -6008,7 +6217,8 @@ async function executeEntry(engine, params) {
       abortController,
       requestContext,
       outputWriter,
-      disableScorers
+      disableScorers,
+      perStep
     });
     engine.applyMutableContext(executionContext, resumedStepResult.mutableContext);
     Object.assign(stepResults, resumedStepResult.stepResults);
@@ -6078,7 +6288,8 @@ async function executeEntry(engine, params) {
       abortController,
       requestContext,
       outputWriter,
-      disableScorers
+      disableScorers,
+      perStep
     });
   } else if (entry.type === "conditional") {
     execResults = await engine.executeConditional({
@@ -6097,7 +6308,8 @@ async function executeEntry(engine, params) {
       abortController,
       requestContext,
       outputWriter,
-      disableScorers
+      disableScorers,
+      perStep
     });
   } else if (entry.type === "loop") {
     execResults = await engine.executeLoop({
@@ -6117,7 +6329,8 @@ async function executeEntry(engine, params) {
       requestContext,
       outputWriter,
       disableScorers,
-      serializedStepGraph
+      serializedStepGraph,
+      perStep
     });
   } else if (entry.type === "foreach") {
     execResults = await engine.executeForeach({
@@ -6137,7 +6350,8 @@ async function executeEntry(engine, params) {
       requestContext,
       outputWriter,
       disableScorers,
-      serializedStepGraph
+      serializedStepGraph,
+      perStep
     });
   } else if (entry.type === "sleep") {
     const startedAt = Date.now();
@@ -6549,7 +6763,8 @@ async function executeStep(engine, params) {
     disableScorers,
     serializedStepGraph,
     tracingContext,
-    iterationCount
+    iterationCount,
+    perStep
   } = params;
   const stepCallId = crypto2.randomUUID();
   const { inputData, validationError } = await validateStepInput({
@@ -6591,10 +6806,9 @@ async function executeStep(engine, params) {
   const stepSpan = tracingContext.currentSpan?.createChildSpan({
     name: `workflow step: '${step.id}'`,
     type: "workflow_step" /* WORKFLOW_STEP */,
+    entityType: "workflow_step" /* WORKFLOW_STEP */,
+    entityId: step.id,
     input: inputData,
-    attributes: {
-      stepId: step.id
-    },
     tracingPolicy: engine.options?.tracingPolicy
   });
   const operationId = `workflow.${workflowId}.run.${runId}.step.${step.id}.running_ev`;
@@ -6636,7 +6850,8 @@ async function executeStep(engine, params) {
       requestContext,
       tracingContext,
       outputWriter,
-      stepSpan
+      stepSpan,
+      perStep
     });
     if (workflowResult !== null) {
       const stepResult2 = { ...stepInfo, ...workflowResult };
@@ -6682,7 +6897,7 @@ async function executeStep(engine, params) {
         runId,
         resourceId,
         workflowId,
-        mastra: engine.mastra ? chunk72YCRTEX_cjs.wrapMastra(engine.mastra, { currentSpan: stepSpan }) : void 0,
+        mastra: engine.mastra ? chunkO2CAMK4A_cjs.wrapMastra(engine.mastra, { currentSpan: stepSpan }) : void 0,
         requestContext,
         inputData,
         state: executionContext.state,
@@ -6768,12 +6983,15 @@ async function executeStep(engine, params) {
         outputWriter,
         // Disable scorers must be explicitly set to false they are on by default
         scorers: disableScorers === false ? void 0 : step.scorers,
-        validateInputs: engine.options?.validateInputs
+        validateInputs: engine.options?.validateInputs,
+        perStep
       });
       if (engine.requiresDurableContextSerialization()) {
         contextMutations.requestContextUpdate = engine.serializeRequestContext(requestContext);
       }
-      return { output, suspended, bailed, contextMutations };
+      const isNestedWorkflowStep = step.component === "WORKFLOW";
+      const nestedWflowStepPaused = isNestedWorkflowStep && perStep;
+      return { output, suspended, bailed, contextMutations, nestedWflowStepPaused };
     },
     { retries, delay: delay2, stepSpan, workflowId, runId }
   );
@@ -6812,6 +7030,8 @@ async function executeStep(engine, params) {
       };
     } else if (durableResult.bailed) {
       execResults = { status: "bailed", output: durableResult.bailed.payload, endedAt: Date.now() };
+    } else if (durableResult.nestedWflowStepPaused) {
+      execResults = { status: "paused" };
     } else {
       execResults = { status: "success", output: durableResult.output, endedAt: Date.now() };
     }
@@ -6857,8 +7077,8 @@ async function runScorersForStep(params) {
         requestContext
       });
     } catch (e) {
-      const errorInstance = chunkHWMMIRIF_cjs.getErrorFromUnknown(e, { serializeStack: false });
-      const mastraError = new chunkHWMMIRIF_cjs.MastraError(
+      const errorInstance = chunk4U7ZLI36_cjs.getErrorFromUnknown(e, { serializeStack: false });
+      const mastraError = new chunk4U7ZLI36_cjs.MastraError(
         {
           id: "WORKFLOW_FAILED_TO_FETCH_SCORERS",
           domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
@@ -7076,11 +7296,11 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         return { ok: true, result };
       } catch (e) {
         if (i === params.retries) {
-          const errorInstance = chunkHWMMIRIF_cjs.getErrorFromUnknown(e, {
+          const errorInstance = chunk4U7ZLI36_cjs.getErrorFromUnknown(e, {
             serializeStack: false,
             fallbackMessage: "Unknown step execution error"
           });
-          const mastraError = new chunkHWMMIRIF_cjs.MastraError(
+          const mastraError = new chunk4U7ZLI36_cjs.MastraError(
             {
               id: "WORKFLOW_STEP_INVOKE_FAILED",
               domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
@@ -7122,7 +7342,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
   formatResultError(error, lastOutput) {
     const outputError = lastOutput?.error;
     const errorSource = error || outputError;
-    const errorInstance = chunkHWMMIRIF_cjs.getErrorFromUnknown(errorSource, {
+    const errorInstance = chunk4U7ZLI36_cjs.getErrorFromUnknown(errorSource, {
       serializeStack: false,
       fallbackMessage: "Unknown workflow error"
     });
@@ -7235,13 +7455,14 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
       workflowSpan,
       disableScorers,
       restart,
-      timeTravel
+      timeTravel,
+      perStep
     } = params;
     const { attempts = 0, delay: delay2 = 0 } = retryConfig ?? {};
     const steps = graph.steps;
     this.retryCounts.clear();
     if (steps.length === 0) {
-      const empty_graph_error = new chunkHWMMIRIF_cjs.MastraError({
+      const empty_graph_error = new chunk4U7ZLI36_cjs.MastraError({
         id: "WORKFLOW_EXECUTE_EMPTY_GRAPH",
         text: "Workflow must have at least one step",
         domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
@@ -7299,7 +7520,8 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         pubsub: params.pubsub,
         requestContext: currentRequestContext,
         outputWriter: params.outputWriter,
-        disableScorers
+        disableScorers,
+        perStep
       });
       this.applyMutableContext(executionContext, lastOutput.mutableContext);
       lastState = lastOutput.mutableContext.state;
@@ -7338,13 +7560,47 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
             }
           });
         }
-        await this.invokeLifecycleCallbacks(result2);
+        if (lastOutput.result.status !== "paused") {
+          await this.invokeLifecycleCallbacks(result2);
+        }
+        if (lastOutput.result.status === "paused") {
+          await params.pubsub.publish(`workflow.events.v2.${runId}`, {
+            type: "watch",
+            runId,
+            data: { type: "workflow-paused", payload: {} }
+          });
+        }
         return {
           ...result2,
           ...lastOutput.result.status === "suspended" && params.outputOptions?.includeResumeLabels ? { resumeLabels: lastOutput.mutableContext.resumeLabels } : {},
           ...params.outputOptions?.includeState ? { state: lastState } : {}
         };
       }
+      if (perStep) {
+        const result2 = await this.fmtReturnValue(params.pubsub, stepResults, lastOutput.result);
+        await this.persistStepUpdate({
+          workflowId,
+          runId,
+          resourceId,
+          stepResults: lastOutput.stepResults,
+          serializedStepGraph: params.serializedStepGraph,
+          executionContext: lastExecutionContext,
+          workflowStatus: "paused",
+          requestContext: currentRequestContext
+        });
+        await params.pubsub.publish(`workflow.events.v2.${runId}`, {
+          type: "watch",
+          runId,
+          data: { type: "workflow-paused", payload: {} }
+        });
+        workflowSpan?.end({
+          attributes: {
+            status: "paused"
+          }
+        });
+        delete result2.result;
+        return { ...result2, status: "paused", ...params.outputOptions?.includeState ? { state: lastState } : {} };
+      }
     }
     const result = await this.fmtReturnValue(params.pubsub, stepResults, lastOutput.result);
     await this.persistStepUpdate({
@@ -7553,7 +7809,7 @@ function createStep(params, agentOptions) {
       component: params.component
     };
   }
-  if (params instanceof chunkZ55SJVEC_cjs.Tool) {
+  if (params instanceof chunk6HJFCSJ4_cjs.Tool) {
     if (!params.inputSchema || !params.outputSchema) {
       throw new Error("Tool must have input and output schemas defined");
     }
@@ -7647,7 +7903,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 chunkX6IBA7FP_cjs.MessageList().add(messages, "input").addSystem(systemMessages ?? []) : void 0),
+          messageList: messageList ?? (Array.isArray(messages) ? new chunkEMLEZXTQ_cjs.MessageList().add(messages, "input").addSystem(systemMessages ?? []) : void 0),
           stepNumber,
           systemMessages,
           streamParts,
@@ -7670,7 +7926,7 @@ function createStep(params, agentOptions) {
           case "input": {
             if (processor.processInput) {
               if (!passThrough.messageList) {
-                throw new chunkHWMMIRIF_cjs.MastraError({
+                throw new chunk4U7ZLI36_cjs.MastraError({
                   category: "USER" /* USER */,
                   domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
                   id: "PROCESSOR_MISSING_MESSAGE_LIST",
@@ -7700,9 +7956,9 @@ function createStep(params, agentOptions) {
                   }
                 }
               };
-              if (result instanceof chunkX6IBA7FP_cjs.MessageList) {
+              if (result instanceof chunkEMLEZXTQ_cjs.MessageList) {
                 if (result !== passThrough.messageList) {
-                  throw new chunkHWMMIRIF_cjs.MastraError({
+                  throw new chunk4U7ZLI36_cjs.MastraError({
                     category: "USER" /* USER */,
                     domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
                     id: "PROCESSOR_RETURNED_EXTERNAL_MESSAGE_LIST",
@@ -7734,7 +7990,7 @@ function createStep(params, agentOptions) {
           case "inputStep": {
             if (processor.processInputStep) {
               if (!passThrough.messageList) {
-                throw new chunkHWMMIRIF_cjs.MastraError({
+                throw new chunk4U7ZLI36_cjs.MastraError({
                   category: "USER" /* USER */,
                   domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
                   id: "PROCESSOR_MISSING_MESSAGE_LIST",
@@ -7796,7 +8052,7 @@ function createStep(params, agentOptions) {
           case "outputResult": {
             if (processor.processOutputResult) {
               if (!passThrough.messageList) {
-                throw new chunkHWMMIRIF_cjs.MastraError({
+                throw new chunk4U7ZLI36_cjs.MastraError({
                   category: "USER" /* USER */,
                   domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
                   id: "PROCESSOR_MISSING_MESSAGE_LIST",
@@ -7825,9 +8081,9 @@ function createStep(params, agentOptions) {
                   }
                 }
               };
-              if (result instanceof chunkX6IBA7FP_cjs.MessageList) {
+              if (result instanceof chunkEMLEZXTQ_cjs.MessageList) {
                 if (result !== passThrough.messageList) {
-                  throw new chunkHWMMIRIF_cjs.MastraError({
+                  throw new chunk4U7ZLI36_cjs.MastraError({
                     category: "USER" /* USER */,
                     domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
                     id: "PROCESSOR_RETURNED_EXTERNAL_MESSAGE_LIST",
@@ -7859,7 +8115,7 @@ function createStep(params, agentOptions) {
           case "outputStep": {
             if (processor.processOutputStep) {
               if (!passThrough.messageList) {
-                throw new chunkHWMMIRIF_cjs.MastraError({
+                throw new chunk4U7ZLI36_cjs.MastraError({
                   category: "USER" /* USER */,
                   domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
                   id: "PROCESSOR_MISSING_MESSAGE_LIST",
@@ -7876,7 +8132,8 @@ function createStep(params, agentOptions) {
                 finishReason,
                 toolCalls,
                 text,
-                systemMessages: systemMessages ?? []
+                systemMessages: systemMessages ?? [],
+                steps: steps ?? []
               });
               const applyMessages = (msgs) => {
                 const deletedIds = idsBeforeProcessing.filter((i) => !msgs.some((m) => m.id === i));
@@ -7893,9 +8150,9 @@ function createStep(params, agentOptions) {
                   }
                 }
               };
-              if (result instanceof chunkX6IBA7FP_cjs.MessageList) {
+              if (result instanceof chunkEMLEZXTQ_cjs.MessageList) {
                 if (result !== passThrough.messageList) {
-                  throw new chunkHWMMIRIF_cjs.MastraError({
+                  throw new chunk4U7ZLI36_cjs.MastraError({
                     category: "USER" /* USER */,
                     domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
                     id: "PROCESSOR_RETURNED_EXTERNAL_MESSAGE_LIST",
@@ -7960,7 +8217,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 chunkZ55SJVEC_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 chunk6HJFCSJ4_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);
@@ -8131,7 +8388,7 @@ var Workflow = class extends chunkDGV2FWB4_cjs.MastraBase {
    * @deprecated waitForEvent has been removed. Please use suspend/resume instead.
    */
   waitForEvent(_event, _step, _opts) {
-    throw new chunkHWMMIRIF_cjs.MastraError({
+    throw new chunk4U7ZLI36_cjs.MastraError({
       id: "WORKFLOW_WAIT_FOR_EVENT_REMOVED",
       domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
       category: "USER" /* USER */,
@@ -8142,8 +8399,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: z8.z.object({}),
-        outputSchema: z8.z.object({}),
+        inputSchema: z8.z.any(),
+        outputSchema: z8.z.any(),
         execute: mappingConfig
       });
       this.stepFlow.push({ type: "step", step: mappingStep2 });
@@ -8199,7 +8456,15 @@ var Workflow = class extends chunkDGV2FWB4_cjs.MastraBase {
             result[key] = requestContext.get(m.requestContextPath);
             continue;
           }
-          const stepResult = m.initData ? getInitData() : getStepResult2(Array.isArray(m.step) ? m.step.find((s) => getStepResult2(s)) : m.step);
+          const stepResult = m.initData ? getInitData() : getStepResult2(
+            Array.isArray(m.step) ? m.step.find((s) => {
+              const result2 = getStepResult2(s);
+              if (typeof result2 === "object" && result2 !== null) {
+                return Object.keys(result2).length > 0;
+              }
+              return result2;
+            }) : m.step
+          );
           if (m.path === ".") {
             result[key] = stepResult;
             continue;
@@ -8410,12 +8675,15 @@ var Workflow = class extends chunkDGV2FWB4_cjs.MastraBase {
       workflowStatus: run.workflowRunStatus,
       stepResults: {}
     });
-    const workflowSnapshotInStorage = await this.getWorkflowRunExecutionResult(runIdToUse, false);
+    const workflowSnapshotInStorage = await this.getWorkflowRunExecutionResult(runIdToUse, {
+      withNestedWorkflows: false
+    });
     if (workflowSnapshotInStorage && workflowSnapshotInStorage.status) {
       run.workflowRunStatus = workflowSnapshotInStorage.status;
     }
     if (!workflowSnapshotInStorage && shouldPersistSnapshot) {
-      await this.mastra?.getStorage()?.persistWorkflowSnapshot({
+      const workflowsStore = await this.mastra?.getStorage()?.getStore("workflows");
+      await workflowsStore?.persistWorkflowSnapshot({
         workflowName: this.id,
         runId: runIdToUse,
         resourceId: options?.resourceId,
@@ -8480,7 +8748,8 @@ var Workflow = class extends chunkDGV2FWB4_cjs.MastraBase {
     retryCount,
     tracingContext,
     outputWriter,
-    validateInputs
+    validateInputs,
+    perStep
   }) {
     this.__registerMastra(mastra);
     const effectiveValidateInputs = validateInputs ?? this.#options.validateInputs ?? true;
@@ -8528,7 +8797,8 @@ var Workflow = class extends chunkDGV2FWB4_cjs.MastraBase {
         requestContext,
         tracingContext,
         outputWriter,
-        outputOptions: { includeState: true, includeResumeLabels: true }
+        outputOptions: { includeState: true, includeResumeLabels: true },
+        perStep
       });
     } else if (restart) {
       res = await run.restart({ requestContext, tracingContext, outputWriter });
@@ -8540,7 +8810,8 @@ var Workflow = class extends chunkDGV2FWB4_cjs.MastraBase {
         tracingContext,
         outputWriter,
         outputOptions: { includeState: true, includeResumeLabels: true },
-        label: resume.label
+        label: resume.label,
+        perStep
       });
     } else {
       res = await run.start({
@@ -8549,7 +8820,8 @@ var Workflow = class extends chunkDGV2FWB4_cjs.MastraBase {
         tracingContext,
         outputWriter,
         initialState: state,
-        outputOptions: { includeState: true, includeResumeLabels: true }
+        outputOptions: { includeState: true, includeResumeLabels: true },
+        perStep
       });
     }
     unwatch();
@@ -8585,7 +8857,12 @@ var Workflow = class extends chunkDGV2FWB4_cjs.MastraBase {
       this.logger.debug("Cannot get workflow runs. Mastra storage is not initialized");
       return { runs: [], total: 0 };
     }
-    return storage.listWorkflowRuns({ workflowName: this.id, ...args ?? {} });
+    const workflowsStore = await storage.getStore("workflows");
+    if (!workflowsStore) {
+      this.logger.debug("Cannot get workflow runs. Workflows storage domain is not available");
+      return { runs: [], total: 0 };
+    }
+    return workflowsStore.listWorkflowRuns({ workflowName: this.id, ...args ?? {} });
   }
   async listActiveWorkflowRuns() {
     const runningRuns = await this.listWorkflowRuns({ status: "running" });
@@ -8622,7 +8899,12 @@ var Workflow = class extends chunkDGV2FWB4_cjs.MastraBase {
       this.logger.debug("Cannot get workflow runs from storage. Mastra storage is not initialized");
       return this.#runs.get(runId) ? { ...this.#runs.get(runId), workflowName: this.id } : null;
     }
-    const run = await storage.getWorkflowRunById({ runId, workflowName: this.id });
+    const workflowsStore = await storage.getStore("workflows");
+    if (!workflowsStore) {
+      this.logger.debug("Cannot get workflow runs. Workflows storage domain is not available");
+      return this.#runs.get(runId) ? { ...this.#runs.get(runId), workflowName: this.id } : null;
+    }
+    const run = await workflowsStore.getWorkflowRunById({ runId, workflowName: this.id });
     return run ?? (this.#runs.get(runId) ? { ...this.#runs.get(runId), workflowName: this.id } : null);
   }
   async deleteWorkflowRunById(runId) {
@@ -8631,7 +8913,12 @@ var Workflow = class extends chunkDGV2FWB4_cjs.MastraBase {
       this.logger.debug("Cannot delete workflow run by ID. Mastra storage is not initialized");
       return;
     }
-    await storage.deleteWorkflowRunById({ runId, workflowName: this.id });
+    const workflowsStore = await storage.getStore("workflows");
+    if (!workflowsStore) {
+      this.logger.debug("Cannot delete workflow run. Workflows storage domain is not available");
+      return;
+    }
+    await workflowsStore.deleteWorkflowRunById({ runId, workflowName: this.id });
     this.#runs.delete(runId);
   }
   async getWorkflowRunSteps({ runId, workflowId }) {
@@ -8640,7 +8927,12 @@ var Workflow = class extends chunkDGV2FWB4_cjs.MastraBase {
       this.logger.debug("Cannot get workflow run steps. Mastra storage is not initialized");
       return {};
     }
-    const run = await storage.getWorkflowRunById({ runId, workflowName: workflowId });
+    const workflowsStore = await storage.getStore("workflows");
+    if (!workflowsStore) {
+      this.logger.debug("Cannot get workflow run steps. Workflows storage domain is not available");
+      return {};
+    }
+    const run = await workflowsStore.getWorkflowRunById({ runId, workflowName: workflowId });
     let snapshot = run?.snapshot;
     if (!snapshot) {
       return {};
@@ -8675,13 +8967,19 @@ var Workflow = class extends chunkDGV2FWB4_cjs.MastraBase {
     }
     return finalSteps;
   }
-  async getWorkflowRunExecutionResult(runId, withNestedWorkflows = true) {
+  async getWorkflowRunExecutionResult(runId, options = {}) {
+    const { withNestedWorkflows = true, fields } = options;
     const storage = this.#mastra?.getStorage();
     if (!storage) {
       this.logger.debug("Cannot get workflow run execution result. Mastra storage is not initialized");
       return null;
     }
-    const run = await storage.getWorkflowRunById({ runId, workflowName: this.id });
+    const workflowsStore = await storage.getStore("workflows");
+    if (!workflowsStore) {
+      this.logger.debug("Cannot get workflow run execution result. Workflows storage domain is not available");
+      return null;
+    }
+    const run = await workflowsStore.getWorkflowRunById({ runId, workflowName: this.id });
     let snapshot = run?.snapshot;
     if (!snapshot) {
       return null;
@@ -8694,15 +8992,51 @@ var Workflow = class extends chunkDGV2FWB4_cjs.MastraBase {
         return null;
       }
     }
-    const fullSteps = withNestedWorkflows ? await this.getWorkflowRunSteps({ runId, workflowId: this.id }) : snapshot.context;
+    const snapshotState = snapshot;
+    const defaultResult = {
+      status: snapshotState.status,
+      result: snapshotState.result,
+      error: snapshotState.error,
+      payload: snapshotState.context?.input,
+      steps: null,
+      // Will be populated below
+      activeStepsPath: snapshotState.activeStepsPath,
+      serializedStepGraph: snapshotState.serializedStepGraph
+    };
+    const allowedFields = new Set(Object.keys(defaultResult));
+    if (fields && fields.length > 0) {
+      const result = {};
+      for (const field of fields) {
+        if (!allowedFields.has(field)) {
+          continue;
+        }
+        if (field === "steps") {
+          let fullSteps2;
+          if (withNestedWorkflows) {
+            fullSteps2 = await this.getWorkflowRunSteps({ runId, workflowId: this.id });
+          } else {
+            const { input, ...stepsOnly } = snapshotState.context || {};
+            fullSteps2 = stepsOnly;
+          }
+          result.steps = fullSteps2;
+        } else if (field === "payload") {
+          result.payload = snapshotState.context?.input;
+        } else {
+          result[field] = snapshotState[field];
+        }
+      }
+      return result;
+    }
+    let fullSteps;
+    if (withNestedWorkflows) {
+      fullSteps = await this.getWorkflowRunSteps({ runId, workflowId: this.id });
+    } else {
+      const { input, ...stepsOnly } = snapshotState.context || {};
+      fullSteps = stepsOnly;
+    }
     return {
-      status: snapshot.status,
-      result: snapshot.result,
-      error: snapshot.error,
-      payload: snapshot.context?.input,
-      steps: fullSteps,
-      activeStepsPath: snapshot.activeStepsPath,
-      serializedStepGraph: snapshot.serializedStepGraph
+      ...defaultResult,
+      steps: fullSteps
     };
   }
 };
@@ -8804,7 +9138,8 @@ var Run = class {
     this.abortController.abort();
     this.workflowRunStatus = "canceled";
     try {
-      await this.mastra?.getStorage()?.updateWorkflowState({
+      const workflowsStore = await this.mastra?.getStorage()?.getStore("workflows");
+      await workflowsStore?.updateWorkflowState({
         workflowName: this.workflowId,
         runId: this.runId,
         opts: {
@@ -8882,15 +9217,15 @@ var Run = class {
     tracingContext,
     tracingOptions,
     format,
-    outputOptions
+    outputOptions,
+    perStep
   }) {
-    const workflowSpan = chunk72YCRTEX_cjs.getOrCreateSpan({
+    const workflowSpan = chunkO2CAMK4A_cjs.getOrCreateSpan({
       type: "workflow_run" /* WORKFLOW_RUN */,
       name: `workflow run: '${this.workflowId}'`,
+      entityType: "workflow_run" /* WORKFLOW_RUN */,
+      entityId: this.workflowId,
       input: inputData,
-      attributes: {
-        workflowId: this.workflowId
-      },
       metadata: {
         resourceId: this.resourceId,
         runId: this.runId
@@ -8920,7 +9255,8 @@ var Run = class {
       outputWriter,
       workflowSpan,
       format,
-      outputOptions
+      outputOptions,
+      perStep
     });
     if (result.status !== "suspended") {
       this.cleanup?.();
@@ -9087,9 +9423,10 @@ var Run = class {
   }
   async streamAsync({
     inputData,
-    requestContext
+    requestContext,
+    perStep
   } = {}) {
-    return this.stream({ inputData, requestContext });
+    return this.stream({ inputData, requestContext, perStep });
   }
   /**
    * Starts the workflow execution with the provided input as a stream
@@ -9103,7 +9440,8 @@ var Run = class {
     tracingOptions,
     closeOnSuspend = true,
     initialState,
-    outputOptions
+    outputOptions,
+    perStep
   } = {}) {
     if (this.closeStreamAction && this.streamOutput) {
       return this.streamOutput;
@@ -9158,7 +9496,8 @@ var Run = class {
               runId: self.runId,
               data: chunk
             });
-          }
+          },
+          perStep
         });
         let executionResults;
         try {
@@ -9200,7 +9539,8 @@ var Run = class {
     requestContext,
     tracingContext,
     tracingOptions,
-    outputOptions
+    outputOptions,
+    perStep
   } = {}) {
     return this.resumeStreamVNext({
       resumeData,
@@ -9208,7 +9548,8 @@ var Run = class {
       requestContext,
       tracingContext,
       tracingOptions,
-      outputOptions
+      outputOptions,
+      perStep
     });
   }
   /**
@@ -9223,7 +9564,8 @@ var Run = class {
     tracingContext,
     tracingOptions,
     forEachIndex,
-    outputOptions
+    outputOptions,
+    perStep
   } = {}) {
     this.closeStreamAction = async () => {
     };
@@ -9273,7 +9615,8 @@ var Run = class {
           },
           isVNext: true,
           forEachIndex,
-          outputOptions
+          outputOptions,
+          perStep
         });
         self.executionResults = executionResultsPromise;
         let executionResults;
@@ -9344,7 +9687,8 @@ var Run = class {
     return this._restart(args);
   }
   async _resume(params) {
-    const snapshot = await this.#mastra?.getStorage()?.loadWorkflowSnapshot({
+    const workflowsStore = await this.#mastra?.getStorage()?.getStore("workflows");
+    const snapshot = await workflowsStore?.loadWorkflowSnapshot({
       workflowName: this.workflowId,
       runId: this.runId
     });
@@ -9416,13 +9760,12 @@ var Run = class {
         requestContextToUse.set(key, value);
       }
     });
-    const workflowSpan = chunk72YCRTEX_cjs.getOrCreateSpan({
+    const workflowSpan = chunkO2CAMK4A_cjs.getOrCreateSpan({
       type: "workflow_run" /* WORKFLOW_RUN */,
       name: `workflow run: '${this.workflowId}'`,
+      entityType: "workflow_run" /* WORKFLOW_RUN */,
+      entityId: this.workflowId,
       input: resumeDataToUse,
-      attributes: {
-        workflowId: this.workflowId
-      },
       metadata: {
         resourceId: this.resourceId,
         runId: this.runId
@@ -9457,7 +9800,8 @@ var Run = class {
       abortController: this.abortController,
       workflowSpan,
       outputOptions: params.outputOptions,
-      outputWriter: params.outputWriter
+      outputWriter: params.outputWriter,
+      perStep: params.perStep
     }).then((result) => {
       if (!params.isVNext && result.status !== "suspended") {
         this.closeStreamAction?.().catch(() => {
@@ -9481,7 +9825,8 @@ var Run = class {
     if (this.workflowEngineType !== "default") {
       throw new Error(`restart() is not supported on ${this.workflowEngineType} workflows`);
     }
-    const snapshot = await this.#mastra?.getStorage()?.loadWorkflowSnapshot({
+    const workflowsStore = await this.#mastra?.getStorage()?.getStore("workflows");
+    const snapshot = await workflowsStore?.loadWorkflowSnapshot({
       workflowName: this.workflowId,
       runId: this.runId
     });
@@ -9527,12 +9872,11 @@ var Run = class {
         requestContextToUse.set(key, value);
       }
     }
-    const workflowSpan = chunk72YCRTEX_cjs.getOrCreateSpan({
+    const workflowSpan = chunkO2CAMK4A_cjs.getOrCreateSpan({
       type: "workflow_run" /* WORKFLOW_RUN */,
       name: `workflow run: '${this.workflowId}'`,
-      attributes: {
-        workflowId: this.workflowId
-      },
+      entityType: "workflow_run" /* WORKFLOW_RUN */,
+      entityId: this.workflowId,
       metadata: {
         resourceId: this.resourceId,
         runId: this.runId
@@ -9576,12 +9920,14 @@ var Run = class {
     outputWriter,
     tracingContext,
     tracingOptions,
-    outputOptions
+    outputOptions,
+    perStep
   }) {
     if (!stepParam || Array.isArray(stepParam) && stepParam.length === 0) {
       throw new Error("Step is required and must be a valid step or array of steps");
     }
-    const snapshot = await this.#mastra?.getStorage()?.loadWorkflowSnapshot({
+    const workflowsStore = await this.#mastra?.getStorage()?.getStore("workflows");
+    const snapshot = await workflowsStore?.loadWorkflowSnapshot({
       workflowName: this.workflowId,
       runId: this.runId
     });
@@ -9611,7 +9957,8 @@ var Run = class {
       nestedStepsContext,
       snapshot,
       initialState,
-      graph: this.executionGraph
+      graph: this.executionGraph,
+      perStep
     });
     const requestContextToUse = requestContext ?? new chunkUVHSM2GU_cjs.RequestContext();
     for (const [key, value] of Object.entries(snapshot.requestContext ?? {})) {
@@ -9619,13 +9966,12 @@ var Run = class {
         requestContextToUse.set(key, value);
       }
     }
-    const workflowSpan = chunk72YCRTEX_cjs.getOrCreateSpan({
+    const workflowSpan = chunkO2CAMK4A_cjs.getOrCreateSpan({
       type: "workflow_run" /* WORKFLOW_RUN */,
       name: `workflow run: '${this.workflowId}'`,
       input: inputData,
-      attributes: {
-        workflowId: this.workflowId
-      },
+      entityType: "workflow_run" /* WORKFLOW_RUN */,
+      entityId: this.workflowId,
       metadata: {
         resourceId: this.resourceId,
         runId: this.runId
@@ -9651,7 +9997,8 @@ var Run = class {
       abortController: this.abortController,
       outputWriter,
       workflowSpan,
-      outputOptions
+      outputOptions,
+      perStep
     });
     if (result.status !== "suspended") {
       this.cleanup?.();
@@ -9672,7 +10019,8 @@ var Run = class {
     requestContext,
     tracingContext,
     tracingOptions,
-    outputOptions
+    outputOptions,
+    perStep
   }) {
     this.closeStreamAction = async () => {
     };
@@ -9713,7 +10061,8 @@ var Run = class {
           outputWriter: async (chunk) => {
             void controller.enqueue(chunk);
           },
-          outputOptions
+          outputOptions,
+          perStep
         });
         self.executionResults = executionResultsPromise;
         let executionResults;
@@ -9943,13 +10292,13 @@ function execute({
   const responseFormat = structuredOutput?.schema ? getResponseFormat(structuredOutput?.schema) : void 0;
   let prompt = inputMessages;
   if (structuredOutputMode === "direct" && responseFormat?.type === "json" && structuredOutput?.jsonPromptInjection) {
-    prompt = chunkX6IBA7FP_cjs.injectJsonInstructionIntoMessages({
+    prompt = providerUtilsV5.injectJsonInstructionIntoMessages({
       messages: inputMessages,
       schema: responseFormat.schema
     });
   }
   if (structuredOutputMode === "processor" && responseFormat?.type === "json" && responseFormat?.schema) {
-    prompt = chunkX6IBA7FP_cjs.injectJsonInstructionIntoMessages({
+    prompt = providerUtilsV5.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:
@@ -10318,7 +10667,8 @@ async function processOutputStream({
         messageList.add(message, "response");
         runState.setState({
           isReasoning: false,
-          reasoningDeltas: []
+          reasoningDeltas: [],
+          providerOptions: void 0
         });
         if (isControllerOpen(controller)) {
           controller.enqueue(chunk);
@@ -10390,7 +10740,7 @@ async function processOutputStream({
         });
         break;
       case "error":
-        if (chunkX6IBA7FP_cjs.isAbortError(chunk.payload.error) && options?.abortSignal?.aborted) {
+        if (providerUtilsV5.isAbortError(chunk.payload.error) && options?.abortSignal?.aborted) {
           break;
         }
         runState.setState({
@@ -10402,7 +10752,7 @@ async function processOutputStream({
             reason: "error"
           }
         });
-        const error = chunkHWMMIRIF_cjs.getErrorFromUnknown(chunk.payload.error, {
+        const error = chunk4U7ZLI36_cjs.getErrorFromUnknown(chunk.payload.error, {
           fallbackMessage: "Unknown error in agent stream"
         });
         controller.enqueue({ ...chunk, payload: { ...chunk.payload, error } });
@@ -10447,11 +10797,14 @@ function executeStreamWithFallbackModels(models) {
       while (attempt <= maxRetries) {
         try {
           const isLastModel = attempt === maxRetries && index === models.length;
-          const result = await callback(modelConfig.model, isLastModel);
+          const result = await callback(modelConfig, isLastModel);
           finalResult = result;
           done = true;
           break;
         } catch (err) {
+          if (err instanceof TripWire) {
+            throw err;
+          }
           attempt++;
           console.error(`Error executing model ${modelConfig.model.modelId}, attempt ${attempt}====`, err);
           if (attempt > maxRetries) {
@@ -10489,7 +10842,6 @@ function createLLMExecutionStep({
   inputProcessors,
   logger,
   agentId,
-  headers,
   downloadRetries,
   downloadConcurrency,
   processorStates,
@@ -10509,7 +10861,9 @@ function createLLMExecutionStep({
       let warnings;
       let request;
       let rawResponse;
-      const { outputStream, callBail, runState, stepTools } = await executeStreamWithFallbackModels(models)(async (model, isLastModel) => {
+      const { outputStream, callBail, runState, stepTools } = await executeStreamWithFallbackModels(models)(async (modelConfig, isLastModel) => {
+        const model = modelConfig.model;
+        const modelHeaders = modelConfig.headers;
         if (initialSystemMessages) {
           messageList.replaceAllSystemMessages(initialSystemMessages);
         }
@@ -10554,6 +10908,45 @@ function createLLMExecutionStep({
             });
             Object.assign(currentStep, processInputStepResult);
           } catch (error) {
+            if (error instanceof TripWire) {
+              if (isControllerOpen(controller)) {
+                controller.enqueue({
+                  type: "tripwire",
+                  runId,
+                  from: "AGENT" /* AGENT */,
+                  payload: {
+                    reason: error.message,
+                    retry: error.options?.retry,
+                    metadata: error.options?.metadata,
+                    processorId: error.processorId
+                  }
+                });
+              }
+              const runState3 = new AgenticRunState({
+                _internal,
+                model
+              });
+              return {
+                callBail: true,
+                outputStream: new MastraModelOutput({
+                  model: {
+                    modelId: model.modelId,
+                    provider: model.provider,
+                    version: model.specificationVersion
+                  },
+                  stream: new web.ReadableStream({
+                    start(c) {
+                      c.close();
+                    }
+                  }),
+                  messageList,
+                  messageId,
+                  options: { runId }
+                }),
+                runState: runState3,
+                stepTools: tools
+              };
+            }
             console.error("Error in processInputStep processors:", error);
             throw error;
           }
@@ -10587,62 +10980,63 @@ Analyse the suspended tools: ${JSON.stringify(suspendedTools)}, using the messag
                       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.`;
+                      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. If you can't construct resumeData from the message for approval type, set approved to true and add resumeData: { approved: true } to the tool call arguments/input.
+                      `;
                 }
                 return message;
               });
             }
           }
         }
-        switch (currentStep.model.specificationVersion) {
-          case "v2": {
-            modelResult = chunk72YCRTEX_cjs.executeWithContextSync({
-              span: modelSpanTracker?.getTracingContext()?.currentSpan,
-              fn: () => execute({
-                runId,
-                model: currentStep.model,
-                providerOptions: currentStep.providerOptions,
-                inputMessages,
-                tools: currentStep.tools,
-                toolChoice: currentStep.toolChoice,
-                activeTools: currentStep.activeTools,
-                options,
-                modelSettings: currentStep.modelSettings,
-                includeRawChunks,
-                structuredOutput: currentStep.structuredOutput,
-                headers,
-                methodType,
-                generateId: _internal?.generateId,
-                onResult: ({
-                  warnings: warningsFromStream,
-                  request: requestFromStream,
-                  rawResponse: rawResponseFromStream
-                }) => {
-                  warnings = warningsFromStream;
-                  request = requestFromStream || {};
-                  rawResponse = rawResponseFromStream;
-                  if (!isControllerOpen(controller)) {
-                    return;
+        if (isSupportedLanguageModel(currentStep.model)) {
+          modelResult = chunkO2CAMK4A_cjs.executeWithContextSync({
+            span: modelSpanTracker?.getTracingContext()?.currentSpan,
+            fn: () => execute({
+              runId,
+              model: currentStep.model,
+              providerOptions: currentStep.providerOptions,
+              inputMessages,
+              tools: currentStep.tools,
+              toolChoice: currentStep.toolChoice,
+              activeTools: currentStep.activeTools,
+              options,
+              modelSettings: currentStep.modelSettings,
+              includeRawChunks,
+              structuredOutput: currentStep.structuredOutput,
+              // Merge headers: modelConfig headers first, then modelSettings overrides them
+              // Only create object if there are actual headers to avoid passing empty {}
+              headers: modelHeaders || currentStep.modelSettings?.headers ? { ...modelHeaders, ...currentStep.modelSettings?.headers } : void 0,
+              methodType,
+              generateId: _internal?.generateId,
+              onResult: ({
+                warnings: warningsFromStream,
+                request: requestFromStream,
+                rawResponse: rawResponseFromStream
+              }) => {
+                warnings = warningsFromStream;
+                request = requestFromStream || {};
+                rawResponse = rawResponseFromStream;
+                if (!isControllerOpen(controller)) {
+                  return;
+                }
+                controller.enqueue({
+                  runId,
+                  from: "AGENT" /* AGENT */,
+                  type: "step-start",
+                  payload: {
+                    request: request || {},
+                    warnings: warnings || [],
+                    messageId
                   }
-                  controller.enqueue({
-                    runId,
-                    from: "AGENT" /* AGENT */,
-                    type: "step-start",
-                    payload: {
-                      request: request || {},
-                      warnings: warnings || [],
-                      messageId
-                    }
-                  });
-                },
-                shouldThrowError: !isLastModel
-              })
-            });
-            break;
-          }
-          default: {
-            throw new Error(`Unsupported model version: ${model.specificationVersion}`);
-          }
+                });
+              },
+              shouldThrowError: !isLastModel
+            })
+          });
+        } else {
+          throw new Error(
+            `Unsupported model version: ${currentStep.model.specificationVersion}. Supported versions: ${supportedLanguageModelSpecifications.join(", ")}`
+          );
         }
         const outputStream2 = new MastraModelOutput({
           model: {
@@ -10683,7 +11077,7 @@ Analyse the suspended tools: ${JSON.stringify(suspendedTools)}, using the messag
           });
         } catch (error) {
           console.error("Error in LLM Execution Step", error);
-          if (chunkX6IBA7FP_cjs.isAbortError(error) && options?.abortSignal?.aborted) {
+          if (providerUtilsV5.isAbortError(error) && options?.abortSignal?.aborted) {
             await options?.onAbort?.({
               steps: inputData?.output?.steps ?? []
             });
@@ -10801,6 +11195,7 @@ Analyse the suspended tools: ${JSON.stringify(suspendedTools)}, using the messag
           }));
           const currentRetryCount = inputData.processorRetryCount || 0;
           await processorRunner.runProcessOutputStep({
+            steps: inputData.output?.steps ?? [],
             messages: messageList.get.all.db(),
             messageList,
             stepNumber,
@@ -11210,7 +11605,17 @@ function createToolCallStep({
         }
         const resumeData = resumeDataFromArgs ?? workflowResumeData;
         const isResumeToolCall = !!resumeDataFromArgs;
-        if (requireToolApproval || tool2.requireApproval) {
+        let toolRequiresApproval = requireToolApproval || tool2.requireApproval;
+        if (tool2.needsApprovalFn) {
+          try {
+            const needsApprovalResult = await tool2.needsApprovalFn(args);
+            toolRequiresApproval = needsApprovalResult;
+          } catch (error) {
+            console.error(`Error evaluating needsApprovalFn for tool ${inputData.toolName}:`, error);
+            toolRequiresApproval = true;
+          }
+        }
+        if (toolRequiresApproval) {
           if (!resumeData) {
             controller.enqueue({
               type: "tool-call-approval",
@@ -11473,11 +11878,10 @@ function createAgenticLoopWorkflow(params) {
     };
     accumulatedSteps.push(currentStep);
     if (rest.stopWhen && typedInputData.stepResult?.isContinued && accumulatedSteps.length > 0) {
+      const steps = accumulatedSteps;
       const conditions = await Promise.all(
         (Array.isArray(rest.stopWhen) ? rest.stopWhen : [rest.stopWhen]).map((condition) => {
-          return condition({
-            steps: accumulatedSteps
-          });
+          return condition({ steps });
         })
       );
       const hasStopped = conditions.some((condition) => condition);
@@ -11620,7 +12024,7 @@ function workflowLoopStream({
       });
       if (executionResult.status !== "success") {
         if (executionResult.status === "failed") {
-          const error = chunkHWMMIRIF_cjs.getErrorFromUnknown(executionResult.error, {
+          const error = chunk4U7ZLI36_cjs.getErrorFromUnknown(executionResult.error, {
             fallbackMessage: "Unknown error in agent workflow stream"
           });
           controller.enqueue({
@@ -11681,7 +12085,7 @@ function loop({
     level: "debug"
   });
   if (models.length === 0 || !models[0]) {
-    const mastraError = new chunkHWMMIRIF_cjs.MastraError({
+    const mastraError = new chunk4U7ZLI36_cjs.MastraError({
       id: "LOOP_MODELS_EMPTY",
       domain: "LLM" /* LLM */,
       category: "USER" /* USER */
@@ -11798,7 +12202,7 @@ var MastraLLMVNext = class extends chunkDGV2FWB4_cjs.MastraBase {
       }
     }
     if (models.length === 0 || !models[0]) {
-      const mastraError = new chunkHWMMIRIF_cjs.MastraError({
+      const mastraError = new chunk4U7ZLI36_cjs.MastraError({
         id: "LLM_LOOP_MODELS_EMPTY",
         domain: "LLM" /* LLM */,
         category: "USER" /* USER */
@@ -11923,8 +12327,6 @@ var MastraLLMVNext = class extends chunkDGV2FWB4_cjs.MastraBase {
         messages: [...messageList.getSystemMessages(), ...messages]
       },
       attributes: {
-        agentId,
-        agentName,
         model: firstModel.modelId,
         provider: firstModel.provider,
         streaming: true,
@@ -11972,7 +12374,7 @@ var MastraLLMVNext = class extends chunkDGV2FWB4_cjs.MastraBase {
             try {
               await options?.onStepFinish?.({ ...props, runId });
             } catch (e) {
-              const mastraError = new chunkHWMMIRIF_cjs.MastraError(
+              const mastraError = new chunk4U7ZLI36_cjs.MastraError(
                 {
                   id: "LLM_STREAM_ON_STEP_FINISH_CALLBACK_EXECUTION_FAILED",
                   domain: "LLM" /* LLM */,
@@ -12006,7 +12408,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 chunkMLKE7HRS_cjs.delay(10 * 1e3);
+              await chunkBC2VKOH4_cjs.delay(10 * 1e3);
             }
           },
           onFinish: async (props) => {
@@ -12031,7 +12433,7 @@ var MastraLLMVNext = class extends chunkDGV2FWB4_cjs.MastraBase {
             try {
               await options?.onFinish?.({ ...props, runId });
             } catch (e) {
-              const mastraError = new chunkHWMMIRIF_cjs.MastraError(
+              const mastraError = new chunk4U7ZLI36_cjs.MastraError(
                 {
                   id: "LLM_STREAM_ON_FINISH_CALLBACK_EXECUTION_FAILED",
                   domain: "LLM" /* LLM */,
@@ -12069,7 +12471,7 @@ var MastraLLMVNext = class extends chunkDGV2FWB4_cjs.MastraBase {
       };
       return loop(loopOptions);
     } catch (e) {
-      const mastraError = new chunkHWMMIRIF_cjs.MastraError(
+      const mastraError = new chunk4U7ZLI36_cjs.MastraError(
         {
           id: "LLM_STREAM_TEXT_AI_SDK_EXECUTION_FAILED",
           domain: "LLM" /* LLM */,
@@ -12216,7 +12618,7 @@ async function prepareMemoryStep({
       );
     }
   } else {
-    const messageList = new chunkX6IBA7FP_cjs.MessageList({
+    const messageList = new chunkEMLEZXTQ_cjs.MessageList({
       threadId: thread?.id,
       resourceId: thread?.resourceId
     });
@@ -12572,7 +12974,7 @@ ${completionResult?.object?.finalResult}` : ""}
       const agentsMap = await agent.listAgents({ requestContext });
       const agentForStep = agentsMap[inputData.primitiveId];
       if (!agentForStep) {
-        const mastraError = new chunkHWMMIRIF_cjs.MastraError({
+        const mastraError = new chunk4U7ZLI36_cjs.MastraError({
           id: "AGENT_NETWORK_AGENT_EXECUTION_STEP_INVALID_TASK_INPUT",
           domain: "AGENT_NETWORK" /* AGENT_NETWORK */,
           category: "USER" /* USER */,
@@ -12699,7 +13101,7 @@ ${completionResult?.object?.finalResult}` : ""}
       const workflowId = inputData.primitiveId;
       const wf = workflowsMap[workflowId];
       if (!wf) {
-        const mastraError = new chunkHWMMIRIF_cjs.MastraError({
+        const mastraError = new chunk4U7ZLI36_cjs.MastraError({
           id: "AGENT_NETWORK_WORKFLOW_EXECUTION_STEP_INVALID_TASK_INPUT",
           domain: "AGENT_NETWORK" /* AGENT_NETWORK */,
           category: "USER" /* USER */,
@@ -12711,7 +13113,7 @@ ${completionResult?.object?.finalResult}` : ""}
       try {
         input = JSON.parse(inputData.prompt);
       } catch (e) {
-        const mastraError = new chunkHWMMIRIF_cjs.MastraError(
+        const mastraError = new chunk4U7ZLI36_cjs.MastraError(
           {
             id: "WORKFLOW_EXECUTION_STEP_INVALID_TASK_INPUT",
             domain: "AGENT_NETWORK" /* AGENT_NETWORK */,
@@ -12836,7 +13238,7 @@ ${completionResult?.object?.finalResult}` : ""}
       const toolsMap = { ...agentTools, ...memoryTools };
       let tool2 = toolsMap[inputData.primitiveId];
       if (!tool2) {
-        const mastraError = new chunkHWMMIRIF_cjs.MastraError({
+        const mastraError = new chunk4U7ZLI36_cjs.MastraError({
           id: "AGENT_NETWORK_TOOL_EXECUTION_STEP_INVALID_TASK_INPUT",
           domain: "AGENT_NETWORK" /* AGENT_NETWORK */,
           category: "USER" /* USER */,
@@ -12845,7 +13247,7 @@ ${completionResult?.object?.finalResult}` : ""}
         throw mastraError;
       }
       if (!tool2.execute) {
-        const mastraError = new chunkHWMMIRIF_cjs.MastraError({
+        const mastraError = new chunk4U7ZLI36_cjs.MastraError({
           id: "AGENT_NETWORK_TOOL_EXECUTION_STEP_INVALID_TASK_INPUT",
           domain: "AGENT_NETWORK" /* AGENT_NETWORK */,
           category: "USER" /* USER */,
@@ -12858,7 +13260,7 @@ ${completionResult?.object?.finalResult}` : ""}
       try {
         inputDataToUse = JSON.parse(inputData.prompt);
       } catch (e) {
-        const mastraError = new chunkHWMMIRIF_cjs.MastraError(
+        const mastraError = new chunk4U7ZLI36_cjs.MastraError(
           {
             id: "AGENT_NETWORK_TOOL_EXECUTION_STEP_INVALID_TASK_INPUT",
             domain: "AGENT_NETWORK" /* AGENT_NETWORK */,
@@ -13083,7 +13485,7 @@ async function networkLoop({
 }) {
   const memoryToUse = await routingAgent.getMemory({ requestContext });
   if (!memoryToUse) {
-    throw new chunkHWMMIRIF_cjs.MastraError({
+    throw new chunk4U7ZLI36_cjs.MastraError({
       id: "AGENT_NETWORK_MEMORY_REQUIRED",
       domain: "AGENT_NETWORK" /* AGENT_NETWORK */,
       category: "USER" /* USER */,
@@ -13186,67 +13588,6 @@ async function networkLoop({
 
 // src/agent/agent-legacy.ts
 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 chunkHWMMIRIF_cjs.MastraError({
-      id: "STRUCTURED_OUTPUT_OPTIONS_REQUIRED",
-      domain: "AGENT" /* AGENT */,
-      category: "USER" /* USER */,
-      text: "structuredOutput is required to use tryGenerateWithJsonFallback"
-    });
-  }
-  try {
-    return await agent.generate(prompt, options);
-  } catch (error) {
-    console.warn("Error in tryGenerateWithJsonFallback. Attempting fallback.", error);
-    return await agent.generate(prompt, {
-      ...options,
-      structuredOutput: { ...options.structuredOutput, jsonPromptInjection: true }
-    });
-  }
-}
-async function tryStreamWithJsonFallback(agent, prompt, options) {
-  if (!options.structuredOutput?.schema) {
-    throw new chunkHWMMIRIF_cjs.MastraError({
-      id: "STRUCTURED_OUTPUT_OPTIONS_REQUIRED",
-      domain: "AGENT" /* AGENT */,
-      category: "USER" /* USER */,
-      text: "structuredOutput is required to use tryStreamWithJsonFallback"
-    });
-  }
-  try {
-    const result = await agent.stream(prompt, options);
-    const object = await result.object;
-    if (!object) {
-      throw new chunkHWMMIRIF_cjs.MastraError({
-        id: "STRUCTURED_OUTPUT_OBJECT_UNDEFINED",
-        domain: "AGENT" /* AGENT */,
-        category: "USER" /* USER */,
-        text: "structuredOutput object is undefined"
-      });
-    }
-    return result;
-  } catch (error) {
-    console.warn("Error in tryStreamWithJsonFallback. Attempting fallback.", error);
-    return await agent.stream(prompt, {
-      ...options,
-      structuredOutput: { ...options.structuredOutput, jsonPromptInjection: true }
-    });
-  }
-}
-function resolveThreadIdFromArgs(args) {
-  if (args?.memory?.thread) {
-    if (typeof args.memory.thread === "string") return { id: args.memory.thread };
-    if (typeof args.memory.thread === "object" && args.memory.thread.id)
-      return args.memory.thread;
-  }
-  if (args?.threadId) return { id: args.threadId };
-  return void 0;
-}
-
-// src/agent/agent-legacy.ts
 var AgentLegacyHandler = class {
   constructor(capabilities) {
     this.capabilities = capabilities;
@@ -13277,15 +13618,16 @@ var AgentLegacyHandler = class {
         if (process.env.NODE_ENV !== "test") {
           this.capabilities.logger.debug(`[Agents:${this.capabilities.name}] - Starting generation`, { runId });
         }
-        const agentSpan = chunk72YCRTEX_cjs.getOrCreateSpan({
+        const agentSpan = chunkO2CAMK4A_cjs.getOrCreateSpan({
           type: "agent_run" /* AGENT_RUN */,
           name: `agent run: '${this.capabilities.id}'`,
+          entityType: "agent" /* AGENT */,
+          entityId: this.capabilities.id,
+          entityName: this.capabilities.name,
           input: {
             messages
           },
           attributes: {
-            agentId: this.capabilities.id,
-            agentName: this.capabilities.name,
             instructions: this.capabilities.convertInstructionsToString(instructions),
             availableTools: [
               ...toolsets ? Object.keys(toolsets) : [],
@@ -13331,7 +13673,7 @@ var AgentLegacyHandler = class {
           methodType: methodType === "generate" ? "generateLegacy" : "streamLegacy",
           memoryConfig
         });
-        let messageList = new chunkX6IBA7FP_cjs.MessageList({
+        let messageList = new chunkEMLEZXTQ_cjs.MessageList({
           threadId,
           resourceId,
           generateMessageId: this.capabilities.mastra?.generateId?.bind(this.capabilities.mastra),
@@ -13356,7 +13698,7 @@ var AgentLegacyHandler = class {
           };
         }
         if (!threadId || !resourceId) {
-          const mastraError = new chunkHWMMIRIF_cjs.MastraError({
+          const mastraError = new chunk4U7ZLI36_cjs.MastraError({
             id: "AGENT_MEMORY_MISSING_RESOURCE_ID",
             domain: "AGENT" /* AGENT */,
             category: "USER" /* USER */,
@@ -13462,7 +13804,7 @@ var AgentLegacyHandler = class {
           result: resToLog,
           threadId
         });
-        const messageListResponses = new chunkX6IBA7FP_cjs.MessageList({
+        const messageListResponses = new chunkEMLEZXTQ_cjs.MessageList({
           threadId,
           resourceId,
           generateMessageId: this.capabilities.mastra?.generateId?.bind(this.capabilities.mastra),
@@ -13532,11 +13874,11 @@ var AgentLegacyHandler = class {
               await Promise.all(promises);
             }
           } catch (e) {
-            if (e instanceof chunkHWMMIRIF_cjs.MastraError) {
+            if (e instanceof chunk4U7ZLI36_cjs.MastraError) {
               agentSpan?.error({ error: e });
               throw e;
             }
-            const mastraError = new chunkHWMMIRIF_cjs.MastraError(
+            const mastraError = new chunk4U7ZLI36_cjs.MastraError(
               {
                 id: "AGENT_MEMORY_PERSIST_RESPONSE_MESSAGES_FAILED",
                 domain: "AGENT" /* AGENT */,
@@ -13738,7 +14080,7 @@ var AgentLegacyHandler = class {
    */
   async generateLegacy(messages, generateOptions = {}) {
     if ("structuredOutput" in generateOptions && generateOptions.structuredOutput) {
-      throw new chunkHWMMIRIF_cjs.MastraError({
+      throw new chunk4U7ZLI36_cjs.MastraError({
         id: "AGENT_GENERATE_LEGACY_STRUCTURED_OUTPUT_NOT_SUPPORTED",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
@@ -13760,7 +14102,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 chunkHWMMIRIF_cjs.MastraError({
+      throw new chunk4U7ZLI36_cjs.MastraError({
         id: "AGENT_GENERATE_V2_MODEL_NOT_SUPPORTED",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
@@ -13980,7 +14322,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 chunkHWMMIRIF_cjs.MastraError({
+      throw new chunk4U7ZLI36_cjs.MastraError({
         id: "AGENT_STREAM_V2_MODEL_NOT_SUPPORTED",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
@@ -14264,7 +14606,7 @@ function getModelMethodFromAgentMethod(methodType) {
   } else if (methodType === "stream" || methodType === "streamLegacy") {
     return "stream";
   } else {
-    throw new chunkHWMMIRIF_cjs.MastraError({
+    throw new chunk4U7ZLI36_cjs.MastraError({
       id: "INVALID_METHOD_TYPE",
       domain: "AGENT" /* AGENT */,
       category: "USER" /* USER */
@@ -14326,6 +14668,14 @@ function createMapResultsStep({
     };
     if (result.tripwire) {
       const agentModel = await capabilities.getModel({ requestContext: result.requestContext });
+      if (!isSupportedLanguageModel(agentModel)) {
+        throw new chunk4U7ZLI36_cjs.MastraError({
+          id: "MAP_RESULTS_STEP_UNSUPPORTED_MODEL",
+          domain: "AGENT" /* AGENT */,
+          category: "USER" /* USER */,
+          text: "Tripwire handling requires a v2/v3 model"
+        });
+      }
       const modelOutput = await getModelOutputForTripwire({
         tripwire: memoryData.tripwire,
         runId,
@@ -14455,7 +14805,7 @@ var prepareToolsStepOutputSchema = z8.z.object({
 var prepareMemoryStepOutputSchema = z8.z.object({
   threadExists: z8.z.boolean(),
   thread: storageThreadSchema.optional(),
-  messageList: z8.z.instanceof(chunkX6IBA7FP_cjs.MessageList),
+  messageList: z8.z.instanceof(chunkEMLEZXTQ_cjs.MessageList),
   /** Tripwire data when input processor triggered abort */
   tripwire: z8.z.object({
     reason: z8.z.string(),
@@ -14493,7 +14843,7 @@ function createPrepareMemoryStep({
     outputSchema: prepareMemoryStepOutputSchema,
     execute: async ({ tracingContext }) => {
       const thread = threadFromArgs;
-      const messageList = new chunkX6IBA7FP_cjs.MessageList({
+      const messageList = new chunkEMLEZXTQ_cjs.MessageList({
         threadId: thread?.id,
         resourceId,
         generateMessageId: capabilities.generateMessageId,
@@ -14519,7 +14869,7 @@ function createPrepareMemoryStep({
         };
       }
       if (!thread?.id || !resourceId) {
-        const mastraError = new chunkHWMMIRIF_cjs.MastraError({
+        const mastraError = new chunk4U7ZLI36_cjs.MastraError({
           id: "AGENT_MEMORY_MISSING_RESOURCE_ID",
           domain: "AGENT" /* AGENT */,
           category: "USER" /* USER */,
@@ -14843,7 +15193,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     this.#description = config.description;
     this.#options = config.options;
     if (!config.model) {
-      const mastraError = new chunkHWMMIRIF_cjs.MastraError({
+      const mastraError = new chunk4U7ZLI36_cjs.MastraError({
         id: "AGENT_CONSTRUCTOR_MODEL_REQUIRED",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
@@ -14858,7 +15208,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     }
     if (Array.isArray(config.model)) {
       if (config.model.length === 0) {
-        const mastraError = new chunkHWMMIRIF_cjs.MastraError({
+        const mastraError = new chunk4U7ZLI36_cjs.MastraError({
           id: "AGENT_CONSTRUCTOR_MODEL_ARRAY_EMPTY",
           domain: "AGENT" /* AGENT */,
           category: "USER" /* USER */,
@@ -14910,7 +15260,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
         this.#voice?.addInstructions(config.instructions);
       }
     } else {
-      this.#voice = new chunkH4VUIOWU_cjs.DefaultVoice();
+      this.#voice = new chunkSSB4AVHU_cjs.DefaultVoice();
     }
     if (config.inputProcessors) {
       this.#inputProcessors = config.inputProcessors;
@@ -14940,7 +15290,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 chunkHWMMIRIF_cjs.MastraError({
+        const mastraError = new chunk4U7ZLI36_cjs.MastraError({
           id: "AGENT_GET_AGENTS_FUNCTION_EMPTY_RETURN",
           domain: "AGENT" /* AGENT */,
           category: "USER" /* USER */,
@@ -14967,7 +15317,6 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
   }) {
     const inputProcessors = inputProcessorOverrides ?? await this.listResolvedInputProcessors(requestContext);
     const outputProcessors = outputProcessorOverrides ?? await this.listResolvedOutputProcessors(requestContext);
-    this.logger.debug("outputProcessors", outputProcessors);
     return new ProcessorRunner({
       inputProcessors,
       outputProcessors,
@@ -15024,7 +15373,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
   async listResolvedOutputProcessors(requestContext) {
     const configuredProcessors = this.#outputProcessors ? typeof this.#outputProcessors === "function" ? await this.#outputProcessors({ requestContext: requestContext || new chunkUVHSM2GU_cjs.RequestContext() }) : this.#outputProcessors : [];
     const memory = await this.getMemory({ requestContext: requestContext || new chunkUVHSM2GU_cjs.RequestContext() });
-    const memoryProcessors = memory ? memory.getOutputProcessors(configuredProcessors, requestContext) : [];
+    const memoryProcessors = memory ? await memory.getOutputProcessors(configuredProcessors, requestContext) : [];
     const allProcessors = [...configuredProcessors, ...memoryProcessors];
     return this.combineProcessorsIntoWorkflow(allProcessors, `${this.id}-output-processor`);
   }
@@ -15036,7 +15385,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
   async listResolvedInputProcessors(requestContext) {
     const configuredProcessors = this.#inputProcessors ? typeof this.#inputProcessors === "function" ? await this.#inputProcessors({ requestContext: requestContext || new chunkUVHSM2GU_cjs.RequestContext() }) : this.#inputProcessors : [];
     const memory = await this.getMemory({ requestContext: requestContext || new chunkUVHSM2GU_cjs.RequestContext() });
-    const memoryProcessors = memory ? memory.getInputProcessors(configuredProcessors, requestContext) : [];
+    const memoryProcessors = memory ? await memory.getInputProcessors(configuredProcessors, requestContext) : [];
     const allProcessors = [...memoryProcessors, ...configuredProcessors];
     return this.combineProcessorsIntoWorkflow(allProcessors, `${this.id}-input-processor`);
   }
@@ -15115,7 +15464,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 chunkHWMMIRIF_cjs.MastraError({
+        const mastraError = new chunk4U7ZLI36_cjs.MastraError({
           id: "AGENT_GET_MEMORY_FUNCTION_EMPTY_RETURN",
           domain: "AGENT" /* AGENT */,
           category: "USER" /* USER */,
@@ -15142,7 +15491,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
   }
   get voice() {
     if (typeof this.#instructions === "function") {
-      const mastraError = new chunkHWMMIRIF_cjs.MastraError({
+      const mastraError = new chunk4U7ZLI36_cjs.MastraError({
         id: "AGENT_VOICE_INCOMPATIBLE_WITH_FUNCTION_INSTRUCTIONS",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
@@ -15192,7 +15541,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 chunkHWMMIRIF_cjs.MastraError({
+        const mastraError = new chunk4U7ZLI36_cjs.MastraError({
           id: "AGENT_GET_SCORERS_FUNCTION_EMPTY_RETURN",
           domain: "AGENT" /* AGENT */,
           category: "USER" /* USER */,
@@ -15226,7 +15575,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
       voice?.addInstructions(this.#convertInstructionsToString(instructions));
       return voice;
     } else {
-      return new chunkH4VUIOWU_cjs.DefaultVoice();
+      return new chunkSSB4AVHU_cjs.DefaultVoice();
     }
   }
   /**
@@ -15244,7 +15593,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 chunkHWMMIRIF_cjs.MastraError({
+          const mastraError = new chunk4U7ZLI36_cjs.MastraError({
             id: "AGENT_GET_INSTRUCTIONS_FUNCTION_EMPTY_RETURN",
             domain: "AGENT" /* AGENT */,
             category: "USER" /* USER */,
@@ -15349,7 +15698,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 chunkHWMMIRIF_cjs.MastraError({
+        const mastraError = new chunk4U7ZLI36_cjs.MastraError({
           id: "AGENT_GET_DEFAULT_GENERATE_OPTIONS_FUNCTION_EMPTY_RETURN",
           domain: "AGENT" /* AGENT */,
           category: "USER" /* USER */,
@@ -15384,7 +15733,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 chunkHWMMIRIF_cjs.MastraError({
+        const mastraError = new chunk4U7ZLI36_cjs.MastraError({
           id: "AGENT_GET_DEFAULT_STREAM_OPTIONS_FUNCTION_EMPTY_RETURN",
           domain: "AGENT" /* AGENT */,
           category: "USER" /* USER */,
@@ -15419,7 +15768,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 chunkHWMMIRIF_cjs.MastraError({
+        const mastraError = new chunk4U7ZLI36_cjs.MastraError({
           id: "AGENT_GET_DEFAULT_OPTIONS_FUNCTION_EMPTY_RETURN",
           domain: "AGENT" /* AGENT */,
           category: "USER" /* USER */,
@@ -15447,12 +15796,12 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
    */
   listTools({ requestContext = new chunkUVHSM2GU_cjs.RequestContext() } = {}) {
     if (typeof this.#tools !== "function") {
-      return chunkMLKE7HRS_cjs.ensureToolProperties(this.#tools);
+      return chunkBC2VKOH4_cjs.ensureToolProperties(this.#tools);
     }
     const result = this.#tools({ requestContext, mastra: this.#mastra });
     return resolveMaybePromise(result, (tools) => {
       if (!tools) {
-        const mastraError = new chunkHWMMIRIF_cjs.MastraError({
+        const mastraError = new chunk4U7ZLI36_cjs.MastraError({
           id: "AGENT_GET_TOOLS_FUNCTION_EMPTY_RETURN",
           domain: "AGENT" /* AGENT */,
           category: "USER" /* USER */,
@@ -15465,7 +15814,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
         this.logger.error(mastraError.toString());
         throw mastraError;
       }
-      return chunkMLKE7HRS_cjs.ensureToolProperties(tools);
+      return chunkBC2VKOH4_cjs.ensureToolProperties(tools);
     });
   }
   /**
@@ -15486,7 +15835,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     const modelToUse = this.getModel({ modelConfig: model, requestContext });
     return resolveMaybePromise(modelToUse, (resolvedModel) => {
       let llm;
-      if (resolvedModel.specificationVersion === "v2") {
+      if (isSupportedLanguageModel(resolvedModel)) {
         const modelsPromise = Array.isArray(this.model) && !model ? this.prepareModels(requestContext) : this.prepareModels(requestContext, resolvedModel);
         llm = modelsPromise.then((models) => {
           const enabledModels = models.filter((model2) => model2.enabled);
@@ -15497,7 +15846,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           });
         });
       } else {
-        llm = new chunkSZYSDJTN_cjs.MastraLLMV1({
+        llm = new chunkT2LVULCK_cjs.MastraLLMV1({
           model: resolvedModel,
           mastra: this.#mastra,
           options: { tracingPolicy: this.#options?.tracingPolicy }
@@ -15522,9 +15871,9 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
    */
   async resolveModelConfig(modelConfig, requestContext) {
     try {
-      return await chunkMXBVP7HX_cjs.resolveModelConfig(modelConfig, requestContext, this.#mastra);
+      return await chunkGXMJ5URG_cjs.resolveModelConfig(modelConfig, requestContext, this.#mastra);
     } catch (error) {
-      const mastraError = new chunkHWMMIRIF_cjs.MastraError({
+      const mastraError = new chunk4U7ZLI36_cjs.MastraError({
         id: "AGENT_GET_MODEL_MISSING_MODEL_INSTANCE",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
@@ -15558,7 +15907,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 chunkHWMMIRIF_cjs.MastraError({
+      const mastraError = new chunk4U7ZLI36_cjs.MastraError({
         id: "AGENT_GET_MODEL_MISSING_MODEL_INSTANCE",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
@@ -15682,7 +16031,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
             mastra.addTool(tool2, toolKey);
           }
         } catch (error) {
-          if (error instanceof chunkHWMMIRIF_cjs.MastraError && error.id !== "MASTRA_ADD_TOOL_DUPLICATE_KEY") {
+          if (error instanceof chunk4U7ZLI36_cjs.MastraError && error.id !== "MASTRA_ADD_TOOL_DUPLICATE_KEY") {
             throw error;
           }
         }
@@ -15693,7 +16042,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
         try {
           mastra.addProcessor(processor);
         } catch (error) {
-          if (error instanceof chunkHWMMIRIF_cjs.MastraError && error.id !== "MASTRA_ADD_PROCESSOR_DUPLICATE_KEY") {
+          if (error instanceof chunk4U7ZLI36_cjs.MastraError && error.id !== "MASTRA_ADD_PROCESSOR_DUPLICATE_KEY") {
             throw error;
           }
         }
@@ -15704,7 +16053,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
         try {
           mastra.addProcessor(processor);
         } catch (error) {
-          if (error instanceof chunkHWMMIRIF_cjs.MastraError && error.id !== "MASTRA_ADD_PROCESSOR_DUPLICATE_KEY") {
+          if (error instanceof chunk4U7ZLI36_cjs.MastraError && error.id !== "MASTRA_ADD_PROCESSOR_DUPLICATE_KEY") {
             throw error;
           }
         }
@@ -15728,7 +16077,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     instructions
   }) {
     const llm = await this.getLLM({ requestContext, model });
-    const normMessage = new chunkX6IBA7FP_cjs.MessageList().add(message, "user").get.all.ui().at(-1);
+    const normMessage = new chunkEMLEZXTQ_cjs.MessageList().add(message, "user").get.all.ui().at(-1);
     if (!normMessage) {
       throw new Error(`Could not generate title from input ${JSON.stringify(message)}`);
     }
@@ -15750,8 +16099,8 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     }
     const systemInstructions = await this.resolveTitleInstructions(requestContext, instructions);
     let text = "";
-    if (llm.getModel().specificationVersion === "v2") {
-      const messageList = new chunkX6IBA7FP_cjs.MessageList().add(
+    if (isSupportedLanguageModel(llm.getModel())) {
+      const messageList = new chunkEMLEZXTQ_cjs.MessageList().add(
         [
           {
             role: "system",
@@ -15804,7 +16153,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
   async genTitle(userMessage, requestContext, tracingContext, model, instructions) {
     try {
       if (userMessage) {
-        const normMessage = new chunkX6IBA7FP_cjs.MessageList().add(userMessage, "user").get.all.ui().at(-1);
+        const normMessage = new chunkEMLEZXTQ_cjs.MessageList().add(userMessage, "user").get.all.ui().at(-1);
         if (normMessage) {
           return await this.generateTitleFromUserMessage({
             message: normMessage,
@@ -15869,7 +16218,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           tracingPolicy: this.#options?.tracingPolicy,
           requireApproval: toolObj.requireApproval
         };
-        const convertedToCoreTool = chunkMLKE7HRS_cjs.makeCoreTool(toolObj, options, void 0, autoResumeSuspendedTools);
+        const convertedToCoreTool = chunkBC2VKOH4_cjs.makeCoreTool(toolObj, options, void 0, autoResumeSuspendedTools);
         convertedMemoryTools[toolName] = convertedToCoreTool;
       }
     }
@@ -15902,7 +16251,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
             processorId: error.processorId
           };
         } else {
-          throw new chunkHWMMIRIF_cjs.MastraError(
+          throw new chunk4U7ZLI36_cjs.MastraError(
             {
               id: "AGENT_INPUT_PROCESSOR_ERROR",
               domain: "AGENT" /* AGENT */,
@@ -16024,7 +16373,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           tracingPolicy: this.#options?.tracingPolicy,
           requireApproval: tool2.requireApproval
         };
-        return [k, chunkMLKE7HRS_cjs.makeCoreTool(tool2, options, void 0, autoResumeSuspendedTools)];
+        return [k, chunkBC2VKOH4_cjs.makeCoreTool(tool2, options, void 0, autoResumeSuspendedTools)];
       })
     );
     const assignedToolEntriesConverted = Object.fromEntries(
@@ -16074,7 +16423,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
             tracingPolicy: this.#options?.tracingPolicy,
             requireApproval: toolObj.requireApproval
           };
-          const convertedToCoreTool = chunkMLKE7HRS_cjs.makeCoreTool(toolObj, options, "toolset", autoResumeSuspendedTools);
+          const convertedToCoreTool = chunkBC2VKOH4_cjs.makeCoreTool(toolObj, options, "toolset", autoResumeSuspendedTools);
           toolsForRequest[toolName] = convertedToCoreTool;
         }
       }
@@ -16119,7 +16468,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           tracingPolicy: this.#options?.tracingPolicy,
           requireApproval: tool2.requireApproval
         };
-        const convertedToCoreTool = chunkMLKE7HRS_cjs.makeCoreTool(rest, options, "client-tool", autoResumeSuspendedTools);
+        const convertedToCoreTool = chunkBC2VKOH4_cjs.makeCoreTool(rest, options, "client-tool", autoResumeSuspendedTools);
         toolsForRequest[toolName] = convertedToCoreTool;
       }
     }
@@ -16157,7 +16506,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           subAgentResourceId: z8.z.string().describe("The resource ID of the agent").optional()
         });
         const modelVersion = (await agent.getModel({ requestContext })).specificationVersion;
-        const toolObj = chunkZ55SJVEC_cjs.createTool({
+        const toolObj = chunk6HJFCSJ4_cjs.createTool({
           id: `agent-${agentName}`,
           description: agent.getDescription() || `Agent: ${agentName}`,
           inputSchema: agentInputSchema,
@@ -16253,7 +16602,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
               }
               return result;
             } catch (err) {
-              const mastraError = new chunkHWMMIRIF_cjs.MastraError(
+              const mastraError = new chunk4U7ZLI36_cjs.MastraError(
                 {
                   id: "AGENT_AGENT_TOOL_EXECUTION_FAILED",
                   domain: "AGENT" /* AGENT */,
@@ -16289,7 +16638,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           tracingContext,
           tracingPolicy: this.#options?.tracingPolicy
         };
-        convertedAgentTools[`agent-${agentName}`] = chunkMLKE7HRS_cjs.makeCoreTool(
+        convertedAgentTools[`agent-${agentName}`] = chunkBC2VKOH4_cjs.makeCoreTool(
           toolObj,
           options,
           void 0,
@@ -16320,7 +16669,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           inputData: workflow.inputSchema,
           ...workflow.stateSchema ? { initialState: workflow.stateSchema } : {}
         });
-        const toolObj = chunkZ55SJVEC_cjs.createTool({
+        const toolObj = chunk6HJFCSJ4_cjs.createTool({
           id: `workflow-${workflowName}`,
           description: workflow.description || `Workflow: ${workflowName}`,
           inputSchema: extendedInputSchema,
@@ -16433,7 +16782,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
                 };
               }
             } catch (err) {
-              const mastraError = new chunkHWMMIRIF_cjs.MastraError(
+              const mastraError = new chunk4U7ZLI36_cjs.MastraError(
                 {
                   id: "AGENT_WORKFLOW_TOOL_EXECUTION_FAILED",
                   domain: "AGENT" /* AGENT */,
@@ -16468,7 +16817,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           tracingContext,
           tracingPolicy: this.#options?.tracingPolicy
         };
-        convertedWorkflowTools[`workflow-${workflowName}`] = chunkMLKE7HRS_cjs.makeCoreTool(
+        convertedWorkflowTools[`workflow-${workflowName}`] = chunkBC2VKOH4_cjs.makeCoreTool(
           toolObj,
           options,
           void 0,
@@ -16498,7 +16847,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     let mastraProxy = void 0;
     const logger = this.logger;
     if (this.#mastra) {
-      mastraProxy = chunkMLKE7HRS_cjs.createMastraProxy({ mastra: this.#mastra, logger });
+      mastraProxy = chunkBC2VKOH4_cjs.createMastraProxy({ mastra: this.#mastra, logger });
     }
     const assignedTools = await this.listAssignedTools({
       runId,
@@ -16582,7 +16931,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
         }
         newKey = newKey.slice(0, 63);
         if (tools[newKey]) {
-          const mastraError = new chunkHWMMIRIF_cjs.MastraError({
+          const mastraError = new chunk4U7ZLI36_cjs.MastraError({
             id: "AGENT_TOOL_NAME_COLLISION",
             domain: "AGENT" /* AGENT */,
             category: "USER" /* USER */,
@@ -16686,7 +17035,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
       if (typeof scorerObject.scorer === "string") {
         try {
           if (!this.#mastra) {
-            throw new chunkHWMMIRIF_cjs.MastraError({
+            throw new chunk4U7ZLI36_cjs.MastraError({
               id: "AGENT_GENEREATE_SCORER_NOT_FOUND",
               domain: "AGENT" /* AGENT */,
               category: "USER" /* USER */,
@@ -16702,8 +17051,8 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
         result[id] = scorerObject;
       }
     }
-    if (Object.keys(result).length === 0) {
-      throw new chunkHWMMIRIF_cjs.MastraError({
+    if (Object.keys(result).length === 0 && Object.keys(overrideScorers).length > 0) {
+      throw new chunk4U7ZLI36_cjs.MastraError({
         id: "AGENT_GENEREATE_SCORER_NOT_FOUND",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
@@ -16719,43 +17068,50 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
   async prepareModels(requestContext, model) {
     if (model || !Array.isArray(this.model)) {
       const modelToUse = model ?? this.model;
-      const resolvedModel = typeof modelToUse === "function" ? await modelToUse({ requestContext, mastra: this.#mastra }) : modelToUse;
-      if (resolvedModel?.specificationVersion !== "v2") {
-        const mastraError = new chunkHWMMIRIF_cjs.MastraError({
+      const resolvedModel = await this.resolveModelConfig(
+        modelToUse,
+        requestContext
+      );
+      if (!isSupportedLanguageModel(resolvedModel)) {
+        const mastraError = new chunk4U7ZLI36_cjs.MastraError({
           id: "AGENT_PREPARE_MODELS_INCOMPATIBLE_WITH_MODEL_ARRAY_V1",
           domain: "AGENT" /* AGENT */,
           category: "USER" /* USER */,
           details: {
             agentName: this.name
           },
-          text: `[Agent:${this.name}] - Only v2 models are allowed when an array of models is provided`
+          text: `[Agent:${this.name}] - Only v2/v3 models are allowed when an array of models is provided`
         });
         this.logger.trackException(mastraError);
         this.logger.error(mastraError.toString());
         throw mastraError;
       }
+      let headers;
+      if (resolvedModel instanceof chunkGXMJ5URG_cjs.ModelRouterLanguageModel) {
+        headers = resolvedModel.config?.headers;
+      }
       return [
         {
           id: "main",
-          // TODO fix type check
           model: resolvedModel,
           maxRetries: this.maxRetries ?? 0,
-          enabled: true
+          enabled: true,
+          headers
         }
       ];
     }
     const models = await Promise.all(
       this.model.map(async (modelConfig) => {
         const model2 = await this.resolveModelConfig(modelConfig.model, requestContext);
-        if (!isV2Model(model2)) {
-          const mastraError = new chunkHWMMIRIF_cjs.MastraError({
+        if (!isSupportedLanguageModel(model2)) {
+          const mastraError = new chunk4U7ZLI36_cjs.MastraError({
             id: "AGENT_PREPARE_MODELS_INCOMPATIBLE_WITH_MODEL_ARRAY_V1",
             domain: "AGENT" /* AGENT */,
             category: "USER" /* USER */,
             details: {
               agentName: this.name
             },
-            text: `[Agent:${this.name}] - Only v2 models are allowed when an array of models is provided`
+            text: `[Agent:${this.name}] - Only v2/v3 models are allowed when an array of models is provided`
           });
           this.logger.trackException(mastraError);
           this.logger.error(mastraError.toString());
@@ -16763,7 +17119,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
         }
         const modelId = modelConfig.id || model2.modelId;
         if (!modelId) {
-          const mastraError = new chunkHWMMIRIF_cjs.MastraError({
+          const mastraError = new chunk4U7ZLI36_cjs.MastraError({
             id: "AGENT_PREPARE_MODELS_MISSING_MODEL_ID",
             domain: "AGENT" /* AGENT */,
             category: "USER" /* USER */,
@@ -16776,11 +17132,16 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           this.logger.error(mastraError.toString());
           throw mastraError;
         }
+        let headers;
+        if (model2 instanceof chunkGXMJ5URG_cjs.ModelRouterLanguageModel) {
+          headers = model2.config?.headers;
+        }
         return {
           id: modelId,
           model: model2,
           maxRetries: modelConfig.maxRetries ?? 0,
-          enabled: modelConfig.enabled ?? true
+          enabled: modelConfig.enabled ?? true,
+          headers
         };
       })
     );
@@ -16790,7 +17151,11 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
    * Executes the agent call, handling tools, memory, and streaming.
    * @internal
    */
-  async #execute({ methodType, resumeContext, ...options }) {
+  async #execute({
+    methodType,
+    resumeContext,
+    ...options
+  }) {
     const existingSnapshot = resumeContext?.snapshot;
     let snapshotMemoryInfo;
     if (existingSnapshot) {
@@ -16828,7 +17193,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
       const targetProvider = structuredOutputModel.provider;
       const targetModelId = structuredOutputModel.modelId;
       if (targetProvider.includes("openai") || targetModelId.includes("openai")) {
-        if (chunkMLKE7HRS_cjs.isZodType(options.structuredOutput.schema) && targetModelId) {
+        if (chunkBC2VKOH4_cjs.isZodType(options.structuredOutput.schema) && targetModelId) {
           const modelInfo = {
             provider: targetProvider,
             modelId: targetModelId,
@@ -16847,13 +17212,14 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     }
     const runId = options.runId || this.#mastra?.generateId() || crypto2.randomUUID();
     const instructions = options.instructions || await this.getInstructions({ requestContext });
-    const agentSpan = chunk72YCRTEX_cjs.getOrCreateSpan({
+    const agentSpan = chunkO2CAMK4A_cjs.getOrCreateSpan({
       type: "agent_run" /* AGENT_RUN */,
       name: `agent run: '${this.id}'`,
+      entityType: "agent" /* AGENT */,
+      entityId: this.id,
+      entityName: this.name,
       input: options.messages,
       attributes: {
-        agentId: this.id,
-        agentName: this.name,
         conversationId: threadFromArgs?.id,
         instructions: this.#convertInstructionsToString(instructions)
       },
@@ -17023,10 +17389,10 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           }
         }
       } catch (e) {
-        if (e instanceof chunkHWMMIRIF_cjs.MastraError) {
+        if (e instanceof chunk4U7ZLI36_cjs.MastraError) {
           throw e;
         }
-        const mastraError = new chunkHWMMIRIF_cjs.MastraError(
+        const mastraError = new chunk4U7ZLI36_cjs.MastraError(
           {
             id: "AGENT_MEMORY_PERSIST_RESPONSE_MESSAGES_FAILED",
             domain: "AGENT" /* AGENT */,
@@ -17137,14 +17503,14 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
       requestContext: mergedOptions.requestContext
     });
     const modelInfo = llm.getModel();
-    if (modelInfo.specificationVersion !== "v2") {
+    if (!isSupportedLanguageModel(modelInfo)) {
       const modelId = modelInfo.modelId || "unknown";
       const provider = modelInfo.provider || "unknown";
-      throw new chunkHWMMIRIF_cjs.MastraError({
+      throw new chunk4U7ZLI36_cjs.MastraError({
         id: "AGENT_GENERATE_V1_MODEL_NOT_SUPPORTED",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
-        text: `Agent "${this.name}" is using AI SDK v4 model (${provider}:${modelId}) which is not compatible with generate(). Please use AI SDK v5 models or call the generateLegacy() method instead. See https://mastra.ai/en/docs/streaming/overview for more information.`,
+        text: `Agent "${this.name}" is using AI SDK v4 model (${provider}:${modelId}) which is not compatible with generate(). Please use AI SDK v5+ models or call the generateLegacy() method instead. See https://mastra.ai/en/docs/streaming/overview for more information.`,
         details: {
           agentName: this.name,
           modelId,
@@ -17163,7 +17529,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     const result = await this.#execute(executeOptions);
     if (result.status !== "success") {
       if (result.status === "failed") {
-        throw new chunkHWMMIRIF_cjs.MastraError(
+        throw new chunk4U7ZLI36_cjs.MastraError(
           {
             id: "AGENT_GENERATE_FAILED",
             domain: "AGENT" /* AGENT */,
@@ -17173,7 +17539,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           result.error
         );
       }
-      throw new chunkHWMMIRIF_cjs.MastraError({
+      throw new chunk4U7ZLI36_cjs.MastraError({
         id: "AGENT_GENERATE_UNKNOWN_ERROR",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
@@ -17199,14 +17565,14 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
       requestContext: mergedOptions.requestContext
     });
     const modelInfo = llm.getModel();
-    if (modelInfo.specificationVersion !== "v2") {
+    if (!isSupportedLanguageModel(modelInfo)) {
       const modelId = modelInfo.modelId || "unknown";
       const provider = modelInfo.provider || "unknown";
-      throw new chunkHWMMIRIF_cjs.MastraError({
+      throw new chunk4U7ZLI36_cjs.MastraError({
         id: "AGENT_STREAM_V1_MODEL_NOT_SUPPORTED",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
-        text: `Agent "${this.name}" is using AI SDK v4 model (${provider}:${modelId}) which is not compatible with stream(). Please use AI SDK v5 models or call the streamLegacy() method instead. See https://mastra.ai/en/docs/streaming/overview for more information.`,
+        text: `Agent "${this.name}" is using AI SDK v4 model (${provider}:${modelId}) which is not compatible with stream(). Please use AI SDK v5+ models or call the streamLegacy() method instead. See https://mastra.ai/en/docs/streaming/overview for more information.`,
         details: {
           agentName: this.name,
           modelId,
@@ -17225,7 +17591,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     const result = await this.#execute(executeOptions);
     if (result.status !== "success") {
       if (result.status === "failed") {
-        throw new chunkHWMMIRIF_cjs.MastraError(
+        throw new chunk4U7ZLI36_cjs.MastraError(
           {
             id: "AGENT_STREAM_FAILED",
             domain: "AGENT" /* AGENT */,
@@ -17235,7 +17601,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           result.error
         );
       }
-      throw new chunkHWMMIRIF_cjs.MastraError({
+      throw new chunk4U7ZLI36_cjs.MastraError({
         id: "AGENT_STREAM_UNKNOWN_ERROR",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
@@ -17268,15 +17634,16 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     const llm = await this.getLLM({
       requestContext: mergedStreamOptions.requestContext
     });
-    if (llm.getModel().specificationVersion !== "v2") {
-      throw new chunkHWMMIRIF_cjs.MastraError({
+    if (!isSupportedLanguageModel(llm.getModel())) {
+      throw new chunk4U7ZLI36_cjs.MastraError({
         id: "AGENT_STREAM_V1_MODEL_NOT_SUPPORTED",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
         text: "V1 models are not supported for stream. Please use streamLegacy instead."
       });
     }
-    const existingSnapshot = await this.#mastra?.getStorage()?.loadWorkflowSnapshot({
+    const workflowsStore = await this.#mastra?.getStorage()?.getStore("workflows");
+    const existingSnapshot = await workflowsStore?.loadWorkflowSnapshot({
       workflowName: "agentic-loop",
       runId: streamOptions?.runId ?? ""
     });
@@ -17291,7 +17658,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     });
     if (result.status !== "success") {
       if (result.status === "failed") {
-        throw new chunkHWMMIRIF_cjs.MastraError(
+        throw new chunk4U7ZLI36_cjs.MastraError(
           {
             id: "AGENT_STREAM_FAILED",
             domain: "AGENT" /* AGENT */,
@@ -17301,7 +17668,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           result.error
         );
       }
-      throw new chunkHWMMIRIF_cjs.MastraError({
+      throw new chunk4U7ZLI36_cjs.MastraError({
         id: "AGENT_STREAM_UNKNOWN_ERROR",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
@@ -17508,7 +17875,7 @@ var ModerationProcessor = class _ModerationProcessor {
         reason: z8__default.default.string().describe("Brief explanation of why content was flagged").nullable()
       });
       let response;
-      if (model.specificationVersion === "v2") {
+      if (isSupportedLanguageModel(model)) {
         response = await this.moderationAgent.generate(prompt, {
           structuredOutput: {
             schema,
@@ -17728,7 +18095,7 @@ var PromptInjectionDetector = class _PromptInjectionDetector {
           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") {
+      if (isSupportedLanguageModel(model)) {
         response = await this.detectionAgent.generate(prompt, {
           structuredOutput: {
             schema,
@@ -17976,7 +18343,7 @@ var PIIDetector = class _PIIDetector {
         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") {
+      if (isSupportedLanguageModel(model)) {
         response = await this.detectionAgent.generate(prompt, {
           structuredOutput: {
             schema,
@@ -18438,7 +18805,7 @@ var LanguageDetector = class _LanguageDetector {
       const schema = this.strategy === "translate" ? baseSchema.extend({
         translated_text: z8__default.default.string().describe("Translated text").nullable()
       }) : baseSchema;
-      if (model.specificationVersion === "v2") {
+      if (isSupportedLanguageModel(model)) {
         response = await this.detectionAgent.generate(prompt, {
           structuredOutput: {
             schema
@@ -19116,7 +19483,7 @@ var SystemPromptScrubber = class {
       const schema = this.strategy === "redact" ? baseSchema.extend({
         redacted_content: z8.z.string().describe("Redacted content").nullable()
       }) : baseSchema;
-      if (model.specificationVersion === "v2") {
+      if (isSupportedLanguageModel(model)) {
         result = await this.detectionAgent.generate(text, {
           structuredOutput: {
             schema,
@@ -19344,6 +19711,50 @@ var ToolCallFilter = class {
   }
 };
 
+// src/memory/working-memory-utils.ts
+var WORKING_MEMORY_START_TAG = "<working_memory>";
+var WORKING_MEMORY_END_TAG = "</working_memory>";
+function extractWorkingMemoryTags(text) {
+  const results = [];
+  let pos = 0;
+  while (pos < text.length) {
+    const start = text.indexOf(WORKING_MEMORY_START_TAG, pos);
+    if (start === -1) break;
+    const end = text.indexOf(WORKING_MEMORY_END_TAG, start + WORKING_MEMORY_START_TAG.length);
+    if (end === -1) break;
+    results.push(text.substring(start, end + WORKING_MEMORY_END_TAG.length));
+    pos = end + WORKING_MEMORY_END_TAG.length;
+  }
+  return results.length > 0 ? results : null;
+}
+function removeWorkingMemoryTags(text) {
+  let result = "";
+  let pos = 0;
+  while (pos < text.length) {
+    const start = text.indexOf(WORKING_MEMORY_START_TAG, pos);
+    if (start === -1) {
+      result += text.substring(pos);
+      break;
+    }
+    result += text.substring(pos, start);
+    const end = text.indexOf(WORKING_MEMORY_END_TAG, start + WORKING_MEMORY_START_TAG.length);
+    if (end === -1) {
+      result += text.substring(start);
+      break;
+    }
+    pos = end + WORKING_MEMORY_END_TAG.length;
+  }
+  return result;
+}
+function extractWorkingMemoryContent(text) {
+  const start = text.indexOf(WORKING_MEMORY_START_TAG);
+  if (start === -1) return null;
+  const contentStart = start + WORKING_MEMORY_START_TAG.length;
+  const end = text.indexOf(WORKING_MEMORY_END_TAG, contentStart);
+  if (end === -1) return null;
+  return text.substring(contentStart, end);
+}
+
 // src/processors/memory/message-history.ts
 var MessageHistory = class {
   id = "message-history";
@@ -19386,25 +19797,43 @@ var MessageHistory = class {
     }
     return messageList;
   }
-  filterIncompleteToolCalls(messages) {
+  /**
+   * Filters messages before persisting to storage:
+   * 1. Removes incomplete tool calls (state === 'call' or 'partial-call')
+   * 2. Removes updateWorkingMemory tool invocations (hide args from message history)
+   * 3. Strips <working_memory> tags from text content
+   */
+  filterMessagesForPersistence(messages) {
     return messages.map((m) => {
-      if (m.role === `assistant`) {
-        const assistant = {
-          ...m,
-          content: {
-            ...m.content,
-            parts: m.content.parts.map((p) => {
-              if (p.type === `tool-invocation` && (p.toolInvocation.state === `call` || p.toolInvocation.state === `partial-call`)) {
-                return null;
-              }
-              return p;
-            }).filter((p) => Boolean(p))
+      const newMessage = { ...m };
+      if (m.content && typeof m.content === "object" && !Array.isArray(m.content)) {
+        newMessage.content = { ...m.content };
+      }
+      if (typeof newMessage.content?.content === "string" && newMessage.content.content.length > 0) {
+        newMessage.content.content = removeWorkingMemoryTags(newMessage.content.content).trim();
+      }
+      if (Array.isArray(newMessage.content?.parts)) {
+        newMessage.content.parts = newMessage.content.parts.map((p) => {
+          if (p.type === `tool-invocation` && (p.toolInvocation.state === `call` || p.toolInvocation.state === `partial-call`)) {
+            return null;
           }
-        };
-        if (assistant.content.parts.length === 0) return null;
-        return assistant;
+          if (p.type === `tool-invocation` && p.toolInvocation.toolName === `updateWorkingMemory`) {
+            return null;
+          }
+          if (p.type === `text`) {
+            const text = typeof p.text === "string" ? p.text : "";
+            return {
+              ...p,
+              text: removeWorkingMemoryTags(text).trim()
+            };
+          }
+          return p;
+        }).filter((p) => Boolean(p));
+        if (newMessage.content.parts.length === 0) {
+          return null;
+        }
       }
-      return m;
+      return newMessage;
     }).filter((m) => Boolean(m));
   }
   async processOutputResult(args) {
@@ -19421,7 +19850,7 @@ var MessageHistory = class {
     if (messagesToSave.length === 0) {
       return messageList;
     }
-    const filtered = this.filterIncompleteToolCalls(messagesToSave);
+    const filtered = this.filterMessagesForPersistence(messagesToSave);
     await this.storage.saveMessages({ messages: filtered });
     const thread = await this.storage.getThreadById({ threadId });
     if (thread) {
@@ -19685,7 +20114,7 @@ var SemanticRecall = class {
    */
   formatCrossThreadMessages(messages, currentThreadId) {
     let result = ``;
-    const v1Messages = new chunkX6IBA7FP_cjs.MessageList().add(messages, "memory").get.all.v1();
+    const v1Messages = new chunkEMLEZXTQ_cjs.MessageList().add(messages, "memory").get.all.v1();
     let lastYmd = null;
     for (const msg of v1Messages) {
       const date = msg.createdAt;
@@ -20035,6 +20464,7 @@ var MastraMemory = class extends chunkDGV2FWB4_cjs.MastraBase {
   _storage;
   vector;
   embedder;
+  embedderOptions;
   threadConfig = { ...memoryDefaultOptions };
   #mastra;
   constructor(config) {
@@ -20090,7 +20520,7 @@ https://mastra.ai/en/docs/memory/semantic-recall`
         );
       }
       if (typeof config.embedder === "string") {
-        this.embedder = new chunkMXBVP7HX_cjs.ModelRouterEmbeddingModel(config.embedder);
+        this.embedder = new chunkGXMJ5URG_cjs.ModelRouterEmbeddingModel(config.embedder);
       } else {
         this.embedder = config.embedder;
       }
@@ -20125,7 +20555,11 @@ https://mastra.ai/en/docs/memory/overview`
     this.vector = vector;
   }
   setEmbedder(embedder) {
-    this.embedder = embedder;
+    if (typeof embedder === "string") {
+      this.embedder = new chunkGXMJ5URG_cjs.ModelRouterEmbeddingModel(embedder);
+    } else {
+      this.embedder = embedder;
+    }
   }
   /**
    * Get a system message to inject into the conversation.
@@ -20186,7 +20620,7 @@ https://mastra.ai/en/docs/memory/overview`
         "The threads.generateTitle option has been moved. Use the top-level generateTitle option instead."
       );
     }
-    const mergedConfig = chunkMLKE7HRS_cjs.deepMerge(this.threadConfig, config || {});
+    const mergedConfig = chunkBC2VKOH4_cjs.deepMerge(this.threadConfig, config || {});
     if (typeof config?.workingMemory === "object" && config.workingMemory?.schema && typeof mergedConfig.workingMemory === "object") {
       mergedConfig.workingMemory.schema = config.workingMemory.schema;
     }
@@ -20247,15 +20681,16 @@ https://mastra.ai/en/docs/memory/overview`
    * @param configuredProcessors - Processors already configured by the user (for deduplication)
    * @returns Array of input processors configured for this memory instance
    */
-  getInputProcessors(configuredProcessors = [], context) {
+  async getInputProcessors(configuredProcessors = [], context) {
+    const memoryStore = await this.storage.getStore("memory");
     const processors = [];
     const memoryContext = context?.get("MastraMemory");
     const runtimeMemoryConfig = memoryContext?.memoryConfig;
     const effectiveConfig = runtimeMemoryConfig ? this.getMergedThreadConfig(runtimeMemoryConfig) : this.threadConfig;
     const isWorkingMemoryEnabled = typeof effectiveConfig.workingMemory === "object" && effectiveConfig.workingMemory.enabled !== false;
     if (isWorkingMemoryEnabled) {
-      if (!this.storage?.stores?.memory)
-        throw new chunkHWMMIRIF_cjs.MastraError({
+      if (!memoryStore)
+        throw new chunk4U7ZLI36_cjs.MastraError({
           category: "USER",
           domain: "STORAGE" /* STORAGE */,
           id: "WORKING_MEMORY_MISSING_STORAGE_ADAPTER",
@@ -20272,7 +20707,7 @@ https://mastra.ai/en/docs/memory/overview`
         }
         processors.push(
           new WorkingMemory({
-            storage: this.storage.stores.memory,
+            storage: memoryStore,
             template,
             scope: typeof effectiveConfig.workingMemory === "object" ? effectiveConfig.workingMemory.scope : void 0,
             useVNext: typeof effectiveConfig.workingMemory === "object" && "version" in effectiveConfig.workingMemory && effectiveConfig.workingMemory.version === "vnext",
@@ -20283,8 +20718,8 @@ https://mastra.ai/en/docs/memory/overview`
     }
     const lastMessages = effectiveConfig.lastMessages;
     if (lastMessages) {
-      if (!this.storage?.stores?.memory)
-        throw new chunkHWMMIRIF_cjs.MastraError({
+      if (!memoryStore)
+        throw new chunk4U7ZLI36_cjs.MastraError({
           category: "USER",
           domain: "STORAGE" /* STORAGE */,
           id: "MESSAGE_HISTORY_MISSING_STORAGE_ADAPTER",
@@ -20294,29 +20729,29 @@ https://mastra.ai/en/docs/memory/overview`
       if (!hasMessageHistory) {
         processors.push(
           new MessageHistory({
-            storage: this.storage.stores.memory,
+            storage: memoryStore,
             lastMessages: typeof lastMessages === "number" ? lastMessages : void 0
           })
         );
       }
     }
     if (effectiveConfig.semanticRecall) {
-      if (!this.storage?.stores?.memory)
-        throw new chunkHWMMIRIF_cjs.MastraError({
+      if (!memoryStore)
+        throw new chunk4U7ZLI36_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 chunkHWMMIRIF_cjs.MastraError({
+        throw new chunk4U7ZLI36_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 chunkHWMMIRIF_cjs.MastraError({
+        throw new chunk4U7ZLI36_cjs.MastraError({
           category: "USER",
           domain: "MASTRA_VECTOR" /* MASTRA_VECTOR */,
           id: "SEMANTIC_RECALL_MISSING_EMBEDDER",
@@ -20328,7 +20763,7 @@ https://mastra.ai/en/docs/memory/overview`
         const indexName = this.getEmbeddingIndexName();
         processors.push(
           new SemanticRecall({
-            storage: this.storage.stores.memory,
+            storage: memoryStore,
             vector: this.vector,
             embedder: this.embedder,
             indexName,
@@ -20345,7 +20780,8 @@ https://mastra.ai/en/docs/memory/overview`
    * @param configuredProcessors - Processors already configured by the user (for deduplication)
    * @returns Array of output processors configured for this memory instance
    */
-  getOutputProcessors(configuredProcessors = [], context) {
+  async getOutputProcessors(configuredProcessors = [], context) {
+    const memoryStore = await this.storage.getStore("memory");
     const processors = [];
     const memoryContext = context?.get("MastraMemory");
     const runtimeMemoryConfig = memoryContext?.memoryConfig;
@@ -20354,22 +20790,22 @@ https://mastra.ai/en/docs/memory/overview`
       return [];
     }
     if (effectiveConfig.semanticRecall) {
-      if (!this.storage?.stores?.memory)
-        throw new chunkHWMMIRIF_cjs.MastraError({
+      if (!memoryStore)
+        throw new chunk4U7ZLI36_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 chunkHWMMIRIF_cjs.MastraError({
+        throw new chunk4U7ZLI36_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 chunkHWMMIRIF_cjs.MastraError({
+        throw new chunk4U7ZLI36_cjs.MastraError({
           category: "USER",
           domain: "MASTRA_VECTOR" /* MASTRA_VECTOR */,
           id: "SEMANTIC_RECALL_MISSING_EMBEDDER",
@@ -20381,7 +20817,7 @@ https://mastra.ai/en/docs/memory/overview`
         const indexName = this.getEmbeddingIndexName();
         processors.push(
           new SemanticRecall({
-            storage: this.storage.stores.memory,
+            storage: memoryStore,
             vector: this.vector,
             embedder: this.embedder,
             indexName,
@@ -20392,8 +20828,8 @@ https://mastra.ai/en/docs/memory/overview`
     }
     const lastMessages = effectiveConfig.lastMessages;
     if (lastMessages) {
-      if (!this.storage?.stores?.memory)
-        throw new chunkHWMMIRIF_cjs.MastraError({
+      if (!memoryStore)
+        throw new chunk4U7ZLI36_cjs.MastraError({
           category: "USER",
           domain: "STORAGE" /* STORAGE */,
           id: "MESSAGE_HISTORY_MISSING_STORAGE_ADAPTER",
@@ -20403,7 +20839,7 @@ https://mastra.ai/en/docs/memory/overview`
       if (!hasMessageHistory) {
         processors.push(
           new MessageHistory({
-            storage: this.storage.stores.memory,
+            storage: memoryStore,
             lastMessages: typeof lastMessages === "number" ? lastMessages : void 0
           })
         );
@@ -20422,7 +20858,7 @@ var MockMemory = class extends MastraMemory {
   } = {}) {
     super({
       name: "mock",
-      storage: storage || new chunkLGB4VNZI_cjs.InMemoryStore(),
+      storage: storage || new chunkLOV5NNGK_cjs.InMemoryStore(),
       options: {
         workingMemory: enableWorkingMemory ? { enabled: true, template: workingMemoryTemplate } : void 0,
         lastMessages: enableMessageHistory ? 10 : void 0
@@ -20430,22 +20866,39 @@ var MockMemory = class extends MastraMemory {
     });
     this._hasOwnStorage = true;
   }
+  async getMemoryStore() {
+    const store = await this.storage.getStore("memory");
+    if (!store) {
+      throw new chunk4U7ZLI36_cjs.MastraError({
+        id: "MASTRA_MEMORY_STORAGE_NOT_AVAILABLE",
+        domain: "MASTRA_MEMORY" /* MASTRA_MEMORY */,
+        category: "SYSTEM" /* SYSTEM */,
+        text: "Memory storage is not supported by this storage adapter"
+      });
+    }
+    return store;
+  }
   async getThreadById({ threadId }) {
-    return this.storage.getThreadById({ threadId });
+    const memoryStorage = await this.getMemoryStore();
+    return memoryStorage.getThreadById({ threadId });
   }
   async saveThread({ thread }) {
-    return this.storage.saveThread({ thread });
+    const memoryStorage = await this.getMemoryStore();
+    return memoryStorage.saveThread({ thread });
   }
   async saveMessages({
     messages
   }) {
-    return this.storage.saveMessages({ messages });
+    const memoryStorage = await this.getMemoryStore();
+    return memoryStorage.saveMessages({ messages });
   }
   async listThreadsByResourceId(args) {
-    return this.storage.listThreadsByResourceId(args);
+    const memoryStorage = await this.getMemoryStore();
+    return memoryStorage.listThreadsByResourceId(args);
   }
   async recall(args) {
-    const result = await this.storage.listMessages({
+    const memoryStorage = await this.getMemoryStore();
+    const result = await memoryStorage.listMessages({
       threadId: args.threadId,
       resourceId: args.resourceId,
       perPage: args.perPage,
@@ -20457,11 +20910,13 @@ var MockMemory = class extends MastraMemory {
     return result;
   }
   async deleteThread(threadId) {
-    return this.storage.deleteThread({ threadId });
+    const memoryStorage = await this.getMemoryStore();
+    return memoryStorage.deleteThread({ threadId });
   }
   async deleteMessages(messageIds) {
+    const memoryStorage = await this.getMemoryStore();
     const ids = Array.isArray(messageIds) ? messageIds?.map((item) => typeof item === "string" ? item : item.id) : [messageIds];
-    return this.storage.deleteMessages(ids);
+    return memoryStorage.deleteMessages(ids);
   }
   async getWorkingMemory({
     threadId,
@@ -20478,12 +20933,17 @@ var MockMemory = class extends MastraMemory {
     if (!id) {
       return null;
     }
-    const resource = await this.storage.getResourceById({ resourceId: id });
+    const memoryStorage = await this.getMemoryStore();
+    const resource = await memoryStorage.getResourceById({ resourceId: id });
     return resource?.workingMemory || null;
   }
   listTools(_config) {
+    const mergedConfig = this.getMergedThreadConfig(_config);
+    if (!mergedConfig.workingMemory?.enabled) {
+      return {};
+    }
     return {
-      updateWorkingMemory: chunkZ55SJVEC_cjs.createTool({
+      updateWorkingMemory: chunk6HJFCSJ4_cjs.createTool({
         id: "update-working-memory",
         description: `Update the working memory with new information. Any data not included will be overwritten.`,
         inputSchema: z8__default.default.object({ memory: z8__default.default.string() }),
@@ -20566,7 +21026,8 @@ var MockMemory = class extends MastraMemory {
     if (!id) {
       throw new Error(`Cannot update working memory: ${scope} ID is required`);
     }
-    await this.storage.updateResource({
+    const memoryStorage = await this.getMemoryStore();
+    await memoryStorage.updateResource({
       resourceId: id,
       workingMemory
     });
@@ -20641,6 +21102,8 @@ exports.ToolCallFilter = ToolCallFilter;
 exports.ToolInvocationPartSchema = ToolInvocationPartSchema;
 exports.TripWire = TripWire;
 exports.UnicodeNormalizer = UnicodeNormalizer;
+exports.WORKING_MEMORY_END_TAG = WORKING_MEMORY_END_TAG;
+exports.WORKING_MEMORY_START_TAG = WORKING_MEMORY_START_TAG;
 exports.Workflow = Workflow;
 exports.WorkflowRunOutput = WorkflowRunOutput;
 exports.WorkingMemory = WorkingMemory;
@@ -20654,6 +21117,8 @@ exports.createDeprecationProxy = createDeprecationProxy;
 exports.createStep = createStep;
 exports.createTimeTravelExecutionParams = createTimeTravelExecutionParams;
 exports.createWorkflow = createWorkflow;
+exports.extractWorkingMemoryContent = extractWorkingMemoryContent;
+exports.extractWorkingMemoryTags = extractWorkingMemoryTags;
 exports.getResumeLabelsByStepId = getResumeLabelsByStepId;
 exports.getStepIds = getStepIds;
 exports.getStepResult = getStepResult;
@@ -20661,17 +21126,20 @@ exports.getZodErrors = getZodErrors;
 exports.hydrateSerializedStepErrors = hydrateSerializedStepErrors;
 exports.isProcessor = isProcessor;
 exports.isProcessorWorkflow = isProcessorWorkflow;
+exports.isSupportedLanguageModel = isSupportedLanguageModel;
 exports.loop = loop;
 exports.mapVariable = mapVariable;
 exports.memoryDefaultOptions = memoryDefaultOptions;
 exports.parseMemoryRequestContext = parseMemoryRequestContext;
+exports.removeWorkingMemoryTags = removeWorkingMemoryTags;
 exports.resolveThreadIdFromArgs = resolveThreadIdFromArgs;
 exports.runCountDeprecationMessage = runCountDeprecationMessage;
+exports.supportedLanguageModelSpecifications = supportedLanguageModelSpecifications;
 exports.tryGenerateWithJsonFallback = tryGenerateWithJsonFallback;
 exports.tryStreamWithJsonFallback = tryStreamWithJsonFallback;
 exports.validateStepInput = validateStepInput;
 exports.validateStepResumeData = validateStepResumeData;
 exports.validateStepStateData = validateStepStateData;
 exports.validateStepSuspendData = validateStepSuspendData;
-//# sourceMappingURL=chunk-R5AJGM55.cjs.map
-//# sourceMappingURL=chunk-R5AJGM55.cjs.map
+//# sourceMappingURL=chunk-DDK3URK2.cjs.map
+//# sourceMappingURL=chunk-DDK3URK2.cjs.map