@mastra/cloudflare 1.0.0-beta.0 → 1.0.0-beta.2

package/dist/index.js

@@ -15,6 +15,17 @@ var MemoryStorageCloudflare = class extends MemoryStorage {
     if (!metadata) return void 0;
     return typeof metadata === "string" ? JSON.parse(metadata) : metadata;
   }
+  /**
+   * Summarizes message content without exposing raw data (for logging).
+   * Returns type, length, and keys only to prevent PII leakage.
+   */
+  summarizeMessageContent(content) {
+    if (!content) return { type: "undefined" };
+    if (typeof content === "string") return { type: "string", length: content.length };
+    if (Array.isArray(content)) return { type: "array", length: content.length };
+    if (typeof content === "object") return { type: "object", keys: Object.keys(content) };
+    return { type: typeof content };
+  }
   async getThreadById({ threadId }) {
     const thread = await this.operations.load({ tableName: TABLE_THREADS, keys: { id: threadId } });
     if (!thread) return null;
@@ -153,7 +164,7 @@ var MemoryStorageCloudflare = class extends MemoryStorage {
       return this.operations.getKey(TABLE_MESSAGES, { threadId, id: messageId });
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
-      this.logger.error(`Error getting message key for thread ${threadId} and message ${messageId}:`, { message });
+      this.logger?.error(`Error getting message key for thread ${threadId} and message ${messageId}:`, { message });
       throw error;
     }
   }
@@ -162,7 +173,7 @@ var MemoryStorageCloudflare = class extends MemoryStorage {
       return this.operations.getKey(TABLE_MESSAGES, { threadId, id: "messages" });
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
-      this.logger.error(`Error getting thread messages key for thread ${threadId}:`, { message });
+      this.logger?.error(`Error getting thread messages key for thread ${threadId}:`, { message });
       throw error;
     }
   }
@@ -252,7 +263,7 @@ var MemoryStorageCloudflare = class extends MemoryStorage {
         });
       } catch (error) {
         const message = error instanceof Error ? error.message : String(error);
-        this.logger.error(`Error updating sorted order for key ${orderKey}:`, { message });
+        this.logger?.error(`Error updating sorted order for key ${orderKey}:`, { message });
         throw error;
       } finally {
         if (this.updateQueue.get(orderKey) === nextPromise) {
@@ -270,7 +281,7 @@ var MemoryStorageCloudflare = class extends MemoryStorage {
       const arr = JSON.parse(typeof raw === "string" ? raw : JSON.stringify(raw));
       return Array.isArray(arr) ? arr : [];
     } catch (e) {
-      this.logger.error(`Error parsing order data for key ${orderKey}:`, { e });
+      this.logger?.error(`Error parsing order data for key ${orderKey}:`, { e });
       return [];
     }
   }
@@ -325,9 +336,11 @@ var MemoryStorageCloudflare = class extends MemoryStorage {
       const messageMigrationTasks = [];
       for (const message of validatedMessages) {
         const existingMessage = await this.findMessageInAnyThread(message.id);
-        console.info(`Checking message ${message.id}: existing=${existingMessage?.threadId}, new=${message.threadId}`);
+        this.logger?.debug(
+          `Checking message ${message.id}: existing=${existingMessage?.threadId}, new=${message.threadId}`
+        );
         if (existingMessage && existingMessage.threadId && existingMessage.threadId !== message.threadId) {
-          console.info(`Migrating message ${message.id} from ${existingMessage.threadId} to ${message.threadId}`);
+          this.logger?.debug(`Migrating message ${message.id} from ${existingMessage.threadId} to ${message.threadId}`);
           messageMigrationTasks.push(this.migrateMessage(message.id, existingMessage.threadId, message.threadId));
         }
       }
@@ -356,10 +369,8 @@ var MemoryStorageCloudflare = class extends MemoryStorage {
                   ...cleanMessage,
                   createdAt: serializeDate(cleanMessage.createdAt)
                 };
-                console.info(`Saving message ${message.id} with content:`, {
-                  content: serializedMessage.content,
-                  contentType: typeof serializedMessage.content,
-                  isArray: Array.isArray(serializedMessage.content)
+                this.logger?.debug(`Saving message ${message.id}`, {
+                  contentSummary: this.summarizeMessageContent(serializedMessage.content)
                 });
                 await this.operations.putKV({ tableName: TABLE_MESSAGES, key, value: serializedMessage });
               })
@@ -458,7 +469,7 @@ var MemoryStorageCloudflare = class extends MemoryStorage {
       const latestIds = await this.getLastN(threadMessagesKey, limit);
       latestIds.forEach((id) => messageIds.add(id));
     } catch {
-      console.info(`No message order found for thread ${threadId}, skipping latest messages`);
+      this.logger?.debug(`No message order found for thread ${threadId}, skipping latest messages`);
     }
   }
   async fetchAndParseMessagesFromMultipleThreads(messageIds, include, targetThreadId) {
@@ -489,15 +500,13 @@ var MemoryStorageCloudflare = class extends MemoryStorage {
           const data = await this.operations.getKV(TABLE_MESSAGES, key);
           if (!data) return null;
           const parsed = typeof data === "string" ? JSON.parse(data) : data;
-          console.info(`Retrieved message ${id} from thread ${threadId} with content:`, {
-            content: parsed.content,
-            contentType: typeof parsed.content,
-            isArray: Array.isArray(parsed.content)
+          this.logger?.debug(`Retrieved message ${id} from thread ${threadId}`, {
+            contentSummary: this.summarizeMessageContent(parsed.content)
           });
           return parsed;
         } catch (error) {
           const message = error instanceof Error ? error.message : String(error);
-          this.logger.error(`Error retrieving message ${id}:`, { message });
+          this.logger?.error(`Error retrieving message ${id}:`, { message });
           return null;
         }
       })
@@ -563,69 +572,32 @@ 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) {
-        try {
-          const threadMessagesKey = this.getThreadMessagesKey(threadId);
-          const allIds = await this.getFullOrder(threadMessagesKey);
-          allIds.forEach((id) => messageIds.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 threadMessageIds = /* @__PURE__ */ new Set();
+      try {
+        const threadMessagesKey = this.getThreadMessagesKey(threadId);
+        const allIds = await this.getFullOrder(threadMessagesKey);
+        allIds.forEach((id) => threadMessageIds.add(id));
+      } catch {
       }
-      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,
+        threadId
       );
-      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: [],
@@ -635,45 +607,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(threadId, 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: [],
@@ -706,14 +691,7 @@ var MemoryStorageCloudflare = class extends MemoryStorage {
       });
       const returnedThreadMessageIds = new Set(finalMessages.filter((m) => m.threadId === 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,
@@ -1820,7 +1798,7 @@ var WorkflowsStorageCloudflare = class extends WorkflowsStorage {
           workflow_name: workflowName,
           run_id: runId,
           resourceId,
-          snapshot: typeof snapshot === "string" ? snapshot : JSON.stringify(snapshot),
+          snapshot: JSON.stringify(snapshot),
           createdAt: /* @__PURE__ */ new Date(),
           updatedAt: /* @__PURE__ */ new Date()
         }
@@ -1905,7 +1883,8 @@ var WorkflowsStorageCloudflare = class extends WorkflowsStorage {
     perPage = 20,
     resourceId,
     fromDate,
-    toDate
+    toDate,
+    status
   } = {}) {
     try {
       if (page < 0 || !Number.isInteger(page)) {
@@ -1936,10 +1915,11 @@ var WorkflowsStorageCloudflare = class extends WorkflowsStorage {
         if (!data) continue;
         try {
           if (resourceId && !keyResourceId) continue;
+          const snapshotData = typeof data.snapshot === "string" ? JSON.parse(data.snapshot) : data.snapshot;
+          if (status && snapshotData.status !== status) continue;
           const createdAt = ensureDate(data.createdAt);
           if (fromDate && createdAt && createdAt < fromDate) continue;
           if (toDate && createdAt && createdAt > toDate) continue;
-          const snapshotData = typeof data.snapshot === "string" ? JSON.parse(data.snapshot) : data.snapshot;
           const resourceIdToUse = keyResourceId || data.resourceId;
           const run = this.parseWorkflowRun({
             ...data,
@@ -2190,7 +2170,8 @@ var CloudflareStore = class extends MastraStorage {
     page = 0,
     resourceId,
     fromDate,
-    toDate
+    toDate,
+    status
   } = {}) {
     return this.stores.workflows.listWorkflowRuns({
       workflowName,
@@ -2198,7 +2179,8 @@ var CloudflareStore = class extends MastraStorage {
       page,
       resourceId,
       fromDate,
-      toDate
+      toDate,
+      status
     });
   }
   async getWorkflowRunById({