@mastra/core 1.0.0-beta.14 → 1.0.0-beta.16

package/dist/{chunk-JAGQZZ43.cjs → chunk-5DL6Y7PJ.cjs}

@@ -1,20 +1,20 @@
 'use strict';
 
-var chunkOOUFPYSX_cjs = require('./chunk-OOUFPYSX.cjs');
+var chunkSSB4AVHU_cjs = require('./chunk-SSB4AVHU.cjs');
 var chunkL3NKIMF5_cjs = require('./chunk-L3NKIMF5.cjs');
-var chunkETWAR2YE_cjs = require('./chunk-ETWAR2YE.cjs');
-var chunk72E3YF6A_cjs = require('./chunk-72E3YF6A.cjs');
+var chunkOXV6QFSV_cjs = require('./chunk-OXV6QFSV.cjs');
+var chunkEMLEZXTQ_cjs = require('./chunk-EMLEZXTQ.cjs');
 var chunkNESKUIRE_cjs = require('./chunk-NESKUIRE.cjs');
 var chunkFVQTJUBD_cjs = require('./chunk-FVQTJUBD.cjs');
-var chunk53SZJCBX_cjs = require('./chunk-53SZJCBX.cjs');
-var chunkTRUNX3AX_cjs = require('./chunk-TRUNX3AX.cjs');
+var chunk4KVIXN7K_cjs = require('./chunk-4KVIXN7K.cjs');
+var chunk7KL2YFFK_cjs = require('./chunk-7KL2YFFK.cjs');
 var chunk4D4KB75Y_cjs = require('./chunk-4D4KB75Y.cjs');
 var chunkMR7ZWBL6_cjs = require('./chunk-MR7ZWBL6.cjs');
-var chunkO3ULBGV6_cjs = require('./chunk-O3ULBGV6.cjs');
-var chunk72YCRTEX_cjs = require('./chunk-72YCRTEX.cjs');
-var chunkHWMMIRIF_cjs = require('./chunk-HWMMIRIF.cjs');
+var chunkAQ22JIR7_cjs = require('./chunk-AQ22JIR7.cjs');
+var chunkZSZOYPSJ_cjs = require('./chunk-ZSZOYPSJ.cjs');
+var chunk4U7ZLI36_cjs = require('./chunk-4U7ZLI36.cjs');
 var chunkKJBMTK5B_cjs = require('./chunk-KJBMTK5B.cjs');
-var chunkZ55SJVEC_cjs = require('./chunk-Z55SJVEC.cjs');
+var chunk6YUHA5UH_cjs = require('./chunk-6YUHA5UH.cjs');
 var chunkUVHSM2GU_cjs = require('./chunk-UVHSM2GU.cjs');
 var chunk4WQYXT2I_cjs = require('./chunk-4WQYXT2I.cjs');
 var chunkDGV2FWB4_cjs = require('./chunk-DGV2FWB4.cjs');
@@ -529,7 +529,8 @@ function prepareToolsAndToolChoice({
 // src/stream/aisdk/v5/compat/consume-stream.ts
 async function consumeStream({
   stream,
-  onError
+  onError,
+  logger
 }) {
   const reader = stream.getReader();
   try {
@@ -538,7 +539,7 @@ async function consumeStream({
       if (done) break;
     }
   } catch (error) {
-    console.error("consumeStream error", error);
+    logger?.error("consumeStream error", error);
     onError?.(error);
   } finally {
     reader.releaseLock();
@@ -557,9 +558,10 @@ var StructuredOutputProcessor = class {
   isStructuringAgentStreamStarted = false;
   jsonPromptInjection;
   providerOptions;
+  logger;
   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 */,
@@ -567,7 +569,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 */,
@@ -579,6 +581,7 @@ var StructuredOutputProcessor = class {
     this.fallbackValue = options.fallbackValue;
     this.jsonPromptInjection = options.jsonPromptInjection;
     this.providerOptions = options.providerOptions;
+    this.logger = options.logger;
     this.structuringAgent = new Agent({
       id: "structured-output-structurer",
       name: "structured-output-structurer",
@@ -744,14 +747,14 @@ The input text may be in any format (sentences, bullet points, paragraphs, etc.)
     const message = `[StructuredOutputProcessor] ${context}: ${error}`;
     switch (this.errorStrategy) {
       case "strict":
-        console.error(message);
+        this.logger?.error(message);
         abort(message);
         break;
       case "warn":
-        console.warn(message);
+        this.logger?.warn(message);
         break;
       case "fallback":
-        console.info(`${message} (using fallback)`);
+        this.logger?.info(`${message} (using fallback)`);
         break;
     }
   }
@@ -764,7 +767,7 @@ var isSupportedLanguageModel = (model) => {
 };
 async function tryGenerateWithJsonFallback(agent, prompt, options) {
   if (!options.structuredOutput?.schema) {
-    throw new chunkHWMMIRIF_cjs.MastraError({
+    throw new chunk4U7ZLI36_cjs.MastraError({
       id: "STRUCTURED_OUTPUT_OPTIONS_REQUIRED",
       domain: "AGENT" /* AGENT */,
       category: "USER" /* USER */,
@@ -783,7 +786,7 @@ async function tryGenerateWithJsonFallback(agent, prompt, options) {
 }
 async function tryStreamWithJsonFallback(agent, prompt, options) {
   if (!options.structuredOutput?.schema) {
-    throw new chunkHWMMIRIF_cjs.MastraError({
+    throw new chunk4U7ZLI36_cjs.MastraError({
       id: "STRUCTURED_OUTPUT_OPTIONS_REQUIRED",
       domain: "AGENT" /* AGENT */,
       category: "USER" /* USER */,
@@ -794,7 +797,7 @@ async function tryStreamWithJsonFallback(agent, prompt, options) {
     const result = await agent.stream(prompt, options);
     const object = await result.object;
     if (!object) {
-      throw new chunkHWMMIRIF_cjs.MastraError({
+      throw new chunk4U7ZLI36_cjs.MastraError({
         id: "STRUCTURED_OUTPUT_OBJECT_UNDEFINED",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
@@ -833,8 +836,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
       },
@@ -900,7 +904,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",
@@ -912,7 +916,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",
@@ -933,8 +937,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
           },
@@ -975,8 +981,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
         },
@@ -992,9 +1000,9 @@ var ProcessorRunner = class _ProcessorRunner {
         retryCount
       });
       const mutations = messageList.stopRecording();
-      if (result instanceof chunk72E3YF6A_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",
@@ -1211,8 +1219,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
           },
@@ -1255,8 +1265,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
         },
@@ -1274,9 +1286,9 @@ var ProcessorRunner = class _ProcessorRunner {
         retryCount
       });
       let mutations;
-      if (result instanceof chunk72E3YF6A_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",
@@ -1379,8 +1391,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
           },
@@ -1439,8 +1453,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
         },
@@ -1533,6 +1549,7 @@ var ProcessorRunner = class _ProcessorRunner {
    */
   async runProcessOutputStep(args) {
     const {
+      steps,
       messageList,
       stepNumber,
       finishReason,
@@ -1552,8 +1569,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
           },
@@ -1572,6 +1591,7 @@ var ProcessorRunner = class _ProcessorRunner {
               toolCalls,
               text,
               systemMessages: currentSystemMessages2,
+              steps,
               retryCount
             },
             tracingContext,
@@ -1600,8 +1620,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
         },
@@ -1618,15 +1640,16 @@ var ProcessorRunner = class _ProcessorRunner {
           toolCalls,
           text,
           systemMessages: currentSystemMessages,
+          steps,
           abort,
           tracingContext: { currentSpan: processorSpan },
           requestContext,
           retryCount
         });
         const mutations = messageList.stopRecording();
-        if (result instanceof chunk72E3YF6A_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",
@@ -1694,9 +1717,9 @@ var ProcessorRunner = class _ProcessorRunner {
     processor,
     stepNumber
   }) {
-    if (result instanceof chunk72E3YF6A_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",
@@ -1712,7 +1735,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",
@@ -1720,7 +1743,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",
@@ -1729,10 +1752,10 @@ var ProcessorRunner = class _ProcessorRunner {
       }
       const { model: _model, ...rest } = result;
       if (result.model) {
-        const resolvedModel = await chunk53SZJCBX_cjs.resolveModelConfig(result.model);
+        const resolvedModel = await chunk4KVIXN7K_cjs.resolveModelConfig(result.model);
         const isSupported = isSupportedLanguageModel(resolvedModel);
         if (!isSupported) {
-          throw new chunkHWMMIRIF_cjs.MastraError({
+          throw new chunk4U7ZLI36_cjs.MastraError({
             category: "USER",
             domain: "AGENT",
             id: "PROCESSOR_RETURNED_UNSUPPORTED_MODEL",
@@ -1932,7 +1955,7 @@ function convertFullStreamChunkToMastra(value, ctx) {
         from: "AGENT" /* AGENT */,
         payload: {
           stepResult: {
-            reason: value.finishReason
+            reason: normalizeFinishReason(value.finishReason)
           },
           output: {
             // Normalize usage to handle both V2 (flat) and V3 (nested) formats
@@ -2040,7 +2063,7 @@ function convertMastraChunkToAISDKv5({
       if (mode === "generate") {
         return {
           type: "file",
-          file: new chunk72E3YF6A_cjs.DefaultGeneratedFile({
+          file: new chunkEMLEZXTQ_cjs.DefaultGeneratedFile({
             data: chunk.payload.data,
             mediaType: chunk.payload.mimeType
           })
@@ -2048,7 +2071,7 @@ function convertMastraChunkToAISDKv5({
       }
       return {
         type: "file",
-        file: new chunk72E3YF6A_cjs.DefaultGeneratedFileWithType({
+        file: new chunkEMLEZXTQ_cjs.DefaultGeneratedFileWithType({
           data: chunk.payload.data,
           mediaType: chunk.payload.mimeType
         })
@@ -2200,6 +2223,21 @@ function normalizeUsage(usage) {
     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 {
@@ -2449,7 +2487,6 @@ var AISDKV5OutputStream = class {
   async getFullOutput() {
     await this.consumeStream({
       onError: (error) => {
-        console.error(error);
         throw error;
       }
     });
@@ -2641,7 +2678,7 @@ var BaseFormatHandler = class {
         } else {
           return {
             success: false,
-            error: new chunkHWMMIRIF_cjs.MastraError(
+            error: new chunk4U7ZLI36_cjs.MastraError(
               {
                 domain: "AGENT" /* AGENT */,
                 category: "SYSTEM" /* SYSTEM */,
@@ -3528,7 +3565,7 @@ var MastraModelOutput = class extends chunkDGV2FWB4_cjs.MastraBase {
                   );
                   const responseMessages = self.messageList.get.response.aiV4.core();
                   const lastResponseMessage = responseMessages[responseMessages.length - 1];
-                  const outputText = lastResponseMessage ? chunk72E3YF6A_cjs.MessageList.coreContentToString(lastResponseMessage.content) : "";
+                  const outputText = lastResponseMessage ? chunkEMLEZXTQ_cjs.MessageList.coreContentToString(lastResponseMessage.content) : "";
                   if (lastStep && outputText && outputText !== originalText) {
                     lastStep.text = outputText;
                   }
@@ -3563,7 +3600,7 @@ var MastraModelOutput = class extends chunkDGV2FWB4_cjs.MastraBase {
                     text: ""
                   });
                 } else {
-                  self.#error = chunkHWMMIRIF_cjs.getErrorFromUnknown(error2, {
+                  self.#error = chunk4U7ZLI36_cjs.getErrorFromUnknown(error2, {
                     fallbackMessage: "Unknown error in stream"
                   });
                   self.resolvePromises({
@@ -3640,7 +3677,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;
@@ -3707,7 +3744,7 @@ var MastraModelOutput = class extends chunkDGV2FWB4_cjs.MastraBase {
   }
   resolvePromise(key, value) {
     if (!(key in this.#delayedPromises)) {
-      throw new chunkHWMMIRIF_cjs.MastraError({
+      throw new chunk4U7ZLI36_cjs.MastraError({
         id: "MASTRA_MODEL_OUTPUT_INVALID_PROMISE_KEY",
         domain: "LLM" /* LLM */,
         category: "SYSTEM" /* SYSTEM */,
@@ -3866,7 +3903,8 @@ var MastraModelOutput = class extends chunkDGV2FWB4_cjs.MastraBase {
     try {
       await consumeStream({
         stream: this.#baseStream,
-        onError: options?.onError
+        onError: options?.onError,
+        logger: this.logger
       });
     } catch (error) {
       options?.onError?.(error);
@@ -3878,7 +3916,7 @@ var MastraModelOutput = class extends chunkDGV2FWB4_cjs.MastraBase {
   async getFullOutput() {
     await this.consumeStream({
       onError: (error) => {
-        console.error(error);
+        this.logger.error("Error consuming stream", error);
         throw error;
       }
     });
@@ -4372,6 +4410,8 @@ var WorkflowRunOutput = class {
             } else {
               self.#status = "failed";
             }
+          } else if (chunk.type === "workflow-paused") {
+            self.#status = "paused";
           }
         },
         close() {
@@ -4507,6 +4547,8 @@ var WorkflowRunOutput = class {
             } else {
               self.#status = "failed";
             }
+          } else if (chunk.type === "workflow-paused") {
+            self.#status = "paused";
           }
         },
         close() {
@@ -5091,7 +5133,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 */,
@@ -5119,7 +5161,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 */,
@@ -5150,7 +5192,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 */,
@@ -5231,7 +5273,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 = {};
@@ -5298,11 +5340,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 = chunkO3ULBGV6_cjs.removeUndefinedValues(result);
+        const formattedResult = chunkAQ22JIR7_cjs.removeUndefinedValues(result);
         stepResults[stepId] = formattedResult;
       }
     });
@@ -5327,7 +5370,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 });
       }
     }
   }
@@ -5353,7 +5396,8 @@ async function executeParallel(engine, params) {
     abortController,
     requestContext,
     outputWriter,
-    disableScorers
+    disableScorers,
+    perStep
   } = params;
   const parallelSpan = tracingContext.currentSpan?.createChildSpan({
     type: "workflow_parallel" /* WORKFLOW_PARALLEL */,
@@ -5375,7 +5419,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;
@@ -5387,6 +5431,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();
@@ -5398,6 +5445,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,
@@ -5426,7 +5476,8 @@ async function executeParallel(engine, params) {
         abortController,
         requestContext,
         outputWriter,
-        disableScorers
+        disableScorers,
+        perStep
       });
       engine.applyMutableContext(executionContext, stepExecResult.mutableContext);
       Object.assign(stepResults, stepExecResult.stepResults);
@@ -5487,7 +5538,8 @@ async function executeConditional(engine, params) {
     abortController,
     requestContext,
     outputWriter,
-    disableScorers
+    disableScorers,
+    perStep
   } = params;
   const conditionalSpan = tracingContext.currentSpan?.createChildSpan({
     type: "workflow_conditional" /* WORKFLOW_CONDITIONAL */,
@@ -5560,8 +5612,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 */,
@@ -5582,7 +5634,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,
@@ -5629,7 +5692,8 @@ async function executeConditional(engine, params) {
         abortController,
         requestContext,
         outputWriter,
-        disableScorers
+        disableScorers,
+        perStep
       });
       engine.applyMutableContext(executionContext, stepExecResult.mutableContext);
       Object.assign(stepResults, stepExecResult.stepResults);
@@ -5691,7 +5755,8 @@ async function executeLoop(engine, params) {
     requestContext,
     outputWriter,
     disableScorers,
-    serializedStepGraph
+    serializedStepGraph,
+    perStep
   } = params;
   const { step, condition } = entry;
   const loopSpan = tracingContext.currentSpan?.createChildSpan({
@@ -5732,7 +5797,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);
@@ -5753,7 +5819,7 @@ async function executeLoop(engine, params) {
     const evalSpan = loopSpan?.createChildSpan({
       type: "workflow_conditional_eval" /* WORKFLOW_CONDITIONAL_EVAL */,
       name: `condition: '${entry.loopType}'`,
-      input: chunkO3ULBGV6_cjs.selectFields(result.output, ["stepResult", "output.text", "output.object", "messages"]),
+      input: chunkAQ22JIR7_cjs.selectFields(result.output, ["stepResult", "output.text", "output.object", "messages"]),
       attributes: {
         conditionIndex: iteration
       },
@@ -5832,7 +5898,8 @@ async function executeForeach(engine, params) {
     requestContext,
     outputWriter,
     disableScorers,
-    serializedStepGraph
+    serializedStepGraph,
+    perStep
   } = params;
   const { step, opts } = entry;
   const results = [];
@@ -5909,7 +5976,8 @@ async function executeForeach(engine, params) {
           skipEmits: true,
           outputWriter,
           disableScorers,
-          serializedStepGraph
+          serializedStepGraph,
+          perStep
         });
         engine.applyMutableContext(executionContext, stepExecResult.mutableContext);
         Object.assign(stepResults, stepExecResult.stepResults);
@@ -6051,7 +6119,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,
@@ -6093,7 +6162,8 @@ async function executeEntry(engine, params) {
     abortController,
     requestContext,
     outputWriter,
-    disableScorers
+    disableScorers,
+    perStep
   } = params;
   const prevOutput = engine.getStepOutput(stepResults, prevStep);
   let execResults;
@@ -6117,7 +6187,8 @@ async function executeEntry(engine, params) {
       requestContext,
       outputWriter,
       disableScorers,
-      serializedStepGraph
+      serializedStepGraph,
+      perStep
     });
     execResults = stepExecResult.result;
     engine.applyMutableContext(executionContext, stepExecResult.mutableContext);
@@ -6149,7 +6220,8 @@ async function executeEntry(engine, params) {
       abortController,
       requestContext,
       outputWriter,
-      disableScorers
+      disableScorers,
+      perStep
     });
     engine.applyMutableContext(executionContext, resumedStepResult.mutableContext);
     Object.assign(stepResults, resumedStepResult.stepResults);
@@ -6219,7 +6291,8 @@ async function executeEntry(engine, params) {
       abortController,
       requestContext,
       outputWriter,
-      disableScorers
+      disableScorers,
+      perStep
     });
   } else if (entry.type === "conditional") {
     execResults = await engine.executeConditional({
@@ -6238,7 +6311,8 @@ async function executeEntry(engine, params) {
       abortController,
       requestContext,
       outputWriter,
-      disableScorers
+      disableScorers,
+      perStep
     });
   } else if (entry.type === "loop") {
     execResults = await engine.executeLoop({
@@ -6258,7 +6332,8 @@ async function executeEntry(engine, params) {
       requestContext,
       outputWriter,
       disableScorers,
-      serializedStepGraph
+      serializedStepGraph,
+      perStep
     });
   } else if (entry.type === "foreach") {
     execResults = await engine.executeForeach({
@@ -6278,7 +6353,8 @@ async function executeEntry(engine, params) {
       requestContext,
       outputWriter,
       disableScorers,
-      serializedStepGraph
+      serializedStepGraph,
+      perStep
     });
   } else if (entry.type === "sleep") {
     const startedAt = Date.now();
@@ -6690,7 +6766,8 @@ async function executeStep(engine, params) {
     disableScorers,
     serializedStepGraph,
     tracingContext,
-    iterationCount
+    iterationCount,
+    perStep
   } = params;
   const stepCallId = crypto2.randomUUID();
   const { inputData, validationError } = await validateStepInput({
@@ -6732,10 +6809,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`;
@@ -6777,7 +6853,8 @@ async function executeStep(engine, params) {
       requestContext,
       tracingContext,
       outputWriter,
-      stepSpan
+      stepSpan,
+      perStep
     });
     if (workflowResult !== null) {
       const stepResult2 = { ...stepInfo, ...workflowResult };
@@ -6823,7 +6900,7 @@ async function executeStep(engine, params) {
         runId,
         resourceId,
         workflowId,
-        mastra: engine.mastra ? chunk72YCRTEX_cjs.wrapMastra(engine.mastra, { currentSpan: stepSpan }) : void 0,
+        mastra: engine.mastra ? chunkZSZOYPSJ_cjs.wrapMastra(engine.mastra, { currentSpan: stepSpan }) : void 0,
         requestContext,
         inputData,
         state: executionContext.state,
@@ -6909,12 +6986,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 }
   );
@@ -6953,6 +7033,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() };
     }
@@ -6998,8 +7080,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 */,
@@ -7217,11 +7299,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 */,
@@ -7263,7 +7345,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"
     });
@@ -7376,13 +7458,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 */,
@@ -7440,7 +7523,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;
@@ -7479,13 +7563,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({
@@ -7694,7 +7812,7 @@ function createStep(params, agentOptions) {
       component: params.component
     };
   }
-  if (params instanceof chunkZ55SJVEC_cjs.Tool) {
+  if (params instanceof chunk6YUHA5UH_cjs.Tool) {
     if (!params.inputSchema || !params.outputSchema) {
       throw new Error("Tool must have input and output schemas defined");
     }
@@ -7788,7 +7906,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 chunk72E3YF6A_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,
@@ -7811,7 +7929,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",
@@ -7841,9 +7959,9 @@ function createStep(params, agentOptions) {
                   }
                 }
               };
-              if (result instanceof chunk72E3YF6A_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",
@@ -7875,7 +7993,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",
@@ -7937,7 +8055,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",
@@ -7966,9 +8084,9 @@ function createStep(params, agentOptions) {
                   }
                 }
               };
-              if (result instanceof chunk72E3YF6A_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",
@@ -8000,7 +8118,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",
@@ -8017,7 +8135,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));
@@ -8034,9 +8153,9 @@ function createStep(params, agentOptions) {
                   }
                 }
               };
-              if (result instanceof chunk72E3YF6A_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",
@@ -8101,7 +8220,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 chunk6YUHA5UH_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);
@@ -8272,7 +8391,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 */,
@@ -8283,8 +8402,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 });
@@ -8340,7 +8459,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;
@@ -8558,7 +8685,8 @@ var Workflow = class extends chunkDGV2FWB4_cjs.MastraBase {
       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,
@@ -8623,7 +8751,8 @@ var Workflow = class extends chunkDGV2FWB4_cjs.MastraBase {
     retryCount,
     tracingContext,
     outputWriter,
-    validateInputs
+    validateInputs,
+    perStep
   }) {
     this.__registerMastra(mastra);
     const effectiveValidateInputs = validateInputs ?? this.#options.validateInputs ?? true;
@@ -8671,7 +8800,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 });
@@ -8683,7 +8813,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({
@@ -8692,7 +8823,8 @@ var Workflow = class extends chunkDGV2FWB4_cjs.MastraBase {
         tracingContext,
         outputWriter,
         initialState: state,
-        outputOptions: { includeState: true, includeResumeLabels: true }
+        outputOptions: { includeState: true, includeResumeLabels: true },
+        perStep
       });
     }
     unwatch();
@@ -8728,7 +8860,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" });
@@ -8765,7 +8902,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) {
@@ -8774,7 +8916,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 }) {
@@ -8783,7 +8930,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 {};
@@ -8825,7 +8977,12 @@ var Workflow = class extends chunkDGV2FWB4_cjs.MastraBase {
       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;
@@ -8984,7 +9141,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: {
@@ -9062,15 +9220,15 @@ var Run = class {
     tracingContext,
     tracingOptions,
     format,
-    outputOptions
+    outputOptions,
+    perStep
   }) {
-    const workflowSpan = chunk72YCRTEX_cjs.getOrCreateSpan({
+    const workflowSpan = chunkZSZOYPSJ_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
@@ -9100,7 +9258,8 @@ var Run = class {
       outputWriter,
       workflowSpan,
       format,
-      outputOptions
+      outputOptions,
+      perStep
     });
     if (result.status !== "suspended") {
       this.cleanup?.();
@@ -9125,7 +9284,7 @@ var Run = class {
    */
   async startAsync(args) {
     this._start(args).catch((err) => {
-      console.error(`[Workflow ${this.workflowId}] Background execution failed:`, err);
+      this.mastra?.getLogger()?.error(`[Workflow ${this.workflowId}] Background execution failed:`, err);
     });
     return { runId: this.runId };
   }
@@ -9174,7 +9333,7 @@ var Run = class {
       try {
         await writer.close();
       } catch (err) {
-        console.error("Error closing stream:", err);
+        this.mastra?.getLogger()?.error("Error closing stream:", err);
       } finally {
         writer.releaseLock();
       }
@@ -9232,7 +9391,7 @@ var Run = class {
       try {
         await writer.close();
       } catch (err) {
-        console.error("Error closing stream:", err);
+        this.mastra?.getLogger()?.error("Error closing stream:", err);
       } finally {
         writer.releaseLock();
       }
@@ -9267,9 +9426,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
@@ -9283,7 +9443,8 @@ var Run = class {
     tracingOptions,
     closeOnSuspend = true,
     initialState,
-    outputOptions
+    outputOptions,
+    perStep
   } = {}) {
     if (this.closeStreamAction && this.streamOutput) {
       return this.streamOutput;
@@ -9322,7 +9483,7 @@ var Run = class {
               controller.close();
             }
           } catch (err) {
-            console.error("Error closing stream:", err);
+            self.mastra?.getLogger()?.error("Error closing stream:", err);
           }
         };
         const executionResultsPromise = self._start({
@@ -9338,7 +9499,8 @@ var Run = class {
               runId: self.runId,
               data: chunk
             });
-          }
+          },
+          perStep
         });
         let executionResults;
         try {
@@ -9380,7 +9542,8 @@ var Run = class {
     requestContext,
     tracingContext,
     tracingOptions,
-    outputOptions
+    outputOptions,
+    perStep
   } = {}) {
     return this.resumeStreamVNext({
       resumeData,
@@ -9388,7 +9551,8 @@ var Run = class {
       requestContext,
       tracingContext,
       tracingOptions,
-      outputOptions
+      outputOptions,
+      perStep
     });
   }
   /**
@@ -9403,7 +9567,8 @@ var Run = class {
     tracingContext,
     tracingOptions,
     forEachIndex,
-    outputOptions
+    outputOptions,
+    perStep
   } = {}) {
     this.closeStreamAction = async () => {
     };
@@ -9439,7 +9604,7 @@ var Run = class {
               controller.close();
             }
           } catch (err) {
-            console.error("Error closing stream:", err);
+            self.mastra?.getLogger()?.error("Error closing stream:", err);
           }
         };
         const executionResultsPromise = self._resume({
@@ -9453,7 +9618,8 @@ var Run = class {
           },
           isVNext: true,
           forEachIndex,
-          outputOptions
+          outputOptions,
+          perStep
         });
         self.executionResults = executionResultsPromise;
         let executionResults;
@@ -9490,14 +9656,22 @@ var Run = class {
     const nestedWatchCb = (event) => {
       if (event.runId === this.runId) {
         const { event: nestedEvent, workflowId } = event.data;
-        void this.pubsub.publish(`workflow.events.v2.${this.runId}`, {
-          type: "watch",
-          runId: this.runId,
-          data: {
-            ...nestedEvent,
-            ...nestedEvent.payload?.id ? { payload: { ...nestedEvent.payload, id: `${workflowId}.${nestedEvent.payload.id}` } } : {}
-          }
-        });
+        if (nestedEvent.type.startsWith("data-") && nestedEvent.data !== void 0) {
+          void this.pubsub.publish(`workflow.events.v2.${this.runId}`, {
+            type: "watch",
+            runId: this.runId,
+            data: nestedEvent
+          });
+        } else {
+          void this.pubsub.publish(`workflow.events.v2.${this.runId}`, {
+            type: "watch",
+            runId: this.runId,
+            data: {
+              ...nestedEvent,
+              ...nestedEvent.payload?.id ? { payload: { ...nestedEvent.payload, id: `${workflowId}.${nestedEvent.payload.id}` } } : {}
+            }
+          });
+        }
       }
     };
     void this.pubsub.subscribe(`workflow.events.v2.${this.runId}`, wrappedCb);
@@ -9524,7 +9698,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
     });
@@ -9596,13 +9771,12 @@ var Run = class {
         requestContextToUse.set(key, value);
       }
     });
-    const workflowSpan = chunk72YCRTEX_cjs.getOrCreateSpan({
+    const workflowSpan = chunkZSZOYPSJ_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
@@ -9637,7 +9811,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(() => {
@@ -9661,7 +9836,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
     });
@@ -9707,12 +9883,11 @@ var Run = class {
         requestContextToUse.set(key, value);
       }
     }
-    const workflowSpan = chunk72YCRTEX_cjs.getOrCreateSpan({
+    const workflowSpan = chunkZSZOYPSJ_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
@@ -9756,12 +9931,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
     });
@@ -9791,7 +9968,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 ?? {})) {
@@ -9799,13 +9977,12 @@ var Run = class {
         requestContextToUse.set(key, value);
       }
     }
-    const workflowSpan = chunk72YCRTEX_cjs.getOrCreateSpan({
+    const workflowSpan = chunkZSZOYPSJ_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
@@ -9831,7 +10008,8 @@ var Run = class {
       abortController: this.abortController,
       outputWriter,
       workflowSpan,
-      outputOptions
+      outputOptions,
+      perStep
     });
     if (result.status !== "suspended") {
       this.cleanup?.();
@@ -9852,7 +10030,8 @@ var Run = class {
     requestContext,
     tracingContext,
     tracingOptions,
-    outputOptions
+    outputOptions,
+    perStep
   }) {
     this.closeStreamAction = async () => {
     };
@@ -9877,7 +10056,7 @@ var Run = class {
               controller.close();
             }
           } catch (err) {
-            console.error("Error closing stream:", err);
+            self.mastra?.getLogger()?.error("Error closing stream:", err);
           }
         };
         const executionResultsPromise = self._timeTravel({
@@ -9893,7 +10072,8 @@ var Run = class {
           outputWriter: async (chunk) => {
             void controller.enqueue(chunk);
           },
-          outputOptions
+          outputOptions,
+          perStep
         });
         self.executionResults = executionResultsPromise;
         let executionResults;
@@ -10321,7 +10501,8 @@ async function processOutputStream({
   options,
   controller,
   responseFromModel,
-  includeRawChunks
+  includeRawChunks,
+  logger
 }) {
   for await (const chunk of outputStream._getBaseStream()) {
     if (!chunk) {
@@ -10404,7 +10585,7 @@ async function processOutputStream({
               abortSignal: options?.abortSignal
             });
           } catch (error2) {
-            console.error("Error calling onInputStart", error2);
+            logger?.error("Error calling onInputStart", error2);
           }
         }
         if (isControllerOpen(controller)) {
@@ -10423,7 +10604,7 @@ async function processOutputStream({
               abortSignal: options?.abortSignal
             });
           } catch (error2) {
-            console.error("Error calling onInputDelta", error2);
+            logger?.error("Error calling onInputDelta", error2);
           }
         }
         if (isControllerOpen(controller)) {
@@ -10498,7 +10679,8 @@ async function processOutputStream({
         messageList.add(message, "response");
         runState.setState({
           isReasoning: false,
-          reasoningDeltas: []
+          reasoningDeltas: [],
+          providerOptions: void 0
         });
         if (isControllerOpen(controller)) {
           controller.enqueue(chunk);
@@ -10582,7 +10764,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 } });
@@ -10612,7 +10794,7 @@ async function processOutputStream({
     }
   }
 }
-function executeStreamWithFallbackModels(models) {
+function executeStreamWithFallbackModels(models, logger) {
   return async (callback) => {
     let index = 0;
     let finalResult;
@@ -10632,8 +10814,11 @@ function executeStreamWithFallbackModels(models) {
           done = true;
           break;
         } catch (err) {
+          if (err instanceof TripWire) {
+            throw err;
+          }
           attempt++;
-          console.error(`Error executing model ${modelConfig.model.modelId}, attempt ${attempt}====`, err);
+          logger?.error(`Error executing model ${modelConfig.model.modelId}, attempt ${attempt}====`, err);
           if (attempt > maxRetries) {
             break;
           }
@@ -10643,7 +10828,7 @@ function executeStreamWithFallbackModels(models) {
       }
     }
     if (typeof finalResult === "undefined") {
-      console.error("Exhausted all fallback models and reached the maximum number of retries.");
+      logger?.error("Exhausted all fallback models and reached the maximum number of retries.");
       throw new Error("Exhausted all fallback models and reached the maximum number of retries.");
     }
     return finalResult;
@@ -10684,11 +10869,15 @@ function createLLMExecutionStep({
     inputSchema: llmIterationOutputSchema,
     outputSchema: llmIterationOutputSchema,
     execute: async ({ inputData, bail, tracingContext }) => {
+      modelSpanTracker?.startStep();
       let modelResult;
       let warnings;
       let request;
       let rawResponse;
-      const { outputStream, callBail, runState, stepTools } = await executeStreamWithFallbackModels(models)(async (modelConfig, isLastModel) => {
+      const { outputStream, callBail, runState, stepTools } = await executeStreamWithFallbackModels(
+        models,
+        logger
+      )(async (modelConfig, isLastModel) => {
         const model = modelConfig.model;
         const modelHeaders = modelConfig.headers;
         if (initialSystemMessages) {
@@ -10735,7 +10924,46 @@ function createLLMExecutionStep({
             });
             Object.assign(currentStep, processInputStepResult);
           } catch (error) {
-            console.error("Error in processInputStep processors:", 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
+              };
+            }
+            logger?.error("Error in processInputStep processors:", error);
             throw error;
           }
         }
@@ -10768,7 +10996,8 @@ 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;
               });
@@ -10776,7 +11005,7 @@ Analyse the suspended tools: ${JSON.stringify(suspendedTools)}, using the messag
           }
         }
         if (isSupportedLanguageModel(currentStep.model)) {
-          modelResult = chunk72YCRTEX_cjs.executeWithContextSync({
+          modelResult = chunkZSZOYPSJ_cjs.executeWithContextSync({
             span: modelSpanTracker?.getTracingContext()?.currentSpan,
             fn: () => execute({
               runId,
@@ -10860,10 +11089,11 @@ Analyse the suspended tools: ${JSON.stringify(suspendedTools)}, using the messag
               warnings,
               request,
               rawResponse
-            }
+            },
+            logger
           });
         } catch (error) {
-          console.error("Error in LLM Execution Step", error);
+          logger?.error("Error in LLM Execution Step", error);
           if (providerUtilsV5.isAbortError(error) && options?.abortSignal?.aborted) {
             await options?.onAbort?.({
               steps: inputData?.output?.steps ?? []
@@ -10982,6 +11212,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,
@@ -10996,7 +11227,7 @@ Analyse the suspended tools: ${JSON.stringify(suspendedTools)}, using the messag
           if (error instanceof TripWire) {
             processOutputStepTripwire = error;
           } else {
-            console.error("Error in processOutputStep processors:", error);
+            logger?.error("Error in processOutputStep processors:", error);
             throw error;
           }
         }
@@ -11262,7 +11493,8 @@ function createToolCallStep({
   runId,
   streamState,
   modelSpanTracker,
-  _internal
+  _internal,
+  logger
 }) {
   return createStep({
     id: "toolCallStep",
@@ -11329,7 +11561,7 @@ function createToolCallStep({
             try {
               await saveQueueManager.flushMessages(messageList, threadId, memoryConfig);
             } catch (error) {
-              console.error("Error removing tool suspension metadata:", error);
+              logger?.error("Error removing tool suspension metadata:", error);
             }
           }
         }
@@ -11353,7 +11585,7 @@ function createToolCallStep({
           }
           await saveQueueManager.flushMessages(messageList, threadId, memoryConfig);
         } catch (error) {
-          console.error("Error flushing messages before suspension:", error);
+          logger?.error("Error flushing messages before suspension:", error);
         }
       };
       if (inputData.providerExecuted) {
@@ -11374,7 +11606,7 @@ function createToolCallStep({
             abortSignal: options?.abortSignal
           });
         } catch (error) {
-          console.error("Error calling onInputAvailable", error);
+          logger?.error("Error calling onInputAvailable", error);
         }
       }
       if (!tool2.execute) {
@@ -11391,7 +11623,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) {
+            logger?.error(`Error evaluating needsApprovalFn for tool ${inputData.toolName}:`, error);
+            toolRequiresApproval = true;
+          }
+        }
+        if (toolRequiresApproval) {
           if (!resumeData) {
             controller.enqueue({
               type: "tool-call-approval",
@@ -11492,7 +11734,7 @@ function createToolCallStep({
               abortSignal: options?.abortSignal
             });
           } catch (error) {
-            console.error("Error calling onOutput", error);
+            logger?.error("Error calling onOutput", error);
           }
         }
         return { result, ...inputData };
@@ -11654,11 +11896,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);
@@ -11801,7 +12042,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({
@@ -11862,7 +12103,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 */
@@ -11979,7 +12220,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 */
@@ -12104,8 +12345,6 @@ var MastraLLMVNext = class extends chunkDGV2FWB4_cjs.MastraBase {
         messages: [...messageList.getSystemMessages(), ...messages]
       },
       attributes: {
-        agentId,
-        agentName,
         model: firstModel.modelId,
         provider: firstModel.provider,
         streaming: true,
@@ -12153,7 +12392,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 */,
@@ -12187,7 +12426,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 chunkO3ULBGV6_cjs.delay(10 * 1e3);
+              await chunkAQ22JIR7_cjs.delay(10 * 1e3);
             }
           },
           onFinish: async (props) => {
@@ -12212,7 +12451,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 */,
@@ -12250,7 +12489,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 */,
@@ -12397,7 +12636,7 @@ async function prepareMemoryStep({
       );
     }
   } else {
-    const messageList = new chunk72E3YF6A_cjs.MessageList({
+    const messageList = new chunkEMLEZXTQ_cjs.MessageList({
       threadId: thread?.id,
       resourceId: thread?.resourceId
     });
@@ -12753,7 +12992,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 */,
@@ -12880,7 +13119,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 */,
@@ -12892,7 +13131,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 */,
@@ -13017,7 +13256,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 */,
@@ -13026,7 +13265,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 */,
@@ -13039,7 +13278,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 */,
@@ -13264,7 +13503,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 */,
@@ -13397,15 +13636,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 = chunkZSZOYPSJ_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) : [],
@@ -13451,7 +13691,7 @@ var AgentLegacyHandler = class {
           methodType: methodType === "generate" ? "generateLegacy" : "streamLegacy",
           memoryConfig
         });
-        let messageList = new chunk72E3YF6A_cjs.MessageList({
+        let messageList = new chunkEMLEZXTQ_cjs.MessageList({
           threadId,
           resourceId,
           generateMessageId: this.capabilities.mastra?.generateId?.bind(this.capabilities.mastra),
@@ -13476,7 +13716,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 */,
@@ -13582,7 +13822,7 @@ var AgentLegacyHandler = class {
           result: resToLog,
           threadId
         });
-        const messageListResponses = new chunk72E3YF6A_cjs.MessageList({
+        const messageListResponses = new chunkEMLEZXTQ_cjs.MessageList({
           threadId,
           resourceId,
           generateMessageId: this.capabilities.mastra?.generateId?.bind(this.capabilities.mastra),
@@ -13652,11 +13892,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 */,
@@ -13858,7 +14098,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 */,
@@ -13880,7 +14120,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 */,
@@ -14100,7 +14340,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 */,
@@ -14384,7 +14624,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 */
@@ -14447,7 +14687,7 @@ function createMapResultsStep({
     if (result.tripwire) {
       const agentModel = await capabilities.getModel({ requestContext: result.requestContext });
       if (!isSupportedLanguageModel(agentModel)) {
-        throw new chunkHWMMIRIF_cjs.MastraError({
+        throw new chunk4U7ZLI36_cjs.MastraError({
           id: "MAP_RESULTS_STEP_UNSUPPORTED_MODEL",
           domain: "AGENT" /* AGENT */,
           category: "USER" /* USER */,
@@ -14468,7 +14708,10 @@ function createMapResultsStep({
       requestContext: result.requestContext
     }) : capabilities.outputProcessors : []);
     if (options.structuredOutput?.model) {
-      const structuredProcessor = new StructuredOutputProcessor(options.structuredOutput);
+      const structuredProcessor = new StructuredOutputProcessor({
+        ...options.structuredOutput,
+        logger: capabilities.logger
+      });
       effectiveOutputProcessors = effectiveOutputProcessors ? [...effectiveOutputProcessors, structuredProcessor] : [structuredProcessor];
     }
     const effectiveInputProcessors = options.inputProcessors || (capabilities.inputProcessors ? typeof capabilities.inputProcessors === "function" ? await capabilities.inputProcessors({
@@ -14583,7 +14826,7 @@ var prepareToolsStepOutputSchema = z8.z.object({
 var prepareMemoryStepOutputSchema = z8.z.object({
   threadExists: z8.z.boolean(),
   thread: storageThreadSchema.optional(),
-  messageList: z8.z.instanceof(chunk72E3YF6A_cjs.MessageList),
+  messageList: z8.z.instanceof(chunkEMLEZXTQ_cjs.MessageList),
   /** Tripwire data when input processor triggered abort */
   tripwire: z8.z.object({
     reason: z8.z.string(),
@@ -14621,7 +14864,7 @@ function createPrepareMemoryStep({
     outputSchema: prepareMemoryStepOutputSchema,
     execute: async ({ tracingContext }) => {
       const thread = threadFromArgs;
-      const messageList = new chunk72E3YF6A_cjs.MessageList({
+      const messageList = new chunkEMLEZXTQ_cjs.MessageList({
         threadId: thread?.id,
         resourceId,
         generateMessageId: capabilities.generateMessageId,
@@ -14647,7 +14890,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 */,
@@ -14971,7 +15214,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 */,
@@ -14986,7 +15229,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 */,
@@ -15038,7 +15281,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
         this.#voice?.addInstructions(config.instructions);
       }
     } else {
-      this.#voice = new chunkOOUFPYSX_cjs.DefaultVoice();
+      this.#voice = new chunkSSB4AVHU_cjs.DefaultVoice();
     }
     if (config.inputProcessors) {
       this.#inputProcessors = config.inputProcessors;
@@ -15068,7 +15311,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 */,
@@ -15151,7 +15394,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`);
   }
@@ -15163,7 +15406,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`);
   }
@@ -15242,7 +15485,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 */,
@@ -15269,7 +15512,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 */,
@@ -15319,7 +15562,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 */,
@@ -15353,7 +15596,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
       voice?.addInstructions(this.#convertInstructionsToString(instructions));
       return voice;
     } else {
-      return new chunkOOUFPYSX_cjs.DefaultVoice();
+      return new chunkSSB4AVHU_cjs.DefaultVoice();
     }
   }
   /**
@@ -15371,7 +15614,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 */,
@@ -15476,7 +15719,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 */,
@@ -15511,7 +15754,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 */,
@@ -15546,7 +15789,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 */,
@@ -15574,12 +15817,12 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
    */
   listTools({ requestContext = new chunkUVHSM2GU_cjs.RequestContext() } = {}) {
     if (typeof this.#tools !== "function") {
-      return chunkO3ULBGV6_cjs.ensureToolProperties(this.#tools);
+      return chunkAQ22JIR7_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 */,
@@ -15592,7 +15835,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
         this.logger.error(mastraError.toString());
         throw mastraError;
       }
-      return chunkO3ULBGV6_cjs.ensureToolProperties(tools);
+      return chunkAQ22JIR7_cjs.ensureToolProperties(tools);
     });
   }
   /**
@@ -15624,7 +15867,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           });
         });
       } else {
-        llm = new chunkTRUNX3AX_cjs.MastraLLMV1({
+        llm = new chunk7KL2YFFK_cjs.MastraLLMV1({
           model: resolvedModel,
           mastra: this.#mastra,
           options: { tracingPolicy: this.#options?.tracingPolicy }
@@ -15649,9 +15892,9 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
    */
   async resolveModelConfig(modelConfig, requestContext) {
     try {
-      return await chunk53SZJCBX_cjs.resolveModelConfig(modelConfig, requestContext, this.#mastra);
+      return await chunk4KVIXN7K_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 */,
@@ -15685,7 +15928,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 */,
@@ -15809,7 +16052,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;
           }
         }
@@ -15820,7 +16063,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;
           }
         }
@@ -15831,7 +16074,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;
           }
         }
@@ -15855,7 +16098,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     instructions
   }) {
     const llm = await this.getLLM({ requestContext, model });
-    const normMessage = new chunk72E3YF6A_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)}`);
     }
@@ -15878,7 +16121,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     const systemInstructions = await this.resolveTitleInstructions(requestContext, instructions);
     let text = "";
     if (isSupportedLanguageModel(llm.getModel())) {
-      const messageList = new chunk72E3YF6A_cjs.MessageList().add(
+      const messageList = new chunkEMLEZXTQ_cjs.MessageList().add(
         [
           {
             role: "system",
@@ -15931,7 +16174,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
   async genTitle(userMessage, requestContext, tracingContext, model, instructions) {
     try {
       if (userMessage) {
-        const normMessage = new chunk72E3YF6A_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,
@@ -15996,7 +16239,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           tracingPolicy: this.#options?.tracingPolicy,
           requireApproval: toolObj.requireApproval
         };
-        const convertedToCoreTool = chunkO3ULBGV6_cjs.makeCoreTool(toolObj, options, void 0, autoResumeSuspendedTools);
+        const convertedToCoreTool = chunkAQ22JIR7_cjs.makeCoreTool(toolObj, options, void 0, autoResumeSuspendedTools);
         convertedMemoryTools[toolName] = convertedToCoreTool;
       }
     }
@@ -16029,7 +16272,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 */,
@@ -16151,7 +16394,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           tracingPolicy: this.#options?.tracingPolicy,
           requireApproval: tool2.requireApproval
         };
-        return [k, chunkO3ULBGV6_cjs.makeCoreTool(tool2, options, void 0, autoResumeSuspendedTools)];
+        return [k, chunkAQ22JIR7_cjs.makeCoreTool(tool2, options, void 0, autoResumeSuspendedTools)];
       })
     );
     const assignedToolEntriesConverted = Object.fromEntries(
@@ -16201,7 +16444,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
             tracingPolicy: this.#options?.tracingPolicy,
             requireApproval: toolObj.requireApproval
           };
-          const convertedToCoreTool = chunkO3ULBGV6_cjs.makeCoreTool(toolObj, options, "toolset", autoResumeSuspendedTools);
+          const convertedToCoreTool = chunkAQ22JIR7_cjs.makeCoreTool(toolObj, options, "toolset", autoResumeSuspendedTools);
           toolsForRequest[toolName] = convertedToCoreTool;
         }
       }
@@ -16246,7 +16489,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           tracingPolicy: this.#options?.tracingPolicy,
           requireApproval: tool2.requireApproval
         };
-        const convertedToCoreTool = chunkO3ULBGV6_cjs.makeCoreTool(rest, options, "client-tool", autoResumeSuspendedTools);
+        const convertedToCoreTool = chunkAQ22JIR7_cjs.makeCoreTool(rest, options, "client-tool", autoResumeSuspendedTools);
         toolsForRequest[toolName] = convertedToCoreTool;
       }
     }
@@ -16284,7 +16527,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 = chunk6YUHA5UH_cjs.createTool({
           id: `agent-${agentName}`,
           description: agent.getDescription() || `Agent: ${agentName}`,
           inputSchema: agentInputSchema,
@@ -16380,7 +16623,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 */,
@@ -16416,7 +16659,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           tracingContext,
           tracingPolicy: this.#options?.tracingPolicy
         };
-        convertedAgentTools[`agent-${agentName}`] = chunkO3ULBGV6_cjs.makeCoreTool(
+        convertedAgentTools[`agent-${agentName}`] = chunkAQ22JIR7_cjs.makeCoreTool(
           toolObj,
           options,
           void 0,
@@ -16447,7 +16690,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           inputData: workflow.inputSchema,
           ...workflow.stateSchema ? { initialState: workflow.stateSchema } : {}
         });
-        const toolObj = chunkZ55SJVEC_cjs.createTool({
+        const toolObj = chunk6YUHA5UH_cjs.createTool({
           id: `workflow-${workflowName}`,
           description: workflow.description || `Workflow: ${workflowName}`,
           inputSchema: extendedInputSchema,
@@ -16560,7 +16803,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 */,
@@ -16595,7 +16838,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           tracingContext,
           tracingPolicy: this.#options?.tracingPolicy
         };
-        convertedWorkflowTools[`workflow-${workflowName}`] = chunkO3ULBGV6_cjs.makeCoreTool(
+        convertedWorkflowTools[`workflow-${workflowName}`] = chunkAQ22JIR7_cjs.makeCoreTool(
           toolObj,
           options,
           void 0,
@@ -16625,7 +16868,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     let mastraProxy = void 0;
     const logger = this.logger;
     if (this.#mastra) {
-      mastraProxy = chunkO3ULBGV6_cjs.createMastraProxy({ mastra: this.#mastra, logger });
+      mastraProxy = chunkAQ22JIR7_cjs.createMastraProxy({ mastra: this.#mastra, logger });
     }
     const assignedTools = await this.listAssignedTools({
       runId,
@@ -16709,7 +16952,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 */,
@@ -16813,7 +17056,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 */,
@@ -16830,7 +17073,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
       }
     }
     if (Object.keys(result).length === 0 && Object.keys(overrideScorers).length > 0) {
-      throw new chunkHWMMIRIF_cjs.MastraError({
+      throw new chunk4U7ZLI36_cjs.MastraError({
         id: "AGENT_GENEREATE_SCORER_NOT_FOUND",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
@@ -16851,7 +17094,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
         requestContext
       );
       if (!isSupportedLanguageModel(resolvedModel)) {
-        const mastraError = new chunkHWMMIRIF_cjs.MastraError({
+        const mastraError = new chunk4U7ZLI36_cjs.MastraError({
           id: "AGENT_PREPARE_MODELS_INCOMPATIBLE_WITH_MODEL_ARRAY_V1",
           domain: "AGENT" /* AGENT */,
           category: "USER" /* USER */,
@@ -16865,7 +17108,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
         throw mastraError;
       }
       let headers;
-      if (resolvedModel instanceof chunk53SZJCBX_cjs.ModelRouterLanguageModel) {
+      if (resolvedModel instanceof chunk4KVIXN7K_cjs.ModelRouterLanguageModel) {
         headers = resolvedModel.config?.headers;
       }
       return [
@@ -16882,7 +17125,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
       this.model.map(async (modelConfig) => {
         const model2 = await this.resolveModelConfig(modelConfig.model, requestContext);
         if (!isSupportedLanguageModel(model2)) {
-          const mastraError = new chunkHWMMIRIF_cjs.MastraError({
+          const mastraError = new chunk4U7ZLI36_cjs.MastraError({
             id: "AGENT_PREPARE_MODELS_INCOMPATIBLE_WITH_MODEL_ARRAY_V1",
             domain: "AGENT" /* AGENT */,
             category: "USER" /* USER */,
@@ -16897,7 +17140,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 */,
@@ -16911,7 +17154,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           throw mastraError;
         }
         let headers;
-        if (model2 instanceof chunk53SZJCBX_cjs.ModelRouterLanguageModel) {
+        if (model2 instanceof chunk4KVIXN7K_cjs.ModelRouterLanguageModel) {
           headers = model2.config?.headers;
         }
         return {
@@ -16971,7 +17214,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
       const targetProvider = structuredOutputModel.provider;
       const targetModelId = structuredOutputModel.modelId;
       if (targetProvider.includes("openai") || targetModelId.includes("openai")) {
-        if (chunkO3ULBGV6_cjs.isZodType(options.structuredOutput.schema) && targetModelId) {
+        if (chunkAQ22JIR7_cjs.isZodType(options.structuredOutput.schema) && targetModelId) {
           const modelInfo = {
             provider: targetProvider,
             modelId: targetModelId,
@@ -16990,13 +17233,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 = chunkZSZOYPSJ_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)
       },
@@ -17166,10 +17410,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 */,
@@ -17283,7 +17527,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     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 */,
@@ -17306,7 +17550,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 */,
@@ -17316,7 +17560,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 */,
@@ -17345,7 +17589,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     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 */,
@@ -17368,7 +17612,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 */,
@@ -17378,7 +17622,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 */,
@@ -17412,14 +17656,15 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
       requestContext: mergedStreamOptions.requestContext
     });
     if (!isSupportedLanguageModel(llm.getModel())) {
-      throw new chunkHWMMIRIF_cjs.MastraError({
+      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 ?? ""
     });
@@ -17434,7 +17679,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 */,
@@ -17444,7 +17689,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 */,
@@ -19487,6 +19732,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";
@@ -19529,25 +19818,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) {
@@ -19564,7 +19871,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) {
@@ -19828,7 +20135,7 @@ var SemanticRecall = class {
    */
   formatCrossThreadMessages(messages, currentThreadId) {
     let result = ``;
-    const v1Messages = new chunk72E3YF6A_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;
@@ -20178,6 +20485,7 @@ var MastraMemory = class extends chunkDGV2FWB4_cjs.MastraBase {
   _storage;
   vector;
   embedder;
+  embedderOptions;
   threadConfig = { ...memoryDefaultOptions };
   #mastra;
   constructor(config) {
@@ -20233,7 +20541,7 @@ https://mastra.ai/en/docs/memory/semantic-recall`
         );
       }
       if (typeof config.embedder === "string") {
-        this.embedder = new chunk53SZJCBX_cjs.ModelRouterEmbeddingModel(config.embedder);
+        this.embedder = new chunk4KVIXN7K_cjs.ModelRouterEmbeddingModel(config.embedder);
       } else {
         this.embedder = config.embedder;
       }
@@ -20268,7 +20576,11 @@ https://mastra.ai/en/docs/memory/overview`
     this.vector = vector;
   }
   setEmbedder(embedder) {
-    this.embedder = embedder;
+    if (typeof embedder === "string") {
+      this.embedder = new chunk4KVIXN7K_cjs.ModelRouterEmbeddingModel(embedder);
+    } else {
+      this.embedder = embedder;
+    }
   }
   /**
    * Get a system message to inject into the conversation.
@@ -20329,7 +20641,7 @@ https://mastra.ai/en/docs/memory/overview`
         "The threads.generateTitle option has been moved. Use the top-level generateTitle option instead."
       );
     }
-    const mergedConfig = chunkO3ULBGV6_cjs.deepMerge(this.threadConfig, config || {});
+    const mergedConfig = chunkAQ22JIR7_cjs.deepMerge(this.threadConfig, config || {});
     if (typeof config?.workingMemory === "object" && config.workingMemory?.schema && typeof mergedConfig.workingMemory === "object") {
       mergedConfig.workingMemory.schema = config.workingMemory.schema;
     }
@@ -20390,15 +20702,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",
@@ -20415,7 +20728,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",
@@ -20426,8 +20739,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",
@@ -20437,29 +20750,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",
@@ -20471,7 +20784,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,
@@ -20488,7 +20801,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;
@@ -20497,22 +20811,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",
@@ -20524,7 +20838,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,
@@ -20535,8 +20849,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",
@@ -20546,7 +20860,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
           })
         );
@@ -20565,7 +20879,7 @@ var MockMemory = class extends MastraMemory {
   } = {}) {
     super({
       name: "mock",
-      storage: storage || new chunkETWAR2YE_cjs.InMemoryStore(),
+      storage: storage || new chunkOXV6QFSV_cjs.InMemoryStore(),
       options: {
         workingMemory: enableWorkingMemory ? { enabled: true, template: workingMemoryTemplate } : void 0,
         lastMessages: enableMessageHistory ? 10 : void 0
@@ -20573,22 +20887,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,
@@ -20600,11 +20931,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,
@@ -20621,12 +20954,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: chunk6YUHA5UH_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() }),
@@ -20709,7 +21047,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
     });
@@ -20784,6 +21123,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;
@@ -20797,6 +21138,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;
@@ -20809,6 +21152,7 @@ exports.loop = loop;
 exports.mapVariable = mapVariable;
 exports.memoryDefaultOptions = memoryDefaultOptions;
 exports.parseMemoryRequestContext = parseMemoryRequestContext;
+exports.removeWorkingMemoryTags = removeWorkingMemoryTags;
 exports.resolveThreadIdFromArgs = resolveThreadIdFromArgs;
 exports.runCountDeprecationMessage = runCountDeprecationMessage;
 exports.supportedLanguageModelSpecifications = supportedLanguageModelSpecifications;
@@ -20818,5 +21162,5 @@ exports.validateStepInput = validateStepInput;
 exports.validateStepResumeData = validateStepResumeData;
 exports.validateStepStateData = validateStepStateData;
 exports.validateStepSuspendData = validateStepSuspendData;
-//# sourceMappingURL=chunk-JAGQZZ43.cjs.map
-//# sourceMappingURL=chunk-JAGQZZ43.cjs.map
+//# sourceMappingURL=chunk-5DL6Y7PJ.cjs.map
+//# sourceMappingURL=chunk-5DL6Y7PJ.cjs.map