@mastra/core 0.16.1-alpha.0 → 0.16.1-alpha.2

package/dist/{chunk-IUF2ESZH.cjs → chunk-WJXZMK43.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 chunkOE3SL5VG_cjs = require('./chunk-OE3SL5VG.cjs');
-var chunkKT4WNDGP_cjs = require('./chunk-KT4WNDGP.cjs');
+var chunkSJO2HEVU_cjs = require('./chunk-SJO2HEVU.cjs');
+var chunkD3UG2YLU_cjs = require('./chunk-D3UG2YLU.cjs');
 var chunkTSNDVBUU_cjs = require('./chunk-TSNDVBUU.cjs');
-var chunk6FVCJBBG_cjs = require('./chunk-6FVCJBBG.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 chunkKT4WNDGP_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 chunkKT4WNDGP_cjs.DefaultGeneratedFileWithType({
+        file: new chunkD3UG2YLU_cjs.DefaultGeneratedFileWithType({
           data: chunk.payload.data,
           mediaType: chunk.payload.mimeType
         })
@@ -2239,7 +2239,8 @@ var MastraModelOutput = class extends chunkKXCUCBEI_cjs.MastraBase {
               } = chunk.payload.metadata;
               response = {
                 ...otherMetadata,
-                messages: messageList.get.response.aiV5.model()
+                messages: messageList.get.response.aiV5.model(),
+                uiMessages: messageList.get.response.aiV5.ui()
               };
             }
             this.populateUsageCount(chunk.payload.output.usage);
@@ -2247,7 +2248,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 => chunkKT4WNDGP_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) {
@@ -2266,7 +2267,8 @@ var MastraModelOutput = class extends chunkKXCUCBEI_cjs.MastraBase {
                   } = chunk.payload.metadata;
                   response = {
                     ...otherMetadata,
-                    messages: messageList.get.response.aiV5.model()
+                    messages: messageList.get.response.aiV5.model(),
+                    uiMessages: messageList.get.response.aiV5.ui()
                   };
                 }
               } else {
@@ -2621,7 +2623,6 @@ var MastraModelOutput = class extends chunkKXCUCBEI_cjs.MastraBase {
         scoringData
       } : {})
     };
-    fullOutput.response.messages = this.messageList.get.response.aiV5.model();
     return fullOutput;
   }
   /**
@@ -3115,7 +3116,9 @@ var toolCallInputSchema = z__default.default.object({
   toolCallId: z__default.default.string(),
   toolName: z__default.default.string(),
   args: z__default.default.any(),
-  providerMetadata: z__default.default.any()
+  providerMetadata: z__default.default.any(),
+  providerExecuted: z__default.default.boolean().optional(),
+  output: z__default.default.any().optional()
 });
 var toolCallOutputSchema = toolCallInputSchema.extend({
   result: z__default.default.any(),
@@ -3636,6 +3639,32 @@ function createToolCallStep({
     execute: async ({
       inputData
     }) => {
+      if (inputData.providerExecuted) {
+        const tracer2 = getTracer({
+          isEnabled: telemetry_settings?.isEnabled,
+          tracer: telemetry_settings?.tracer
+        });
+        const span2 = tracer2.startSpan("mastra.stream.toolCall").setAttributes({
+          ...assembleOperationName({
+            operationId: "mastra.stream.toolCall",
+            telemetry: telemetry_settings
+          }),
+          "stream.toolCall.toolName": inputData.toolName,
+          "stream.toolCall.toolCallId": inputData.toolCallId,
+          "stream.toolCall.args": JSON.stringify(inputData.args),
+          "stream.toolCall.providerExecuted": true
+        });
+        if (inputData.output) {
+          span2.setAttributes({
+            "stream.toolCall.result": JSON.stringify(inputData.output)
+          });
+        }
+        span2.end();
+        return {
+          ...inputData,
+          result: inputData.output
+        };
+      }
       const tool = tools?.[inputData.toolName] || Object.values(tools || {})?.find(tool2 => `id` in tool2 && tool2.id === inputData.toolName);
       if (!tool) {
         throw new Error(`Tool ${inputData.toolName} not found`);
@@ -3777,7 +3806,8 @@ function createOuterLLMWorkflow({
               toolCallId: toolCall.toolCallId,
               toolName: toolCall.toolName,
               result: toolCall.result,
-              providerMetadata: toolCall.providerMetadata
+              providerMetadata: toolCall.providerMetadata,
+              providerExecuted: toolCall.providerExecuted
             }
           };
           rest.controller.enqueue(chunk);
@@ -4156,7 +4186,6 @@ var MastraLLMVNext = class extends chunkKXCUCBEI_cjs.MastraBase {
     }];
   }
   stream({
-    messages,
     stopWhen = aiV5.stepCountIs(5),
     maxSteps,
     tools = {},
@@ -4171,7 +4200,9 @@ var MastraLLMVNext = class extends chunkKXCUCBEI_cjs.MastraBase {
     outputProcessors,
     returnScorerData,
     providerOptions,
-    tracingContext
+    tracingContext,
+    messageList,
+    _internal
     // ...rest
   }) {
     let stopWhenToUse;
@@ -4180,6 +4211,7 @@ var MastraLLMVNext = class extends chunkKXCUCBEI_cjs.MastraBase {
     } else {
       stopWhenToUse = stopWhen;
     }
+    const messages = messageList.get.all.aiV5.model();
     const model = this.#model;
     this.logger.debug(`[LLM] - Streaming text`, {
       runId,
@@ -4203,11 +4235,6 @@ var MastraLLMVNext = class extends chunkKXCUCBEI_cjs.MastraBase {
       }
     });
     try {
-      const messageList = new chunkKT4WNDGP_cjs.MessageList({
-        threadId,
-        resourceId
-      });
-      messageList.add(messages, "input");
       const loopOptions = {
         messageList,
         model: this.#model,
@@ -4220,6 +4247,7 @@ var MastraLLMVNext = class extends chunkKXCUCBEI_cjs.MastraBase {
           ...this.experimental_telemetry,
           ...telemetry_settings
         },
+        _internal,
         output,
         outputProcessors,
         returnScorerData,
@@ -4264,7 +4292,7 @@ var MastraLLMVNext = class extends chunkKXCUCBEI_cjs.MastraBase {
               this.logger.warn("Rate limit approaching, waiting 10 seconds", {
                 runId
               });
-              await chunk6FVCJBBG_cjs.delay(10 * 1e3);
+              await chunkKB4IEMPV_cjs.delay(10 * 1e3);
             }
           },
           onFinish: async props => {
@@ -4339,14 +4367,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) {
@@ -5159,7 +5191,7 @@ var Machine = class extends EventEmitter__default.default {
         const logger = this.logger;
         let mastraProxy = void 0;
         if (this.#mastra) {
-          mastraProxy = chunk6FVCJBBG_cjs.createMastraProxy({
+          mastraProxy = chunkKB4IEMPV_cjs.createMastraProxy({
             mastra: this.#mastra,
             logger
           });
@@ -9328,13 +9360,13 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
       this.logger.error(mastraError.toString());
       throw mastraError;
     }
-    return chunk6FVCJBBG_cjs.ensureToolProperties(this.#tools);
+    return chunkKB4IEMPV_cjs.ensureToolProperties(this.#tools);
   }
   getTools({
     runtimeContext = new chunkGPWMM745_cjs.RuntimeContext()
   } = {}) {
     if (typeof this.#tools !== "function") {
-      return chunk6FVCJBBG_cjs.ensureToolProperties(this.#tools);
+      return chunkKB4IEMPV_cjs.ensureToolProperties(this.#tools);
     }
     const result = this.#tools({
       runtimeContext,
@@ -9355,7 +9387,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
         this.logger.error(mastraError.toString());
         throw mastraError;
       }
-      return chunk6FVCJBBG_cjs.ensureToolProperties(tools);
+      return chunkKB4IEMPV_cjs.ensureToolProperties(tools);
     });
   }
   get llm() {
@@ -9399,7 +9431,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
           mastra: this.#mastra
         });
       } else {
-        llm = new chunkOE3SL5VG_cjs.MastraLLMV1({
+        llm = new chunkSJO2HEVU_cjs.MastraLLMV1({
           model: resolvedModel,
           mastra: this.#mastra
         });
@@ -9515,7 +9547,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
       runtimeContext,
       model
     });
-    const normMessage = new chunkKT4WNDGP_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)}`);
     }
@@ -9538,16 +9570,17 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
     const systemInstructions = await this.resolveTitleInstructions(runtimeContext, instructions);
     let text = "";
     if (llm.getModel().specificationVersion === "v2") {
+      const messageList = new chunkD3UG2YLU_cjs.MessageList().add([{
+        role: "system",
+        content: systemInstructions
+      }], "system").add([{
+        role: "user",
+        content: JSON.stringify(partsToGen)
+      }], "input");
       const result = llm.stream({
         runtimeContext,
         tracingContext,
-        messages: [{
-          role: "system",
-          content: systemInstructions
-        }, {
-          role: "user",
-          content: JSON.stringify(partsToGen)
-        }]
+        messageList
       });
       text = await result.text;
     } else {
@@ -9574,7 +9607,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
   async genTitle(userMessage, runtimeContext, tracingContext, model, instructions) {
     try {
       if (userMessage) {
-        const normMessage = new chunkKT4WNDGP_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,
@@ -9600,7 +9633,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
     runId,
     userMessages,
     systemMessage,
-    messageList = new chunkKT4WNDGP_cjs.MessageList({
+    messageList = new chunkD3UG2YLU_cjs.MessageList({
       threadId,
       resourceId
     }),
@@ -9655,7 +9688,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
         systemMessage: systemMessages,
         memorySystemMessage: memorySystemMessage || void 0
       });
-      const returnList = new chunkKT4WNDGP_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()
@@ -9700,7 +9733,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
             runtimeContext
           }) : this.model
         };
-        const convertedToCoreTool = chunk6FVCJBBG_cjs.makeCoreTool(toolObj, options);
+        const convertedToCoreTool = chunkKB4IEMPV_cjs.makeCoreTool(toolObj, options);
         convertedMemoryTools[toolName] = convertedToCoreTool;
       }
     }
@@ -9871,7 +9904,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
         }) : this.model,
         writableStream
       };
-      return [k, chunk6FVCJBBG_cjs.makeCoreTool(tool, options)];
+      return [k, chunkKB4IEMPV_cjs.makeCoreTool(tool, options)];
     }));
     const assignedToolEntriesConverted = Object.fromEntries(assignedCoreToolEntries.filter(entry => Boolean(entry)));
     toolsForRequest = {
@@ -9915,7 +9948,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
               runtimeContext
             }) : this.model
           };
-          const convertedToCoreTool = chunk6FVCJBBG_cjs.makeCoreTool(toolObj, options, "toolset");
+          const convertedToCoreTool = chunkKB4IEMPV_cjs.makeCoreTool(toolObj, options, "toolset");
           toolsForRequest[toolName] = convertedToCoreTool;
         }
       }
@@ -9960,7 +9993,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
             runtimeContext
           }) : this.model
         };
-        const convertedToCoreTool = chunk6FVCJBBG_cjs.makeCoreTool(rest, options, "client-tool");
+        const convertedToCoreTool = chunkKB4IEMPV_cjs.makeCoreTool(rest, options, "client-tool");
         toolsForRequest[toolName] = convertedToCoreTool;
       }
     }
@@ -10003,7 +10036,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
                 threadId,
                 resourceId
               });
-              const run = workflow.createRun();
+              const run = await workflow.createRunAsync();
               let result;
               if (methodType === "generate") {
                 result = await run.start({
@@ -10027,6 +10060,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
                 const streamResult = run.streamVNext({
                   inputData: context,
                   runtimeContext,
+                  tracingContext: innerTracingContext,
                   format
                 });
                 if (writer) {
@@ -10074,7 +10108,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
           }) : this.model,
           tracingContext
         };
-        convertedWorkflowTools[workflowName] = chunk6FVCJBBG_cjs.makeCoreTool(toolObj, options);
+        convertedWorkflowTools[workflowName] = chunkKB4IEMPV_cjs.makeCoreTool(toolObj, options);
       }
     }
     return convertedWorkflowTools;
@@ -10094,7 +10128,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
     let mastraProxy = void 0;
     const logger = this.logger;
     if (this.#mastra) {
-      mastraProxy = chunk6FVCJBBG_cjs.createMastraProxy({
+      mastraProxy = chunkKB4IEMPV_cjs.createMastraProxy({
         mastra: this.#mastra,
         logger
       });
@@ -10236,7 +10270,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,
@@ -10283,7 +10317,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
           writableStream,
           methodType
         });
-        const messageList = new chunkKT4WNDGP_cjs.MessageList({
+        const messageList = new chunkD3UG2YLU_cjs.MessageList({
           threadId,
           resourceId,
           generateMessageId: this.#mastra?.generateId?.bind(this.#mastra),
@@ -10373,7 +10407,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
         let [memoryMessages, memorySystemMessage] = await Promise.all([existingThread || hasResourceScopeSemanticRecall ? this.getMemoryMessages({
           resourceId,
           threadId: threadObject.id,
-          vectorMessageSearch: new chunkKT4WNDGP_cjs.MessageList().add(messages, `user`).getLatestUserContent() || "",
+          vectorMessageSearch: new chunkD3UG2YLU_cjs.MessageList().add(messages, `user`).getLatestUserContent() || "",
           memoryConfig,
           runtimeContext
         }) : [], memory.getSystemMessage({
@@ -10396,7 +10430,7 @@ The following messages were remembered from a different conversation:
 <remembered_from_other_conversation>
 ${(() => {
             let result = ``;
-            const messages2 = new chunkKT4WNDGP_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;
@@ -10449,7 +10483,7 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
           systemMessage,
           memorySystemMessage: memorySystemMessage || void 0
         });
-        const processedList = new chunkKT4WNDGP_cjs.MessageList({
+        const processedList = new chunkD3UG2YLU_cjs.MessageList({
           threadId: threadObject.id,
           resourceId,
           generateMessageId: this.#mastra?.generateId?.bind(this.#mastra),
@@ -10505,7 +10539,7 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
           result: resToLog,
           threadId
         });
-        const messageListResponses = new chunkKT4WNDGP_cjs.MessageList({
+        const messageListResponses = new chunkD3UG2YLU_cjs.MessageList({
           threadId,
           resourceId,
           generateMessageId: this.#mastra?.generateId?.bind(this.#mastra),
@@ -10533,14 +10567,7 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
               }];
             }
             if (responseMessages) {
-              const messagesWithoutIds = responseMessages.map(m => {
-                const {
-                  id,
-                  ...messageWithoutId
-                } = m;
-                return messageWithoutId;
-              });
-              messageList.add(messagesWithoutIds, "response");
+              messageList.add(responseMessages, "response");
             }
             if (!threadExists) {
               await memory.createThread({
@@ -10963,7 +10990,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,
@@ -11039,12 +11066,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
@@ -11055,7 +11082,6 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
       id: "prepare-memory-step",
       inputSchema: z.z.any(),
       outputSchema: z.z.object({
-        messageObjects: z.z.array(z.z.any()),
         threadExists: z.z.boolean(),
         thread: z.z.any(),
         messageList: z.z.any(),
@@ -11066,7 +11092,7 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
         tracingContext
       }) => {
         const thread = threadFromArgs;
-        const messageList = new chunkKT4WNDGP_cjs.MessageList({
+        const messageList = new chunkD3UG2YLU_cjs.MessageList({
           threadId: thread?.id,
           resourceId,
           generateMessageId: this.#mastra?.generateId?.bind(this.#mastra),
@@ -11087,7 +11113,6 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
             messageList
           });
           return {
-            messageObjects: messageList.get.all.prompt(),
             threadExists: false,
             thread: void 0,
             messageList,
@@ -11151,7 +11176,7 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
         let [memoryMessages, memorySystemMessage] = await Promise.all([existingThread || hasResourceScopeSemanticRecall ? this.getMemoryMessages({
           resourceId,
           threadId: threadObject.id,
-          vectorMessageSearch: new chunkKT4WNDGP_cjs.MessageList().add(options.messages, `user`).getLatestUserContent() || "",
+          vectorMessageSearch: new chunkD3UG2YLU_cjs.MessageList().add(options.messages, `user`).getLatestUserContent() || "",
           memoryConfig,
           runtimeContext
         }) : [], memory.getSystemMessage({
@@ -11174,7 +11199,7 @@ The following messages were remembered from a different conversation:
 <remembered_from_other_conversation>
 ${(() => {
             let result2 = ``;
-            const messages = new chunkKT4WNDGP_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;
@@ -11226,18 +11251,17 @@ the following messages are from ${ymd}
           systemMessage,
           memorySystemMessage: memorySystemMessage || void 0
         });
-        const processedList = new chunkKT4WNDGP_cjs.MessageList({
+        const processedList = new chunkD3UG2YLU_cjs.MessageList({
           threadId: threadObject.id,
           resourceId,
           generateMessageId: this.#mastra?.generateId?.bind(this.#mastra),
           // @ts-ignore Flag for agent network messages
           _agentNetworkAppend: this._agentNetworkAppend
-        }).addSystem(instructions || `${this.instructions}.`).addSystem(memorySystemMessage).add(options.context || [], "context").add(processedMemoryMessages, "memory").add(messageList.get.input.v2(), "user").get.all.prompt();
+        }).addSystem(instructions || `${this.instructions}.`).addSystem(memorySystemMessage).add(options.context || [], "context").add(processedMemoryMessages, "memory").add(messageList.get.input.v2(), "user");
         return {
           thread: threadObject,
-          messageList,
+          messageList: processedList,
           // add old processed messages + new input messages
-          messageObjects: processedList,
           ...(tripwireTriggered && {
             tripwire: true,
             tripwireReason
@@ -11264,7 +11288,10 @@ the following messages are from ${ymd}
           ...inputData,
           outputProcessors,
           returnScorerData: options.returnScorerData,
-          tracingContext
+          tracingContext,
+          _internal: {
+            generateId: inputData.experimental_generateMessageId || this.#mastra?.generateId?.bind(this.#mastra)
+          }
         });
         if (format === "aisdk") {
           return streamResult.aisdk.v5;
@@ -11284,7 +11311,6 @@ the following messages are from ${ymd}
     }) => {
       const result2 = {
         ...options,
-        messages: inputData["prepare-memory-step"].messageObjects,
         tools: inputData["prepare-tools-step"].convertedTools,
         runId,
         temperature: options.modelSettings?.temperature,
@@ -11379,11 +11405,13 @@ 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 = {
-        messages: result2.messages,
         runtimeContext: result2.runtimeContext,
         tracingContext: {
           currentSpan: agentAISpan
@@ -11407,7 +11435,6 @@ the following messages are from ${ymd}
               return;
             }
             const messageList = inputData["prepare-memory-step"].messageList;
-            messageList.add(payload.response.messages, "response");
             try {
               const outputText = messageList.get.all.core().map(m => m.content).join("\n");
               await this.#executeOnFinish({
@@ -11436,17 +11463,25 @@ 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
+          onStepFinish: result2.onStepFinish,
+          onChunk: options.onChunk,
+          onError: options.onError,
+          onAbort: options.onAbort,
+          activeTools: options.activeTools,
+          abortSignal: options.abortSignal
         },
         output: options.output,
         outputProcessors: effectiveOutputProcessors,
         modelSettings: {
           temperature: 0,
           ...(options.modelSettings || {})
-        }
+        },
+        messageList: inputData["prepare-memory-step"].messageList
       };
       return loopOptions;
     }).then(streamStep).commit();
@@ -11523,14 +11558,8 @@ the following messages are from ${ymd}
           }];
         }
         if (responseMessages) {
-          const messagesWithoutIds = responseMessages.map(m => {
-            const {
-              id,
-              ...messageWithoutId
-            } = m;
-            return messageWithoutId;
-          }).filter(m => m.role !== "user");
-          messageList.add(messagesWithoutIds, "response");
+          const filteredMessages = responseMessages.filter(m => m.role !== "user");
+          messageList.add(filteredMessages, "response");
         }
         if (!threadExists) {
           await memory.createThread({
@@ -11680,7 +11709,8 @@ the following messages are from ${ymd}
     });
     const mergedGenerateOptions = {
       ...defaultGenerateOptions,
-      ...generateOptions
+      ...generateOptions,
+      experimental_generateMessageId: defaultGenerateOptions.experimental_generateMessageId || this.#mastra?.generateId?.bind(this.#mastra)
     };
     const {
       llm,
@@ -11747,7 +11777,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) {
@@ -11760,7 +11793,7 @@ the following messages are from ${ymd}
         runtimeContext: mergedGenerateOptions.runtimeContext || new chunkGPWMM745_cjs.RuntimeContext(),
         tracingContext,
         outputProcessorOverrides: finalOutputProcessors,
-        messageList: new chunkKT4WNDGP_cjs.MessageList({
+        messageList: new chunkD3UG2YLU_cjs.MessageList({
           threadId: llmOptions.threadId || "",
           resourceId: llmOptions.resourceId || ""
         }).add({
@@ -11853,7 +11886,7 @@ the following messages are from ${ymd}
     const outputProcessorResult = await this.__runOutputProcessors({
       runtimeContext: mergedGenerateOptions.runtimeContext || new chunkGPWMM745_cjs.RuntimeContext(),
       tracingContext,
-      messageList: new chunkKT4WNDGP_cjs.MessageList({
+      messageList: new chunkD3UG2YLU_cjs.MessageList({
         threadId: llmOptions.threadId || "",
         resourceId: llmOptions.resourceId || ""
       }).add({
@@ -11931,7 +11964,8 @@ the following messages are from ${ymd}
     const mergedStreamOptions = {
       ...defaultStreamOptions,
       ...streamOptions,
-      onFinish: this.#mergeOnFinishWithTelemetry(streamOptions, defaultStreamOptions)
+      onFinish: this.#mergeOnFinishWithTelemetry(streamOptions, defaultStreamOptions),
+      experimental_generateMessageId: defaultStreamOptions.experimental_generateMessageId || this.#mastra?.generateId?.bind(this.#mastra)
     };
     const {
       llm,
@@ -12313,9 +12347,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 => {
@@ -12323,7 +12357,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);
           }
@@ -12335,9 +12371,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);
         }
@@ -12346,9 +12387,7 @@ var MastraWorkflowStream = class extends web.ReadableStream {
           runId: run.runId,
           from: "WORKFLOW" /* WORKFLOW */,
           payload: {
-            stepResult: {
-              reason: "stop"
-            },
+            workflowStatus,
             output: {
               usage: this.#usageCount
             },
@@ -12517,7 +12556,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,
@@ -13030,7 +13069,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),
@@ -13614,7 +13653,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
         }
@@ -14482,6 +14521,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,
@@ -15186,6 +15231,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,
@@ -15619,12 +15666,13 @@ var Run = class {
   streamVNext({
     inputData,
     runtimeContext,
+    tracingContext,
     format
   } = {}) {
     this.closeStreamAction = async () => {};
     return new MastraWorkflowStream({
       run: this,
-      createStream: writer => {
+      createStream: () => {
         const {
           readable,
           writable
@@ -15642,7 +15690,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);
@@ -15680,6 +15728,7 @@ var Run = class {
         const executionResults = this._start({
           inputData,
           runtimeContext,
+          tracingContext,
           writableStream: writable,
           format
         }).then(result => {
@@ -15963,5 +16012,5 @@ exports.recursivelyCheckForFinalState = recursivelyCheckForFinalState;
 exports.resolveVariables = resolveVariables;
 exports.updateStepInHierarchy = updateStepInHierarchy;
 exports.workflowToStep = workflowToStep;
-//# sourceMappingURL=chunk-IUF2ESZH.cjs.map
-//# sourceMappingURL=chunk-IUF2ESZH.cjs.map
+//# sourceMappingURL=chunk-WJXZMK43.cjs.map
+//# sourceMappingURL=chunk-WJXZMK43.cjs.map