@mastra/core 0.16.0 → 0.16.1-alpha.1

package/dist/{chunk-7GYN2OE3.cjs → chunk-C3R2Q3NN.cjs}

@@ -3,14 +3,14 @@
 var chunkAHJY7RHO_cjs = require('./chunk-AHJY7RHO.cjs');
 var chunkABJOUEVA_cjs = require('./chunk-ABJOUEVA.cjs');
 var chunkBHB4PDNV_cjs = require('./chunk-BHB4PDNV.cjs');
-var chunkMNDKBEEQ_cjs = require('./chunk-MNDKBEEQ.cjs');
-var chunkSIKEQ32R_cjs = require('./chunk-SIKEQ32R.cjs');
+var chunkSJO2HEVU_cjs = require('./chunk-SJO2HEVU.cjs');
+var chunkD3UG2YLU_cjs = require('./chunk-D3UG2YLU.cjs');
 var chunkTSNDVBUU_cjs = require('./chunk-TSNDVBUU.cjs');
-var chunkLVGGMWSE_cjs = require('./chunk-LVGGMWSE.cjs');
+var chunkKB4IEMPV_cjs = require('./chunk-KB4IEMPV.cjs');
 var chunkGPWMM745_cjs = require('./chunk-GPWMM745.cjs');
 var chunkS6MAHT7F_cjs = require('./chunk-S6MAHT7F.cjs');
 var chunkABRPHTOG_cjs = require('./chunk-ABRPHTOG.cjs');
-var chunkUFCYMOYH_cjs = require('./chunk-UFCYMOYH.cjs');
+var chunkUGCG7DI3_cjs = require('./chunk-UGCG7DI3.cjs');
 var chunkC73WLCY3_cjs = require('./chunk-C73WLCY3.cjs');
 var chunkKXCUCBEI_cjs = require('./chunk-KXCUCBEI.cjs');
 var chunkV5WKCX3G_cjs = require('./chunk-V5WKCX3G.cjs');
@@ -1173,7 +1173,7 @@ function convertMastraChunkToAISDKv5({
       if (mode === "generate") {
         return {
           type: "file",
-          file: new chunkSIKEQ32R_cjs.DefaultGeneratedFile({
+          file: new chunkD3UG2YLU_cjs.DefaultGeneratedFile({
             data: chunk.payload.data,
             mediaType: chunk.payload.mimeType
           })
@@ -1181,7 +1181,7 @@ function convertMastraChunkToAISDKv5({
       }
       return {
         type: "file",
-        file: new chunkSIKEQ32R_cjs.DefaultGeneratedFileWithType({
+        file: new chunkD3UG2YLU_cjs.DefaultGeneratedFileWithType({
           data: chunk.payload.data,
           mediaType: chunk.payload.mimeType
         })
@@ -1641,22 +1641,32 @@ var ObjectFormatHandler = class extends BaseFormatHandler {
       shouldEmit: false
     };
   }
-  async validateAndTransformFinal(finalValue) {
-    if (!finalValue) {
+  async validateAndTransformFinal(finalRawValue) {
+    if (!finalRawValue) {
       return {
         success: false,
         error: new Error("No object generated: could not parse the response.")
       };
     }
+    let rawValue = finalRawValue;
+    if (typeof finalRawValue === "string" && finalRawValue?.includes?.("```json")) {
+      const match = finalRawValue.match(/```json\s*\n?([\s\S]*?)\n?\s*```/);
+      if (match && match[1]) {
+        rawValue = match[1].trim();
+      }
+    }
+    const {
+      value
+    } = await aiV5.parsePartialJson(rawValue);
     if (!this.schema) {
       return {
         success: true,
-        value: finalValue
+        value
       };
     }
     try {
       const result = await safeValidateTypes({
-        value: finalValue,
+        value,
         schema: this.schema
       });
       if (result.success) {
@@ -1822,7 +1832,17 @@ var EnumFormatHandler = class extends BaseFormatHandler {
       shouldEmit: false
     };
   }
-  async validateAndTransformFinal(finalValue) {
+  async validateAndTransformFinal(rawFinalValue) {
+    const {
+      value
+    } = await aiV5.parsePartialJson(rawFinalValue);
+    if (!(typeof value === "object" && value !== null && "result" in value)) {
+      return {
+        success: false,
+        error: new Error("Invalid enum format: expected object with result property")
+      };
+    }
+    const finalValue = value.result;
     if (!finalValue || typeof finalValue !== "object" || typeof finalValue.result !== "string") {
       return {
         success: false,
@@ -1928,7 +1948,7 @@ function createObjectStreamTransformer({
         onFinish(void 0);
         return;
       }
-      const finalResult = await handler.validateAndTransformFinal(previousObject);
+      const finalResult = await handler.validateAndTransformFinal(accumulatedText);
       if (!finalResult.success) {
         controller.enqueue({
           from: "AGENT" /* AGENT */,
@@ -2227,7 +2247,7 @@ var MastraModelOutput = class extends chunkKXCUCBEI_cjs.MastraBase {
             try {
               if (self.processorRunner) {
                 self.messageList = await self.processorRunner.runOutputProcessors(self.messageList);
-                const outputText = self.messageList.get.response.aiV4.core().map(m => chunkSIKEQ32R_cjs.MessageList.coreContentToString(m.content)).join("\n");
+                const outputText = self.messageList.get.response.aiV4.core().map(m => chunkD3UG2YLU_cjs.MessageList.coreContentToString(m.content)).join("\n");
                 const messages = self.messageList.get.response.v2();
                 const messagesWithStructuredData = messages.filter(msg => msg.content.metadata && msg.content.metadata.structuredOutput);
                 if (messagesWithStructuredData[0] && messagesWithStructuredData[0].content.metadata?.structuredOutput) {
@@ -2955,6 +2975,12 @@ var AISDKV5InputStream = class extends MastraModelInput {
   }
 };
 
+// src/stream/aisdk/v5/model-supports.ts
+function getModelSupport(modelId, provider) {
+  return modelSupports.find(m => m.modelId === modelId && m.provider === provider);
+}
+var modelSupports = [];
+
 // src/stream/aisdk/v5/execute.ts
 function execute({
   runId,
@@ -2986,6 +3012,16 @@ function execute({
       "stream.prompt.tools": toolsAndToolChoice?.tools?.map(tool => JSON.stringify(tool))
     });
   }
+  const modelSupports2 = getModelSupport(model.modelId, model.provider);
+  const modelSupportsResponseFormat = modelSupports2?.capabilities.responseFormat?.support === "full";
+  const responseFormat = output ? getResponseFormat(output) : void 0;
+  let prompt = inputMessages;
+  if (output && responseFormat?.type === "json" && !modelSupportsResponseFormat) {
+    prompt = providerUtilsV5.injectJsonInstructionIntoMessages({
+      messages: inputMessages,
+      schema: responseFormat.schema
+    });
+  }
   const stream = v5.initialize({
     runId,
     onResult,
@@ -2993,11 +3029,11 @@ function execute({
       try {
         const stream2 = await model.doStream({
           ...toolsAndToolChoice,
-          prompt: inputMessages,
+          prompt,
           providerOptions,
           abortSignal: options?.abortSignal,
           includeRawChunks,
-          responseFormat: output ? getResponseFormat(output) : void 0,
+          responseFormat: modelSupportsResponseFormat ? responseFormat : void 0,
           ...(modelSettings ?? {}),
           headers
         });
@@ -3795,7 +3831,9 @@ function createOuterLLMWorkflow({
       })));
     }
     return inputData.output.toolCalls || [];
-  }).foreach(toolCallStep).then(llmMappingStep).commit();
+  }).foreach(toolCallStep, {
+    concurrency: 10
+  }).then(llmMappingStep).commit();
 }
 
 // src/loop/workflow/stream.ts
@@ -4150,9 +4188,6 @@ var MastraLLMVNext = class extends chunkKXCUCBEI_cjs.MastraBase {
       messages,
       tools: Object.keys(tools || {})
     });
-    if (output) {
-      output = this._applySchemaCompat(output);
-    }
     const llmAISpan = tracingContext?.currentSpan?.createChildSpan({
       name: `llm stream: '${model.modelId}'`,
       type: "llm_generation" /* LLM_GENERATION */,
@@ -4168,7 +4203,7 @@ var MastraLLMVNext = class extends chunkKXCUCBEI_cjs.MastraBase {
       }
     });
     try {
-      const messageList = new chunkSIKEQ32R_cjs.MessageList({
+      const messageList = new chunkD3UG2YLU_cjs.MessageList({
         threadId,
         resourceId
       });
@@ -4229,7 +4264,7 @@ var MastraLLMVNext = class extends chunkKXCUCBEI_cjs.MastraBase {
               this.logger.warn("Rate limit approaching, waiting 10 seconds", {
                 runId
               });
-              await chunkLVGGMWSE_cjs.delay(10 * 1e3);
+              await chunkKB4IEMPV_cjs.delay(10 * 1e3);
             }
           },
           onFinish: async props => {
@@ -4304,14 +4339,18 @@ var StructuredOutputProcessor = class {
   structuringAgent;
   errorStrategy;
   fallbackValue;
-  constructor(options) {
+  constructor(options, fallbackModel) {
     this.schema = options.schema;
     this.errorStrategy = options.errorStrategy ?? "strict";
     this.fallbackValue = options.fallbackValue;
+    const modelToUse = options.model || fallbackModel;
+    if (!modelToUse) {
+      throw new Error("StructuredOutputProcessor requires a model to be provided either in options or as fallback");
+    }
     this.structuringAgent = new exports.Agent({
       name: "structured-output-structurer",
       instructions: options.instructions || this.generateInstructions(),
-      model: options.model
+      model: modelToUse
     });
   }
   async processOutputResult(args) {
@@ -5124,7 +5163,7 @@ var Machine = class extends EventEmitter__default.default {
         const logger = this.logger;
         let mastraProxy = void 0;
         if (this.#mastra) {
-          mastraProxy = chunkLVGGMWSE_cjs.createMastraProxy({
+          mastraProxy = chunkKB4IEMPV_cjs.createMastraProxy({
             mastra: this.#mastra,
             logger
           });
@@ -9293,13 +9332,13 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
       this.logger.error(mastraError.toString());
       throw mastraError;
     }
-    return chunkLVGGMWSE_cjs.ensureToolProperties(this.#tools);
+    return chunkKB4IEMPV_cjs.ensureToolProperties(this.#tools);
   }
   getTools({
     runtimeContext = new chunkGPWMM745_cjs.RuntimeContext()
   } = {}) {
     if (typeof this.#tools !== "function") {
-      return chunkLVGGMWSE_cjs.ensureToolProperties(this.#tools);
+      return chunkKB4IEMPV_cjs.ensureToolProperties(this.#tools);
     }
     const result = this.#tools({
       runtimeContext,
@@ -9320,7 +9359,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
         this.logger.error(mastraError.toString());
         throw mastraError;
       }
-      return chunkLVGGMWSE_cjs.ensureToolProperties(tools);
+      return chunkKB4IEMPV_cjs.ensureToolProperties(tools);
     });
   }
   get llm() {
@@ -9364,7 +9403,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
           mastra: this.#mastra
         });
       } else {
-        llm = new chunkMNDKBEEQ_cjs.MastraLLMV1({
+        llm = new chunkSJO2HEVU_cjs.MastraLLMV1({
           model: resolvedModel,
           mastra: this.#mastra
         });
@@ -9480,7 +9519,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
       runtimeContext,
       model
     });
-    const normMessage = new chunkSIKEQ32R_cjs.MessageList().add(message, "user").get.all.ui().at(-1);
+    const normMessage = new chunkD3UG2YLU_cjs.MessageList().add(message, "user").get.all.ui().at(-1);
     if (!normMessage) {
       throw new Error(`Could not generate title from input ${JSON.stringify(message)}`);
     }
@@ -9539,7 +9578,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
   async genTitle(userMessage, runtimeContext, tracingContext, model, instructions) {
     try {
       if (userMessage) {
-        const normMessage = new chunkSIKEQ32R_cjs.MessageList().add(userMessage, "user").get.all.ui().at(-1);
+        const normMessage = new chunkD3UG2YLU_cjs.MessageList().add(userMessage, "user").get.all.ui().at(-1);
         if (normMessage) {
           return await this.generateTitleFromUserMessage({
             message: normMessage,
@@ -9565,7 +9604,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
     runId,
     userMessages,
     systemMessage,
-    messageList = new chunkSIKEQ32R_cjs.MessageList({
+    messageList = new chunkD3UG2YLU_cjs.MessageList({
       threadId,
       resourceId
     }),
@@ -9620,7 +9659,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
         systemMessage: systemMessages,
         memorySystemMessage: memorySystemMessage || void 0
       });
-      const returnList = new chunkSIKEQ32R_cjs.MessageList().addSystem(systemMessages).add(processedMemoryMessages, "memory").add(newMessages, "user");
+      const returnList = new chunkD3UG2YLU_cjs.MessageList().addSystem(systemMessages).add(processedMemoryMessages, "memory").add(newMessages, "user");
       return {
         threadId: thread.id,
         messages: returnList.get.all.prompt()
@@ -9665,7 +9704,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
             runtimeContext
           }) : this.model
         };
-        const convertedToCoreTool = chunkLVGGMWSE_cjs.makeCoreTool(toolObj, options);
+        const convertedToCoreTool = chunkKB4IEMPV_cjs.makeCoreTool(toolObj, options);
         convertedMemoryTools[toolName] = convertedToCoreTool;
       }
     }
@@ -9836,7 +9875,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
         }) : this.model,
         writableStream
       };
-      return [k, chunkLVGGMWSE_cjs.makeCoreTool(tool, options)];
+      return [k, chunkKB4IEMPV_cjs.makeCoreTool(tool, options)];
     }));
     const assignedToolEntriesConverted = Object.fromEntries(assignedCoreToolEntries.filter(entry => Boolean(entry)));
     toolsForRequest = {
@@ -9880,7 +9919,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
               runtimeContext
             }) : this.model
           };
-          const convertedToCoreTool = chunkLVGGMWSE_cjs.makeCoreTool(toolObj, options, "toolset");
+          const convertedToCoreTool = chunkKB4IEMPV_cjs.makeCoreTool(toolObj, options, "toolset");
           toolsForRequest[toolName] = convertedToCoreTool;
         }
       }
@@ -9925,7 +9964,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
             runtimeContext
           }) : this.model
         };
-        const convertedToCoreTool = chunkLVGGMWSE_cjs.makeCoreTool(rest, options, "client-tool");
+        const convertedToCoreTool = chunkKB4IEMPV_cjs.makeCoreTool(rest, options, "client-tool");
         toolsForRequest[toolName] = convertedToCoreTool;
       }
     }
@@ -9936,8 +9975,8 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
     threadId,
     resourceId,
     runtimeContext,
-    methodType,
     tracingContext,
+    methodType,
     format
   }) {
     const convertedWorkflowTools = {};
@@ -9956,17 +9995,9 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
           // current tool span onto the workflow to maintain continuity of the trace
           execute: async ({
             context,
-            writer
+            writer,
+            tracingContext: innerTracingContext
           }) => {
-            const toolAISpan = tracingContext.currentSpan?.createChildSpan({
-              type: "tool_call" /* TOOL_CALL */,
-              name: `tool: '${workflowName}'`,
-              input: context,
-              attributes: {
-                toolId: workflowName,
-                toolType: "workflow"
-              }
-            });
             try {
               this.logger.debug(`[Agent:${this.name}] - Executing workflow as tool ${workflowName}`, {
                 name: workflowName,
@@ -9982,16 +10013,13 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
                 result = await run.start({
                   inputData: context,
                   runtimeContext,
-                  tracingContext: {
-                    currentSpan: toolAISpan
-                  }
+                  tracingContext: innerTracingContext
                 });
               } else if (methodType === "stream") {
-                const streamResult = await run.stream({
+                const streamResult = run.stream({
                   inputData: context,
-                  runtimeContext
-                  // TODO: is this forgottn?
-                  //currentSpan: toolAISpan,
+                  runtimeContext,
+                  tracingContext: innerTracingContext
                 });
                 if (writer) {
                   await streamResult.stream.pipeTo(writer);
@@ -10003,6 +10031,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
                 const streamResult = run.streamVNext({
                   inputData: context,
                   runtimeContext,
+                  tracingContext: innerTracingContext,
                   format
                 });
                 if (writer) {
@@ -10010,9 +10039,6 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
                 }
                 result = await streamResult.result;
               }
-              toolAISpan?.end({
-                output: result
-              });
               return {
                 result,
                 runId: run.runId
@@ -10032,9 +10058,6 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
               }, err);
               this.logger.trackException(mastraError);
               this.logger.error(mastraError.toString());
-              toolAISpan?.error({
-                error: mastraError
-              });
               throw mastraError;
             }
           }
@@ -10056,7 +10079,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
           }) : this.model,
           tracingContext
         };
-        convertedWorkflowTools[workflowName] = chunkLVGGMWSE_cjs.makeCoreTool(toolObj, options);
+        convertedWorkflowTools[workflowName] = chunkKB4IEMPV_cjs.makeCoreTool(toolObj, options);
       }
     }
     return convertedWorkflowTools;
@@ -10076,7 +10099,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
     let mastraProxy = void 0;
     const logger = this.logger;
     if (this.#mastra) {
-      mastraProxy = chunkLVGGMWSE_cjs.createMastraProxy({
+      mastraProxy = chunkKB4IEMPV_cjs.createMastraProxy({
         mastra: this.#mastra,
         logger
       });
@@ -10218,7 +10241,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
             runId
           });
         }
-        const agentAISpan = chunkUFCYMOYH_cjs.getOrCreateSpan({
+        const agentAISpan = chunkUGCG7DI3_cjs.getOrCreateSpan({
           type: "agent_run" /* AGENT_RUN */,
           name: `agent run: '${this.id}'`,
           input: messages,
@@ -10265,7 +10288,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
           writableStream,
           methodType
         });
-        const messageList = new chunkSIKEQ32R_cjs.MessageList({
+        const messageList = new chunkD3UG2YLU_cjs.MessageList({
           threadId,
           resourceId,
           generateMessageId: this.#mastra?.generateId?.bind(this.#mastra),
@@ -10350,10 +10373,12 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
             saveThread: false
           });
         }
-        let [memoryMessages, memorySystemMessage] = await Promise.all([existingThread ? this.getMemoryMessages({
+        const config = memory.getMergedThreadConfig(memoryConfig || {});
+        const hasResourceScopeSemanticRecall = typeof config?.semanticRecall === "object" && config?.semanticRecall?.scope === "resource";
+        let [memoryMessages, memorySystemMessage] = await Promise.all([existingThread || hasResourceScopeSemanticRecall ? this.getMemoryMessages({
           resourceId,
           threadId: threadObject.id,
-          vectorMessageSearch: new chunkSIKEQ32R_cjs.MessageList().add(messages, `user`).getLatestUserContent() || "",
+          vectorMessageSearch: new chunkD3UG2YLU_cjs.MessageList().add(messages, `user`).getLatestUserContent() || "",
           memoryConfig,
           runtimeContext
         }) : [], memory.getSystemMessage({
@@ -10376,7 +10401,7 @@ The following messages were remembered from a different conversation:
 <remembered_from_other_conversation>
 ${(() => {
             let result = ``;
-            const messages2 = new chunkSIKEQ32R_cjs.MessageList().add(resultsFromOtherThreads, "memory").get.all.v1();
+            const messages2 = new chunkD3UG2YLU_cjs.MessageList().add(resultsFromOtherThreads, "memory").get.all.v1();
             let lastYmd = null;
             for (const msg of messages2) {
               const date = msg.createdAt;
@@ -10429,7 +10454,7 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
           systemMessage,
           memorySystemMessage: memorySystemMessage || void 0
         });
-        const processedList = new chunkSIKEQ32R_cjs.MessageList({
+        const processedList = new chunkD3UG2YLU_cjs.MessageList({
           threadId: threadObject.id,
           resourceId,
           generateMessageId: this.#mastra?.generateId?.bind(this.#mastra),
@@ -10485,7 +10510,7 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
           result: resToLog,
           threadId
         });
-        const messageListResponses = new chunkSIKEQ32R_cjs.MessageList({
+        const messageListResponses = new chunkD3UG2YLU_cjs.MessageList({
           threadId,
           resourceId,
           generateMessageId: this.#mastra?.generateId?.bind(this.#mastra),
@@ -10943,7 +10968,7 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
     const instructions = options.instructions || (await this.getInstructions({
       runtimeContext
     }));
-    const agentAISpan = chunkUFCYMOYH_cjs.getOrCreateSpan({
+    const agentAISpan = chunkUGCG7DI3_cjs.getOrCreateSpan({
       type: "agent_run" /* AGENT_RUN */,
       name: `agent run: '${this.id}'`,
       input: options.messages,
@@ -11019,12 +11044,12 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
           resourceId,
           runId,
           runtimeContext,
-          writableStream: options.writableStream,
-          methodType,
-          format,
           tracingContext: {
             currentSpan: agentAISpan
-          }
+          },
+          writableStream: options.writableStream,
+          methodType,
+          format
         });
         return {
           convertedTools
@@ -11046,7 +11071,7 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
         tracingContext
       }) => {
         const thread = threadFromArgs;
-        const messageList = new chunkSIKEQ32R_cjs.MessageList({
+        const messageList = new chunkD3UG2YLU_cjs.MessageList({
           threadId: thread?.id,
           resourceId,
           generateMessageId: this.#mastra?.generateId?.bind(this.#mastra),
@@ -11126,10 +11151,12 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
             saveThread: false
           });
         }
-        let [memoryMessages, memorySystemMessage] = await Promise.all([existingThread ? this.getMemoryMessages({
+        const config = memory.getMergedThreadConfig(memoryConfig || {});
+        const hasResourceScopeSemanticRecall = typeof config?.semanticRecall === "object" && config?.semanticRecall?.scope === "resource";
+        let [memoryMessages, memorySystemMessage] = await Promise.all([existingThread || hasResourceScopeSemanticRecall ? this.getMemoryMessages({
           resourceId,
           threadId: threadObject.id,
-          vectorMessageSearch: new chunkSIKEQ32R_cjs.MessageList().add(options.messages, `user`).getLatestUserContent() || "",
+          vectorMessageSearch: new chunkD3UG2YLU_cjs.MessageList().add(options.messages, `user`).getLatestUserContent() || "",
           memoryConfig,
           runtimeContext
         }) : [], memory.getSystemMessage({
@@ -11152,7 +11179,7 @@ The following messages were remembered from a different conversation:
 <remembered_from_other_conversation>
 ${(() => {
             let result2 = ``;
-            const messages = new chunkSIKEQ32R_cjs.MessageList().add(resultsFromOtherThreads, "memory").get.all.v1();
+            const messages = new chunkD3UG2YLU_cjs.MessageList().add(resultsFromOtherThreads, "memory").get.all.v1();
             let lastYmd = null;
             for (const msg of messages) {
               const date = msg.createdAt;
@@ -11204,7 +11231,7 @@ the following messages are from ${ymd}
           systemMessage,
           memorySystemMessage: memorySystemMessage || void 0
         });
-        const processedList = new chunkSIKEQ32R_cjs.MessageList({
+        const processedList = new chunkD3UG2YLU_cjs.MessageList({
           threadId: threadObject.id,
           resourceId,
           generateMessageId: this.#mastra?.generateId?.bind(this.#mastra),
@@ -11357,7 +11384,10 @@ the following messages are from ${ymd}
         runtimeContext: result2.runtimeContext
       }) : this.#outputProcessors : []);
       if (options.structuredOutput) {
-        const structuredProcessor = new StructuredOutputProcessor(options.structuredOutput);
+        const agentModel = await this.getModel({
+          runtimeContext: result2.runtimeContext
+        });
+        const structuredProcessor = new StructuredOutputProcessor(options.structuredOutput, agentModel);
         effectiveOutputProcessors = effectiveOutputProcessors ? [...effectiveOutputProcessors, structuredProcessor] : [structuredProcessor];
       }
       const loopOptions = {
@@ -11414,7 +11444,9 @@ the following messages are from ${ymd}
             await options?.onFinish?.({
               ...result2,
               runId,
-              messages: messageList.get.response.aiV5.model()
+              messages: messageList.get.response.aiV5.model(),
+              usage: payload.usage,
+              totalUsage: payload.totalUsage
             });
           },
           onStepFinish: result2.onStepFinish
@@ -11725,7 +11757,10 @@ the following messages are from ${ymd}
     };
     let finalOutputProcessors = mergedGenerateOptions.outputProcessors;
     if (mergedGenerateOptions.structuredOutput) {
-      const structuredProcessor = new StructuredOutputProcessor(mergedGenerateOptions.structuredOutput);
+      const agentModel = await this.getModel({
+        runtimeContext: mergedGenerateOptions.runtimeContext
+      });
+      const structuredProcessor = new StructuredOutputProcessor(mergedGenerateOptions.structuredOutput, agentModel);
       finalOutputProcessors = finalOutputProcessors ? [...finalOutputProcessors, structuredProcessor] : [structuredProcessor];
     }
     if (!output || experimental_output) {
@@ -11738,7 +11773,7 @@ the following messages are from ${ymd}
         runtimeContext: mergedGenerateOptions.runtimeContext || new chunkGPWMM745_cjs.RuntimeContext(),
         tracingContext,
         outputProcessorOverrides: finalOutputProcessors,
-        messageList: new chunkSIKEQ32R_cjs.MessageList({
+        messageList: new chunkD3UG2YLU_cjs.MessageList({
           threadId: llmOptions.threadId || "",
           resourceId: llmOptions.resourceId || ""
         }).add({
@@ -11831,7 +11866,7 @@ the following messages are from ${ymd}
     const outputProcessorResult = await this.__runOutputProcessors({
       runtimeContext: mergedGenerateOptions.runtimeContext || new chunkGPWMM745_cjs.RuntimeContext(),
       tracingContext,
-      messageList: new chunkSIKEQ32R_cjs.MessageList({
+      messageList: new chunkD3UG2YLU_cjs.MessageList({
         threadId: llmOptions.threadId || "",
         resourceId: llmOptions.resourceId || ""
       }).add({
@@ -12291,9 +12326,9 @@ var MastraWorkflowStream = class extends web.ReadableStream {
       deferredPromise.reject = reject;
     });
     const updateUsageCount = usage => {
-      this.#usageCount.promptTokens += parseInt(usage.promptTokens?.toString() ?? "0", 10);
-      this.#usageCount.completionTokens += parseInt(usage.completionTokens?.toString() ?? "0", 10);
-      this.#usageCount.totalTokens += parseInt(usage.totalTokens?.toString() ?? "0", 10);
+      this.#usageCount.promptTokens += parseInt(usage?.promptTokens?.toString() ?? "0", 10);
+      this.#usageCount.completionTokens += parseInt(usage?.completionTokens?.toString() ?? "0", 10);
+      this.#usageCount.totalTokens += parseInt(usage?.totalTokens?.toString() ?? "0", 10);
     };
     super({
       start: async controller => {
@@ -12301,7 +12336,9 @@ var MastraWorkflowStream = class extends web.ReadableStream {
           write: chunk => {
             if (chunk.type === "step-output" && chunk.payload?.output?.from === "AGENT" && chunk.payload?.output?.type === "finish" || chunk.type === "step-output" && chunk.payload?.output?.from === "WORKFLOW" && chunk.payload?.output?.type === "finish") {
               const finishPayload = chunk.payload?.output.payload;
-              updateUsageCount(finishPayload.usage);
+              if (finishPayload) {
+                updateUsageCount(finishPayload.usage);
+              }
             }
             controller.enqueue(chunk);
           }
@@ -12313,9 +12350,14 @@ var MastraWorkflowStream = class extends web.ReadableStream {
           payload: {}
         });
         const stream = await createStream(writer);
+        let workflowStatus = "success";
         for await (const chunk of stream) {
-          if (chunk.type === "step-finish") {
+          if (chunk.type === "step-finish" && chunk.payload.usage) {
             updateUsageCount(chunk.payload.usage);
+          } else if (chunk.type === "workflow-canceled") {
+            workflowStatus = "canceled";
+          } else if (chunk.type === "workflow-step-result" && chunk.payload.status === "failed") {
+            workflowStatus = "failed";
           }
           controller.enqueue(chunk);
         }
@@ -12324,9 +12366,7 @@ var MastraWorkflowStream = class extends web.ReadableStream {
           runId: run.runId,
           from: "WORKFLOW" /* WORKFLOW */,
           payload: {
-            stepResult: {
-              reason: "stop"
-            },
+            workflowStatus,
             output: {
               usage: this.#usageCount
             },
@@ -12495,7 +12535,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
     } = retryConfig ?? {};
     const steps = graph.steps;
     this.runCounts.clear();
-    const workflowAISpan = chunkUFCYMOYH_cjs.getOrCreateSpan({
+    const workflowAISpan = chunkUGCG7DI3_cjs.getOrCreateSpan({
       type: "workflow_run" /* WORKFLOW_RUN */,
       name: `workflow run: '${workflowId}'`,
       input,
@@ -13008,7 +13048,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         const result = await runStep({
           runId,
           workflowId,
-          mastra: this.mastra ? chunkUFCYMOYH_cjs.wrapMastra(this.mastra, innerTracingContext) : void 0,
+          mastra: this.mastra ? chunkUGCG7DI3_cjs.wrapMastra(this.mastra, innerTracingContext) : void 0,
           runtimeContext,
           inputData: prevOutput,
           runCount: this.getOrGenerateRunCount(step.id),
@@ -13592,7 +13632,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
       const evalSpan = loopSpan?.createChildSpan({
         type: "workflow_conditional_eval" /* WORKFLOW_CONDITIONAL_EVAL */,
         name: `condition: ${entry.loopType}`,
-        input: chunkUFCYMOYH_cjs.selectFields(result.output, ["stepResult", "output.text", "output.object", "messages"]),
+        input: chunkUGCG7DI3_cjs.selectFields(result.output, ["stepResult", "output.text", "output.object", "messages"]),
         attributes: {
           conditionIndex: iteration
         }
@@ -14460,6 +14500,12 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
       workflowStatus: execResults.status === "success" ? "running" : execResults.status,
       runtimeContext
     });
+    if (execResults.status === "canceled") {
+      await emitter.emit("watch-v2", {
+        type: "workflow-canceled",
+        payload: {}
+      });
+    }
     return {
       result: execResults,
       stepResults,
@@ -15164,6 +15210,8 @@ var Workflow = class extends chunkKXCUCBEI_cjs.MastraBase {
     }
     return scorers;
   }
+  // This method should only be called internally for nested workflow execution, as well as from mastra server handlers
+  // To run a workflow use `.createRunAsync` and then `.start` or `.resume`
   async execute({
     runId,
     inputData,
@@ -15501,7 +15549,8 @@ var Run = class {
    */
   stream({
     inputData,
-    runtimeContext
+    runtimeContext,
+    tracingContext
   } = {}) {
     const {
       readable,
@@ -15566,7 +15615,8 @@ var Run = class {
     this.executionResults = this._start({
       inputData,
       runtimeContext,
-      format: "aisdk"
+      format: "aisdk",
+      tracingContext
     }).then(result => {
       if (result.status !== "suspended") {
         this.closeStreamAction?.().catch(() => {});
@@ -15595,12 +15645,13 @@ var Run = class {
   streamVNext({
     inputData,
     runtimeContext,
+    tracingContext,
     format
   } = {}) {
     this.closeStreamAction = async () => {};
     return new MastraWorkflowStream({
       run: this,
-      createStream: writer => {
+      createStream: () => {
         const {
           readable,
           writable
@@ -15618,7 +15669,7 @@ var Run = class {
             return;
           }
           isWriting = true;
-          let watchWriter = writer.getWriter();
+          let watchWriter = writable.getWriter();
           try {
             for (const chunk of chunkToWrite) {
               await watchWriter.write(chunk);
@@ -15656,6 +15707,7 @@ var Run = class {
         const executionResults = this._start({
           inputData,
           runtimeContext,
+          tracingContext,
           writableStream: writable,
           format
         }).then(result => {
@@ -15939,5 +15991,5 @@ exports.recursivelyCheckForFinalState = recursivelyCheckForFinalState;
 exports.resolveVariables = resolveVariables;
 exports.updateStepInHierarchy = updateStepInHierarchy;
 exports.workflowToStep = workflowToStep;
-//# sourceMappingURL=chunk-7GYN2OE3.cjs.map
-//# sourceMappingURL=chunk-7GYN2OE3.cjs.map
+//# sourceMappingURL=chunk-C3R2Q3NN.cjs.map
+//# sourceMappingURL=chunk-C3R2Q3NN.cjs.map