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

package/dist/{chunk-MW4CYUSP.js → chunk-ZGSS7RCP.js}

@@ -1,14 +1,14 @@
 import { DefaultVoice } from './chunk-QQIBOVFQ.js';
 import { STREAM_FORMAT_SYMBOL, EMITTER_SYMBOL } from './chunk-NLNKQD2T.js';
 import { InstrumentClass, Telemetry } from './chunk-TLJPVRO5.js';
-import { MastraLLMV1 } from './chunk-2QDX6OPE.js';
-import { MessageList, DefaultGeneratedFile, DefaultGeneratedFileWithType } from './chunk-4BQBSBQP.js';
+import { MastraLLMV1 } from './chunk-BQ43NQXK.js';
+import { MessageList, DefaultGeneratedFile, DefaultGeneratedFileWithType } from './chunk-YI3AIJJL.js';
 import { executeHook } from './chunk-TTELJD4F.js';
-import { ensureToolProperties, makeCoreTool, createMastraProxy, delay } from './chunk-ULA3AGAI.js';
+import { ensureToolProperties, makeCoreTool, createMastraProxy, delay } from './chunk-TDLB5JKT.js';
 import { RuntimeContext } from './chunk-HLRWYUFN.js';
 import { ToolStream } from './chunk-YW7UILPE.js';
 import { createTool, Tool } from './chunk-BJGHUKKM.js';
-import { getOrCreateSpan, wrapMastra, selectFields } from './chunk-WEPWZHE4.js';
+import { getOrCreateSpan, wrapMastra, selectFields } from './chunk-2NKNTPFR.js';
 import { MastraError } from './chunk-MCOVMKIS.js';
 import { MastraBase } from './chunk-6GF5M4GX.js';
 import { ConsoleLogger, RegisteredLogger } from './chunk-X3GXU6TZ.js';
@@ -2213,7 +2213,8 @@ var MastraModelOutput = class extends MastraBase {
               } = chunk.payload.metadata;
               response = {
                 ...otherMetadata,
-                messages: messageList.get.response.aiV5.model()
+                messages: messageList.get.response.aiV5.model(),
+                uiMessages: messageList.get.response.aiV5.ui()
               };
             }
             this.populateUsageCount(chunk.payload.output.usage);
@@ -2240,7 +2241,8 @@ var MastraModelOutput = class extends MastraBase {
                   } = chunk.payload.metadata;
                   response = {
                     ...otherMetadata,
-                    messages: messageList.get.response.aiV5.model()
+                    messages: messageList.get.response.aiV5.model(),
+                    uiMessages: messageList.get.response.aiV5.ui()
                   };
                 }
               } else {
@@ -2595,7 +2597,6 @@ var MastraModelOutput = class extends MastraBase {
         scoringData
       } : {})
     };
-    fullOutput.response.messages = this.messageList.get.response.aiV5.model();
     return fullOutput;
   }
   /**
@@ -3089,7 +3090,9 @@ var toolCallInputSchema = z.object({
   toolCallId: z.string(),
   toolName: z.string(),
   args: z.any(),
-  providerMetadata: z.any()
+  providerMetadata: z.any(),
+  providerExecuted: z.boolean().optional(),
+  output: z.any().optional()
 });
 var toolCallOutputSchema = toolCallInputSchema.extend({
   result: z.any(),
@@ -3610,6 +3613,32 @@ function createToolCallStep({
     execute: async ({
       inputData
     }) => {
+      if (inputData.providerExecuted) {
+        const tracer2 = getTracer({
+          isEnabled: telemetry_settings?.isEnabled,
+          tracer: telemetry_settings?.tracer
+        });
+        const span2 = tracer2.startSpan("mastra.stream.toolCall").setAttributes({
+          ...assembleOperationName({
+            operationId: "mastra.stream.toolCall",
+            telemetry: telemetry_settings
+          }),
+          "stream.toolCall.toolName": inputData.toolName,
+          "stream.toolCall.toolCallId": inputData.toolCallId,
+          "stream.toolCall.args": JSON.stringify(inputData.args),
+          "stream.toolCall.providerExecuted": true
+        });
+        if (inputData.output) {
+          span2.setAttributes({
+            "stream.toolCall.result": JSON.stringify(inputData.output)
+          });
+        }
+        span2.end();
+        return {
+          ...inputData,
+          result: inputData.output
+        };
+      }
       const tool = tools?.[inputData.toolName] || Object.values(tools || {})?.find(tool2 => `id` in tool2 && tool2.id === inputData.toolName);
       if (!tool) {
         throw new Error(`Tool ${inputData.toolName} not found`);
@@ -3751,7 +3780,8 @@ function createOuterLLMWorkflow({
               toolCallId: toolCall.toolCallId,
               toolName: toolCall.toolName,
               result: toolCall.result,
-              providerMetadata: toolCall.providerMetadata
+              providerMetadata: toolCall.providerMetadata,
+              providerExecuted: toolCall.providerExecuted
             }
           };
           rest.controller.enqueue(chunk);
@@ -4130,7 +4160,6 @@ var MastraLLMVNext = class extends MastraBase {
     }];
   }
   stream({
-    messages,
     stopWhen = stepCountIs(5),
     maxSteps,
     tools = {},
@@ -4145,7 +4174,9 @@ var MastraLLMVNext = class extends MastraBase {
     outputProcessors,
     returnScorerData,
     providerOptions,
-    tracingContext
+    tracingContext,
+    messageList,
+    _internal
     // ...rest
   }) {
     let stopWhenToUse;
@@ -4154,6 +4185,7 @@ var MastraLLMVNext = class extends MastraBase {
     } else {
       stopWhenToUse = stopWhen;
     }
+    const messages = messageList.get.all.aiV5.model();
     const model = this.#model;
     this.logger.debug(`[LLM] - Streaming text`, {
       runId,
@@ -4177,11 +4209,6 @@ var MastraLLMVNext = class extends MastraBase {
       }
     });
     try {
-      const messageList = new MessageList({
-        threadId,
-        resourceId
-      });
-      messageList.add(messages, "input");
       const loopOptions = {
         messageList,
         model: this.#model,
@@ -4194,6 +4221,7 @@ var MastraLLMVNext = class extends MastraBase {
           ...this.experimental_telemetry,
           ...telemetry_settings
         },
+        _internal,
         output,
         outputProcessors,
         returnScorerData,
@@ -4313,14 +4341,18 @@ var StructuredOutputProcessor = class {
   structuringAgent;
   errorStrategy;
   fallbackValue;
-  constructor(options) {
+  constructor(options, fallbackModel) {
     this.schema = options.schema;
     this.errorStrategy = options.errorStrategy ?? "strict";
     this.fallbackValue = options.fallbackValue;
+    const modelToUse = options.model || fallbackModel;
+    if (!modelToUse) {
+      throw new Error("StructuredOutputProcessor requires a model to be provided either in options or as fallback");
+    }
     this.structuringAgent = new Agent({
       name: "structured-output-structurer",
       instructions: options.instructions || this.generateInstructions(),
-      model: options.model
+      model: modelToUse
     });
   }
   async processOutputResult(args) {
@@ -9512,16 +9544,17 @@ var Agent = class extends (_a = MastraBase) {
     const systemInstructions = await this.resolveTitleInstructions(runtimeContext, instructions);
     let text = "";
     if (llm.getModel().specificationVersion === "v2") {
+      const messageList = new MessageList().add([{
+        role: "system",
+        content: systemInstructions
+      }], "system").add([{
+        role: "user",
+        content: JSON.stringify(partsToGen)
+      }], "input");
       const result = llm.stream({
         runtimeContext,
         tracingContext,
-        messages: [{
-          role: "system",
-          content: systemInstructions
-        }, {
-          role: "user",
-          content: JSON.stringify(partsToGen)
-        }]
+        messageList
       });
       text = await result.text;
     } else {
@@ -9977,7 +10010,7 @@ var Agent = class extends (_a = MastraBase) {
                 threadId,
                 resourceId
               });
-              const run = workflow.createRun();
+              const run = await workflow.createRunAsync();
               let result;
               if (methodType === "generate") {
                 result = await run.start({
@@ -10001,6 +10034,7 @@ var Agent = class extends (_a = MastraBase) {
                 const streamResult = run.streamVNext({
                   inputData: context,
                   runtimeContext,
+                  tracingContext: innerTracingContext,
                   format
                 });
                 if (writer) {
@@ -10507,14 +10541,7 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
               }];
             }
             if (responseMessages) {
-              const messagesWithoutIds = responseMessages.map(m => {
-                const {
-                  id,
-                  ...messageWithoutId
-                } = m;
-                return messageWithoutId;
-              });
-              messageList.add(messagesWithoutIds, "response");
+              messageList.add(responseMessages, "response");
             }
             if (!threadExists) {
               await memory.createThread({
@@ -11013,12 +11040,12 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
           resourceId,
           runId,
           runtimeContext,
-          writableStream: options.writableStream,
-          methodType,
-          format,
           tracingContext: {
             currentSpan: agentAISpan
-          }
+          },
+          writableStream: options.writableStream,
+          methodType,
+          format
         });
         return {
           convertedTools
@@ -11029,7 +11056,6 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
       id: "prepare-memory-step",
       inputSchema: z$1.any(),
       outputSchema: z$1.object({
-        messageObjects: z$1.array(z$1.any()),
         threadExists: z$1.boolean(),
         thread: z$1.any(),
         messageList: z$1.any(),
@@ -11061,7 +11087,6 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
             messageList
           });
           return {
-            messageObjects: messageList.get.all.prompt(),
             threadExists: false,
             thread: void 0,
             messageList,
@@ -11206,12 +11231,11 @@ the following messages are from ${ymd}
           generateMessageId: this.#mastra?.generateId?.bind(this.#mastra),
           // @ts-ignore Flag for agent network messages
           _agentNetworkAppend: this._agentNetworkAppend
-        }).addSystem(instructions || `${this.instructions}.`).addSystem(memorySystemMessage).add(options.context || [], "context").add(processedMemoryMessages, "memory").add(messageList.get.input.v2(), "user").get.all.prompt();
+        }).addSystem(instructions || `${this.instructions}.`).addSystem(memorySystemMessage).add(options.context || [], "context").add(processedMemoryMessages, "memory").add(messageList.get.input.v2(), "user");
         return {
           thread: threadObject,
-          messageList,
+          messageList: processedList,
           // add old processed messages + new input messages
-          messageObjects: processedList,
           ...(tripwireTriggered && {
             tripwire: true,
             tripwireReason
@@ -11238,7 +11262,10 @@ the following messages are from ${ymd}
           ...inputData,
           outputProcessors,
           returnScorerData: options.returnScorerData,
-          tracingContext
+          tracingContext,
+          _internal: {
+            generateId: inputData.experimental_generateMessageId || this.#mastra?.generateId?.bind(this.#mastra)
+          }
         });
         if (format === "aisdk") {
           return streamResult.aisdk.v5;
@@ -11258,7 +11285,6 @@ the following messages are from ${ymd}
     }) => {
       const result2 = {
         ...options,
-        messages: inputData["prepare-memory-step"].messageObjects,
         tools: inputData["prepare-tools-step"].convertedTools,
         runId,
         temperature: options.modelSettings?.temperature,
@@ -11353,11 +11379,13 @@ the following messages are from ${ymd}
         runtimeContext: result2.runtimeContext
       }) : this.#outputProcessors : []);
       if (options.structuredOutput) {
-        const structuredProcessor = new StructuredOutputProcessor(options.structuredOutput);
+        const agentModel = await this.getModel({
+          runtimeContext: result2.runtimeContext
+        });
+        const structuredProcessor = new StructuredOutputProcessor(options.structuredOutput, agentModel);
         effectiveOutputProcessors = effectiveOutputProcessors ? [...effectiveOutputProcessors, structuredProcessor] : [structuredProcessor];
       }
       const loopOptions = {
-        messages: result2.messages,
         runtimeContext: result2.runtimeContext,
         tracingContext: {
           currentSpan: agentAISpan
@@ -11381,7 +11409,6 @@ the following messages are from ${ymd}
               return;
             }
             const messageList = inputData["prepare-memory-step"].messageList;
-            messageList.add(payload.response.messages, "response");
             try {
               const outputText = messageList.get.all.core().map(m => m.content).join("\n");
               await this.#executeOnFinish({
@@ -11410,17 +11437,25 @@ the following messages are from ${ymd}
             await options?.onFinish?.({
               ...result2,
               runId,
-              messages: messageList.get.response.aiV5.model()
+              messages: messageList.get.response.aiV5.model(),
+              usage: payload.usage,
+              totalUsage: payload.totalUsage
             });
           },
-          onStepFinish: result2.onStepFinish
+          onStepFinish: result2.onStepFinish,
+          onChunk: options.onChunk,
+          onError: options.onError,
+          onAbort: options.onAbort,
+          activeTools: options.activeTools,
+          abortSignal: options.abortSignal
         },
         output: options.output,
         outputProcessors: effectiveOutputProcessors,
         modelSettings: {
           temperature: 0,
           ...(options.modelSettings || {})
-        }
+        },
+        messageList: inputData["prepare-memory-step"].messageList
       };
       return loopOptions;
     }).then(streamStep).commit();
@@ -11497,14 +11532,8 @@ the following messages are from ${ymd}
           }];
         }
         if (responseMessages) {
-          const messagesWithoutIds = responseMessages.map(m => {
-            const {
-              id,
-              ...messageWithoutId
-            } = m;
-            return messageWithoutId;
-          }).filter(m => m.role !== "user");
-          messageList.add(messagesWithoutIds, "response");
+          const filteredMessages = responseMessages.filter(m => m.role !== "user");
+          messageList.add(filteredMessages, "response");
         }
         if (!threadExists) {
           await memory.createThread({
@@ -11654,7 +11683,8 @@ the following messages are from ${ymd}
     });
     const mergedGenerateOptions = {
       ...defaultGenerateOptions,
-      ...generateOptions
+      ...generateOptions,
+      experimental_generateMessageId: defaultGenerateOptions.experimental_generateMessageId || this.#mastra?.generateId?.bind(this.#mastra)
     };
     const {
       llm,
@@ -11721,7 +11751,10 @@ the following messages are from ${ymd}
     };
     let finalOutputProcessors = mergedGenerateOptions.outputProcessors;
     if (mergedGenerateOptions.structuredOutput) {
-      const structuredProcessor = new StructuredOutputProcessor(mergedGenerateOptions.structuredOutput);
+      const agentModel = await this.getModel({
+        runtimeContext: mergedGenerateOptions.runtimeContext
+      });
+      const structuredProcessor = new StructuredOutputProcessor(mergedGenerateOptions.structuredOutput, agentModel);
       finalOutputProcessors = finalOutputProcessors ? [...finalOutputProcessors, structuredProcessor] : [structuredProcessor];
     }
     if (!output || experimental_output) {
@@ -11905,7 +11938,8 @@ the following messages are from ${ymd}
     const mergedStreamOptions = {
       ...defaultStreamOptions,
       ...streamOptions,
-      onFinish: this.#mergeOnFinishWithTelemetry(streamOptions, defaultStreamOptions)
+      onFinish: this.#mergeOnFinishWithTelemetry(streamOptions, defaultStreamOptions),
+      experimental_generateMessageId: defaultStreamOptions.experimental_generateMessageId || this.#mastra?.generateId?.bind(this.#mastra)
     };
     const {
       llm,
@@ -12287,9 +12321,9 @@ var MastraWorkflowStream = class extends ReadableStream$1 {
       deferredPromise.reject = reject;
     });
     const updateUsageCount = usage => {
-      this.#usageCount.promptTokens += parseInt(usage.promptTokens?.toString() ?? "0", 10);
-      this.#usageCount.completionTokens += parseInt(usage.completionTokens?.toString() ?? "0", 10);
-      this.#usageCount.totalTokens += parseInt(usage.totalTokens?.toString() ?? "0", 10);
+      this.#usageCount.promptTokens += parseInt(usage?.promptTokens?.toString() ?? "0", 10);
+      this.#usageCount.completionTokens += parseInt(usage?.completionTokens?.toString() ?? "0", 10);
+      this.#usageCount.totalTokens += parseInt(usage?.totalTokens?.toString() ?? "0", 10);
     };
     super({
       start: async controller => {
@@ -12297,7 +12331,9 @@ var MastraWorkflowStream = class extends ReadableStream$1 {
           write: chunk => {
             if (chunk.type === "step-output" && chunk.payload?.output?.from === "AGENT" && chunk.payload?.output?.type === "finish" || chunk.type === "step-output" && chunk.payload?.output?.from === "WORKFLOW" && chunk.payload?.output?.type === "finish") {
               const finishPayload = chunk.payload?.output.payload;
-              updateUsageCount(finishPayload.usage);
+              if (finishPayload) {
+                updateUsageCount(finishPayload.usage);
+              }
             }
             controller.enqueue(chunk);
           }
@@ -12309,9 +12345,14 @@ var MastraWorkflowStream = class extends ReadableStream$1 {
           payload: {}
         });
         const stream = await createStream(writer);
+        let workflowStatus = "success";
         for await (const chunk of stream) {
-          if (chunk.type === "step-finish") {
+          if (chunk.type === "step-finish" && chunk.payload.usage) {
             updateUsageCount(chunk.payload.usage);
+          } else if (chunk.type === "workflow-canceled") {
+            workflowStatus = "canceled";
+          } else if (chunk.type === "workflow-step-result" && chunk.payload.status === "failed") {
+            workflowStatus = "failed";
           }
           controller.enqueue(chunk);
         }
@@ -12320,9 +12361,7 @@ var MastraWorkflowStream = class extends ReadableStream$1 {
           runId: run.runId,
           from: "WORKFLOW" /* WORKFLOW */,
           payload: {
-            stepResult: {
-              reason: "stop"
-            },
+            workflowStatus,
             output: {
               usage: this.#usageCount
             },
@@ -14456,6 +14495,12 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
       workflowStatus: execResults.status === "success" ? "running" : execResults.status,
       runtimeContext
     });
+    if (execResults.status === "canceled") {
+      await emitter.emit("watch-v2", {
+        type: "workflow-canceled",
+        payload: {}
+      });
+    }
     return {
       result: execResults,
       stepResults,
@@ -15160,6 +15205,8 @@ var Workflow = class extends MastraBase {
     }
     return scorers;
   }
+  // This method should only be called internally for nested workflow execution, as well as from mastra server handlers
+  // To run a workflow use `.createRunAsync` and then `.start` or `.resume`
   async execute({
     runId,
     inputData,
@@ -15593,12 +15640,13 @@ var Run = class {
   streamVNext({
     inputData,
     runtimeContext,
+    tracingContext,
     format
   } = {}) {
     this.closeStreamAction = async () => {};
     return new MastraWorkflowStream({
       run: this,
-      createStream: writer => {
+      createStream: () => {
         const {
           readable,
           writable
@@ -15616,7 +15664,7 @@ var Run = class {
             return;
           }
           isWriting = true;
-          let watchWriter = writer.getWriter();
+          let watchWriter = writable.getWriter();
           try {
             for (const chunk of chunkToWrite) {
               await watchWriter.write(chunk);
@@ -15654,6 +15702,7 @@ var Run = class {
         const executionResults = this._start({
           inputData,
           runtimeContext,
+          tracingContext,
           writableStream: writable,
           format
         }).then(result => {
@@ -15893,5 +15942,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-MW4CYUSP.js.map
-//# sourceMappingURL=chunk-MW4CYUSP.js.map
+//# sourceMappingURL=chunk-ZGSS7RCP.js.map
+//# sourceMappingURL=chunk-ZGSS7RCP.js.map