@mastra/core 0.24.3 → 0.24.4-alpha.0

package/dist/{chunk-RHZQQQZ4.cjs → chunk-JMO24AJV.cjs}

@@ -1819,6 +1819,12 @@ var MessageList = class _MessageList {
   }
   hydrateMastraMessageV2Fields(message) {
     if (!(message.createdAt instanceof Date)) message.createdAt = new Date(message.createdAt);
+    if (!message.threadId && this.memoryInfo?.threadId) {
+      message.threadId = this.memoryInfo.threadId;
+    }
+    if (!message.resourceId && this.memoryInfo?.resourceId) {
+      message.resourceId = this.memoryInfo.resourceId;
+    }
     if (message.content.toolInvocations && message.content.parts) {
       message.content.toolInvocations = message.content.toolInvocations.map((ti) => {
         if (!ti.args || Object.keys(ti.args).length === 0) {
@@ -1848,6 +1854,9 @@ var MessageList = class _MessageList {
     if ("metadata" in message && message.metadata !== null && message.metadata !== void 0) {
       content.metadata = message.metadata;
     }
+    if ("providerMetadata" in message && message.providerMetadata !== null && message.providerMetadata !== void 0) {
+      content.providerMetadata = message.providerMetadata;
+    }
     return {
       id: message.id || this.newMessageId(),
       role: _MessageList.getRole(message),
@@ -1891,8 +1900,8 @@ var MessageList = class _MessageList {
               ...Object.keys(mergedProviderMetadata).length > 0 ? { providerMetadata: mergedProviderMetadata } : {}
             });
             break;
-          case "tool-call":
-            parts.push({
+          case "tool-call": {
+            const toolCallPart = {
               type: "tool-invocation",
               toolInvocation: {
                 state: "call",
@@ -1900,8 +1909,13 @@ var MessageList = class _MessageList {
                 toolName: part.toolName,
                 args: part.args
               }
-            });
+            };
+            if ("providerOptions" in part && part.providerOptions) {
+              toolCallPart.providerMetadata = part.providerOptions;
+            }
+            parts.push(toolCallPart);
             break;
+          }
           case "tool-result":
             let toolArgs = {};
             const toolCallInSameMsg = coreMessage.content.find(
@@ -1933,20 +1947,29 @@ var MessageList = class _MessageList {
               args: toolArgs
               // Use the args from the corresponding tool-call
             };
-            parts.push({
+            const toolResultPart = {
               type: "tool-invocation",
               toolInvocation: invocation
-            });
+            };
+            if ("providerOptions" in part && part.providerOptions) {
+              toolResultPart.providerMetadata = part.providerOptions;
+            }
+            parts.push(toolResultPart);
             toolInvocations.push(invocation);
             break;
-          case "reasoning":
-            parts.push({
+          case "reasoning": {
+            const reasoningPart = {
               type: "reasoning",
               reasoning: "",
               // leave this blank so we aren't double storing it in the db along with details
               details: [{ type: "text", text: part.text, signature: part.signature }]
-            });
+            };
+            if ("providerOptions" in part && part.providerOptions) {
+              reasoningPart.providerMetadata = part.providerOptions;
+            }
+            parts.push(reasoningPart);
             break;
+          }
           case "redacted-reasoning":
             parts.push({
               type: "reasoning",
@@ -2553,6 +2576,9 @@ var MessageList = class _MessageList {
     if (v2Msg.content.metadata) {
       v3Msg.content.metadata = { ...v2Msg.content.metadata };
     }
+    if (v2Msg.content.providerMetadata) {
+      v3Msg.content.providerMetadata = v2Msg.content.providerMetadata;
+    }
     if (v2Msg.content.content !== void 0) {
       v3Msg.content.metadata = {
         ...v3Msg.content.metadata || {},
@@ -2583,12 +2609,16 @@ var MessageList = class _MessageList {
               callProviderMetadata: part.providerMetadata
             });
           } else {
-            parts.push({
+            const toolPart = {
               type: `tool-${part.toolInvocation.toolName}`,
               toolCallId: part.toolInvocation.toolCallId,
               state: part.toolInvocation.state === `call` ? `input-available` : `input-streaming`,
               input: part.toolInvocation.args
-            });
+            };
+            if (part.providerMetadata) {
+              toolPart.callProviderMetadata = part.providerMetadata;
+            }
+            parts.push(toolPart);
           }
           break;
         case "source":
@@ -2684,9 +2714,39 @@ var MessageList = class _MessageList {
     return v3Msg;
   }
   aiV5UIMessagesToAIV5ModelMessages(messages) {
-    const preprocessed = this.addStartStepPartsForAIV5(this.sanitizeV5UIMessages(messages));
+    const sanitized = this.sanitizeV5UIMessages(messages);
+    const preprocessed = this.addStartStepPartsForAIV5(sanitized);
     const result = AIV5__namespace.convertToModelMessages(preprocessed);
-    return result;
+    const finalResult = result.map((modelMsg, index) => {
+      const uiMsg = preprocessed[index];
+      let updatedMsg = modelMsg;
+      if (uiMsg?.metadata && typeof uiMsg.metadata === "object" && "providerMetadata" in uiMsg.metadata && uiMsg.metadata.providerMetadata) {
+        updatedMsg = {
+          ...updatedMsg,
+          providerOptions: uiMsg.metadata.providerMetadata
+        };
+      }
+      if (updatedMsg.role === "assistant" && Array.isArray(updatedMsg.content)) {
+        const updatedContent = updatedMsg.content.map((part, partIndex) => {
+          if (part.type === "tool-call") {
+            const uiPart = uiMsg?.parts[partIndex];
+            if (uiPart && "callProviderMetadata" in uiPart && uiPart.callProviderMetadata) {
+              return {
+                ...part,
+                providerMetadata: uiPart.callProviderMetadata
+              };
+            }
+          }
+          return part;
+        });
+        return {
+          ...updatedMsg,
+          content: updatedContent
+        };
+      }
+      return updatedMsg;
+    });
+    return finalResult;
   }
   addStartStepPartsForAIV5(messages) {
     for (const message of messages) {
@@ -2731,6 +2791,7 @@ var MessageList = class _MessageList {
     if (m.createdAt) metadata.createdAt = m.createdAt;
     if (m.threadId) metadata.threadId = m.threadId;
     if (m.resourceId) metadata.resourceId = m.resourceId;
+    if (m.content.providerMetadata) metadata.providerMetadata = m.content.providerMetadata;
     const filteredParts = m.content.parts;
     return {
       id: m.id,
@@ -3083,5 +3144,5 @@ exports.DefaultGeneratedFile = DefaultGeneratedFile;
 exports.DefaultGeneratedFileWithType = DefaultGeneratedFileWithType;
 exports.MessageList = MessageList;
 exports.convertMessages = convertMessages;
-//# sourceMappingURL=chunk-RHZQQQZ4.cjs.map
-//# sourceMappingURL=chunk-RHZQQQZ4.cjs.map
+//# sourceMappingURL=chunk-JMO24AJV.cjs.map
+//# sourceMappingURL=chunk-JMO24AJV.cjs.map