@mastra/cloudflare 1.0.0-beta.1 → 1.0.0-beta.3

package/dist/index.js

@@ -1,5 +1,5 @@
 import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
-import { MastraStorage, TABLE_THREADS, TABLE_MESSAGES, TABLE_WORKFLOW_SNAPSHOT, TABLE_SCORERS, StoreOperations, TABLE_TRACES, WorkflowsStorage, ensureDate, normalizePerPage, MemoryStorage, calculatePagination, serializeDate, TABLE_RESOURCES, ScoresStorage, safelyParseJSON } from '@mastra/core/storage';
+import { MastraStorage, TABLE_THREADS, TABLE_MESSAGES, TABLE_WORKFLOW_SNAPSHOT, TABLE_SCORERS, StoreOperations, TABLE_TRACES, WorkflowsStorage, ensureDate, normalizePerPage, MemoryStorage, calculatePagination, serializeDate, TABLE_RESOURCES, ScoresStorage, transformScoreRow as transformScoreRow$1 } from '@mastra/core/storage';
 import Cloudflare from 'cloudflare';
 import { MessageList } from '@mastra/core/agent';
 import { saveScorePayloadSchema } from '@mastra/core/evals';
@@ -207,6 +207,17 @@ var MemoryStorageCloudflare = class extends MemoryStorage {
       );
     }
   }
+  /**
+   * Searches all threads in the KV store to find a message by its ID.
+   *
+   * **Performance Warning**: This method sequentially scans all threads to locate
+   * the message. For stores with many threads, this can result in significant
+   * latency and API calls. When possible, callers should provide the `threadId`
+   * directly to avoid this full scan.
+   *
+   * @param messageId - The globally unique message ID to search for
+   * @returns The message with its threadId if found, null otherwise
+   */
   async findMessageInAnyThread(messageId) {
     try {
       const prefix = this.operations.namespacePrefix ? `${this.operations.namespacePrefix}:` : "";
@@ -436,10 +447,25 @@ var MemoryStorageCloudflare = class extends MemoryStorage {
   async getFullOrder(orderKey) {
     return this.getRange(orderKey, 0, -1);
   }
-  async getIncludedMessagesWithContext(threadId, include, messageIds) {
+  /**
+   * Retrieves messages specified in the include array along with their surrounding context.
+   *
+   * **Performance Note**: When `threadId` is not provided in an include entry, this method
+   * must call `findMessageInAnyThread` which sequentially scans all threads in the KV store.
+   * For optimal performance, callers should provide `threadId` in include entries when known.
+   *
+   * @param include - Array of message IDs to include, optionally with context windows
+   * @param messageIds - Set to accumulate the message IDs that should be fetched
+   */
+  async getIncludedMessagesWithContext(include, messageIds) {
     await Promise.all(
       include.map(async (item) => {
-        const targetThreadId = item.threadId || threadId;
+        let targetThreadId = item.threadId;
+        if (!targetThreadId) {
+          const foundMessage = await this.findMessageInAnyThread(item.id);
+          if (!foundMessage) return;
+          targetThreadId = foundMessage.threadId;
+        }
         if (!targetThreadId) return;
         const threadMessagesKey = this.getThreadMessagesKey(targetThreadId);
         messageIds.add(item.id);
@@ -472,6 +498,13 @@ var MemoryStorageCloudflare = class extends MemoryStorage {
       this.logger?.debug(`No message order found for thread ${threadId}, skipping latest messages`);
     }
   }
+  /**
+   * Fetches and parses messages from one or more threads.
+   *
+   * **Performance Note**: When neither `include` entries with `threadId` nor `targetThreadId`
+   * are provided, this method falls back to `findMessageInAnyThread` which scans all threads.
+   * For optimal performance, provide `threadId` in include entries or specify `targetThreadId`.
+   */
   async fetchAndParseMessagesFromMultipleThreads(messageIds, include, targetThreadId) {
     const messageIdToThreadId = /* @__PURE__ */ new Map();
     if (include) {
@@ -513,6 +546,14 @@ var MemoryStorageCloudflare = class extends MemoryStorage {
     );
     return messages.filter((msg) => msg !== null);
   }
+  /**
+   * Retrieves messages by their IDs.
+   *
+   * **Performance Warning**: This method calls `findMessageInAnyThread` for each message ID,
+   * which scans all threads in the KV store. For large numbers of messages or threads,
+   * this can result in significant latency. Consider using `listMessages` with specific
+   * thread IDs when the thread context is known.
+   */
   async listMessagesById({ messageIds }) {
     if (messageIds.length === 0) return { messages: [] };
     try {
@@ -546,15 +587,17 @@ var MemoryStorageCloudflare = class extends MemoryStorage {
   }
   async listMessages(args) {
     const { threadId, resourceId, include, filter, perPage: perPageInput, page = 0, orderBy } = args;
-    if (!threadId.trim()) {
+    const threadIds = Array.isArray(threadId) ? threadId : [threadId];
+    const isValidThreadId = (id) => typeof id === "string" && id.trim().length > 0;
+    if (threadIds.length === 0 || threadIds.some((id) => !isValidThreadId(id))) {
       throw new MastraError(
         {
           id: "STORAGE_CLOUDFLARE_LIST_MESSAGES_INVALID_THREAD_ID",
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          details: { threadId }
+          details: { threadId: Array.isArray(threadId) ? JSON.stringify(threadId) : String(threadId) }
         },
-        new Error("threadId must be a non-empty string")
+        new Error("threadId must be a non-empty string or array of non-empty strings")
       );
     }
     const perPage = normalizePerPage(perPageInput, 40);
@@ -572,69 +615,34 @@ var MemoryStorageCloudflare = class extends MemoryStorage {
         );
       }
       const { field, direction } = this.parseOrderBy(orderBy, "ASC");
-      const messageIds = /* @__PURE__ */ new Set();
-      const hasFilters = !!resourceId || !!filter?.dateRange;
-      if (hasFilters || perPage === Number.MAX_SAFE_INTEGER) {
+      const threadMessageIds = /* @__PURE__ */ new Set();
+      for (const tid of threadIds) {
         try {
-          const threadMessagesKey = this.getThreadMessagesKey(threadId);
+          const threadMessagesKey = this.getThreadMessagesKey(tid);
           const allIds = await this.getFullOrder(threadMessagesKey);
-          allIds.forEach((id) => messageIds.add(id));
+          allIds.forEach((id) => threadMessageIds.add(id));
         } catch {
         }
-      } else {
-        if (perPage > 0) {
-          try {
-            const threadMessagesKey = this.getThreadMessagesKey(threadId);
-            const fullOrder = await this.getFullOrder(threadMessagesKey);
-            const totalMessages = fullOrder.length;
-            let start;
-            let end;
-            if (direction === "ASC") {
-              start = offset;
-              end = Math.min(offset + perPage - 1, totalMessages - 1);
-            } else {
-              start = Math.max(totalMessages - offset - perPage, 0);
-              end = totalMessages - offset - 1;
-            }
-            const paginatedIds = await this.getRange(threadMessagesKey, start, end);
-            paginatedIds.forEach((id) => messageIds.add(id));
-          } catch {
-          }
-        }
       }
-      if (include && include.length > 0) {
-        await this.getIncludedMessagesWithContext(threadId, include, messageIds);
-      }
-      const messages = await this.fetchAndParseMessagesFromMultipleThreads(
-        Array.from(messageIds),
-        include,
-        include && include.length > 0 ? void 0 : threadId
+      const threadMessages = await this.fetchAndParseMessagesFromMultipleThreads(
+        Array.from(threadMessageIds),
+        void 0,
+        threadIds.length === 1 ? threadIds[0] : void 0
       );
-      let filteredMessages = messages;
+      let filteredThreadMessages = threadMessages;
       if (resourceId) {
-        filteredMessages = filteredMessages.filter((msg) => msg.resourceId === resourceId);
+        filteredThreadMessages = filteredThreadMessages.filter((msg) => msg.resourceId === resourceId);
       }
       const dateRange = filter?.dateRange;
       if (dateRange) {
-        filteredMessages = filteredMessages.filter((msg) => {
+        filteredThreadMessages = filteredThreadMessages.filter((msg) => {
           const messageDate = new Date(msg.createdAt);
           if (dateRange.start && messageDate < new Date(dateRange.start)) return false;
           if (dateRange.end && messageDate > new Date(dateRange.end)) return false;
           return true;
         });
       }
-      let total;
-      if (hasFilters) {
-        total = filteredMessages.length;
-      } else {
-        try {
-          const threadMessagesKey = this.getThreadMessagesKey(threadId);
-          const fullOrder = await this.getFullOrder(threadMessagesKey);
-          total = fullOrder.length;
-        } catch {
-          total = filteredMessages.length;
-        }
-      }
+      const total = filteredThreadMessages.length;
       if (perPage === 0 && (!include || include.length === 0)) {
         return {
           messages: [],
@@ -644,45 +652,58 @@ var MemoryStorageCloudflare = class extends MemoryStorage {
           hasMore: offset < total
         };
       }
-      if (hasFilters && perPage !== Number.MAX_SAFE_INTEGER && perPage > 0) {
-        if (direction === "ASC") {
-          filteredMessages = filteredMessages.slice(offset, offset + perPage);
-        } else {
-          const start = Math.max(filteredMessages.length - offset - perPage, 0);
-          const end = filteredMessages.length - offset;
-          filteredMessages = filteredMessages.slice(start, end);
+      filteredThreadMessages.sort((a, b) => {
+        const timeA = new Date(a.createdAt).getTime();
+        const timeB = new Date(b.createdAt).getTime();
+        const timeDiff = direction === "ASC" ? timeA - timeB : timeB - timeA;
+        if (timeDiff === 0) {
+          return a.id.localeCompare(b.id);
         }
+        return timeDiff;
+      });
+      let paginatedMessages;
+      if (perPage === 0) {
+        paginatedMessages = [];
+      } else if (perPage === Number.MAX_SAFE_INTEGER) {
+        paginatedMessages = filteredThreadMessages;
+      } else {
+        paginatedMessages = filteredThreadMessages.slice(offset, offset + perPage);
       }
-      const paginatedCount = hasFilters && perPage !== Number.MAX_SAFE_INTEGER && perPage > 0 ? filteredMessages.length : filteredMessages.length;
-      try {
-        const threadMessagesKey = this.getThreadMessagesKey(threadId);
-        const messageOrder = await this.getFullOrder(threadMessagesKey);
-        const orderMap = new Map(messageOrder.map((id, index) => [id, index]));
-        filteredMessages.sort((a, b) => {
-          const indexA = orderMap.get(a.id);
-          const indexB = orderMap.get(b.id);
-          if (indexA !== void 0 && indexB !== void 0) {
-            return direction === "ASC" ? indexA - indexB : indexB - indexA;
-          }
-          const timeA = new Date(a.createdAt).getTime();
-          const timeB = new Date(b.createdAt).getTime();
-          const timeDiff = direction === "ASC" ? timeA - timeB : timeB - timeA;
-          if (timeDiff === 0) {
-            return a.id.localeCompare(b.id);
-          }
-          return timeDiff;
-        });
-      } catch {
-        filteredMessages.sort((a, b) => {
-          const timeA = new Date(a.createdAt).getTime();
-          const timeB = new Date(b.createdAt).getTime();
-          const timeDiff = direction === "ASC" ? timeA - timeB : timeB - timeA;
-          if (timeDiff === 0) {
-            return a.id.localeCompare(b.id);
-          }
-          return timeDiff;
-        });
+      let includedMessages = [];
+      if (include && include.length > 0) {
+        const includedMessageIds = /* @__PURE__ */ new Set();
+        await this.getIncludedMessagesWithContext(include, includedMessageIds);
+        const paginatedIds = new Set(paginatedMessages.map((m) => m.id));
+        const idsToFetch = Array.from(includedMessageIds).filter((id) => !paginatedIds.has(id));
+        if (idsToFetch.length > 0) {
+          includedMessages = await this.fetchAndParseMessagesFromMultipleThreads(idsToFetch, include, void 0);
+        }
+      }
+      const seenIds = /* @__PURE__ */ new Set();
+      const allMessages = [];
+      for (const msg of paginatedMessages) {
+        if (!seenIds.has(msg.id)) {
+          allMessages.push(msg);
+          seenIds.add(msg.id);
+        }
       }
+      for (const msg of includedMessages) {
+        if (!seenIds.has(msg.id)) {
+          allMessages.push(msg);
+          seenIds.add(msg.id);
+        }
+      }
+      allMessages.sort((a, b) => {
+        const timeA = new Date(a.createdAt).getTime();
+        const timeB = new Date(b.createdAt).getTime();
+        const timeDiff = direction === "ASC" ? timeA - timeB : timeB - timeA;
+        if (timeDiff === 0) {
+          return a.id.localeCompare(b.id);
+        }
+        return timeDiff;
+      });
+      let filteredMessages = allMessages;
+      const paginatedCount = paginatedMessages.length;
       if (total === 0 && filteredMessages.length === 0 && (!include || include.length === 0)) {
         return {
           messages: [],
@@ -697,7 +718,11 @@ var MemoryStorageCloudflare = class extends MemoryStorage {
         type: message.type !== "v2" ? message.type : void 0,
         createdAt: ensureDate(message.createdAt)
       }));
-      const list = new MessageList({ threadId, resourceId }).add(prepared, "memory");
+      const primaryThreadId = Array.isArray(threadId) ? threadId[0] : threadId;
+      const list = new MessageList({ threadId: primaryThreadId, resourceId }).add(
+        prepared,
+        "memory"
+      );
       let finalMessages = list.get.all.db();
       finalMessages = finalMessages.sort((a, b) => {
         const isDateField = field === "createdAt" || field === "updatedAt";
@@ -713,16 +738,12 @@ var MemoryStorageCloudflare = class extends MemoryStorage {
         const cmp = direction === "ASC" ? String(aVal).localeCompare(String(bVal)) : String(bVal).localeCompare(String(aVal));
         return cmp !== 0 ? cmp : a.id.localeCompare(b.id);
       });
-      const returnedThreadMessageIds = new Set(finalMessages.filter((m) => m.threadId === threadId).map((m) => m.id));
+      const threadIdSet = new Set(threadIds);
+      const returnedThreadMessageIds = new Set(
+        finalMessages.filter((m) => m.threadId && threadIdSet.has(m.threadId)).map((m) => m.id)
+      );
       const allThreadMessagesReturned = returnedThreadMessageIds.size >= total;
-      let hasMore;
-      if (perPageInput === false || allThreadMessagesReturned) {
-        hasMore = false;
-      } else if (direction === "ASC") {
-        hasMore = offset + paginatedCount < total;
-      } else {
-        hasMore = total - offset - perPage > 0;
-      }
+      const hasMore = perPageInput !== false && !allThreadMessagesReturned && offset + paginatedCount < total;
       return {
         messages: finalMessages,
         total,
@@ -736,9 +757,9 @@ var MemoryStorageCloudflare = class extends MemoryStorage {
           id: "CLOUDFLARE_STORAGE_LIST_MESSAGES_FAILED",
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          text: `Failed to list messages for thread ${threadId}: ${error instanceof Error ? error.message : String(error)}`,
+          text: `Failed to list messages for thread ${Array.isArray(threadId) ? threadId.join(",") : threadId}: ${error instanceof Error ? error.message : String(error)}`,
           details: {
-            threadId,
+            threadId: Array.isArray(threadId) ? threadId.join(",") : threadId,
             resourceId: resourceId ?? ""
           }
         },
@@ -1490,17 +1511,7 @@ var StoreOperationsCloudflare = class extends StoreOperations {
   }
 };
 function transformScoreRow(row) {
-  const deserialized = { ...row };
-  deserialized.input = safelyParseJSON(row.input);
-  deserialized.output = safelyParseJSON(row.output);
-  deserialized.scorer = safelyParseJSON(row.scorer);
-  deserialized.preprocessStepResult = safelyParseJSON(row.preprocessStepResult);
-  deserialized.analyzeStepResult = safelyParseJSON(row.analyzeStepResult);
-  deserialized.metadata = safelyParseJSON(row.metadata);
-  deserialized.additionalContext = safelyParseJSON(row.additionalContext);
-  deserialized.requestContext = safelyParseJSON(row.requestContext);
-  deserialized.entity = safelyParseJSON(row.entity);
-  return deserialized;
+  return transformScoreRow$1(row);
 }
 var ScoresStorageCloudflare = class extends ScoresStorage {
   operations;