@mastra/core 0.16.1-alpha.1 → 0.16.1-alpha.3

package/dist/{chunk-C3R2Q3NN.cjs → chunk-BJASJTXK.cjs}

@@ -2239,7 +2239,8 @@ var MastraModelOutput = class extends chunkKXCUCBEI_cjs.MastraBase {
               } = chunk.payload.metadata;
               response = {
                 ...otherMetadata,
-                messages: messageList.get.response.aiV5.model()
+                messages: messageList.get.response.aiV5.model(),
+                uiMessages: messageList.get.response.aiV5.ui()
               };
             }
             this.populateUsageCount(chunk.payload.output.usage);
@@ -2266,7 +2267,8 @@ var MastraModelOutput = class extends chunkKXCUCBEI_cjs.MastraBase {
                   } = chunk.payload.metadata;
                   response = {
                     ...otherMetadata,
-                    messages: messageList.get.response.aiV5.model()
+                    messages: messageList.get.response.aiV5.model(),
+                    uiMessages: messageList.get.response.aiV5.ui()
                   };
                 }
               } else {
@@ -2621,7 +2623,6 @@ var MastraModelOutput = class extends chunkKXCUCBEI_cjs.MastraBase {
         scoringData
       } : {})
     };
-    fullOutput.response.messages = this.messageList.get.response.aiV5.model();
     return fullOutput;
   }
   /**
@@ -3115,7 +3116,9 @@ var toolCallInputSchema = z__default.default.object({
   toolCallId: z__default.default.string(),
   toolName: z__default.default.string(),
   args: z__default.default.any(),
-  providerMetadata: z__default.default.any()
+  providerMetadata: z__default.default.any(),
+  providerExecuted: z__default.default.boolean().optional(),
+  output: z__default.default.any().optional()
 });
 var toolCallOutputSchema = toolCallInputSchema.extend({
   result: z__default.default.any(),
@@ -3416,18 +3419,60 @@ function createLLMExecutionStep({
       switch (model.specificationVersion) {
         case "v2":
           {
-            const inputMessages = await messageList.get.all.aiV5.llmPrompt({
+            const messageListPromptArgs = {
               downloadRetries,
               downloadConcurrency,
               supportedUrls: model?.supportedUrls
-            });
+            };
+            let inputMessages = await messageList.get.all.aiV5.llmPrompt(messageListPromptArgs);
+            let stepModel = model;
+            let stepToolChoice = toolChoice;
+            let stepTools = tools;
+            if (options?.prepareStep) {
+              try {
+                const prepareStepResult = await options.prepareStep({
+                  stepNumber: inputData.output?.steps?.length || 0,
+                  steps: inputData.output?.steps || [],
+                  model,
+                  messages: messageList.get.all.aiV5.model()
+                });
+                if (prepareStepResult) {
+                  if (prepareStepResult.model) {
+                    stepModel = prepareStepResult.model;
+                  }
+                  if (prepareStepResult.toolChoice) {
+                    stepToolChoice = prepareStepResult.toolChoice;
+                  }
+                  if (prepareStepResult.activeTools && stepTools) {
+                    const activeToolsSet = new Set(prepareStepResult.activeTools);
+                    stepTools = Object.fromEntries(Object.entries(stepTools).filter(([toolName]) => activeToolsSet.has(toolName)));
+                  }
+                  if (prepareStepResult.messages) {
+                    const newMessages = prepareStepResult.messages;
+                    const newMessageList = new chunkD3UG2YLU_cjs.MessageList();
+                    for (const message of newMessages) {
+                      if (message.role === "system") {
+                        newMessageList.addSystem(message);
+                      } else if (message.role === "user") {
+                        newMessageList.add(message, "input");
+                      } else if (message.role === "assistant" || message.role === "tool") {
+                        newMessageList.add(message, "response");
+                      }
+                    }
+                    inputMessages = await newMessageList.get.all.aiV5.llmPrompt(messageListPromptArgs);
+                  }
+                }
+              } catch (error) {
+                console.error("Error in prepareStep callback:", error);
+              }
+            }
             modelResult = execute({
               runId,
-              model,
+              model: stepModel,
               providerOptions,
               inputMessages,
-              tools,
-              toolChoice,
+              tools: stepTools,
+              toolChoice: stepToolChoice,
               options,
               modelSettings,
               telemetry_settings,
@@ -3636,6 +3681,32 @@ function createToolCallStep({
     execute: async ({
       inputData
     }) => {
+      if (inputData.providerExecuted) {
+        const tracer2 = getTracer({
+          isEnabled: telemetry_settings?.isEnabled,
+          tracer: telemetry_settings?.tracer
+        });
+        const span2 = tracer2.startSpan("mastra.stream.toolCall").setAttributes({
+          ...assembleOperationName({
+            operationId: "mastra.stream.toolCall",
+            telemetry: telemetry_settings
+          }),
+          "stream.toolCall.toolName": inputData.toolName,
+          "stream.toolCall.toolCallId": inputData.toolCallId,
+          "stream.toolCall.args": JSON.stringify(inputData.args),
+          "stream.toolCall.providerExecuted": true
+        });
+        if (inputData.output) {
+          span2.setAttributes({
+            "stream.toolCall.result": JSON.stringify(inputData.output)
+          });
+        }
+        span2.end();
+        return {
+          ...inputData,
+          result: inputData.output
+        };
+      }
       const tool = tools?.[inputData.toolName] || Object.values(tools || {})?.find(tool2 => `id` in tool2 && tool2.id === inputData.toolName);
       if (!tool) {
         throw new Error(`Tool ${inputData.toolName} not found`);
@@ -3777,7 +3848,8 @@ function createOuterLLMWorkflow({
               toolCallId: toolCall.toolCallId,
               toolName: toolCall.toolName,
               result: toolCall.result,
-              providerMetadata: toolCall.providerMetadata
+              providerMetadata: toolCall.providerMetadata,
+              providerExecuted: toolCall.providerExecuted
             }
           };
           rest.controller.enqueue(chunk);
@@ -4156,7 +4228,6 @@ var MastraLLMVNext = class extends chunkKXCUCBEI_cjs.MastraBase {
     }];
   }
   stream({
-    messages,
     stopWhen = aiV5.stepCountIs(5),
     maxSteps,
     tools = {},
@@ -4171,7 +4242,9 @@ var MastraLLMVNext = class extends chunkKXCUCBEI_cjs.MastraBase {
     outputProcessors,
     returnScorerData,
     providerOptions,
-    tracingContext
+    tracingContext,
+    messageList,
+    _internal
     // ...rest
   }) {
     let stopWhenToUse;
@@ -4180,6 +4253,7 @@ var MastraLLMVNext = class extends chunkKXCUCBEI_cjs.MastraBase {
     } else {
       stopWhenToUse = stopWhen;
     }
+    const messages = messageList.get.all.aiV5.model();
     const model = this.#model;
     this.logger.debug(`[LLM] - Streaming text`, {
       runId,
@@ -4203,11 +4277,6 @@ var MastraLLMVNext = class extends chunkKXCUCBEI_cjs.MastraBase {
       }
     });
     try {
-      const messageList = new chunkD3UG2YLU_cjs.MessageList({
-        threadId,
-        resourceId
-      });
-      messageList.add(messages, "input");
       const loopOptions = {
         messageList,
         model: this.#model,
@@ -4220,6 +4289,7 @@ var MastraLLMVNext = class extends chunkKXCUCBEI_cjs.MastraBase {
           ...this.experimental_telemetry,
           ...telemetry_settings
         },
+        _internal,
         output,
         outputProcessors,
         returnScorerData,
@@ -9542,16 +9612,17 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
     const systemInstructions = await this.resolveTitleInstructions(runtimeContext, instructions);
     let text = "";
     if (llm.getModel().specificationVersion === "v2") {
+      const messageList = new chunkD3UG2YLU_cjs.MessageList().add([{
+        role: "system",
+        content: systemInstructions
+      }], "system").add([{
+        role: "user",
+        content: JSON.stringify(partsToGen)
+      }], "input");
       const result = llm.stream({
         runtimeContext,
         tracingContext,
-        messages: [{
-          role: "system",
-          content: systemInstructions
-        }, {
-          role: "user",
-          content: JSON.stringify(partsToGen)
-        }]
+        messageList
       });
       text = await result.text;
     } else {
@@ -10007,7 +10078,7 @@ exports.Agent = class Agent extends (_a = chunkKXCUCBEI_cjs.MastraBase) {
                 threadId,
                 resourceId
               });
-              const run = workflow.createRun();
+              const run = await workflow.createRunAsync();
               let result;
               if (methodType === "generate") {
                 result = await run.start({
@@ -10538,14 +10609,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({
@@ -11060,7 +11124,6 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
       id: "prepare-memory-step",
       inputSchema: z.z.any(),
       outputSchema: z.z.object({
-        messageObjects: z.z.array(z.z.any()),
         threadExists: z.z.boolean(),
         thread: z.z.any(),
         messageList: z.z.any(),
@@ -11092,7 +11155,6 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
             messageList
           });
           return {
-            messageObjects: messageList.get.all.prompt(),
             threadExists: false,
             thread: void 0,
             messageList,
@@ -11237,12 +11299,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
@@ -11269,7 +11330,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;
@@ -11289,7 +11353,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,
@@ -11391,7 +11454,6 @@ the following messages are from ${ymd}
         effectiveOutputProcessors = effectiveOutputProcessors ? [...effectiveOutputProcessors, structuredProcessor] : [structuredProcessor];
       }
       const loopOptions = {
-        messages: result2.messages,
         runtimeContext: result2.runtimeContext,
         tracingContext: {
           currentSpan: agentAISpan
@@ -11406,6 +11468,9 @@ the following messages are from ${ymd}
         maxSteps: result2.maxSteps,
         providerOptions: result2.providerOptions,
         options: {
+          ...(options.prepareStep && {
+            prepareStep: options.prepareStep
+          }),
           onFinish: async payload => {
             if (payload.finishReason === "error") {
               this.logger.error("Error in agent stream", {
@@ -11415,7 +11480,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({
@@ -11449,14 +11513,20 @@ the following messages are from ${ymd}
               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();
@@ -11533,14 +11603,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({
@@ -11690,7 +11754,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,
@@ -11944,7 +12009,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,
@@ -15991,5 +16057,5 @@ exports.recursivelyCheckForFinalState = recursivelyCheckForFinalState;
 exports.resolveVariables = resolveVariables;
 exports.updateStepInHierarchy = updateStepInHierarchy;
 exports.workflowToStep = workflowToStep;
-//# sourceMappingURL=chunk-C3R2Q3NN.cjs.map
-//# sourceMappingURL=chunk-C3R2Q3NN.cjs.map
+//# sourceMappingURL=chunk-BJASJTXK.cjs.map
+//# sourceMappingURL=chunk-BJASJTXK.cjs.map