@mastra/core 0.15.3 → 0.16.0-alpha.1

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

@@ -1,8 +1,8 @@
 'use strict';
 
-var chunkVZYIKGJ6_cjs = require('./chunk-VZYIKGJ6.cjs');
-var chunkNFXTYMWZ_cjs = require('./chunk-NFXTYMWZ.cjs');
-var chunkZ637KSJF_cjs = require('./chunk-Z637KSJF.cjs');
+var chunkAHJY7RHO_cjs = require('./chunk-AHJY7RHO.cjs');
+var chunkABJOUEVA_cjs = require('./chunk-ABJOUEVA.cjs');
+var chunkBHB4PDNV_cjs = require('./chunk-BHB4PDNV.cjs');
 var chunkMNDKBEEQ_cjs = require('./chunk-MNDKBEEQ.cjs');
 var chunkSIKEQ32R_cjs = require('./chunk-SIKEQ32R.cjs');
 var chunkTSNDVBUU_cjs = require('./chunk-TSNDVBUU.cjs');
@@ -2226,7 +2226,7 @@ var MastraModelOutput = class extends chunkKXCUCBEI_cjs.MastraBase {
             chunk.payload.output.usage = self.#usageCount;
             try {
               if (self.processorRunner) {
-                await self.processorRunner.runOutputProcessors(self.messageList);
+                self.messageList = await self.processorRunner.runOutputProcessors(self.messageList);
                 const outputText = self.messageList.get.response.aiV4.core().map(m => chunkSIKEQ32R_cjs.MessageList.coreContentToString(m.content)).join("\n");
                 const messages = self.messageList.get.response.v2();
                 const messagesWithStructuredData = messages.filter(msg => msg.content.metadata && msg.content.metadata.structuredOutput);
@@ -2238,6 +2238,17 @@ var MastraModelOutput = class extends chunkKXCUCBEI_cjs.MastraBase {
                 }
                 self.#delayedPromises.text.resolve(outputText);
                 self.#delayedPromises.finishReason.resolve(self.#finishReason);
+                if (chunk.payload.metadata) {
+                  const {
+                    providerMetadata,
+                    request,
+                    ...otherMetadata
+                  } = chunk.payload.metadata;
+                  response = {
+                    ...otherMetadata,
+                    messages: messageList.get.response.aiV5.model()
+                  };
+                }
               } else {
                 self.#delayedPromises.text.resolve(self.#bufferedText.join(""));
                 self.#delayedPromises.finishReason.resolve(self.#finishReason);
@@ -4449,7 +4460,8 @@ function runScorer({
   source,
   entityType,
   threadId,
-  resourceId
+  resourceId,
+  tracingContext
 }) {
   let shouldExecute = false;
   if (!scorerObject?.sampling || scorerObject?.sampling?.type === "none") {
@@ -4482,7 +4494,8 @@ function runScorer({
     structuredOutput,
     entityType,
     threadId,
-    resourceId
+    resourceId,
+    tracingContext
   };
   chunkTSNDVBUU_cjs.executeHook("onScorerRun" /* ON_SCORER_RUN */, payload);
 }
@@ -8900,7 +8913,7 @@ function resolveThreadIdFromArgs(args) {
   return void 0;
 }
 var _Agent_decorators, _init, _a;
-_Agent_decorators = [chunkZ637KSJF_cjs.InstrumentClass({
+_Agent_decorators = [chunkBHB4PDNV_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"]
 })];
@@ -8978,7 +8991,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
         this.#voice?.addInstructions(config.instructions);
       }
     } else {
-      this.#voice = new chunkVZYIKGJ6_cjs.DefaultVoice();
+      this.#voice = new chunkAHJY7RHO_cjs.DefaultVoice();
     }
     if (config.inputProcessors) {
       this.#inputProcessors = config.inputProcessors;
@@ -9128,7 +9141,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
       }));
       return voice;
     } else {
-      return new chunkVZYIKGJ6_cjs.DefaultVoice();
+      return new chunkAHJY7RHO_cjs.DefaultVoice();
     }
   }
   get instructions() {
@@ -9924,7 +9937,8 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
     resourceId,
     runtimeContext,
     methodType,
-    tracingContext
+    tracingContext,
+    format
   }) {
     const convertedWorkflowTools = {};
     const workflows = await this.getWorkflows({
@@ -9988,8 +10002,8 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
               } else if (methodType === "streamVNext") {
                 const streamResult = run.streamVNext({
                   inputData: context,
-                  runtimeContext
-                  //format,
+                  runtimeContext,
+                  format
                 });
                 if (writer) {
                   await streamResult.pipeTo(writer);
@@ -9999,7 +10013,10 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
               toolAISpan?.end({
                 output: result
               });
-              return result;
+              return {
+                result,
+                runId: run.runId
+              };
             } catch (err) {
               const mastraError = new chunkC73WLCY3_cjs.MastraError({
                 id: "AGENT_WORKFLOW_TOOL_EXECUTION_FAILED",
@@ -10591,7 +10608,10 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
           structuredOutput,
           overrideScorers,
           threadId,
-          resourceId
+          resourceId,
+          tracingContext: {
+            currentSpan: agentAISpan
+          }
         });
         const scoringData = {
           input: {
@@ -10628,7 +10648,8 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
     structuredOutput,
     overrideScorers,
     threadId,
-    resourceId
+    resourceId,
+    tracingContext
   }) {
     const agentName = this.name;
     const userInputMessages = messageList.get.all.ui().filter(m => m.role === "user");
@@ -10679,7 +10700,8 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
           entityType: "AGENT",
           structuredOutput: !!structuredOutput,
           threadId,
-          resourceId
+          resourceId,
+          tracingContext
         });
       }
     }
@@ -10752,7 +10774,7 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
     const llm = await this.getLLM({
       runtimeContext
     });
-    const activeSpan = chunkZ637KSJF_cjs.Telemetry.getActiveSpan();
+    const activeSpan = chunkBHB4PDNV_cjs.Telemetry.getActiveSpan();
     const baggageEntries = {};
     if (threadFromArgs?.id) {
       if (activeSpan) {
@@ -10771,7 +10793,7 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
       };
     }
     if (Object.keys(baggageEntries).length > 0) {
-      chunkZ637KSJF_cjs.Telemetry.setBaggage(baggageEntries);
+      chunkBHB4PDNV_cjs.Telemetry.setBaggage(baggageEntries);
     }
     const memory = await this.getMemory({
       runtimeContext
@@ -10937,7 +10959,7 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
       tracingContext: options.tracingContext,
       runtimeContext
     });
-    const activeSpan = chunkZ637KSJF_cjs.Telemetry.getActiveSpan();
+    const activeSpan = chunkBHB4PDNV_cjs.Telemetry.getActiveSpan();
     const baggageEntries = {};
     if (threadFromArgs?.id) {
       if (activeSpan) {
@@ -10956,7 +10978,7 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
       };
     }
     if (Object.keys(baggageEntries).length > 0) {
-      chunkZ637KSJF_cjs.Telemetry.setBaggage(baggageEntries);
+      chunkBHB4PDNV_cjs.Telemetry.setBaggage(baggageEntries);
     }
     const memory = await this.getMemory({
       runtimeContext
@@ -11564,7 +11586,8 @@ the following messages are from ${ymd}
       instructions,
       runtimeContext,
       structuredOutput,
-      overrideScorers
+      overrideScorers,
+      tracingContext
     });
   }
   async generateVNext(messages, options) {
@@ -12529,7 +12552,8 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
               attempts,
               delay: delay2
             },
-            executionSpan
+            executionSpan,
+            format: params.format
           },
           tracingContext: {
             currentSpan: workflowAISpan
@@ -12665,6 +12689,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
     emitter,
     abortController,
     runtimeContext,
+    executionContext,
     writableStream,
     tracingContext
   }) {
@@ -12709,7 +12734,8 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         abort: () => {
           abortController?.abort();
         },
-        [chunkNFXTYMWZ_cjs.EMITTER_SYMBOL]: emitter,
+        [chunkABJOUEVA_cjs.EMITTER_SYMBOL]: emitter,
+        [chunkABJOUEVA_cjs.STREAM_FORMAT_SYMBOL]: executionContext.format,
         engine: {},
         abortSignal: abortController?.signal,
         writer: new chunkS6MAHT7F_cjs.ToolStream({
@@ -12743,6 +12769,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
     emitter,
     abortController,
     runtimeContext,
+    executionContext,
     writableStream,
     tracingContext
   }) {
@@ -12788,7 +12815,8 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         abort: () => {
           abortController?.abort();
         },
-        [chunkNFXTYMWZ_cjs.EMITTER_SYMBOL]: emitter,
+        [chunkABJOUEVA_cjs.EMITTER_SYMBOL]: emitter,
+        [chunkABJOUEVA_cjs.STREAM_FORMAT_SYMBOL]: executionContext.format,
         engine: {},
         abortSignal: abortController?.signal,
         writer: new chunkS6MAHT7F_cjs.ToolStream({
@@ -13019,7 +13047,8 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
             // @ts-ignore
             runId: stepResults[step.id]?.suspendPayload?.__workflow_meta?.runId
           } : void 0,
-          [chunkNFXTYMWZ_cjs.EMITTER_SYMBOL]: emitter,
+          [chunkABJOUEVA_cjs.EMITTER_SYMBOL]: emitter,
+          [chunkABJOUEVA_cjs.STREAM_FORMAT_SYMBOL]: executionContext.format,
           engine: {},
           abortSignal: abortController?.signal,
           writer: new chunkS6MAHT7F_cjs.ToolStream({
@@ -13040,7 +13069,8 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
             workflowId,
             stepId: step.id,
             runtimeContext,
-            disableScorers
+            disableScorers,
+            tracingContext
           });
         }
         if (suspended) {
@@ -13160,7 +13190,8 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
     workflowId,
     stepId,
     runtimeContext,
-    disableScorers
+    disableScorers,
+    tracingContext
   }) {
     let scorersToUse = scorers;
     if (typeof scorersToUse === "function") {
@@ -13196,7 +13227,8 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
           },
           structuredOutput: true,
           source: "LIVE",
-          entityType: "WORKFLOW"
+          entityType: "WORKFLOW",
+          tracingContext
         });
       }
     }
@@ -13353,7 +13385,8 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
           abort: () => {
             abortController?.abort();
           },
-          [chunkNFXTYMWZ_cjs.EMITTER_SYMBOL]: emitter,
+          [chunkABJOUEVA_cjs.EMITTER_SYMBOL]: emitter,
+          [chunkABJOUEVA_cjs.STREAM_FORMAT_SYMBOL]: executionContext.format,
           engine: {},
           abortSignal: abortController?.signal,
           writer: new chunkS6MAHT7F_cjs.ToolStream({
@@ -13587,7 +13620,8 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         abort: () => {
           abortController?.abort();
         },
-        [chunkNFXTYMWZ_cjs.EMITTER_SYMBOL]: emitter,
+        [chunkABJOUEVA_cjs.EMITTER_SYMBOL]: emitter,
+        [chunkABJOUEVA_cjs.STREAM_FORMAT_SYMBOL]: executionContext.format,
         engine: {},
         abortSignal: abortController?.signal,
         writer: new chunkS6MAHT7F_cjs.ToolStream({
@@ -14454,7 +14488,8 @@ function createStep(params) {
       }),
       execute: async ({
         inputData,
-        [chunkNFXTYMWZ_cjs.EMITTER_SYMBOL]: emitter,
+        [chunkABJOUEVA_cjs.EMITTER_SYMBOL]: emitter,
+        [chunkABJOUEVA_cjs.STREAM_FORMAT_SYMBOL]: streamFormat,
         runtimeContext,
         abortSignal,
         abort
@@ -14470,27 +14505,42 @@ function createStep(params) {
         };
         await emitter.emit("watch-v2", {
           type: "workflow-agent-call-start",
+          from: "WORKFLOW",
           payload: toolData
         });
-        const {
-          fullStream
-        } = await params.stream(inputData.prompt, {
-          // resourceId: inputData.resourceId,
-          // threadId: inputData.threadId,
-          runtimeContext,
-          onFinish: result => {
-            streamPromise.resolve(result.text);
-          },
-          abortSignal
-        });
+        let stream;
+        if (streamFormat === "aisdk") {
+          const {
+            fullStream
+          } = await params.stream(inputData.prompt, {
+            // resourceId: inputData.resourceId,
+            // threadId: inputData.threadId,
+            runtimeContext,
+            onFinish: result => {
+              streamPromise.resolve(result.text);
+            },
+            abortSignal
+          });
+          stream = fullStream;
+        } else {
+          const modelOutput = await params.streamVNext(inputData.prompt, {
+            runtimeContext,
+            onFinish: result => {
+              streamPromise.resolve(result.text);
+            }
+            // abortSignal,
+          });
+          stream = modelOutput.fullStream;
+        }
         if (abortSignal.aborted) {
           return abort();
         }
-        for await (const chunk of fullStream) {
+        for await (const chunk of stream) {
           await emitter.emit("watch-v2", chunk);
         }
         await emitter.emit("watch-v2", {
           type: "workflow-agent-call-finish",
+          from: "WORKFLOW",
           payload: toolData
         });
         return {
@@ -14533,7 +14583,7 @@ function createStep(params) {
     suspendSchema: params.suspendSchema,
     scorers: params.scorers,
     retries: params.retries,
-    execute: params.execute
+    execute: params.execute.bind(params)
   };
 }
 function cloneStep(step, opts) {
@@ -15120,7 +15170,7 @@ var Workflow = class extends chunkKXCUCBEI_cjs.MastraBase {
     resumeData,
     suspend,
     resume,
-    [chunkNFXTYMWZ_cjs.EMITTER_SYMBOL]: emitter,
+    [chunkABJOUEVA_cjs.EMITTER_SYMBOL]: emitter,
     mastra,
     runtimeContext,
     abort,
@@ -15385,16 +15435,12 @@ var Run = class {
   async sendEvent(event, data) {
     this.emitter.emit(`user-event-${event}`, data);
   }
-  /**
-   * Starts the workflow execution with the provided input
-   * @param input The input data for the workflow
-   * @returns A promise that resolves to the workflow output
-   */
-  async start({
+  async _start({
     inputData,
     runtimeContext,
     writableStream,
-    tracingContext
+    tracingContext,
+    format
   }) {
     const result = await this.executionEngine.execute({
       workflowId: this.workflowId,
@@ -15421,13 +15467,33 @@ var Run = class {
       runtimeContext: runtimeContext ?? new chunkGPWMM745_cjs.RuntimeContext(),
       abortController: this.abortController,
       writableStream,
-      tracingContext
+      tracingContext,
+      format
     });
     if (result.status !== "suspended") {
       this.cleanup?.();
     }
     return result;
   }
+  /**
+   * Starts the workflow execution with the provided input
+   * @param input The input data for the workflow
+   * @returns A promise that resolves to the workflow output
+   */
+  async start({
+    inputData,
+    runtimeContext,
+    writableStream,
+    tracingContext
+  }) {
+    return this._start({
+      inputData,
+      runtimeContext,
+      writableStream,
+      tracingContext,
+      format: "aisdk"
+    });
+  }
   /**
    * Starts the workflow execution with the provided input as a stream
    * @param input The input data for the workflow
@@ -15497,9 +15563,10 @@ var Run = class {
         runId: this.runId
       }
     });
-    this.executionResults = this.start({
+    this.executionResults = this._start({
       inputData,
-      runtimeContext
+      runtimeContext,
+      format: "aisdk"
     }).then(result => {
       if (result.status !== "suspended") {
         this.closeStreamAction?.().catch(() => {});
@@ -15527,7 +15594,8 @@ var Run = class {
    */
   streamVNext({
     inputData,
-    runtimeContext
+    runtimeContext,
+    format
   } = {}) {
     this.closeStreamAction = async () => {};
     return new MastraWorkflowStream({
@@ -15563,12 +15631,13 @@ var Run = class {
         };
         const unwatch = this.watch(async ({
           type,
+          from = "WORKFLOW" /* WORKFLOW */,
           payload
         }) => {
           buffer.push({
             type,
             runId: this.runId,
-            from: "WORKFLOW" /* WORKFLOW */,
+            from,
             payload: {
               stepName: payload.id,
               ...payload
@@ -15584,10 +15653,11 @@ var Run = class {
             console.error("Error closing stream:", err);
           }
         };
-        const executionResults = this.start({
+        const executionResults = this._start({
           inputData,
           runtimeContext,
-          writableStream: writable
+          writableStream: writable,
+          format
         }).then(result => {
           if (result.status !== "suspended") {
             this.closeStreamAction?.().catch(() => {});
@@ -15869,5 +15939,5 @@ exports.recursivelyCheckForFinalState = recursivelyCheckForFinalState;
 exports.resolveVariables = resolveVariables;
 exports.updateStepInHierarchy = updateStepInHierarchy;
 exports.workflowToStep = workflowToStep;
-//# sourceMappingURL=chunk-EZCMCWSC.cjs.map
-//# sourceMappingURL=chunk-EZCMCWSC.cjs.map
+//# sourceMappingURL=chunk-7GYN2OE3.cjs.map
+//# sourceMappingURL=chunk-7GYN2OE3.cjs.map