@mastra/core 0.24.5 → 0.24.6

package/dist/{chunk-4SXWN3RR.js → chunk-Q6LWNLAJ.js}

@@ -1,4 +1,4 @@
-import { fetchWithRetry } from './chunk-ZIHEKHUB.js';
+import { fetchWithRetry } from './chunk-WIMFJ2BA.js';
 import { MastraError } from './chunk-PZUZNPFM.js';
 import { convertUint8ArrayToBase64, convertBase64ToUint8Array, isUrlSupported } from '@ai-sdk/provider-utils-v5';
 import { randomUUID } from 'crypto';
@@ -210,14 +210,150 @@ function convertImageFilePart(part, downloadedAssets) {
     }
   }
 }
+z.union([
+  z.string(),
+  z.instanceof(Uint8Array),
+  z.instanceof(ArrayBuffer),
+  z.custom(
+    // Buffer might not be available in some environments such as CloudFlare:
+    (value) => globalThis.Buffer?.isBuffer(value) ?? false,
+    { message: "Must be a Buffer" }
+  )
+]);
+function convertDataContentToBase64String(content) {
+  if (typeof content === "string") {
+    return content;
+  }
+  if (content instanceof ArrayBuffer) {
+    return convertUint8ArrayToBase64$1(new Uint8Array(content));
+  }
+  return convertUint8ArrayToBase64$1(content);
+}
+
+// src/agent/message-list/prompt/image-utils.ts
+function parseDataUri(dataUri) {
+  if (!dataUri.startsWith("data:")) {
+    return {
+      isDataUri: false,
+      base64Content: dataUri
+    };
+  }
+  const base64Index = dataUri.indexOf(",");
+  if (base64Index === -1) {
+    return {
+      isDataUri: true,
+      base64Content: dataUri
+    };
+  }
+  const header = dataUri.substring(5, base64Index);
+  const base64Content = dataUri.substring(base64Index + 1);
+  const semicolonIndex = header.indexOf(";");
+  const mimeType = semicolonIndex !== -1 ? header.substring(0, semicolonIndex) : header;
+  return {
+    isDataUri: true,
+    mimeType: mimeType || void 0,
+    base64Content
+  };
+}
+function createDataUri(base64Content, mimeType = "application/octet-stream") {
+  if (base64Content.startsWith("data:")) {
+    return base64Content;
+  }
+  return `data:${mimeType};base64,${base64Content}`;
+}
+function imageContentToString(image, fallbackMimeType) {
+  if (typeof image === "string") {
+    return image;
+  }
+  if (image instanceof URL) {
+    return image.toString();
+  }
+  if (image instanceof Uint8Array || image instanceof ArrayBuffer || globalThis.Buffer && Buffer.isBuffer(image)) {
+    const base64 = convertDataContentToBase64String(image);
+    if (fallbackMimeType && !base64.startsWith("data:")) {
+      return `data:${fallbackMimeType};base64,${base64}`;
+    }
+    return base64;
+  }
+  return String(image);
+}
+function imageContentToDataUri(image, mimeType = "image/png") {
+  const imageStr = imageContentToString(image, mimeType);
+  if (imageStr.startsWith("data:")) {
+    return imageStr;
+  }
+  if (imageStr.startsWith("http://") || imageStr.startsWith("https://")) {
+    return imageStr;
+  }
+  return `data:${mimeType};base64,${imageStr}`;
+}
+function getImageCacheKey(image) {
+  if (image instanceof URL) {
+    return image.toString();
+  }
+  if (typeof image === "string") {
+    return image.length;
+  }
+  if (image instanceof Uint8Array) {
+    return image.byteLength;
+  }
+  if (image instanceof ArrayBuffer) {
+    return image.byteLength;
+  }
+  return image;
+}
+function isValidUrl(str) {
+  try {
+    new URL(str);
+    return true;
+  } catch {
+    if (str.startsWith("//")) {
+      try {
+        new URL(`https:${str}`);
+        return true;
+      } catch {
+        return false;
+      }
+    }
+    return false;
+  }
+}
+function categorizeFileData(data, fallbackMimeType) {
+  const parsed = parseDataUri(data);
+  const mimeType = parsed.isDataUri && parsed.mimeType ? parsed.mimeType : fallbackMimeType;
+  if (parsed.isDataUri) {
+    return {
+      type: "dataUri",
+      mimeType,
+      data
+    };
+  }
+  if (isValidUrl(data)) {
+    return {
+      type: "url",
+      mimeType,
+      data
+    };
+  }
+  return {
+    type: "raw",
+    mimeType,
+    data
+  };
+}
 
 // src/agent/message-list/prompt/attachments-to-parts.ts
 function attachmentsToParts(attachments) {
   const parts = [];
   for (const attachment of attachments) {
+    const categorized = categorizeFileData(attachment.url, attachment.contentType);
+    let urlString = attachment.url;
+    if (categorized.type === "raw") {
+      urlString = createDataUri(attachment.url, attachment.contentType || "application/octet-stream");
+    }
     let url;
     try {
-      url = new URL(attachment.url);
+      url = new URL(urlString);
     } catch {
       throw new Error(`Invalid URL: ${attachment.url}`);
     }
@@ -242,13 +378,13 @@ function attachmentsToParts(attachments) {
         if (attachment.contentType?.startsWith("image/")) {
           parts.push({
             type: "image",
-            image: attachment.url,
+            image: urlString,
             mimeType: attachment.contentType
           });
         } else if (attachment.contentType?.startsWith("text/")) {
           parts.push({
             type: "file",
-            data: attachment.url,
+            data: urlString,
             mimeType: attachment.contentType
           });
         } else {
@@ -257,7 +393,7 @@ function attachmentsToParts(attachments) {
           }
           parts.push({
             type: "file",
-            data: attachment.url,
+            data: urlString,
             mimeType: attachment.contentType
           });
         }
@@ -568,25 +704,6 @@ function convertToV1Messages(messages) {
   }
   return v1Messages;
 }
-z.union([
-  z.string(),
-  z.instanceof(Uint8Array),
-  z.instanceof(ArrayBuffer),
-  z.custom(
-    // Buffer might not be available in some environments such as CloudFlare:
-    (value) => globalThis.Buffer?.isBuffer(value) ?? false,
-    { message: "Must be a Buffer" }
-  )
-]);
-function convertDataContentToBase64String(content) {
-  if (typeof content === "string") {
-    return content;
-  }
-  if (content instanceof ArrayBuffer) {
-    return convertUint8ArrayToBase64$1(new Uint8Array(content));
-  }
-  return convertUint8ArrayToBase64$1(content);
-}
 var downloadFromUrl = async ({ url, downloadRetries }) => {
   const urlText = url.toString();
   try {
@@ -669,118 +786,6 @@ async function downloadAssetsFromMessages({
   return Object.fromEntries(downloadFileList);
 }
 
-// src/agent/message-list/prompt/image-utils.ts
-function parseDataUri(dataUri) {
-  if (!dataUri.startsWith("data:")) {
-    return {
-      isDataUri: false,
-      base64Content: dataUri
-    };
-  }
-  const base64Index = dataUri.indexOf(",");
-  if (base64Index === -1) {
-    return {
-      isDataUri: true,
-      base64Content: dataUri
-    };
-  }
-  const header = dataUri.substring(5, base64Index);
-  const base64Content = dataUri.substring(base64Index + 1);
-  const semicolonIndex = header.indexOf(";");
-  const mimeType = semicolonIndex !== -1 ? header.substring(0, semicolonIndex) : header;
-  return {
-    isDataUri: true,
-    mimeType: mimeType || void 0,
-    base64Content
-  };
-}
-function createDataUri(base64Content, mimeType = "application/octet-stream") {
-  if (base64Content.startsWith("data:")) {
-    return base64Content;
-  }
-  return `data:${mimeType};base64,${base64Content}`;
-}
-function imageContentToString(image, fallbackMimeType) {
-  if (typeof image === "string") {
-    return image;
-  }
-  if (image instanceof URL) {
-    return image.toString();
-  }
-  if (image instanceof Uint8Array || image instanceof ArrayBuffer || globalThis.Buffer && Buffer.isBuffer(image)) {
-    const base64 = convertDataContentToBase64String(image);
-    if (fallbackMimeType && !base64.startsWith("data:")) {
-      return `data:${fallbackMimeType};base64,${base64}`;
-    }
-    return base64;
-  }
-  return String(image);
-}
-function imageContentToDataUri(image, mimeType = "image/png") {
-  const imageStr = imageContentToString(image, mimeType);
-  if (imageStr.startsWith("data:")) {
-    return imageStr;
-  }
-  if (imageStr.startsWith("http://") || imageStr.startsWith("https://")) {
-    return imageStr;
-  }
-  return `data:${mimeType};base64,${imageStr}`;
-}
-function getImageCacheKey(image) {
-  if (image instanceof URL) {
-    return image.toString();
-  }
-  if (typeof image === "string") {
-    return image.length;
-  }
-  if (image instanceof Uint8Array) {
-    return image.byteLength;
-  }
-  if (image instanceof ArrayBuffer) {
-    return image.byteLength;
-  }
-  return image;
-}
-function isValidUrl(str) {
-  try {
-    new URL(str);
-    return true;
-  } catch {
-    if (str.startsWith("//")) {
-      try {
-        new URL(`https:${str}`);
-        return true;
-      } catch {
-        return false;
-      }
-    }
-    return false;
-  }
-}
-function categorizeFileData(data, fallbackMimeType) {
-  const parsed = parseDataUri(data);
-  const mimeType = parsed.isDataUri && parsed.mimeType ? parsed.mimeType : fallbackMimeType;
-  if (parsed.isDataUri) {
-    return {
-      type: "dataUri",
-      mimeType,
-      data
-    };
-  }
-  if (isValidUrl(data)) {
-    return {
-      type: "url",
-      mimeType,
-      data
-    };
-  }
-  return {
-    type: "raw",
-    mimeType,
-    data
-  };
-}
-
 // src/agent/message-list/utils/ai-v5/gemini-compatibility.ts
 function ensureGeminiCompatibleMessages(messages) {
   const result = [...messages];
@@ -1362,9 +1367,20 @@ var MessageList = class _MessageList {
     if (m.content.parts.length) {
       for (const part of m.content.parts) {
         if (part.type === `file`) {
+          let normalizedUrl;
+          if (typeof part.data === "string") {
+            const categorized = categorizeFileData(part.data, part.mimeType);
+            if (categorized.type === "raw") {
+              normalizedUrl = createDataUri(part.data, part.mimeType || "application/octet-stream");
+            } else {
+              normalizedUrl = part.data;
+            }
+          } else {
+            normalizedUrl = part.data;
+          }
           experimentalAttachments.push({
             contentType: part.mimeType,
-            url: part.data
+            url: normalizedUrl
           });
         } else if (part.type === "tool-invocation" && (part.toolInvocation.state === "call" || part.toolInvocation.state === "partial-call")) {
           continue;
@@ -2010,6 +2026,12 @@ var MessageList = class _MessageList {
     if (toolInvocations.length) content.toolInvocations = toolInvocations;
     if (typeof coreMessage.content === `string`) content.content = coreMessage.content;
     if (experimentalAttachments.length) content.experimental_attachments = experimentalAttachments;
+    if (coreMessage.providerOptions) {
+      content.providerMetadata = coreMessage.providerOptions;
+    }
+    if ("metadata" in coreMessage && coreMessage.metadata !== null && coreMessage.metadata !== void 0) {
+      content.metadata = coreMessage.metadata;
+    }
     return {
       id,
       role: _MessageList.getRole(coreMessage),
@@ -2242,9 +2264,23 @@ var MessageList = class _MessageList {
           if (role === `tool` || role === `assistant`) {
             throw new Error(incompatibleMessage);
           }
+          let processedImage;
+          if (part.image instanceof URL || part.image instanceof Uint8Array) {
+            processedImage = part.image;
+          } else if (Buffer.isBuffer(part.image) || part.image instanceof ArrayBuffer) {
+            processedImage = new Uint8Array(part.image);
+          } else {
+            const categorized = categorizeFileData(part.image, part.mimeType);
+            if (categorized.type === "raw") {
+              const dataUri = createDataUri(part.image, part.mimeType || "image/png");
+              processedImage = new URL(dataUri);
+            } else {
+              processedImage = new URL(part.image);
+            }
+          }
           roleContent[role].push({
             ...part,
-            image: part.image instanceof URL || part.image instanceof Uint8Array ? part.image : Buffer.isBuffer(part.image) || part.image instanceof ArrayBuffer ? new Uint8Array(part.image) : new URL(part.image)
+            image: processedImage
           });
           break;
         }
@@ -2460,15 +2496,17 @@ var MessageList = class _MessageList {
                 type: "file",
                 mimeType: p.mediaType,
                 data: fileDataSource,
-                providerMetadata: p.providerMetadata
+                ...p.providerMetadata ? { providerMetadata: p.providerMetadata } : {}
               };
             }
             case "reasoning":
-              if (p.text === "") return null;
+              if (p.text === "" && !p.providerMetadata) return null;
               return {
                 type: "reasoning",
-                reasoning: p.text,
-                details: [{ type: "text", text: p.text }],
+                // Keep reasoning field empty to match the format used in llm-execution-step
+                // This ensures cache keys match for deduplication when merging assistant messages
+                reasoning: "",
+                details: p.text ? [{ type: "text", text: p.text }] : [],
                 providerMetadata: p.providerMetadata
               };
             case "source-url":
@@ -2612,7 +2650,7 @@ var MessageList = class _MessageList {
             if (c.type === `text`) return p + c.text;
             return p;
           }, "") ?? "");
-          if (text || part.details?.length) {
+          if (text || part.details?.length || part.providerMetadata) {
             parts.push({
               type: "reasoning",
               text: text || "",
@@ -2628,7 +2666,7 @@ var MessageList = class _MessageList {
               type: "file",
               url: part.data,
               mediaType: categorized.mimeType || "image/png",
-              providerMetadata: part.providerMetadata
+              ...part.providerMetadata ? { providerMetadata: part.providerMetadata } : {}
             });
             fileUrls.add(part.data);
           } else {
@@ -2659,7 +2697,7 @@ var MessageList = class _MessageList {
               url: dataUri,
               // Use url field with data URI
               mediaType: finalMimeType,
-              providerMetadata: part.providerMetadata
+              ...part.providerMetadata ? { providerMetadata: part.providerMetadata } : {}
             });
           }
           fileUrls.add(part.data);
@@ -2710,7 +2748,16 @@ var MessageList = class _MessageList {
             if (uiPart && "callProviderMetadata" in uiPart && uiPart.callProviderMetadata) {
               return {
                 ...part,
-                providerMetadata: uiPart.callProviderMetadata
+                providerOptions: uiPart.callProviderMetadata
+              };
+            }
+          }
+          if (part.type === "reasoning") {
+            const uiPart = uiMsg?.parts[partIndex];
+            if (uiPart && "providerMetadata" in uiPart && uiPart.providerMetadata) {
+              return {
+                ...part,
+                providerOptions: uiPart.providerMetadata
               };
             }
           }
@@ -2763,8 +2810,9 @@ var MessageList = class _MessageList {
     return msgs;
   }
   static mastraMessageV3ToAIV5UIMessage(m) {
+    const { __originalContent, ...cleanMetadata } = m.content.metadata || {};
     const metadata = {
-      ...m.content.metadata || {}
+      ...cleanMetadata
     };
     if (m.createdAt) metadata.createdAt = m.createdAt;
     if (m.threadId) metadata.threadId = m.threadId;
@@ -2984,6 +3032,12 @@ var MessageList = class _MessageList {
       format: 3,
       parts
     };
+    if ("metadata" in coreMessage && coreMessage.metadata !== null && coreMessage.metadata !== void 0) {
+      content.metadata = {
+        ...content.metadata || {},
+        ...coreMessage.metadata
+      };
+    }
     if (coreMessage.content) {
       content.metadata = {
         ...content.metadata || {},
@@ -3119,5 +3173,5 @@ function convertMessages(messages) {
 }
 
 export { DefaultGeneratedFile, DefaultGeneratedFileWithType, MessageList, convertMessages };
-//# sourceMappingURL=chunk-4SXWN3RR.js.map
-//# sourceMappingURL=chunk-4SXWN3RR.js.map
+//# sourceMappingURL=chunk-Q6LWNLAJ.js.map
+//# sourceMappingURL=chunk-Q6LWNLAJ.js.map