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

package/dist/{chunk-P2IJ74UW.js → chunk-IH5UAO56.js}

@@ -1,14 +1,14 @@
-import { DefaultVoice } from './chunk-XM2ASGWH.js';
+import { DefaultVoice } from './chunk-4VU6A5XE.js';
 import { EMITTER_SYMBOL } from './chunk-GK5V7YTQ.js';
-import { InstrumentClass, Telemetry } from './chunk-76MWMAR7.js';
-import { MastraLLMV1 } from './chunk-CKM2ESZF.js';
-import { MessageList, DefaultGeneratedFile, DefaultGeneratedFileWithType } from './chunk-F4SQXAXR.js';
+import { InstrumentClass, Telemetry } from './chunk-R7K2QO7M.js';
+import { MastraLLMV1 } from './chunk-HGYL2SSF.js';
+import { MessageList, DefaultGeneratedFile, DefaultGeneratedFileWithType } from './chunk-BGE27UEX.js';
 import { executeHook } from './chunk-TTELJD4F.js';
 import { ensureToolProperties, makeCoreTool, createMastraProxy, delay } from './chunk-WWQ3QRPF.js';
 import { RuntimeContext } from './chunk-HLRWYUFN.js';
 import { ToolStream } from './chunk-YW7UILPE.js';
-import { Tool } from './chunk-BJGHUKKM.js';
-import { getOrCreateSpan, wrapMastra, selectFields } from './chunk-LOYT3WUA.js';
+import { createTool, Tool } from './chunk-BJGHUKKM.js';
+import { getOrCreateSpan, wrapMastra, selectFields } from './chunk-WEPWZHE4.js';
 import { MastraError } from './chunk-MCOVMKIS.js';
 import { MastraBase } from './chunk-6GF5M4GX.js';
 import { ConsoleLogger, RegisteredLogger } from './chunk-X3GXU6TZ.js';
@@ -2023,6 +2023,7 @@ var MastraModelOutput = class extends MastraBase {
     reasoningDetails: new DelayedPromise()
   };
   #streamConsumed = false;
+  #returnScorerData = false;
   /**
    * Unique identifier for this execution run.
    */
@@ -2047,6 +2048,7 @@ var MastraModelOutput = class extends MastraBase {
       name: "MastraModelOutput"
     });
     this.#options = options;
+    this.#returnScorerData = !!options.returnScorerData;
     this.runId = options.runId;
     if (options.outputProcessors?.length) {
       this.processorRunner = new ProcessorRunner({
@@ -2526,6 +2528,18 @@ var MastraModelOutput = class extends 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,
@@ -2545,7 +2559,10 @@ var MastraModelOutput = class extends 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;
@@ -3069,7 +3086,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;
@@ -3750,16 +3776,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);
         }
       });
@@ -3905,6 +3921,7 @@ function loop({
   _internal,
   mode = "stream",
   outputProcessors,
+  returnScorerData,
   llmAISpan,
   ...rest
 }) {
@@ -3984,7 +4001,8 @@ function loop({
       onStepFinish: rest.options?.onStepFinish,
       includeRawChunks: !!includeRawChunks,
       output: rest.output,
-      outputProcessors
+      outputProcessors,
+      returnScorerData
     }
   });
 }
@@ -4076,6 +4094,7 @@ var MastraLLMVNext = class extends MastraBase {
     output,
     options,
     outputProcessors,
+    returnScorerData,
     providerOptions,
     tracingContext
     // ...rest
@@ -4131,6 +4150,7 @@ var MastraLLMVNext = class extends MastraBase {
         },
         output,
         outputProcessors,
+        returnScorerData,
         llmAISpan,
         options: {
           ...options,
@@ -9879,27 +9899,31 @@ var Agent = class extends (_a = 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 = 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"
@@ -9909,19 +9933,45 @@ var Agent = class extends (_a = 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
               });
@@ -9947,9 +9997,26 @@ var Agent = class extends (_a = 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] = makeCoreTool(toolObj, options);
+      }
     }
     return convertedWorkflowTools;
   }
@@ -9961,7 +10028,9 @@ var Agent = class extends (_a = MastraBase) {
     runId,
     runtimeContext,
     tracingContext,
-    writableStream
+    writableStream,
+    methodType,
+    format
   }) {
     let mastraProxy = void 0;
     const logger = this.logger;
@@ -10011,6 +10080,8 @@ var Agent = class extends (_a = MastraBase) {
       resourceId,
       threadId,
       runtimeContext,
+      methodType,
+      format,
       tracingContext
     });
     return this.formatTools({
@@ -10096,6 +10167,7 @@ var Agent = class extends (_a = MastraBase) {
     runtimeContext,
     saveQueueManager,
     writableStream,
+    methodType,
     tracingContext
   }) {
     return {
@@ -10149,7 +10221,8 @@ var Agent = class extends (_a = MastraBase) {
           runId,
           runtimeContext,
           tracingContext: innerTracingContext,
-          writableStream
+          writableStream,
+          methodType
         });
         const messageList = new MessageList({
           threadId,
@@ -10627,7 +10700,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,
@@ -10704,6 +10777,7 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
       runtimeContext,
       saveQueueManager,
       writableStream,
+      methodType,
       tracingContext
     });
     let messageList;
@@ -10791,7 +10865,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 RuntimeContext();
     const threadFromArgs = resolveThreadIdFromArgs({
       threadId: options.threadId,
@@ -10886,6 +10979,8 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
           runId,
           runtimeContext,
           writableStream: options.writableStream,
+          methodType,
+          format,
           tracingContext: {
             currentSpan: agentAISpan
           }
@@ -11105,9 +11200,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;
@@ -11463,7 +11559,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
@@ -11478,7 +11575,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") {
@@ -11517,7 +11615,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
@@ -11761,13 +11859,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
@@ -12159,21 +12258,20 @@ var MastraWorkflowStream = class extends ReadableStream$1 {
           }
         });
         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: {
@@ -12589,7 +12687,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         engine: {},
         abortSignal: abortController?.signal,
         writer: new ToolStream({
-          prefix: "step",
+          prefix: "workflow-step",
           callId: stepCallId,
           name: "sleep",
           runId
@@ -12668,7 +12766,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         engine: {},
         abortSignal: abortController?.signal,
         writer: new ToolStream({
-          prefix: "step",
+          prefix: "workflow-step",
           callId: stepCallId,
           name: "sleepUntil",
           runId
@@ -12804,7 +12902,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,
@@ -12899,7 +12997,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
           engine: {},
           abortSignal: abortController?.signal,
           writer: new ToolStream({
-            prefix: "step",
+            prefix: "workflow-step",
             callId: stepCallId,
             name: step.id,
             runId
@@ -12990,7 +13088,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,
@@ -12999,7 +13097,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         });
       } else {
         await emitter.emit("watch-v2", {
-          type: "step-result",
+          type: "workflow-step-result",
           payload: {
             id: step.id,
             stepCallId,
@@ -13007,7 +13105,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
           }
         });
         await emitter.emit("watch-v2", {
-          type: "step-finish",
+          type: "workflow-step-finish",
           payload: {
             id: step.id,
             stepCallId,
@@ -13236,7 +13334,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
           engine: {},
           abortSignal: abortController?.signal,
           writer: new ToolStream({
-            prefix: "step",
+            prefix: "workflow-step",
             callId: randomUUID(),
             name: "conditional",
             runId
@@ -13470,7 +13568,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         engine: {},
         abortSignal: abortController?.signal,
         writer: new ToolStream({
-          prefix: "step",
+          prefix: "workflow-step",
           callId: randomUUID(),
           name: "loop",
           runId
@@ -13560,7 +13658,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,
@@ -13631,7 +13729,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
@@ -13639,14 +13737,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: {}
@@ -13695,7 +13793,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",
@@ -13704,7 +13802,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
       }
     });
     await emitter.emit("watch-v2", {
-      type: "step-finish",
+      type: "workflow-step-finish",
       payload: {
         id: step.id,
         metadata: {}
@@ -13977,7 +14075,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,
@@ -14057,7 +14155,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,
@@ -14066,7 +14164,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         }
       });
       await emitter.emit("watch-v2", {
-        type: "step-finish",
+        type: "workflow-step-finish",
         payload: {
           id: entry.id,
           metadata: {}
@@ -14100,7 +14198,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,
@@ -14180,7 +14278,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,
@@ -14189,7 +14287,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         }
       });
       await emitter.emit("watch-v2", {
-        type: "step-finish",
+        type: "workflow-step-finish",
         payload: {
           id: entry.id,
           metadata: {}
@@ -14224,7 +14322,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,
@@ -14348,8 +14446,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
@@ -14366,29 +14464,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
         };
@@ -14964,7 +15045,7 @@ var Workflow = class extends 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,
@@ -15011,6 +15092,7 @@ var Workflow = class extends MastraBase {
     return scorers;
   }
   async execute({
+    runId,
     inputData,
     resumeData,
     suspend,
@@ -15027,7 +15109,9 @@ var Workflow = class extends 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();
     };
@@ -15118,7 +15202,63 @@ var Workflow = class extends 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");
@@ -15140,12 +15280,16 @@ var Workflow = class extends 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
     };
   }
 };
@@ -15274,15 +15418,43 @@ var Run = class {
       readable,
       writable
     } = new 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
         }
@@ -15297,7 +15469,7 @@ var Run = class {
       }
     };
     this.emitter.emit("watch-v2", {
-      type: "start",
+      type: "workflow-start",
       payload: {
         runId: this.runId
       }
@@ -15370,35 +15542,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();
@@ -15652,5 +15802,5 @@ function deepMergeWorkflowState(a, b) {
 }
 
 export { AISDKV5OutputStream, Agent, DefaultExecutionEngine, ExecutionEngine, LanguageDetector, LanguageDetectorInputProcessor, LegacyStep, LegacyWorkflow, MastraModelOutput, ModerationInputProcessor, ModerationProcessor, PIIDetector, PIIDetectorInputProcessor, PromptInjectionDetector, PromptInjectionDetectorInputProcessor, Run, StructuredOutputProcessor, TripWire, UnicodeNormalizer, UnicodeNormalizerInputProcessor, WhenConditionReturnValue, Workflow, agentToStep, cloneStep, cloneWorkflow, createStep, createWorkflow, getActivePathsAndStatus, getResultActivePaths, getStepResult, getSuspendedPaths, isAgent, isConditionalKey, isErrorEvent, isFinalState, isLimboState, isTransitionEvent, isVariableReference, isWorkflow, loop, mapVariable, mergeChildValue, recursivelyCheckForFinalState, resolveVariables, updateStepInHierarchy, workflowToStep };
-//# sourceMappingURL=chunk-P2IJ74UW.js.map
-//# sourceMappingURL=chunk-P2IJ74UW.js.map
+//# sourceMappingURL=chunk-IH5UAO56.js.map
+//# sourceMappingURL=chunk-IH5UAO56.js.map