@mastra/cloudflare 0.13.2 → 0.13.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_EVALS, TABLE_SCORERS, TABLE_TRACES, StoreOperations, serializeDate, ensureDate, LegacyEvalsStorage, WorkflowsStorage, TracesStorage, MemoryStorage, resolveMessageLimit, TABLE_RESOURCES, ScoresStorage, safelyParseJSON } from '@mastra/core/storage';
+import { MastraStorage, TABLE_THREADS, TABLE_MESSAGES, TABLE_WORKFLOW_SNAPSHOT, TABLE_EVALS, TABLE_SCORERS, TABLE_TRACES, StoreOperations, serializeDate, ensureDate, LegacyEvalsStorage, WorkflowsStorage, TracesStorage, MemoryStorage, resolveMessageLimit, TABLE_RESOURCES, ScoresStorage, SCORERS_SCHEMA, safelyParseJSON } from '@mastra/core/storage';
 import Cloudflare from 'cloudflare';
 import { MessageList } from '@mastra/core/agent';
 import { saveScorePayloadSchema } from '@mastra/core/scores';
@@ -115,6 +115,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;
@@ -292,7 +303,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;
     }
   }
@@ -301,7 +312,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;
     }
   }
@@ -391,7 +402,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) {
@@ -409,7 +420,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 [];
     }
   }
@@ -464,9 +475,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));
         }
       }
@@ -495,10 +508,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 });
               })
@@ -562,9 +573,6 @@ var MemoryStorageCloudflare = class extends MemoryStorage {
   async getLastN(orderKey, n) {
     return this.getRange(orderKey, -n, -1);
   }
-  async getFullOrder(orderKey) {
-    return this.getRange(orderKey, 0, -1);
-  }
   async getIncludedMessagesWithContext(threadId, include, messageIds) {
     await Promise.all(
       include.map(async (item) => {
@@ -598,7 +606,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) {
@@ -629,15 +637,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;
         }
       })
@@ -669,33 +675,7 @@ var MemoryStorageCloudflare = class extends MemoryStorage {
         targetThreadId
       );
       if (!messages.length) return [];
-      try {
-        const threadMessagesKey = this.getThreadMessagesKey(threadId);
-        const messageOrder = await this.getFullOrder(threadMessagesKey);
-        const orderMap = new Map(messageOrder.map((id, index) => [id, index]));
-        messages.sort((a, b) => {
-          const indexA = orderMap.get(a.id);
-          const indexB = orderMap.get(b.id);
-          if (indexA !== void 0 && indexB !== void 0) return orderMap.get(a.id) - orderMap.get(b.id);
-          return new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime();
-        });
-      } catch (error) {
-        const mastraError = new MastraError(
-          {
-            id: "CLOUDFLARE_STORAGE_SORT_MESSAGES_FAILED",
-            domain: ErrorDomain.STORAGE,
-            category: ErrorCategory.THIRD_PARTY,
-            text: `Error sorting messages for thread ${threadId} falling back to creation time`,
-            details: {
-              threadId
-            }
-          },
-          error
-        );
-        this.logger?.trackException(mastraError);
-        this.logger?.error(mastraError.toString());
-        messages.sort((a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime());
-      }
+      messages.sort((a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime());
       const prepared = messages.map(({ _index, ...message }) => ({
         ...message,
         type: message.type === `v2` ? void 0 : message.type,
@@ -769,26 +749,49 @@ var MemoryStorageCloudflare = class extends MemoryStorage {
     const { page = 0, perPage = 100 } = selectBy?.pagination || {};
     try {
       if (!threadId.trim()) throw new Error("threadId must be a non-empty string");
-      const messages = format === "v2" ? await this.getMessages({ threadId, selectBy, format: "v2" }) : await this.getMessages({ threadId, selectBy, format: "v1" });
-      let filteredMessages = messages;
+      const includedMessages = [];
+      if (selectBy?.include?.length) {
+        const includeOnlySelectBy = { ...selectBy, last: 0 };
+        const included = format === "v2" ? await this.getMessages({ threadId, selectBy: includeOnlySelectBy, format: "v2" }) : await this.getMessages({ threadId, selectBy: includeOnlySelectBy, format: "v1" });
+        includedMessages.push(...included);
+      }
+      const threadOnlySelectBy = selectBy ? { ...selectBy, include: void 0 } : void 0;
+      const threadMessages = format === "v2" ? await this.getMessages({ threadId, selectBy: threadOnlySelectBy, format: "v2" }) : await this.getMessages({ threadId, selectBy: threadOnlySelectBy, format: "v1" });
+      let filteredMessages = threadMessages;
       if (selectBy?.pagination?.dateRange) {
         const { start: dateStart, end: dateEnd } = selectBy.pagination.dateRange;
-        filteredMessages = messages.filter((message) => {
+        filteredMessages = threadMessages.filter((message) => {
           const messageDate = new Date(message.createdAt);
           if (dateStart && messageDate < dateStart) return false;
           if (dateEnd && messageDate > dateEnd) return false;
           return true;
         });
       }
+      const total = filteredMessages.length;
       const start = page * perPage;
       const end = start + perPage;
       const paginatedMessages = filteredMessages.slice(start, end);
+      const seenIds = /* @__PURE__ */ new Set();
+      const combinedMessages = [];
+      for (const msg of paginatedMessages) {
+        if (!seenIds.has(msg.id)) {
+          combinedMessages.push(msg);
+          seenIds.add(msg.id);
+        }
+      }
+      for (const msg of includedMessages) {
+        if (!seenIds.has(msg.id)) {
+          combinedMessages.push(msg);
+          seenIds.add(msg.id);
+        }
+      }
+      combinedMessages.sort((a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime());
       return {
         page,
         perPage,
-        total: filteredMessages.length,
-        hasMore: start + perPage < filteredMessages.length,
-        messages: paginatedMessages
+        total,
+        hasMore: start + perPage < total,
+        messages: combinedMessages
       };
     } catch (error) {
       const mastraError = new MastraError(
@@ -1574,17 +1577,21 @@ 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.runtimeContext = safelyParseJSON(row.runtimeContext);
-  deserialized.entity = safelyParseJSON(row.entity);
-  return deserialized;
+  const result = {};
+  for (const [key, columnSchema] of Object.entries(SCORERS_SCHEMA)) {
+    const value = row[key];
+    if (value == null) {
+      continue;
+    }
+    if (columnSchema.type === "jsonb") {
+      result[key] = safelyParseJSON(value);
+    } else if (columnSchema.type === "timestamp") {
+      result[key] = new Date(value);
+    } else {
+      result[key] = value;
+    }
+  }
+  return result;
 }
 var ScoresStorageCloudflare = class extends ScoresStorage {
   operations;