@mastra/core 0.15.3-alpha.4 → 0.15.3-alpha.6

package/dist/{chunk-KUNWELBC.cjs → chunk-25VRTGOH.cjs}

@@ -1,16 +1,16 @@
 'use strict';
 
-var chunkFBBP67MQ_cjs = require('./chunk-FBBP67MQ.cjs');
+var chunkVZYIKGJ6_cjs = require('./chunk-VZYIKGJ6.cjs');
 var chunkNFXTYMWZ_cjs = require('./chunk-NFXTYMWZ.cjs');
-var chunkZOU4K5MI_cjs = require('./chunk-ZOU4K5MI.cjs');
-var chunkF2CAC2R2_cjs = require('./chunk-F2CAC2R2.cjs');
-var chunk5CJDO3UO_cjs = require('./chunk-5CJDO3UO.cjs');
+var chunkZ637KSJF_cjs = require('./chunk-Z637KSJF.cjs');
+var chunkMNDKBEEQ_cjs = require('./chunk-MNDKBEEQ.cjs');
+var chunkAAJF7WLJ_cjs = require('./chunk-AAJF7WLJ.cjs');
 var chunkTSNDVBUU_cjs = require('./chunk-TSNDVBUU.cjs');
 var chunkLVGGMWSE_cjs = require('./chunk-LVGGMWSE.cjs');
 var chunkGPWMM745_cjs = require('./chunk-GPWMM745.cjs');
 var chunkS6MAHT7F_cjs = require('./chunk-S6MAHT7F.cjs');
 var chunkABRPHTOG_cjs = require('./chunk-ABRPHTOG.cjs');
-var chunkI7OAONIW_cjs = require('./chunk-I7OAONIW.cjs');
+var chunkUFCYMOYH_cjs = require('./chunk-UFCYMOYH.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 chunk5CJDO3UO_cjs.DefaultGeneratedFile({
+          file: new chunkAAJF7WLJ_cjs.DefaultGeneratedFile({
             data: chunk.payload.data,
             mediaType: chunk.payload.mimeType
           })
@@ -1181,7 +1181,7 @@ function convertMastraChunkToAISDKv5({
       }
       return {
         type: "file",
-        file: new chunk5CJDO3UO_cjs.DefaultGeneratedFileWithType({
+        file: new chunkAAJF7WLJ_cjs.DefaultGeneratedFileWithType({
           data: chunk.payload.data,
           mediaType: chunk.payload.mimeType
         })
@@ -2049,6 +2049,7 @@ var MastraModelOutput = class extends chunkKXCUCBEI_cjs.MastraBase {
     reasoningDetails: new DelayedPromise()
   };
   #streamConsumed = false;
+  #returnScorerData = false;
   /**
    * Unique identifier for this execution run.
    */
@@ -2073,6 +2074,7 @@ var MastraModelOutput = class extends chunkKXCUCBEI_cjs.MastraBase {
       name: "MastraModelOutput"
     });
     this.#options = options;
+    this.#returnScorerData = !!options.returnScorerData;
     this.runId = options.runId;
     if (options.outputProcessors?.length) {
       this.processorRunner = new ProcessorRunner({
@@ -2225,7 +2227,7 @@ var MastraModelOutput = class extends chunkKXCUCBEI_cjs.MastraBase {
             try {
               if (self.processorRunner) {
                 await self.processorRunner.runOutputProcessors(self.messageList);
-                const outputText = self.messageList.get.response.aiV4.core().map(m => chunk5CJDO3UO_cjs.MessageList.coreContentToString(m.content)).join("\n");
+                const outputText = self.messageList.get.response.aiV4.core().map(m => chunkAAJF7WLJ_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) {
@@ -2552,6 +2554,18 @@ var MastraModelOutput = class extends chunkKXCUCBEI_cjs.MastraBase {
         throw error;
       }
     });
+    let scoringData;
+    if (this.#returnScorerData) {
+      scoringData = {
+        input: {
+          inputMessages: this.messageList.getPersisted.input.ui(),
+          rememberedMessages: this.messageList.getPersisted.remembered.ui(),
+          systemMessages: this.messageList.getSystemMessages(),
+          taggedSystemMessages: this.messageList.getPersisted.taggedSystemMessages
+        },
+        output: this.messageList.getPersisted.response.ui()
+      };
+    }
     const fullOutput = {
       text: await this.text,
       usage: await this.usage,
@@ -2571,7 +2585,10 @@ var MastraModelOutput = class extends chunkKXCUCBEI_cjs.MastraBase {
       object: await this.object,
       error: this.error,
       tripwire: this.#tripwire,
-      tripwireReason: this.#tripwireReason
+      tripwireReason: this.#tripwireReason,
+      ...(scoringData ? {
+        scoringData
+      } : {})
     };
     fullOutput.response.messages = this.messageList.get.response.aiV5.model();
     return fullOutput;
@@ -3095,7 +3112,16 @@ async function processOutputStream({
         reasoningDeltas: []
       });
     }
-    if (chunk.type !== "text-delta" && chunk.type !== "tool-call" && runState.state.isStreaming) {
+    if (chunk.type !== "text-delta" && chunk.type !== "tool-call" &&
+    // not 100% sure about this being the right fix.
+    // basically for some llm providers they add response-metadata after each text-delta
+    // we then flush the chunks by calling messageList.add (a few lines down)
+    // this results in a bunch of weird separated text chunks on the message instead of combined chunks
+    // easiest solution here is to just not flush for response-metadata
+    // BUT does this cause other issues?
+    // Alternative solution: in message list allow combining text deltas together when the message source is "response" and the text parts are directly next to each other
+    // simple solution for now is to not flush text deltas on response-metadata
+    chunk.type !== "response-metadata" && runState.state.isStreaming) {
       if (runState.state.textDeltas.length) {
         const textStartPayload = chunk.payload;
         const providerMetadata = textStartPayload.providerMetadata ?? runState.state.providerOptions;
@@ -3776,16 +3802,6 @@ function workflowLoopStream({
     start: async controller => {
       const writer = new WritableStream({
         write: chunk => {
-          if (llmAISpan && chunk.type === "text-delta") {
-            llmAISpan.createEventSpan({
-              type: "llm_chunk" /* LLM_CHUNK */,
-              name: `llm chunk: ${chunk.type}`,
-              output: chunk.payload.text,
-              attributes: {
-                chunkType: chunk.type
-              }
-            });
-          }
           controller.enqueue(chunk);
         }
       });
@@ -3931,6 +3947,7 @@ function loop({
   _internal,
   mode = "stream",
   outputProcessors,
+  returnScorerData,
   llmAISpan,
   ...rest
 }) {
@@ -4010,7 +4027,8 @@ function loop({
       onStepFinish: rest.options?.onStepFinish,
       includeRawChunks: !!includeRawChunks,
       output: rest.output,
-      outputProcessors
+      outputProcessors,
+      returnScorerData
     }
   });
 }
@@ -4102,6 +4120,7 @@ var MastraLLMVNext = class extends chunkKXCUCBEI_cjs.MastraBase {
     output,
     options,
     outputProcessors,
+    returnScorerData,
     providerOptions,
     tracingContext
     // ...rest
@@ -4138,7 +4157,7 @@ var MastraLLMVNext = class extends chunkKXCUCBEI_cjs.MastraBase {
       }
     });
     try {
-      const messageList = new chunk5CJDO3UO_cjs.MessageList({
+      const messageList = new chunkAAJF7WLJ_cjs.MessageList({
         threadId,
         resourceId
       });
@@ -4157,6 +4176,7 @@ var MastraLLMVNext = class extends chunkKXCUCBEI_cjs.MastraBase {
         },
         output,
         outputProcessors,
+        returnScorerData,
         llmAISpan,
         options: {
           ...options,
@@ -8882,7 +8902,7 @@ function resolveThreadIdFromArgs(args) {
   return void 0;
 }
 var _Agent_decorators, _init, _a;
-_Agent_decorators = [chunkZOU4K5MI_cjs.InstrumentClass({
+_Agent_decorators = [chunkZ637KSJF_cjs.InstrumentClass({
   prefix: "agent",
   excludeMethods: ["hasOwnMemory", "getMemory", "__primitive", "__registerMastra", "__registerPrimitives", "__runInputProcessors", "__runOutputProcessors", "_wrapToolsWithAITracing", "getProcessorRunner", "__setTools", "__setLogger", "__setTelemetry", "log", "getModel", "getInstructions", "getTools", "getLLM", "getWorkflows", "getDefaultGenerateOptions", "getDefaultStreamOptions", "getDescription", "getScorers", "getVoice"]
 })];
@@ -8960,7 +8980,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
         this.#voice?.addInstructions(config.instructions);
       }
     } else {
-      this.#voice = new chunkFBBP67MQ_cjs.DefaultVoice();
+      this.#voice = new chunkVZYIKGJ6_cjs.DefaultVoice();
     }
     if (config.inputProcessors) {
       this.#inputProcessors = config.inputProcessors;
@@ -9110,7 +9130,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
       }));
       return voice;
     } else {
-      return new chunkFBBP67MQ_cjs.DefaultVoice();
+      return new chunkVZYIKGJ6_cjs.DefaultVoice();
     }
   }
   get instructions() {
@@ -9333,7 +9353,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
           mastra: this.#mastra
         });
       } else {
-        llm = new chunkF2CAC2R2_cjs.MastraLLMV1({
+        llm = new chunkMNDKBEEQ_cjs.MastraLLMV1({
           model: resolvedModel,
           mastra: this.#mastra
         });
@@ -9449,7 +9469,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
       runtimeContext,
       model
     });
-    const normMessage = new chunk5CJDO3UO_cjs.MessageList().add(message, "user").get.all.ui().at(-1);
+    const normMessage = new chunkAAJF7WLJ_cjs.MessageList().add(message, "user").get.all.ui().at(-1);
     if (!normMessage) {
       throw new Error(`Could not generate title from input ${JSON.stringify(message)}`);
     }
@@ -9508,7 +9528,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
   async genTitle(userMessage, runtimeContext, tracingContext, model, instructions) {
     try {
       if (userMessage) {
-        const normMessage = new chunk5CJDO3UO_cjs.MessageList().add(userMessage, "user").get.all.ui().at(-1);
+        const normMessage = new chunkAAJF7WLJ_cjs.MessageList().add(userMessage, "user").get.all.ui().at(-1);
         if (normMessage) {
           return await this.generateTitleFromUserMessage({
             message: normMessage,
@@ -9534,7 +9554,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
     runId,
     userMessages,
     systemMessage,
-    messageList = new chunk5CJDO3UO_cjs.MessageList({
+    messageList = new chunkAAJF7WLJ_cjs.MessageList({
       threadId,
       resourceId
     }),
@@ -9589,7 +9609,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
         systemMessage: systemMessages,
         memorySystemMessage: memorySystemMessage || void 0
       });
-      const returnList = new chunk5CJDO3UO_cjs.MessageList().addSystem(systemMessages).add(processedMemoryMessages, "memory").add(newMessages, "user");
+      const returnList = new chunkAAJF7WLJ_cjs.MessageList().addSystem(systemMessages).add(processedMemoryMessages, "memory").add(newMessages, "user");
       return {
         threadId: thread.id,
         messages: returnList.get.all.prompt()
@@ -9905,27 +9925,31 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
     threadId,
     resourceId,
     runtimeContext,
+    methodType,
     tracingContext
   }) {
-    let convertedWorkflowTools = {};
+    const convertedWorkflowTools = {};
     const workflows = await this.getWorkflows({
       runtimeContext
     });
     if (Object.keys(workflows).length > 0) {
-      convertedWorkflowTools = Object.entries(workflows).reduce((memo, [workflowName, workflow]) => {
-        memo[workflowName] = {
+      for (const [workflowName, workflow] of Object.entries(workflows)) {
+        const toolObj = chunkABRPHTOG_cjs.createTool({
+          id: workflowName,
           description: workflow.description || `Workflow: ${workflowName}`,
-          parameters: workflow.inputSchema || {
-            type: "object",
-            properties: {}
-          },
+          inputSchema: workflow.inputSchema,
+          outputSchema: workflow.outputSchema,
+          mastra: this.#mastra,
           // manually wrap workflow tools with ai tracing, so that we can pass the
           // current tool span onto the workflow to maintain continuity of the trace
-          execute: async args => {
+          execute: async ({
+            context,
+            writer
+          }) => {
             const toolAISpan = tracingContext.currentSpan?.createChildSpan({
               type: "tool_call" /* TOOL_CALL */,
               name: `tool: '${workflowName}'`,
-              input: args,
+              input: context,
               attributes: {
                 toolId: workflowName,
                 toolType: "workflow"
@@ -9935,19 +9959,45 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
               this.logger.debug(`[Agent:${this.name}] - Executing workflow as tool ${workflowName}`, {
                 name: workflowName,
                 description: workflow.description,
-                args,
+                args: context,
                 runId,
                 threadId,
                 resourceId
               });
               const run = workflow.createRun();
-              const result = await run.start({
-                inputData: args,
-                runtimeContext,
-                tracingContext: {
-                  currentSpan: toolAISpan
+              let result;
+              if (methodType === "generate") {
+                result = await run.start({
+                  inputData: context,
+                  runtimeContext,
+                  tracingContext: {
+                    currentSpan: toolAISpan
+                  }
+                });
+              } else if (methodType === "stream") {
+                const streamResult = await run.stream({
+                  inputData: context,
+                  runtimeContext
+                  // TODO: is this forgottn?
+                  //currentSpan: toolAISpan,
+                });
+                if (writer) {
+                  await streamResult.stream.pipeTo(writer);
+                } else {
+                  for await (const _chunk of streamResult.stream) {}
                 }
-              });
+                result = await streamResult.getWorkflowState();
+              } else if (methodType === "streamVNext") {
+                const streamResult = run.streamVNext({
+                  inputData: context,
+                  runtimeContext
+                  //format,
+                });
+                if (writer) {
+                  await streamResult.pipeTo(writer);
+                }
+                result = await streamResult.result;
+              }
               toolAISpan?.end({
                 output: result
               });
@@ -9973,9 +10023,26 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
               throw mastraError;
             }
           }
+        });
+        const options = {
+          name: workflowName,
+          runId,
+          threadId,
+          resourceId,
+          logger: this.logger,
+          mastra: this.#mastra,
+          memory: await this.getMemory({
+            runtimeContext
+          }),
+          agentName: this.name,
+          runtimeContext,
+          model: typeof this.model === "function" ? await this.getModel({
+            runtimeContext
+          }) : this.model,
+          tracingContext
         };
-        return memo;
-      }, {});
+        convertedWorkflowTools[workflowName] = chunkLVGGMWSE_cjs.makeCoreTool(toolObj, options);
+      }
     }
     return convertedWorkflowTools;
   }
@@ -9987,7 +10054,9 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
     runId,
     runtimeContext,
     tracingContext,
-    writableStream
+    writableStream,
+    methodType,
+    format
   }) {
     let mastraProxy = void 0;
     const logger = this.logger;
@@ -10037,6 +10106,8 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
       resourceId,
       threadId,
       runtimeContext,
+      methodType,
+      format,
       tracingContext
     });
     return this.formatTools({
@@ -10122,6 +10193,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
     runtimeContext,
     saveQueueManager,
     writableStream,
+    methodType,
     tracingContext
   }) {
     return {
@@ -10131,7 +10203,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
             runId
           });
         }
-        const agentAISpan = chunkI7OAONIW_cjs.getOrCreateSpan({
+        const agentAISpan = chunkUFCYMOYH_cjs.getOrCreateSpan({
           type: "agent_run" /* AGENT_RUN */,
           name: `agent run: '${this.id}'`,
           input: messages,
@@ -10175,9 +10247,10 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
           runId,
           runtimeContext,
           tracingContext: innerTracingContext,
-          writableStream
+          writableStream,
+          methodType
         });
-        const messageList = new chunk5CJDO3UO_cjs.MessageList({
+        const messageList = new chunkAAJF7WLJ_cjs.MessageList({
           threadId,
           resourceId,
           generateMessageId: this.#mastra?.generateId?.bind(this.#mastra),
@@ -10265,7 +10338,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
         let [memoryMessages, memorySystemMessage] = await Promise.all([existingThread ? this.getMemoryMessages({
           resourceId,
           threadId: threadObject.id,
-          vectorMessageSearch: new chunk5CJDO3UO_cjs.MessageList().add(messages, `user`).getLatestUserContent() || "",
+          vectorMessageSearch: new chunkAAJF7WLJ_cjs.MessageList().add(messages, `user`).getLatestUserContent() || "",
           memoryConfig,
           runtimeContext
         }) : [], memory.getSystemMessage({
@@ -10288,7 +10361,7 @@ The following messages were remembered from a different conversation:
 <remembered_from_other_conversation>
 ${(() => {
             let result = ``;
-            const messages2 = new chunk5CJDO3UO_cjs.MessageList().add(resultsFromOtherThreads, "memory").get.all.v1();
+            const messages2 = new chunkAAJF7WLJ_cjs.MessageList().add(resultsFromOtherThreads, "memory").get.all.v1();
             let lastYmd = null;
             for (const msg of messages2) {
               const date = msg.createdAt;
@@ -10341,7 +10414,7 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
           systemMessage,
           memorySystemMessage: memorySystemMessage || void 0
         });
-        const processedList = new chunk5CJDO3UO_cjs.MessageList({
+        const processedList = new chunkAAJF7WLJ_cjs.MessageList({
           threadId: threadObject.id,
           resourceId,
           generateMessageId: this.#mastra?.generateId?.bind(this.#mastra),
@@ -10397,7 +10470,7 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
           result: resToLog,
           threadId
         });
-        const messageListResponses = new chunk5CJDO3UO_cjs.MessageList({
+        const messageListResponses = new chunkAAJF7WLJ_cjs.MessageList({
           threadId,
           resourceId,
           generateMessageId: this.#mastra?.generateId?.bind(this.#mastra),
@@ -10653,7 +10726,7 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
     }
     return result;
   }
-  async prepareLLMOptions(messages, options) {
+  async prepareLLMOptions(messages, options, methodType) {
     const {
       context,
       memoryOptions: memoryConfigFromArgs,
@@ -10686,7 +10759,7 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
     const llm = await this.getLLM({
       runtimeContext
     });
-    const activeSpan = chunkZOU4K5MI_cjs.Telemetry.getActiveSpan();
+    const activeSpan = chunkZ637KSJF_cjs.Telemetry.getActiveSpan();
     const baggageEntries = {};
     if (threadFromArgs?.id) {
       if (activeSpan) {
@@ -10705,7 +10778,7 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
       };
     }
     if (Object.keys(baggageEntries).length > 0) {
-      chunkZOU4K5MI_cjs.Telemetry.setBaggage(baggageEntries);
+      chunkZ637KSJF_cjs.Telemetry.setBaggage(baggageEntries);
     }
     const memory = await this.getMemory({
       runtimeContext
@@ -10730,6 +10803,7 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
       runtimeContext,
       saveQueueManager,
       writableStream,
+      methodType,
       tracingContext
     });
     let messageList;
@@ -10817,7 +10891,26 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
       }
     };
   }
-  async #execute(options) {
+  /**
+   * Merges telemetry wrapper with default onFinish callback when needed
+   */
+  #mergeOnFinishWithTelemetry(streamOptions, defaultStreamOptions) {
+    let finalOnFinish = streamOptions?.onFinish || defaultStreamOptions.onFinish;
+    if (streamOptions?.onFinish && streamOptions.onFinish.__hasOriginalOnFinish === false && defaultStreamOptions.onFinish) {
+      const telemetryWrapper = streamOptions.onFinish;
+      const defaultCallback = defaultStreamOptions.onFinish;
+      finalOnFinish = async data => {
+        await telemetryWrapper(data);
+        await defaultCallback(data);
+      };
+    }
+    return finalOnFinish;
+  }
+  async #execute({
+    methodType,
+    format = "mastra",
+    ...options
+  }) {
     const runtimeContext = options.runtimeContext || new chunkGPWMM745_cjs.RuntimeContext();
     const threadFromArgs = resolveThreadIdFromArgs({
       threadId: options.threadId,
@@ -10835,7 +10928,7 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
     const instructions = options.instructions || (await this.getInstructions({
       runtimeContext
     }));
-    const agentAISpan = chunkI7OAONIW_cjs.getOrCreateSpan({
+    const agentAISpan = chunkUFCYMOYH_cjs.getOrCreateSpan({
       type: "agent_run" /* AGENT_RUN */,
       name: `agent run: '${this.id}'`,
       input: options.messages,
@@ -10851,7 +10944,7 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
       tracingContext: options.tracingContext,
       runtimeContext
     });
-    const activeSpan = chunkZOU4K5MI_cjs.Telemetry.getActiveSpan();
+    const activeSpan = chunkZ637KSJF_cjs.Telemetry.getActiveSpan();
     const baggageEntries = {};
     if (threadFromArgs?.id) {
       if (activeSpan) {
@@ -10870,7 +10963,7 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
       };
     }
     if (Object.keys(baggageEntries).length > 0) {
-      chunkZOU4K5MI_cjs.Telemetry.setBaggage(baggageEntries);
+      chunkZ637KSJF_cjs.Telemetry.setBaggage(baggageEntries);
     }
     const memory = await this.getMemory({
       runtimeContext
@@ -10912,6 +11005,8 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
           runId,
           runtimeContext,
           writableStream: options.writableStream,
+          methodType,
+          format,
           tracingContext: {
             currentSpan: agentAISpan
           }
@@ -10936,7 +11031,7 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
         tracingContext
       }) => {
         const thread = threadFromArgs;
-        const messageList = new chunk5CJDO3UO_cjs.MessageList({
+        const messageList = new chunkAAJF7WLJ_cjs.MessageList({
           threadId: thread?.id,
           resourceId,
           generateMessageId: this.#mastra?.generateId?.bind(this.#mastra),
@@ -11019,7 +11114,7 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
         let [memoryMessages, memorySystemMessage] = await Promise.all([existingThread ? this.getMemoryMessages({
           resourceId,
           threadId: threadObject.id,
-          vectorMessageSearch: new chunk5CJDO3UO_cjs.MessageList().add(options.messages, `user`).getLatestUserContent() || "",
+          vectorMessageSearch: new chunkAAJF7WLJ_cjs.MessageList().add(options.messages, `user`).getLatestUserContent() || "",
           memoryConfig,
           runtimeContext
         }) : [], memory.getSystemMessage({
@@ -11042,7 +11137,7 @@ The following messages were remembered from a different conversation:
 <remembered_from_other_conversation>
 ${(() => {
             let result2 = ``;
-            const messages = new chunk5CJDO3UO_cjs.MessageList().add(resultsFromOtherThreads, "memory").get.all.v1();
+            const messages = new chunkAAJF7WLJ_cjs.MessageList().add(resultsFromOtherThreads, "memory").get.all.v1();
             let lastYmd = null;
             for (const msg of messages) {
               const date = msg.createdAt;
@@ -11094,7 +11189,7 @@ the following messages are from ${ymd}
           systemMessage,
           memorySystemMessage: memorySystemMessage || void 0
         });
-        const processedList = new chunk5CJDO3UO_cjs.MessageList({
+        const processedList = new chunkAAJF7WLJ_cjs.MessageList({
           threadId: threadObject.id,
           resourceId,
           generateMessageId: this.#mastra?.generateId?.bind(this.#mastra),
@@ -11131,9 +11226,10 @@ the following messages are from ${ymd}
         const streamResult = llm.stream({
           ...inputData,
           outputProcessors,
+          returnScorerData: options.returnScorerData,
           tracingContext
         });
-        if (options.format === "aisdk") {
+        if (format === "aisdk") {
           return streamResult.aisdk.v5;
         }
         return streamResult;
@@ -11489,7 +11585,8 @@ the following messages are from ${ymd}
     });
     const mergedStreamOptions = {
       ...defaultStreamOptions,
-      ...streamOptions
+      ...streamOptions,
+      onFinish: this.#mergeOnFinishWithTelemetry(streamOptions, defaultStreamOptions)
     };
     const llm = await this.getLLM({
       runtimeContext: mergedStreamOptions.runtimeContext
@@ -11504,7 +11601,8 @@ the following messages are from ${ymd}
     }
     const result = await this.#execute({
       ...mergedStreamOptions,
-      messages
+      messages,
+      methodType: "streamVNext"
     });
     if (result.status !== "success") {
       if (result.status === "failed") {
@@ -11543,7 +11641,7 @@ the following messages are from ${ymd}
       llm,
       before,
       after
-    } = await this.prepareLLMOptions(messages, mergedGenerateOptions);
+    } = await this.prepareLLMOptions(messages, mergedGenerateOptions, "generate");
     if (llm.getModel().specificationVersion !== "v1") {
       this.logger.error("V2 models are not supported for the current version of generate. Please use generateVNext instead.", {
         modelId: llm.getModel().modelId
@@ -11617,7 +11715,7 @@ the following messages are from ${ymd}
         runtimeContext: mergedGenerateOptions.runtimeContext || new chunkGPWMM745_cjs.RuntimeContext(),
         tracingContext,
         outputProcessorOverrides: finalOutputProcessors,
-        messageList: new chunk5CJDO3UO_cjs.MessageList({
+        messageList: new chunkAAJF7WLJ_cjs.MessageList({
           threadId: llmOptions.threadId || "",
           resourceId: llmOptions.resourceId || ""
         }).add({
@@ -11710,7 +11808,7 @@ the following messages are from ${ymd}
     const outputProcessorResult = await this.__runOutputProcessors({
       runtimeContext: mergedGenerateOptions.runtimeContext || new chunkGPWMM745_cjs.RuntimeContext(),
       tracingContext,
-      messageList: new chunk5CJDO3UO_cjs.MessageList({
+      messageList: new chunkAAJF7WLJ_cjs.MessageList({
         threadId: llmOptions.threadId || "",
         resourceId: llmOptions.resourceId || ""
       }).add({
@@ -11787,13 +11885,14 @@ the following messages are from ${ymd}
     });
     const mergedStreamOptions = {
       ...defaultStreamOptions,
-      ...streamOptions
+      ...streamOptions,
+      onFinish: this.#mergeOnFinishWithTelemetry(streamOptions, defaultStreamOptions)
     };
     const {
       llm,
       before,
       after
-    } = await this.prepareLLMOptions(messages, mergedStreamOptions);
+    } = await this.prepareLLMOptions(messages, mergedStreamOptions, "stream");
     if (llm.getModel().specificationVersion !== "v1") {
       this.logger.error("V2 models are not supported for stream. Please use streamVNext instead.", {
         modelId: llm.getModel().modelId
@@ -12185,21 +12284,20 @@ var MastraWorkflowStream = class extends web.ReadableStream {
           }
         });
         controller.enqueue({
-          type: "start",
+          type: "workflow-start",
           runId: run.runId,
           from: "WORKFLOW" /* WORKFLOW */,
           payload: {}
         });
         const stream = await createStream(writer);
         for await (const chunk of stream) {
-          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 (chunk.type === "step-finish") {
+            updateUsageCount(chunk.payload.usage);
           }
           controller.enqueue(chunk);
         }
         controller.enqueue({
-          type: "finish",
+          type: "workflow-finish",
           runId: run.runId,
           from: "WORKFLOW" /* WORKFLOW */,
           payload: {
@@ -12374,7 +12472,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
     } = retryConfig ?? {};
     const steps = graph.steps;
     this.runCounts.clear();
-    const workflowAISpan = chunkI7OAONIW_cjs.getOrCreateSpan({
+    const workflowAISpan = chunkUFCYMOYH_cjs.getOrCreateSpan({
       type: "workflow_run" /* WORKFLOW_RUN */,
       name: `workflow run: '${workflowId}'`,
       input,
@@ -12615,7 +12713,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         engine: {},
         abortSignal: abortController?.signal,
         writer: new chunkS6MAHT7F_cjs.ToolStream({
-          prefix: "step",
+          prefix: "workflow-step",
           callId: stepCallId,
           name: "sleep",
           runId
@@ -12694,7 +12792,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         engine: {},
         abortSignal: abortController?.signal,
         writer: new chunkS6MAHT7F_cjs.ToolStream({
-          prefix: "step",
+          prefix: "workflow-step",
           callId: stepCallId,
           name: "sleepUntil",
           runId
@@ -12830,7 +12928,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         eventTimestamp: Date.now()
       });
       await emitter.emit("watch-v2", {
-        type: "step-start",
+        type: "workflow-step-start",
         payload: {
           id: step.id,
           stepCallId,
@@ -12882,7 +12980,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         const result = await runStep({
           runId,
           workflowId,
-          mastra: this.mastra ? chunkI7OAONIW_cjs.wrapMastra(this.mastra, innerTracingContext) : void 0,
+          mastra: this.mastra ? chunkUFCYMOYH_cjs.wrapMastra(this.mastra, innerTracingContext) : void 0,
           runtimeContext,
           inputData: prevOutput,
           runCount: this.getOrGenerateRunCount(step.id),
@@ -12925,7 +13023,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
           engine: {},
           abortSignal: abortController?.signal,
           writer: new chunkS6MAHT7F_cjs.ToolStream({
-            prefix: "step",
+            prefix: "workflow-step",
             callId: stepCallId,
             name: step.id,
             runId
@@ -13016,7 +13114,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
       });
       if (execResults.status === "suspended") {
         await emitter.emit("watch-v2", {
-          type: "step-suspended",
+          type: "workflow-step-suspended",
           payload: {
             id: step.id,
             stepCallId,
@@ -13025,7 +13123,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         });
       } else {
         await emitter.emit("watch-v2", {
-          type: "step-result",
+          type: "workflow-step-result",
           payload: {
             id: step.id,
             stepCallId,
@@ -13033,7 +13131,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
           }
         });
         await emitter.emit("watch-v2", {
-          type: "step-finish",
+          type: "workflow-step-finish",
           payload: {
             id: step.id,
             stepCallId,
@@ -13262,7 +13360,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
           engine: {},
           abortSignal: abortController?.signal,
           writer: new chunkS6MAHT7F_cjs.ToolStream({
-            prefix: "step",
+            prefix: "workflow-step",
             callId: crypto2.randomUUID(),
             name: "conditional",
             runId
@@ -13464,7 +13562,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
       const evalSpan = loopSpan?.createChildSpan({
         type: "workflow_conditional_eval" /* WORKFLOW_CONDITIONAL_EVAL */,
         name: `condition: ${entry.loopType}`,
-        input: chunkI7OAONIW_cjs.selectFields(result.output, ["stepResult", "output.text", "output.object", "messages"]),
+        input: chunkUFCYMOYH_cjs.selectFields(result.output, ["stepResult", "output.text", "output.object", "messages"]),
         attributes: {
           conditionIndex: iteration
         }
@@ -13496,7 +13594,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         engine: {},
         abortSignal: abortController?.signal,
         writer: new chunkS6MAHT7F_cjs.ToolStream({
-          prefix: "step",
+          prefix: "workflow-step",
           callId: crypto2.randomUUID(),
           name: "loop",
           runId
@@ -13586,7 +13684,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
       eventTimestamp: Date.now()
     });
     await emitter.emit("watch-v2", {
-      type: "step-start",
+      type: "workflow-step-start",
       payload: {
         id: step.id,
         ...stepInfo,
@@ -13657,7 +13755,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
           });
           if (execResults.status === "suspended") {
             await emitter.emit("watch-v2", {
-              type: "step-suspended",
+              type: "workflow-step-suspended",
               payload: {
                 id: step.id,
                 ...execResults
@@ -13665,14 +13763,14 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
             });
           } else {
             await emitter.emit("watch-v2", {
-              type: "step-result",
+              type: "workflow-step-result",
               payload: {
                 id: step.id,
                 ...execResults
               }
             });
             await emitter.emit("watch-v2", {
-              type: "step-finish",
+              type: "workflow-step-finish",
               payload: {
                 id: step.id,
                 metadata: {}
@@ -13721,7 +13819,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
       eventTimestamp: Date.now()
     });
     await emitter.emit("watch-v2", {
-      type: "step-result",
+      type: "workflow-step-result",
       payload: {
         id: step.id,
         status: "success",
@@ -13730,7 +13828,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
       }
     });
     await emitter.emit("watch-v2", {
-      type: "step-finish",
+      type: "workflow-step-finish",
       payload: {
         id: step.id,
         metadata: {}
@@ -14003,7 +14101,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         eventTimestamp: Date.now()
       });
       await emitter.emit("watch-v2", {
-        type: "step-waiting",
+        type: "workflow-step-waiting",
         payload: {
           id: entry.id,
           payload: prevOutput,
@@ -14083,7 +14181,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         eventTimestamp: Date.now()
       });
       await emitter.emit("watch-v2", {
-        type: "step-result",
+        type: "workflow-step-result",
         payload: {
           id: entry.id,
           endedAt,
@@ -14092,7 +14190,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         }
       });
       await emitter.emit("watch-v2", {
-        type: "step-finish",
+        type: "workflow-step-finish",
         payload: {
           id: entry.id,
           metadata: {}
@@ -14126,7 +14224,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         eventTimestamp: Date.now()
       });
       await emitter.emit("watch-v2", {
-        type: "step-waiting",
+        type: "workflow-step-waiting",
         payload: {
           id: entry.id,
           payload: prevOutput,
@@ -14206,7 +14304,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         eventTimestamp: Date.now()
       });
       await emitter.emit("watch-v2", {
-        type: "step-result",
+        type: "workflow-step-result",
         payload: {
           id: entry.id,
           endedAt,
@@ -14215,7 +14313,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         }
       });
       await emitter.emit("watch-v2", {
-        type: "step-finish",
+        type: "workflow-step-finish",
         payload: {
           id: entry.id,
           metadata: {}
@@ -14250,7 +14348,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         eventTimestamp: Date.now()
       });
       await emitter.emit("watch-v2", {
-        type: "step-waiting",
+        type: "workflow-step-waiting",
         payload: {
           id: entry.step.id,
           payload: prevOutput,
@@ -14374,8 +14472,8 @@ function createStep(params) {
           args: inputData
         };
         await emitter.emit("watch-v2", {
-          type: "tool-call-streaming-start",
-          ...toolData
+          type: "workflow-agent-call-start",
+          payload: toolData
         });
         const {
           fullStream
@@ -14392,29 +14490,12 @@ function createStep(params) {
           return abort();
         }
         for await (const chunk of fullStream) {
-          switch (chunk.type) {
-            case "text-delta":
-              await emitter.emit("watch-v2", {
-                type: "tool-call-delta",
-                ...toolData,
-                argsTextDelta: chunk.textDelta
-              });
-              break;
-            case "step-start":
-            case "step-finish":
-            case "finish":
-              break;
-            case "tool-call":
-            case "tool-result":
-            case "tool-call-streaming-start":
-            case "tool-call-delta":
-            case "source":
-            case "file":
-            default:
-              await emitter.emit("watch-v2", chunk);
-              break;
-          }
+          await emitter.emit("watch-v2", chunk);
         }
+        await emitter.emit("watch-v2", {
+          type: "workflow-agent-call-finish",
+          payload: toolData
+        });
         return {
           text: await streamPromise.promise
         };
@@ -14990,7 +15071,7 @@ var Workflow = class extends chunkKXCUCBEI_cjs.MastraBase {
       cleanup: () => this.#runs.delete(runIdToUse)
     });
     this.#runs.set(runIdToUse, run);
-    const workflowSnapshotInStorage = await this.getWorkflowRunExecutionResult(runIdToUse);
+    const workflowSnapshotInStorage = await this.getWorkflowRunExecutionResult(runIdToUse, false);
     if (!workflowSnapshotInStorage) {
       await this.mastra?.getStorage()?.persistWorkflowSnapshot({
         workflowName: this.id,
@@ -15037,6 +15118,7 @@ var Workflow = class extends chunkKXCUCBEI_cjs.MastraBase {
     return scorers;
   }
   async execute({
+    runId,
     inputData,
     resumeData,
     suspend,
@@ -15053,7 +15135,9 @@ var Workflow = class extends chunkKXCUCBEI_cjs.MastraBase {
     const isResume = !!(resume?.steps && resume.steps.length > 0);
     const run = isResume ? await this.createRunAsync({
       runId: resume.runId
-    }) : await this.createRunAsync();
+    }) : await this.createRunAsync({
+      runId
+    });
     const nestedAbortCb = () => {
       abort();
     };
@@ -15144,7 +15228,63 @@ var Workflow = class extends chunkKXCUCBEI_cjs.MastraBase {
       workflowName: this.id
     } : null);
   }
-  async getWorkflowRunExecutionResult(runId) {
+  async getWorkflowRunSteps({
+    runId,
+    workflowId
+  }) {
+    const storage = this.#mastra?.getStorage();
+    if (!storage) {
+      this.logger.debug("Cannot get workflow run steps. Mastra storage is not initialized");
+      return {};
+    }
+    const run = await storage.getWorkflowRunById({
+      runId,
+      workflowName: workflowId
+    });
+    let snapshot = run?.snapshot;
+    if (!snapshot) {
+      return {};
+    }
+    if (typeof snapshot === "string") {
+      try {
+        snapshot = JSON.parse(snapshot);
+      } catch (e) {
+        this.logger.debug("Cannot get workflow run execution result. Snapshot is not a valid JSON string", e);
+        return {};
+      }
+    }
+    const {
+      serializedStepGraph,
+      context
+    } = snapshot;
+    const {
+      input,
+      ...steps
+    } = context;
+    let finalSteps = {};
+    for (const step of Object.keys(steps)) {
+      const stepGraph = serializedStepGraph.find(stepGraph2 => stepGraph2?.step?.id === step);
+      finalSteps[step] = steps[step];
+      if (stepGraph && stepGraph?.step?.component === "WORKFLOW") {
+        const nestedSteps = await this.getWorkflowRunSteps({
+          runId,
+          workflowId: step
+        });
+        if (nestedSteps) {
+          const updatedNestedSteps = Object.entries(nestedSteps).reduce((acc, [key, value]) => {
+            acc[`${step}.${key}`] = value;
+            return acc;
+          }, {});
+          finalSteps = {
+            ...finalSteps,
+            ...updatedNestedSteps
+          };
+        }
+      }
+    }
+    return finalSteps;
+  }
+  async getWorkflowRunExecutionResult(runId, withNestedWorkflows = true) {
     const storage = this.#mastra?.getStorage();
     if (!storage) {
       this.logger.debug("Cannot get workflow run execution result. Mastra storage is not initialized");
@@ -15166,12 +15306,16 @@ var Workflow = class extends chunkKXCUCBEI_cjs.MastraBase {
         return null;
       }
     }
+    const fullSteps = withNestedWorkflows ? await this.getWorkflowRunSteps({
+      runId,
+      workflowId: this.id
+    }) : snapshot.context;
     return {
       status: snapshot.status,
       result: snapshot.result,
       error: snapshot.error,
       payload: snapshot.context?.input,
-      steps: snapshot.context
+      steps: fullSteps
     };
   }
 };
@@ -15300,15 +15444,43 @@ var Run = class {
       readable,
       writable
     } = new web.TransformStream();
+    let currentToolData = void 0;
     const writer = writable.getWriter();
     const unwatch = this.watch(async event => {
+      if (event.type === "workflow-agent-call-start") {
+        currentToolData = {
+          name: event.payload.name,
+          args: event.payload.args
+        };
+        await writer.write({
+          ...event.payload,
+          type: "tool-call-streaming-start"
+        });
+        return;
+      }
       try {
-        await writer.write(event);
+        if (event.type === "workflow-agent-call-finish") {
+          return;
+        } else if (!event.type.startsWith("workflow-")) {
+          if (event.type === "text-delta") {
+            await writer.write({
+              type: "tool-call-delta",
+              ...(currentToolData ?? {}),
+              argsTextDelta: event.textDelta
+            });
+          }
+          return;
+        }
+        const e = {
+          ...event,
+          type: event.type.replace("workflow-", "")
+        };
+        await writer.write(e);
       } catch {}
     }, "watch-v2");
     this.closeStreamAction = async () => {
       this.emitter.emit("watch-v2", {
-        type: "finish",
+        type: "workflow-finish",
         payload: {
           runId: this.runId
         }
@@ -15323,7 +15495,7 @@ var Run = class {
       }
     };
     this.emitter.emit("watch-v2", {
-      type: "start",
+      type: "workflow-start",
       payload: {
         runId: this.runId
       }
@@ -15396,35 +15568,13 @@ var Run = class {
           type,
           payload
         }) => {
-          let newPayload = payload;
-          if (type === "step-start") {
-            const {
-              payload: args,
-              id,
-              ...rest
-            } = newPayload;
-            newPayload = {
-              args,
-              ...rest
-            };
-          } else if (type === "step-result") {
-            const {
-              output,
-              id,
-              ...rest
-            } = newPayload;
-            newPayload = {
-              result: output,
-              ...rest
-            };
-          }
           buffer.push({
             type,
             runId: this.runId,
             from: "WORKFLOW" /* WORKFLOW */,
             payload: {
               stepName: payload.id,
-              ...newPayload
+              ...payload
             }
           });
           await tryWrite();
@@ -15722,5 +15872,5 @@ exports.recursivelyCheckForFinalState = recursivelyCheckForFinalState;
 exports.resolveVariables = resolveVariables;
 exports.updateStepInHierarchy = updateStepInHierarchy;
 exports.workflowToStep = workflowToStep;
-//# sourceMappingURL=chunk-KUNWELBC.cjs.map
-//# sourceMappingURL=chunk-KUNWELBC.cjs.map
+//# sourceMappingURL=chunk-25VRTGOH.cjs.map
+//# sourceMappingURL=chunk-25VRTGOH.cjs.map