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

package/dist/{chunk-VSM3NLUX.cjs → chunk-VRFSEZBA.cjs}

@@ -230,14 +230,137 @@ function convertImageFilePart(part, downloadedAssets) {
     }
   }
 }
+zod.z.union([
+  zod.z.string(),
+  zod.z.instanceof(Uint8Array),
+  zod.z.instanceof(ArrayBuffer),
+  zod.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 chunkSVLMF4UZ_cjs.convertUint8ArrayToBase64(new Uint8Array(content));
+  }
+  return chunkSVLMF4UZ_cjs.convertUint8ArrayToBase64(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);
+    return base64;
+  }
+  return String(image);
+}
+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}`);
     }
@@ -262,13 +385,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 {
@@ -277,7 +400,7 @@ function attachmentsToParts(attachments) {
           }
           parts.push({
             type: "file",
-            data: attachment.url,
+            data: urlString,
             mimeType: attachment.contentType
           });
         }
@@ -588,25 +711,6 @@ function convertToV1Messages(messages) {
   }
   return v1Messages;
 }
-zod.z.union([
-  zod.z.string(),
-  zod.z.instanceof(Uint8Array),
-  zod.z.instanceof(ArrayBuffer),
-  zod.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 chunkSVLMF4UZ_cjs.convertUint8ArrayToBase64(new Uint8Array(content));
-  }
-  return chunkSVLMF4UZ_cjs.convertUint8ArrayToBase64(content);
-}
 
 // src/utils/fetchWithRetry.ts
 async function fetchWithRetry(url, options = {}, maxRetries = 3) {
@@ -728,105 +832,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);
-    return base64;
-  }
-  return String(image);
-}
-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];
@@ -912,6 +917,9 @@ var MessageList = class _MessageList {
   userContextMessagesPersisted = /* @__PURE__ */ new Set();
   generateMessageId;
   _agentNetworkAppend = false;
+  // Event recording for observability
+  isRecording = false;
+  recordedEvents = [];
   constructor({
     threadId,
     resourceId,
@@ -925,10 +933,34 @@ var MessageList = class _MessageList {
     this.generateMessageId = generateMessageId;
     this._agentNetworkAppend = _agentNetworkAppend || false;
   }
+  /**
+   * Start recording mutations to the MessageList for observability/tracing
+   */
+  startRecording() {
+    this.isRecording = true;
+    this.recordedEvents = [];
+  }
+  /**
+   * Stop recording and return the list of recorded events
+   */
+  stopRecording() {
+    this.isRecording = false;
+    const events = [...this.recordedEvents];
+    this.recordedEvents = [];
+    return events;
+  }
   add(messages, messageSource) {
     if (messageSource === `user`) messageSource = `input`;
     if (!messages) return this;
-    for (const message of Array.isArray(messages) ? messages : [messages]) {
+    const messageArray = Array.isArray(messages) ? messages : [messages];
+    if (this.isRecording) {
+      this.recordedEvents.push({
+        type: "add",
+        source: messageSource,
+        count: messageArray.length
+      });
+    }
+    for (const message of messageArray) {
       this.addOne(
         typeof message === `string` ? {
           role: "user",
@@ -990,6 +1022,22 @@ var MessageList = class _MessageList {
     this.userContextMessagesPersisted = this.deserializeSet(state.userContextMessagesPersisted);
     return this;
   }
+  makeMessageSourceChecker() {
+    const sources = {
+      memory: new Set(Array.from(this.memoryMessages.values()).map((m) => m.id)),
+      output: new Set(Array.from(this.newResponseMessages.values()).map((m) => m.id)),
+      input: new Set(Array.from(this.newUserMessages.values()).map((m) => m.id))
+    };
+    return {
+      ...sources,
+      getSource: (msg) => {
+        if (sources.memory.has(msg.id)) return "memory";
+        if (sources.input.has(msg.id)) return "input";
+        if (sources.output.has(msg.id)) return "response";
+        return null;
+      }
+    };
+  }
   getLatestUserContent() {
     const currentUserMessages = this.all.core().filter((m) => m.role === "user");
     const content = currentUserMessages.at(-1)?.content;
@@ -1014,11 +1062,34 @@ var MessageList = class _MessageList {
   }
   get clear() {
     return {
+      all: {
+        db: () => {
+          const allMessages = [...this.messages];
+          this.messages = [];
+          this.newUserMessages.clear();
+          this.newResponseMessages.clear();
+          this.userContextMessages.clear();
+          if (this.isRecording && allMessages.length > 0) {
+            this.recordedEvents.push({
+              type: "clear",
+              count: allMessages.length
+            });
+          }
+          return allMessages;
+        }
+      },
       input: {
         db: () => {
           const userMessages = Array.from(this.newUserMessages);
           this.messages = this.messages.filter((m) => !this.newUserMessages.has(m));
           this.newUserMessages.clear();
+          if (this.isRecording && userMessages.length > 0) {
+            this.recordedEvents.push({
+              type: "clear",
+              source: "input",
+              count: userMessages.length
+            });
+          }
           return userMessages;
         }
       },
@@ -1027,11 +1098,46 @@ var MessageList = class _MessageList {
           const responseMessages = Array.from(this.newResponseMessages);
           this.messages = this.messages.filter((m) => !this.newResponseMessages.has(m));
           this.newResponseMessages.clear();
+          if (this.isRecording && responseMessages.length > 0) {
+            this.recordedEvents.push({
+              type: "clear",
+              source: "response",
+              count: responseMessages.length
+            });
+          }
           return responseMessages;
         }
       }
     };
   }
+  /**
+   * Remove messages by ID
+   * @param ids - Array of message IDs to remove
+   * @returns Array of removed messages
+   */
+  removeByIds(ids) {
+    const idsSet = new Set(ids);
+    const removed = [];
+    this.messages = this.messages.filter((m) => {
+      if (idsSet.has(m.id)) {
+        removed.push(m);
+        this.memoryMessages.delete(m);
+        this.newUserMessages.delete(m);
+        this.newResponseMessages.delete(m);
+        this.userContextMessages.delete(m);
+        return false;
+      }
+      return true;
+    });
+    if (this.isRecording && removed.length > 0) {
+      this.recordedEvents.push({
+        type: "removeByIds",
+        ids,
+        count: removed.length
+      });
+    }
+    return removed;
+  }
   all = {
     db: () => this.messages,
     v1: () => convertToV1Messages(this.all.db()),
@@ -1335,12 +1441,47 @@ var MessageList = class _MessageList {
     if (unsavedMessages.length === 0) return void 0;
     return Math.min(...unsavedMessages.map((m) => new Date(m.createdAt).getTime()));
   }
+  /**
+   * Check if a message is a new user or response message that should be saved.
+   * Checks by message ID to handle cases where the message object may be a copy.
+   */
+  isNewMessage(messageOrId) {
+    const id = typeof messageOrId === "string" ? messageOrId : messageOrId.id;
+    if (typeof messageOrId !== "string") {
+      if (this.newUserMessages.has(messageOrId) || this.newResponseMessages.has(messageOrId)) {
+        return true;
+      }
+    }
+    return Array.from(this.newUserMessages).some((m) => m.id === id) || Array.from(this.newResponseMessages).some((m) => m.id === id);
+  }
   getSystemMessages(tag) {
     if (tag) {
       return this.taggedSystemMessages[tag] || [];
     }
     return this.systemMessages;
   }
+  /**
+   * Get all system messages (both tagged and untagged)
+   * @returns Array of all system messages
+   */
+  getAllSystemMessages() {
+    return [...this.systemMessages, ...Object.values(this.taggedSystemMessages).flat()];
+  }
+  /**
+   * Replace all system messages with new ones
+   * This clears both tagged and untagged system messages and replaces them with the provided array
+   * @param messages - Array of system messages to set
+   */
+  replaceAllSystemMessages(messages) {
+    this.systemMessages = [];
+    this.taggedSystemMessages = {};
+    for (const message of messages) {
+      if (message.role === "system") {
+        this.systemMessages.push(message);
+      }
+    }
+    return this;
+  }
   addSystem(messages, tag) {
     if (!messages) return this;
     for (const message of Array.isArray(messages) ? messages : [messages]) {
@@ -1399,8 +1540,21 @@ var MessageList = class _MessageList {
     if (tag && !this.isDuplicateSystem(coreMessage, tag)) {
       this.taggedSystemMessages[tag] ||= [];
       this.taggedSystemMessages[tag].push(coreMessage);
+      if (this.isRecording) {
+        this.recordedEvents.push({
+          type: "addSystem",
+          tag,
+          message: coreMessage
+        });
+      }
     } else if (!tag && !this.isDuplicateSystem(coreMessage)) {
       this.systemMessages.push(coreMessage);
+      if (this.isRecording) {
+        this.recordedEvents.push({
+          type: "addSystem",
+          message: coreMessage
+        });
+      }
     }
   }
   isDuplicateSystem(message, tag) {
@@ -1426,9 +1580,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;
@@ -1669,6 +1834,9 @@ var MessageList = class _MessageList {
     } else if (messageSource === `response`) {
       this.newResponseMessages.add(messageV2);
       this.newResponseMessagesPersisted.add(messageV2);
+      if (this.newUserMessages.has(messageV2)) {
+        this.newUserMessages.delete(messageV2);
+      }
     } else if (messageSource === `input`) {
       this.newUserMessages.add(messageV2);
       this.newUserMessagesPersisted.add(messageV2);
@@ -1797,8 +1965,10 @@ var MessageList = class _MessageList {
     }
     if (_MessageList.isAIV5CoreMessage(message)) {
       const dbMsg = _MessageList.aiV5ModelMessageToMastraDBMessage(message, messageSource);
+      const rawCreatedAt = "metadata" in message && message.metadata && typeof message.metadata === "object" && "createdAt" in message.metadata ? message.metadata.createdAt : void 0;
       const result = {
         ...dbMsg,
+        createdAt: this.generateCreatedAt(messageSource, rawCreatedAt),
         threadId: this.memoryInfo?.threadId,
         resourceId: this.memoryInfo?.resourceId
       };
@@ -1806,8 +1976,10 @@ var MessageList = class _MessageList {
     }
     if (_MessageList.isAIV5UIMessage(message)) {
       const dbMsg = _MessageList.aiV5UIMessageToMastraDBMessage(message);
+      const rawCreatedAt = "createdAt" in message ? message.createdAt : void 0;
       return {
         ...dbMsg,
+        createdAt: this.generateCreatedAt(messageSource, rawCreatedAt),
         threadId: this.memoryInfo?.threadId,
         resourceId: this.memoryInfo?.resourceId
       };
@@ -1817,16 +1989,16 @@ var MessageList = class _MessageList {
   lastCreatedAt;
   // this makes sure messages added in order will always have a date atleast 1ms apart.
   generateCreatedAt(messageSource, start) {
-    start = start instanceof Date ? start : start ? new Date(start) : void 0;
-    if (start && !this.lastCreatedAt) {
-      this.lastCreatedAt = start.getTime();
-      return start;
+    const startDate = start instanceof Date ? start : typeof start === "string" || typeof start === "number" ? new Date(start) : void 0;
+    if (startDate && !this.lastCreatedAt) {
+      this.lastCreatedAt = startDate.getTime();
+      return startDate;
     }
-    if (start && messageSource === `memory`) {
-      return start;
+    if (startDate && messageSource === `memory`) {
+      return startDate;
     }
     const now = /* @__PURE__ */ new Date();
-    const nowTime = start?.getTime() || now.getTime();
+    const nowTime = startDate?.getTime() || now.getTime();
     const lastTime = this.messages.reduce((p, m) => {
       if (m.createdAt.getTime() > p) return m.createdAt.getTime();
       return p;
@@ -2110,10 +2282,14 @@ var MessageList = class _MessageList {
     if (coreMessage.providerOptions) {
       content.providerMetadata = coreMessage.providerOptions;
     }
+    if ("metadata" in coreMessage && coreMessage.metadata !== null && coreMessage.metadata !== void 0) {
+      content.metadata = coreMessage.metadata;
+    }
+    const rawCreatedAt = "metadata" in coreMessage && coreMessage.metadata && typeof coreMessage.metadata === "object" && "createdAt" in coreMessage.metadata ? coreMessage.metadata.createdAt : void 0;
     return {
       id,
       role: _MessageList.getRole(coreMessage),
-      createdAt: this.generateCreatedAt(messageSource),
+      createdAt: this.generateCreatedAt(messageSource, rawCreatedAt),
       threadId: this.memoryInfo?.threadId,
       resourceId: this.memoryInfo?.resourceId,
       content
@@ -2166,6 +2342,11 @@ var MessageList = class _MessageList {
           }
           return prev;
         }, 0);
+        const partAny = part;
+        if (partAny && Object.hasOwn(partAny, "providerMetadata") && partAny.providerMetadata && Object.hasOwn(partAny.providerMetadata, "openai") && partAny.providerMetadata.openai && Object.hasOwn(partAny.providerMetadata.openai, "itemId")) {
+          const itemId = partAny.providerMetadata.openai.itemId;
+          key += `|${itemId}`;
+        }
       }
       if (part.type === `file`) {
         key += part.data;
@@ -2312,9 +2493,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;
         }
@@ -2964,7 +3159,7 @@ var MessageList = class _MessageList {
       }
     }
     const contentString = mastraDBParts.filter((p) => p.type === "text").map((p) => p.text).join("\n");
-    const metadata = {};
+    const metadata = "metadata" in modelMsg && modelMsg.metadata !== null && modelMsg.metadata !== void 0 ? modelMsg.metadata : {};
     const id = `id` in modelMsg && typeof modelMsg.id === `string` ? modelMsg.id : `msg-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
     const message = {
       id,
@@ -2977,7 +3172,7 @@ var MessageList = class _MessageList {
         reasoning: reasoningParts.length > 0 ? reasoningParts.join("\n") : void 0,
         experimental_attachments: experimental_attachments.length > 0 ? experimental_attachments : void 0,
         content: contentString || void 0,
-        metadata
+        metadata: Object.keys(metadata).length > 0 ? metadata : void 0
       }
     };
     if (modelMsg.providerOptions) {
@@ -3010,7 +3205,8 @@ var MessageList = class _MessageList {
       if (message.role !== `assistant`) continue;
       for (const [index, part] of message.parts.entries()) {
         if (!AIV5__namespace.isToolUIPart(part)) continue;
-        if (message.parts.at(index + 1)?.type !== `step-start`) {
+        const nextPart = message.parts.at(index + 1);
+        if (nextPart && nextPart.type !== `step-start` && !AIV5__namespace.isToolUIPart(nextPart)) {
           message.parts.splice(index + 1, 0, { type: "step-start" });
         }
       }
@@ -3139,5 +3335,5 @@ exports.DefaultGeneratedFile = DefaultGeneratedFile;
 exports.DefaultGeneratedFileWithType = DefaultGeneratedFileWithType;
 exports.MessageList = MessageList;
 exports.convertMessages = convertMessages;
-//# sourceMappingURL=chunk-VSM3NLUX.cjs.map
-//# sourceMappingURL=chunk-VSM3NLUX.cjs.map
+//# sourceMappingURL=chunk-VRFSEZBA.cjs.map
+//# sourceMappingURL=chunk-VRFSEZBA.cjs.map