@mastra/core 1.0.0-beta.3 → 1.0.0-beta.4

package/dist/{chunk-OWX2PUFH.cjs → chunk-2NVBZKZI.cjs}

@@ -1,9 +1,9 @@
 'use strict';
 
-var chunkQUKUN6NR_cjs = require('./chunk-QUKUN6NR.cjs');
+var chunkISMGVGUM_cjs = require('./chunk-ISMGVGUM.cjs');
 var chunkABJOUEVA_cjs = require('./chunk-ABJOUEVA.cjs');
-var chunkG36A2JRR_cjs = require('./chunk-G36A2JRR.cjs');
-var chunkN4SJ4YX7_cjs = require('./chunk-N4SJ4YX7.cjs');
+var chunkVSM3NLUX_cjs = require('./chunk-VSM3NLUX.cjs');
+var chunk3W5RQCCY_cjs = require('./chunk-3W5RQCCY.cjs');
 var chunkO6NA3Z43_cjs = require('./chunk-O6NA3Z43.cjs');
 var chunkMR7ZWBL6_cjs = require('./chunk-MR7ZWBL6.cjs');
 var chunkHBJPYQRN_cjs = require('./chunk-HBJPYQRN.cjs');
@@ -449,14 +449,22 @@ function prepareToolsAndToolChoice({
               inputSchema: aiV5.asSchema(sdkTool.inputSchema).jsonSchema,
               providerOptions: sdkTool.providerOptions
             };
-          case "provider-defined":
+          case "provider-defined": {
+            const providerId = sdkTool.id;
+            let providerToolName = name;
+            if (providerId && providerId.includes(".")) {
+              providerToolName = providerId.split(".").slice(1).join(".");
+            } else if (providerId) {
+              providerToolName = providerId;
+            }
             return {
               type: "provider-defined",
-              name,
+              name: providerToolName,
               // TODO: as any seems wrong here. are there cases where we don't have an id?
-              id: sdkTool.id,
+              id: providerId,
               args: sdkTool.args
             };
+          }
           default: {
             const exhaustiveCheck = toolType;
             throw new Error(`Unsupported tool type: ${exhaustiveCheck}`);
@@ -5356,7 +5364,7 @@ function convertMastraChunkToAISDKv5({
       if (mode === "generate") {
         return {
           type: "file",
-          file: new chunkG36A2JRR_cjs.DefaultGeneratedFile({
+          file: new chunkVSM3NLUX_cjs.DefaultGeneratedFile({
             data: chunk.payload.data,
             mediaType: chunk.payload.mimeType
           })
@@ -5364,7 +5372,7 @@ function convertMastraChunkToAISDKv5({
       }
       return {
         type: "file",
-        file: new chunkG36A2JRR_cjs.DefaultGeneratedFileWithType({
+        file: new chunkVSM3NLUX_cjs.DefaultGeneratedFileWithType({
           data: chunk.payload.data,
           mediaType: chunk.payload.mimeType
         })
@@ -5748,23 +5756,22 @@ async function processOutputStream({
       if (runState.state.textDeltas.length) {
         const textStartPayload = chunk.payload;
         const providerMetadata = textStartPayload.providerMetadata ?? runState.state.providerOptions;
-        messageList.add(
-          {
-            id: messageId,
-            role: "assistant",
-            content: [
-              providerMetadata ? {
+        const message = {
+          id: messageId,
+          role: "assistant",
+          content: {
+            format: 2,
+            parts: [
+              {
                 type: "text",
                 text: runState.state.textDeltas.join(""),
-                providerOptions: providerMetadata
-              } : {
-                type: "text",
-                text: runState.state.textDeltas.join("")
+                ...providerMetadata ? { providerMetadata } : {}
               }
             ]
           },
-          "response"
-        );
+          createdAt: /* @__PURE__ */ new Date()
+        };
+        messageList.add(message, "response");
       }
       runState.setState({
         isStreaming: false,
@@ -5844,20 +5851,23 @@ async function processOutputStream({
           providerOptions: chunk.payload.providerMetadata ?? runState.state.providerOptions
         });
         if (Object.values(chunk.payload.providerMetadata || {}).find((v) => v?.redactedData)) {
-          messageList.add(
-            {
-              id: messageId,
-              role: "assistant",
-              content: [
+          const message = {
+            id: messageId,
+            role: "assistant",
+            content: {
+              format: 2,
+              parts: [
                 {
                   type: "reasoning",
-                  text: "",
-                  providerOptions: chunk.payload.providerMetadata ?? runState.state.providerOptions
+                  reasoning: "",
+                  details: [{ type: "redacted", data: "" }],
+                  providerMetadata: chunk.payload.providerMetadata ?? runState.state.providerOptions
                 }
               ]
             },
-            "response"
-          );
+            createdAt: /* @__PURE__ */ new Date()
+          };
+          messageList.add(message, "response");
           if (isControllerOpen(controller)) {
             controller.enqueue(chunk);
           }
@@ -5883,20 +5893,23 @@ async function processOutputStream({
       }
       case "reasoning-end": {
         if (runState.state.reasoningDeltas.length > 0) {
-          messageList.add(
-            {
-              id: messageId,
-              role: "assistant",
-              content: [
+          const message = {
+            id: messageId,
+            role: "assistant",
+            content: {
+              format: 2,
+              parts: [
                 {
                   type: "reasoning",
-                  text: runState.state.reasoningDeltas.join(""),
-                  providerOptions: chunk.payload.providerMetadata ?? runState.state.providerOptions
+                  reasoning: "",
+                  details: [{ type: "text", text: runState.state.reasoningDeltas.join("") }],
+                  providerMetadata: chunk.payload.providerMetadata ?? runState.state.providerOptions
                 }
               ]
             },
-            "response"
-          );
+            createdAt: /* @__PURE__ */ new Date()
+          };
+          messageList.add(message, "response");
         }
         runState.setState({
           isReasoning: false,
@@ -5908,25 +5921,31 @@ async function processOutputStream({
         break;
       }
       case "file":
-        messageList.add(
-          {
+        {
+          const message = {
             id: messageId,
             role: "assistant",
-            content: [
-              {
-                type: "file",
-                data: chunk.payload.data,
-                mimeType: chunk.payload.mimeType
-              }
-            ]
-          },
-          "response"
-        );
-        controller.enqueue(chunk);
+            content: {
+              format: 2,
+              parts: [
+                {
+                  type: "file",
+                  // @ts-expect-error
+                  data: chunk.payload.data,
+                  // TODO: incorrect string type
+                  mimeType: chunk.payload.mimeType
+                }
+              ]
+            },
+            createdAt: /* @__PURE__ */ new Date()
+          };
+          messageList.add(message, "response");
+          controller.enqueue(chunk);
+        }
         break;
       case "source":
-        messageList.add(
-          {
+        {
+          const message = {
             id: messageId,
             role: "assistant",
             content: {
@@ -5945,10 +5964,10 @@ async function processOutputStream({
               ]
             },
             createdAt: /* @__PURE__ */ new Date()
-          },
-          "response"
-        );
-        controller.enqueue(chunk);
+          };
+          messageList.add(message, "response");
+          controller.enqueue(chunk);
+        }
         break;
       case "finish":
         runState.setState({
@@ -6115,7 +6134,7 @@ function createLLMExecutionStep({
                   }
                   if (prepareStepResult.messages) {
                     const newMessages = prepareStepResult.messages;
-                    const newMessageList = new chunkG36A2JRR_cjs.MessageList();
+                    const newMessageList = new chunkVSM3NLUX_cjs.MessageList();
                     for (const message of newMessages) {
                       if (message.role === "system") {
                         newMessageList.addSystem(message);
@@ -6287,24 +6306,27 @@ function createLLMExecutionStep({
         return chunk.payload;
       });
       if (toolCalls.length > 0) {
-        const assistantContent = [
-          ...toolCalls.map((toolCall) => {
-            return {
-              type: "tool-call",
-              toolCallId: toolCall.toolCallId,
-              toolName: toolCall.toolName,
-              args: toolCall.args
-            };
-          })
-        ];
-        messageList.add(
-          {
-            id: messageId,
-            role: "assistant",
-            content: assistantContent
+        const message = {
+          id: messageId,
+          role: "assistant",
+          content: {
+            format: 2,
+            parts: toolCalls.map((toolCall) => {
+              return {
+                type: "tool-invocation",
+                toolInvocation: {
+                  state: "call",
+                  toolCallId: toolCall.toolCallId,
+                  toolName: toolCall.toolName,
+                  args: toolCall.args
+                },
+                ...toolCall.providerMetadata ? { providerMetadata: toolCall.providerMetadata } : {}
+              };
+            })
           },
-          "response"
-        );
+          createdAt: /* @__PURE__ */ new Date()
+        };
+        messageList.add(message, "response");
       }
       const finishReason = runState?.state?.stepResult?.reason ?? outputStream._getImmediateFinishReason();
       const hasErrored = runState.state.hasErrored;
@@ -6386,24 +6408,28 @@ function createLLMMappingStep({ models, _internal, ...rest }, llmExecutionStep)
             };
             rest.controller.enqueue(chunk);
           });
-          rest.messageList.add(
-            {
-              id: toolResultMessageId,
-              role: "tool",
-              content: errorResults.map((toolCall) => {
+          const msg = {
+            id: toolResultMessageId || "",
+            role: "assistant",
+            content: {
+              format: 2,
+              parts: errorResults.map((toolCallErrorResult) => {
                 return {
-                  type: "tool-result",
-                  args: toolCall.args,
-                  toolCallId: toolCall.toolCallId,
-                  toolName: toolCall.toolName,
-                  result: {
-                    tool_execution_error: toolCall.error?.message ?? toolCall.error
-                  }
+                  type: "tool-invocation",
+                  toolInvocation: {
+                    state: "result",
+                    toolCallId: toolCallErrorResult.toolCallId,
+                    toolName: toolCallErrorResult.toolName,
+                    args: toolCallErrorResult.args,
+                    result: toolCallErrorResult.error?.message ?? toolCallErrorResult.error
+                  },
+                  ...toolCallErrorResult.providerMetadata ? { providerMetadata: toolCallErrorResult.providerMetadata } : {}
                 };
               })
             },
-            "response"
-          );
+            createdAt: /* @__PURE__ */ new Date()
+          };
+          rest.messageList.add(msg, "response");
         }
         initialResult.stepResult.isContinued = false;
         return bail(initialResult);
@@ -6431,24 +6457,30 @@ function createLLMMappingStep({ models, _internal, ...rest }, llmExecutionStep)
               })
             });
           }
-          const toolResultMessageId = rest.experimental_generateMessageId?.() || _internal?.generateId?.();
-          rest.messageList.add(
-            {
-              id: toolResultMessageId,
-              role: "tool",
-              content: inputData.map((toolCall2) => {
-                return {
-                  type: "tool-result",
-                  args: toolCall2.args,
-                  toolCallId: toolCall2.toolCallId,
-                  toolName: toolCall2.toolName,
-                  result: toolCall2.result
-                };
-              })
-            },
-            "response"
-          );
         }
+        const toolResultMessageId = rest.experimental_generateMessageId?.() || _internal?.generateId?.();
+        const toolResultMessage = {
+          id: toolResultMessageId || "",
+          role: "assistant",
+          content: {
+            format: 2,
+            parts: inputData.map((toolCall) => {
+              return {
+                type: "tool-invocation",
+                toolInvocation: {
+                  state: "result",
+                  toolCallId: toolCall.toolCallId,
+                  toolName: toolCall.toolName,
+                  args: toolCall.args,
+                  result: toolCall.result
+                },
+                ...toolCall.providerMetadata ? { providerMetadata: toolCall.providerMetadata } : {}
+              };
+            })
+          },
+          createdAt: /* @__PURE__ */ new Date()
+        };
+        rest.messageList.add(toolResultMessage, "response");
         return {
           ...initialResult,
           messages: {
@@ -7459,7 +7491,7 @@ async function prepareMemoryStep({
       );
     }
   } else {
-    const messageList = new chunkG36A2JRR_cjs.MessageList({
+    const messageList = new chunkVSM3NLUX_cjs.MessageList({
       threadId: thread?.id,
       resourceId: thread?.resourceId
     });
@@ -7954,7 +7986,7 @@ ${completionResult?.object?.finalResult}` : ""}
         requestContext
       });
       let chunks = [];
-      for await (const chunk of stream) {
+      for await (const chunk of stream.fullStream) {
         chunks.push(chunk);
         await writer?.write({
           type: `workflow-execution-event-${chunk.type}`,
@@ -8911,7 +8943,7 @@ var AgentLegacyHandler = class {
           writableStream,
           methodType: methodType === "generate" ? "generateLegacy" : "streamLegacy"
         });
-        const messageList = new chunkG36A2JRR_cjs.MessageList({
+        const messageList = new chunkVSM3NLUX_cjs.MessageList({
           threadId,
           resourceId,
           generateMessageId: this.capabilities.mastra?.generateId?.bind(this.capabilities.mastra),
@@ -8992,7 +9024,7 @@ var AgentLegacyHandler = class {
           existingThread || hasResourceScopeSemanticRecall ? this.capabilities.getMemoryMessages({
             resourceId,
             threadId: threadObject.id,
-            vectorMessageSearch: new chunkG36A2JRR_cjs.MessageList().add(messages, `user`).getLatestUserContent() || "",
+            vectorMessageSearch: new chunkVSM3NLUX_cjs.MessageList().add(messages, `user`).getLatestUserContent() || "",
             memoryConfig,
             requestContext
           }) : { messages: [] },
@@ -9014,7 +9046,7 @@ The following messages were remembered from a different conversation:
 <remembered_from_other_conversation>
 ${(() => {
             let result = ``;
-            const messages2 = new chunkG36A2JRR_cjs.MessageList().add(resultsFromOtherThreads, "memory").get.all.v1();
+            const messages2 = new chunkVSM3NLUX_cjs.MessageList().add(resultsFromOtherThreads, "memory").get.all.v1();
             let lastYmd = null;
             for (const msg of messages2) {
               const date = msg.createdAt;
@@ -9065,7 +9097,7 @@ the following messages are from ${ymd}
           systemMessage,
           memorySystemMessage: memorySystemMessage || void 0
         });
-        const processedList = new chunkG36A2JRR_cjs.MessageList({
+        const processedList = new chunkVSM3NLUX_cjs.MessageList({
           threadId: threadObject.id,
           resourceId,
           generateMessageId: this.capabilities.mastra?.generateId?.bind(this.capabilities.mastra),
@@ -9121,7 +9153,7 @@ the following messages are from ${ymd}
           result: resToLog,
           threadId
         });
-        const messageListResponses = new chunkG36A2JRR_cjs.MessageList({
+        const messageListResponses = new chunkVSM3NLUX_cjs.MessageList({
           threadId,
           resourceId,
           generateMessageId: this.capabilities.mastra?.generateId?.bind(this.capabilities.mastra),
@@ -9481,7 +9513,7 @@ the following messages are from ${ymd}
         requestContext: mergedGenerateOptions.requestContext || new chunkJ7O6WENZ_cjs.RequestContext(),
         tracingContext,
         outputProcessorOverrides: finalOutputProcessors,
-        messageList: new chunkG36A2JRR_cjs.MessageList({
+        messageList: new chunkVSM3NLUX_cjs.MessageList({
           threadId: llmOptions.threadId || "",
           resourceId: llmOptions.resourceId || ""
         }).add(
@@ -9571,7 +9603,7 @@ the following messages are from ${ymd}
     const outputProcessorResult = await this.capabilities.__runOutputProcessors({
       requestContext: mergedGenerateOptions.requestContext || new chunkJ7O6WENZ_cjs.RequestContext(),
       tracingContext,
-      messageList: new chunkG36A2JRR_cjs.MessageList({
+      messageList: new chunkVSM3NLUX_cjs.MessageList({
         threadId: llmOptions.threadId || "",
         resourceId: llmOptions.resourceId || ""
       }).add(
@@ -11966,7 +11998,7 @@ var prepareToolsStepOutputSchema = z5.z.object({
 var prepareMemoryStepOutputSchema = z5.z.object({
   threadExists: z5.z.boolean(),
   thread: storageThreadSchema.optional(),
-  messageList: z5.z.instanceof(chunkG36A2JRR_cjs.MessageList),
+  messageList: z5.z.instanceof(chunkVSM3NLUX_cjs.MessageList),
   tripwire: z5.z.boolean().optional(),
   tripwireReason: z5.z.string().optional()
 });
@@ -11999,7 +12031,7 @@ function createPrepareMemoryStep({
     outputSchema: prepareMemoryStepOutputSchema,
     execute: async ({ tracingContext }) => {
       const thread = threadFromArgs;
-      const messageList = new chunkG36A2JRR_cjs.MessageList({
+      const messageList = new chunkVSM3NLUX_cjs.MessageList({
         threadId: thread?.id,
         resourceId,
         generateMessageId: capabilities.generateMessageId,
@@ -12080,7 +12112,7 @@ function createPrepareMemoryStep({
         existingThread || hasResourceScopeSemanticRecall ? capabilities.getMemoryMessages({
           resourceId,
           threadId: threadObject.id,
-          vectorMessageSearch: new chunkG36A2JRR_cjs.MessageList().add(options.messages, `user`).getLatestUserContent() || "",
+          vectorMessageSearch: new chunkVSM3NLUX_cjs.MessageList().add(options.messages, `user`).getLatestUserContent() || "",
           memoryConfig,
           requestContext
         }) : { messages: [] },
@@ -12106,7 +12138,7 @@ The following messages were remembered from a different conversation:
 <remembered_from_other_conversation>
 ${(() => {
           let result = ``;
-          const messages = new chunkG36A2JRR_cjs.MessageList().add(resultsFromOtherThreads, "memory").get.all.v1();
+          const messages = new chunkVSM3NLUX_cjs.MessageList().add(resultsFromOtherThreads, "memory").get.all.v1();
           let lastYmd = null;
           for (const msg of messages) {
             const date = msg.createdAt;
@@ -12153,7 +12185,7 @@ the following messages are from ${ymd}
         systemMessage,
         memorySystemMessage: memorySystemMessage || void 0
       });
-      const processedList = new chunkG36A2JRR_cjs.MessageList({
+      const processedList = new chunkVSM3NLUX_cjs.MessageList({
         threadId: threadObject.id,
         resourceId,
         generateMessageId: capabilities.generateMessageId,
@@ -12474,7 +12506,7 @@ var Agent = class extends chunkKEXGB7FK_cjs.MastraBase {
         this.#voice?.addInstructions(config.instructions);
       }
     } else {
-      this.#voice = new chunkQUKUN6NR_cjs.DefaultVoice();
+      this.#voice = new chunkISMGVGUM_cjs.DefaultVoice();
     }
     if (config.inputProcessors) {
       this.#inputProcessors = config.inputProcessors;
@@ -12721,7 +12753,7 @@ var Agent = class extends chunkKEXGB7FK_cjs.MastraBase {
       voice?.addInstructions(this.#convertInstructionsToString(instructions));
       return voice;
     } else {
-      return new chunkQUKUN6NR_cjs.DefaultVoice();
+      return new chunkISMGVGUM_cjs.DefaultVoice();
     }
   }
   /**
@@ -13017,7 +13049,7 @@ var Agent = class extends chunkKEXGB7FK_cjs.MastraBase {
    */
   async resolveModelConfig(modelConfig, requestContext) {
     try {
-      return await chunkN4SJ4YX7_cjs.resolveModelConfig(modelConfig, requestContext, this.#mastra);
+      return await chunk3W5RQCCY_cjs.resolveModelConfig(modelConfig, requestContext, this.#mastra);
     } catch (error) {
       const mastraError = new chunkTWH4PTDG_cjs.MastraError({
         id: "AGENT_GET_MODEL_MISSING_MODEL_INSTANCE",
@@ -13223,7 +13255,7 @@ var Agent = class extends chunkKEXGB7FK_cjs.MastraBase {
     instructions
   }) {
     const llm = await this.getLLM({ requestContext, model });
-    const normMessage = new chunkG36A2JRR_cjs.MessageList().add(message, "user").get.all.ui().at(-1);
+    const normMessage = new chunkVSM3NLUX_cjs.MessageList().add(message, "user").get.all.ui().at(-1);
     if (!normMessage) {
       throw new Error(`Could not generate title from input ${JSON.stringify(message)}`);
     }
@@ -13246,7 +13278,7 @@ var Agent = class extends chunkKEXGB7FK_cjs.MastraBase {
     const systemInstructions = await this.resolveTitleInstructions(requestContext, instructions);
     let text = "";
     if (llm.getModel().specificationVersion === "v2") {
-      const messageList = new chunkG36A2JRR_cjs.MessageList().add(
+      const messageList = new chunkVSM3NLUX_cjs.MessageList().add(
         [
           {
             role: "system",
@@ -13298,7 +13330,7 @@ var Agent = class extends chunkKEXGB7FK_cjs.MastraBase {
   async genTitle(userMessage, requestContext, tracingContext, model, instructions) {
     try {
       if (userMessage) {
-        const normMessage = new chunkG36A2JRR_cjs.MessageList().add(userMessage, "user").get.all.ui().at(-1);
+        const normMessage = new chunkVSM3NLUX_cjs.MessageList().add(userMessage, "user").get.all.ui().at(-1);
         if (normMessage) {
           return await this.generateTitleFromUserMessage({
             message: normMessage,
@@ -15924,7 +15956,7 @@ var MastraModelOutput = class extends chunkKEXGB7FK_cjs.MastraBase {
                     self.messageList,
                     options.tracingContext
                   );
-                  const outputText = self.messageList.get.response.aiV4.core().map((m) => chunkG36A2JRR_cjs.MessageList.coreContentToString(m.content)).join("\n");
+                  const outputText = self.messageList.get.response.aiV4.core().map((m) => chunkVSM3NLUX_cjs.MessageList.coreContentToString(m.content)).join("\n");
                   self.#delayedPromises.text.resolve(outputText);
                   self.#delayedPromises.finishReason.resolve(self.#finishReason);
                   if (chunk.payload.metadata) {
@@ -16561,5 +16593,5 @@ exports.tryGenerateWithJsonFallback = tryGenerateWithJsonFallback;
 exports.tryStreamWithJsonFallback = tryStreamWithJsonFallback;
 exports.validateStepInput = validateStepInput;
 exports.validateStepResumeData = validateStepResumeData;
-//# sourceMappingURL=chunk-OWX2PUFH.cjs.map
-//# sourceMappingURL=chunk-OWX2PUFH.cjs.map
+//# sourceMappingURL=chunk-2NVBZKZI.cjs.map
+//# sourceMappingURL=chunk-2NVBZKZI.cjs.map