@mastra/cloudflare 0.0.0-toolOptionTypes-20250917085558 → 0.0.0-top-level-fix-20251211103030

package/dist/index.cjs

@@ -4,112 +4,13 @@ var error = require('@mastra/core/error');
 var storage = require('@mastra/core/storage');
 var Cloudflare = require('cloudflare');
 var agent = require('@mastra/core/agent');
+var evals = require('@mastra/core/evals');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var Cloudflare__default = /*#__PURE__*/_interopDefault(Cloudflare);
 
 // src/storage/index.ts
-var LegacyEvalsStorageCloudflare = class extends storage.LegacyEvalsStorage {
-  operations;
-  constructor({ operations }) {
-    super();
-    this.operations = operations;
-  }
-  async getEvalsByAgentName(agentName, type) {
-    try {
-      const prefix = this.operations.namespacePrefix ? `${this.operations.namespacePrefix}:` : "";
-      const keyObjs = await this.operations.listKV(storage.TABLE_EVALS, { prefix: `${prefix}${storage.TABLE_EVALS}` });
-      const evals = [];
-      for (const { name: key } of keyObjs) {
-        const data = await this.operations.getKV(storage.TABLE_EVALS, key);
-        if (!data) continue;
-        if (data.agent_name !== agentName) continue;
-        if (type) {
-          const isTest = data.test_info !== null && data.test_info !== void 0;
-          const evalType = isTest ? "test" : "live";
-          if (evalType !== type) continue;
-        }
-        const mappedData = {
-          ...data,
-          runId: data.run_id,
-          testInfo: data.test_info
-        };
-        evals.push(mappedData);
-      }
-      evals.sort((a, b) => {
-        const aTime = new Date(a.createdAt || 0).getTime();
-        const bTime = new Date(b.createdAt || 0).getTime();
-        return bTime - aTime;
-      });
-      return evals;
-    } catch (error$1) {
-      throw new error.MastraError(
-        {
-          id: "CLOUDFLARE_STORAGE_GET_EVALS_BY_AGENT_NAME_FAILED",
-          domain: error.ErrorDomain.STORAGE,
-          category: error.ErrorCategory.THIRD_PARTY,
-          text: "Failed to get evals by agent name"
-        },
-        error$1
-      );
-    }
-  }
-  async getEvals(options) {
-    try {
-      const { agentName, type, page = 0, perPage = 100, dateRange } = options;
-      const prefix = this.operations.namespacePrefix ? `${this.operations.namespacePrefix}:` : "";
-      const keyObjs = await this.operations.listKV(storage.TABLE_EVALS, { prefix: `${prefix}${storage.TABLE_EVALS}` });
-      const evals = [];
-      for (const { name: key } of keyObjs) {
-        const data = await this.operations.getKV(storage.TABLE_EVALS, key);
-        if (!data) continue;
-        if (agentName && data.agent_name !== agentName) continue;
-        if (type) {
-          const isTest = data.test_info !== null && data.test_info !== void 0;
-          const evalType = isTest ? "test" : "live";
-          if (evalType !== type) continue;
-        }
-        if (dateRange?.start || dateRange?.end) {
-          const evalDate = new Date(data.createdAt || data.created_at || 0);
-          if (dateRange.start && evalDate < dateRange.start) continue;
-          if (dateRange.end && evalDate > dateRange.end) continue;
-        }
-        const mappedData = {
-          ...data,
-          runId: data.run_id,
-          testInfo: data.test_info
-        };
-        evals.push(mappedData);
-      }
-      evals.sort((a, b) => {
-        const aTime = new Date(a.createdAt || 0).getTime();
-        const bTime = new Date(b.createdAt || 0).getTime();
-        return bTime - aTime;
-      });
-      const start = page * perPage;
-      const end = start + perPage;
-      const paginatedEvals = evals.slice(start, end);
-      return {
-        page,
-        perPage,
-        total: evals.length,
-        hasMore: start + perPage < evals.length,
-        evals: paginatedEvals
-      };
-    } catch (error$1) {
-      throw new error.MastraError(
-        {
-          id: "CLOUDFLARE_STORAGE_GET_EVALS_FAILED",
-          domain: error.ErrorDomain.STORAGE,
-          category: error.ErrorCategory.THIRD_PARTY,
-          text: "Failed to get evals"
-        },
-        error$1
-      );
-    }
-  }
-};
 var MemoryStorageCloudflare = class extends storage.MemoryStorage {
   operations;
   constructor({ operations }) {
@@ -120,6 +21,17 @@ var MemoryStorageCloudflare = class extends storage.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: storage.TABLE_THREADS, keys: { id: threadId } });
     if (!thread) return null;
@@ -133,7 +45,7 @@ var MemoryStorageCloudflare = class extends storage.MemoryStorage {
     } catch (error$1) {
       const mastraError = new error.MastraError(
         {
-          id: "CLOUDFLARE_STORAGE_GET_THREAD_BY_ID_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE", "GET_THREAD_BY_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -147,61 +59,23 @@ var MemoryStorageCloudflare = class extends storage.MemoryStorage {
       return null;
     }
   }
-  async getThreadsByResourceId({ resourceId }) {
+  async listThreadsByResourceId(args) {
     try {
-      const keyList = await this.operations.listKV(storage.TABLE_THREADS);
-      const threads = await Promise.all(
-        keyList.map(async (keyObj) => {
-          try {
-            const data = await this.operations.getKV(storage.TABLE_THREADS, keyObj.name);
-            if (!data) return null;
-            const thread = typeof data === "string" ? JSON.parse(data) : data;
-            if (!thread || !thread.resourceId || thread.resourceId !== resourceId) return null;
-            return {
-              ...thread,
-              createdAt: storage.ensureDate(thread.createdAt),
-              updatedAt: storage.ensureDate(thread.updatedAt),
-              metadata: this.ensureMetadata(thread.metadata)
-            };
-          } catch (error$1) {
-            const mastraError = new error.MastraError(
-              {
-                id: "CLOUDFLARE_STORAGE_GET_THREADS_BY_RESOURCE_ID_FAILED",
-                domain: error.ErrorDomain.STORAGE,
-                category: error.ErrorCategory.THIRD_PARTY,
-                details: {
-                  resourceId
-                }
-              },
-              error$1
-            );
-            this.logger?.trackException(mastraError);
-            this.logger?.error(mastraError.toString());
-            return null;
-          }
-        })
-      );
-      return threads.filter((thread) => thread !== null);
-    } catch (error$1) {
-      const mastraError = new error.MastraError(
-        {
-          id: "CLOUDFLARE_STORAGE_GET_THREADS_BY_RESOURCE_ID_FAILED",
-          domain: error.ErrorDomain.STORAGE,
-          category: error.ErrorCategory.THIRD_PARTY,
-          details: {
-            resourceId
-          }
-        },
-        error$1
-      );
-      this.logger?.trackException(mastraError);
-      this.logger?.error(mastraError.toString());
-      return [];
-    }
-  }
-  async getThreadsByResourceIdPaginated(args) {
-    try {
-      const { resourceId, page = 0, perPage = 100 } = args;
+      const { resourceId, page = 0, perPage: perPageInput, orderBy } = args;
+      const perPage = storage.normalizePerPage(perPageInput, 100);
+      if (page < 0) {
+        throw new error.MastraError(
+          {
+            id: storage.createStorageErrorId("CLOUDFLARE", "LIST_THREADS_BY_RESOURCE_ID", "INVALID_PAGE"),
+            domain: error.ErrorDomain.STORAGE,
+            category: error.ErrorCategory.USER,
+            details: { page }
+          },
+          new Error("page must be >= 0")
+        );
+      }
+      const { offset, perPage: perPageForResponse } = storage.calculatePagination(page, perPageInput, perPage);
+      const { field, direction } = this.parseOrderBy(orderBy);
       const prefix = this.operations.namespacePrefix ? `${this.operations.namespacePrefix}:` : "";
       const keyObjs = await this.operations.listKV(storage.TABLE_THREADS, { prefix: `${prefix}${storage.TABLE_THREADS}` });
       const threads = [];
@@ -212,24 +86,23 @@ var MemoryStorageCloudflare = class extends storage.MemoryStorage {
         threads.push(data);
       }
       threads.sort((a, b) => {
-        const aTime = new Date(a.createdAt || 0).getTime();
-        const bTime = new Date(b.createdAt || 0).getTime();
-        return bTime - aTime;
+        const aTime = new Date(a[field] || 0).getTime();
+        const bTime = new Date(b[field] || 0).getTime();
+        return direction === "ASC" ? aTime - bTime : bTime - aTime;
       });
-      const start = page * perPage;
-      const end = start + perPage;
-      const paginatedThreads = threads.slice(start, end);
+      const end = perPageInput === false ? threads.length : offset + perPage;
+      const paginatedThreads = threads.slice(offset, end);
       return {
         page,
-        perPage,
+        perPage: perPageForResponse,
         total: threads.length,
-        hasMore: start + perPage < threads.length,
+        hasMore: perPageInput === false ? false : offset + perPage < threads.length,
         threads: paginatedThreads
       };
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_STORAGE_GET_THREADS_BY_RESOURCE_ID_PAGINATED_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE", "LIST_THREADS_BY_RESOURCE_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           text: "Failed to get threads by resource ID with pagination"
@@ -245,7 +118,7 @@ var MemoryStorageCloudflare = class extends storage.MemoryStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_STORAGE_SAVE_THREAD_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE", "SAVE_THREAD", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -280,7 +153,7 @@ var MemoryStorageCloudflare = class extends storage.MemoryStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_STORAGE_UPDATE_THREAD_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE", "UPDATE_THREAD", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -297,7 +170,7 @@ var MemoryStorageCloudflare = class extends storage.MemoryStorage {
       return this.operations.getKey(storage.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;
     }
   }
@@ -306,7 +179,7 @@ var MemoryStorageCloudflare = class extends storage.MemoryStorage {
       return this.operations.getKey(storage.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;
     }
   }
@@ -329,7 +202,7 @@ var MemoryStorageCloudflare = class extends storage.MemoryStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_STORAGE_DELETE_THREAD_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE", "DELETE_THREAD", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -340,6 +213,17 @@ var MemoryStorageCloudflare = class extends storage.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}:` : "";
@@ -396,7 +280,7 @@ var MemoryStorageCloudflare = class extends storage.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) {
@@ -414,7 +298,7 @@ var MemoryStorageCloudflare = class extends storage.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 [];
     }
   }
@@ -445,8 +329,8 @@ var MemoryStorageCloudflare = class extends storage.MemoryStorage {
     }
   }
   async saveMessages(args) {
-    const { messages, format = "v1" } = args;
-    if (!Array.isArray(messages) || messages.length === 0) return [];
+    const { messages } = args;
+    if (!Array.isArray(messages) || messages.length === 0) return { messages: [] };
     try {
       const validatedMessages = messages.map((message, index) => {
         const errors = [];
@@ -469,9 +353,11 @@ var MemoryStorageCloudflare = class extends storage.MemoryStorage {
       const messageMigrationTasks = [];
       for (const message of validatedMessages) {
         const existingMessage = await this.findMessageInAnyThread(message.id);
-        console.log(`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.log(`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));
         }
       }
@@ -500,10 +386,8 @@ var MemoryStorageCloudflare = class extends storage.MemoryStorage {
                   ...cleanMessage,
                   createdAt: storage.serializeDate(cleanMessage.createdAt)
                 };
-                console.log(`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: storage.TABLE_MESSAGES, key, value: serializedMessage });
               })
@@ -523,7 +407,7 @@ var MemoryStorageCloudflare = class extends storage.MemoryStorage {
           } catch (error$1) {
             throw new error.MastraError(
               {
-                id: "CLOUDFLARE_STORAGE_SAVE_MESSAGES_FAILED",
+                id: storage.createStorageErrorId("CLOUDFLARE", "SAVE_MESSAGES", "FAILED"),
                 domain: error.ErrorDomain.STORAGE,
                 category: error.ErrorCategory.THIRD_PARTY,
                 details: {
@@ -539,12 +423,11 @@ var MemoryStorageCloudflare = class extends storage.MemoryStorage {
         ({ _index, ...message }) => ({ ...message, type: message.type !== "v2" ? message.type : void 0 })
       );
       const list = new agent.MessageList().add(prepared, "memory");
-      if (format === `v2`) return list.get.all.v2();
-      return list.get.all.v1();
+      return { messages: list.get.all.db() };
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_STORAGE_SAVE_MESSAGES_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE", "SAVE_MESSAGES", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY
         },
@@ -570,10 +453,25 @@ var MemoryStorageCloudflare = class extends storage.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);
@@ -603,9 +501,16 @@ var MemoryStorageCloudflare = class extends storage.MemoryStorage {
       const latestIds = await this.getLastN(threadMessagesKey, limit);
       latestIds.forEach((id) => messageIds.add(id));
     } catch {
-      console.log(`No message order found for thread ${threadId}, skipping latest messages`);
+      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) {
@@ -634,111 +539,29 @@ var MemoryStorageCloudflare = class extends storage.MemoryStorage {
           const data = await this.operations.getKV(storage.TABLE_MESSAGES, key);
           if (!data) return null;
           const parsed = typeof data === "string" ? JSON.parse(data) : data;
-          console.log(`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;
         }
       })
     );
     return messages.filter((msg) => msg !== null);
   }
-  async getMessages({
-    threadId,
-    resourceId,
-    selectBy,
-    format
-  }) {
-    console.log(`getMessages called with format: ${format}, threadId: ${threadId}`);
-    const actualFormat = format || "v1";
-    console.log(`Using format: ${actualFormat}`);
-    const limit = storage.resolveMessageLimit({ last: selectBy?.last, defaultLimit: 40 });
-    const messageIds = /* @__PURE__ */ new Set();
-    if (limit === 0 && !selectBy?.include?.length) return [];
-    try {
-      if (!threadId.trim()) throw new Error("threadId must be a non-empty string");
-      await Promise.all([
-        selectBy?.include?.length ? this.getIncludedMessagesWithContext(threadId, selectBy.include, messageIds) : Promise.resolve(),
-        limit > 0 ? this.getRecentMessages(threadId, limit, messageIds) : Promise.resolve()
-      ]);
-      const targetThreadId = selectBy?.include?.length ? void 0 : threadId;
-      const messages = await this.fetchAndParseMessagesFromMultipleThreads(
-        Array.from(messageIds),
-        selectBy?.include,
-        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$1) {
-        const mastraError = new error.MastraError(
-          {
-            id: "CLOUDFLARE_STORAGE_SORT_MESSAGES_FAILED",
-            domain: error.ErrorDomain.STORAGE,
-            category: error.ErrorCategory.THIRD_PARTY,
-            text: `Error sorting messages for thread ${threadId} falling back to creation time`,
-            details: {
-              threadId
-            }
-          },
-          error$1
-        );
-        this.logger?.trackException(mastraError);
-        this.logger?.error(mastraError.toString());
-        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,
-        createdAt: storage.ensureDate(message.createdAt)
-      }));
-      if (actualFormat === `v1`) {
-        console.log(`Processing ${prepared.length} messages for v1 format - returning directly without MessageList`);
-        return prepared.map((msg) => ({
-          ...msg,
-          createdAt: new Date(msg.createdAt)
-        }));
-      }
-      const list = new agent.MessageList({ threadId, resourceId }).add(prepared, "memory");
-      return list.get.all.v2();
-    } catch (error$1) {
-      const mastraError = new error.MastraError(
-        {
-          id: "CLOUDFLARE_STORAGE_GET_MESSAGES_FAILED",
-          domain: error.ErrorDomain.STORAGE,
-          category: error.ErrorCategory.THIRD_PARTY,
-          text: `Error retrieving messages for thread ${threadId}`,
-          details: {
-            threadId,
-            resourceId: resourceId ?? ""
-          }
-        },
-        error$1
-      );
-      this.logger?.trackException(mastraError);
-      this.logger?.error(mastraError.toString());
-      return [];
-    }
-  }
-  async getMessagesById({
-    messageIds,
-    format
-  }) {
-    if (messageIds.length === 0) return [];
+  /**
+   * 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 {
       const messages = (await Promise.all(messageIds.map((id) => this.findMessageInAnyThread(id)))).filter(
         (result) => !!result
@@ -749,12 +572,11 @@ var MemoryStorageCloudflare = class extends storage.MemoryStorage {
         createdAt: storage.ensureDate(message.createdAt)
       }));
       const list = new agent.MessageList().add(prepared, "memory");
-      if (format === `v1`) return list.get.all.v1();
-      return list.get.all.v2();
+      return { messages: list.get.all.db() };
     } catch (error$1) {
       const mastraError = new error.MastraError(
         {
-          id: "CLOUDFLARE_STORAGE_GET_MESSAGES_BY_ID_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE", "LIST_MESSAGES_BY_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           text: `Error retrieving messages by ID`,
@@ -766,52 +588,198 @@ var MemoryStorageCloudflare = class extends storage.MemoryStorage {
       );
       this.logger?.trackException(mastraError);
       this.logger?.error(mastraError.toString());
-      return [];
+      return { messages: [] };
     }
   }
-  async getMessagesPaginated(args) {
-    const { threadId, resourceId, selectBy, format = "v1" } = args;
-    const { page = 0, perPage = 100 } = selectBy?.pagination || {};
+  async listMessages(args) {
+    const { threadId, resourceId, include, filter, perPage: perPageInput, page = 0, orderBy } = args;
+    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 error.MastraError(
+        {
+          id: storage.createStorageErrorId("CLOUDFLARE", "LIST_MESSAGES", "INVALID_THREAD_ID"),
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          details: { threadId: Array.isArray(threadId) ? JSON.stringify(threadId) : String(threadId) }
+        },
+        new Error("threadId must be a non-empty string or array of non-empty strings")
+      );
+    }
+    const perPage = storage.normalizePerPage(perPageInput, 40);
+    const { offset, perPage: perPageForResponse } = storage.calculatePagination(page, perPageInput, perPage);
     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;
-      if (selectBy?.pagination?.dateRange) {
-        const { start: dateStart, end: dateEnd } = selectBy.pagination.dateRange;
-        filteredMessages = messages.filter((message) => {
-          const messageDate = new Date(message.createdAt);
-          if (dateStart && messageDate < dateStart) return false;
-          if (dateEnd && messageDate > dateEnd) return false;
+      if (page < 0) {
+        throw new error.MastraError(
+          {
+            id: storage.createStorageErrorId("CLOUDFLARE", "LIST_MESSAGES", "INVALID_PAGE"),
+            domain: error.ErrorDomain.STORAGE,
+            category: error.ErrorCategory.USER,
+            details: { page }
+          },
+          new Error("page must be >= 0")
+        );
+      }
+      const { field, direction } = this.parseOrderBy(orderBy, "ASC");
+      const threadMessageIds = /* @__PURE__ */ new Set();
+      for (const tid of threadIds) {
+        try {
+          const threadMessagesKey = this.getThreadMessagesKey(tid);
+          const allIds = await this.getFullOrder(threadMessagesKey);
+          allIds.forEach((id) => threadMessageIds.add(id));
+        } catch {
+        }
+      }
+      const threadMessages = await this.fetchAndParseMessagesFromMultipleThreads(
+        Array.from(threadMessageIds),
+        void 0,
+        threadIds.length === 1 ? threadIds[0] : void 0
+      );
+      let filteredThreadMessages = threadMessages;
+      if (resourceId) {
+        filteredThreadMessages = filteredThreadMessages.filter((msg) => msg.resourceId === resourceId);
+      }
+      const dateRange = filter?.dateRange;
+      if (dateRange) {
+        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;
         });
       }
-      const start = page * perPage;
-      const end = start + perPage;
-      const paginatedMessages = filteredMessages.slice(start, end);
+      const total = filteredThreadMessages.length;
+      if (perPage === 0 && (!include || include.length === 0)) {
+        return {
+          messages: [],
+          total,
+          page,
+          perPage: perPageForResponse,
+          hasMore: offset < total
+        };
+      }
+      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);
+      }
+      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: [],
+          total: 0,
+          page,
+          perPage: perPageForResponse,
+          hasMore: false
+        };
+      }
+      const prepared = filteredMessages.map(({ _index, ...message }) => ({
+        ...message,
+        type: message.type !== "v2" ? message.type : void 0,
+        createdAt: storage.ensureDate(message.createdAt)
+      }));
+      const primaryThreadId = Array.isArray(threadId) ? threadId[0] : threadId;
+      const list = new agent.MessageList({ threadId: primaryThreadId, resourceId }).add(
+        prepared,
+        "memory"
+      );
+      let finalMessages = list.get.all.db();
+      finalMessages = finalMessages.sort((a, b) => {
+        const isDateField = field === "createdAt" || field === "updatedAt";
+        const aVal = isDateField ? new Date(a[field]).getTime() : a[field];
+        const bVal = isDateField ? new Date(b[field]).getTime() : b[field];
+        if (aVal == null && bVal == null) return a.id.localeCompare(b.id);
+        if (aVal == null) return 1;
+        if (bVal == null) return -1;
+        if (typeof aVal === "number" && typeof bVal === "number") {
+          const cmp2 = direction === "ASC" ? aVal - bVal : bVal - aVal;
+          return cmp2 !== 0 ? cmp2 : a.id.localeCompare(b.id);
+        }
+        const cmp = direction === "ASC" ? String(aVal).localeCompare(String(bVal)) : String(bVal).localeCompare(String(aVal));
+        return cmp !== 0 ? cmp : a.id.localeCompare(b.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;
+      const hasMore = perPageInput !== false && !allThreadMessagesReturned && offset + paginatedCount < total;
       return {
+        messages: finalMessages,
+        total,
         page,
-        perPage,
-        total: filteredMessages.length,
-        hasMore: start + perPage < filteredMessages.length,
-        messages: paginatedMessages
+        perPage: perPageForResponse,
+        hasMore
       };
     } catch (error$1) {
       const mastraError = new error.MastraError(
         {
-          id: "CLOUDFLARE_STORAGE_GET_MESSAGES_PAGINATED_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE", "LIST_MESSAGES", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
-          text: "Failed to get messages with pagination",
+          text: `Failed to list messages for thread ${Array.isArray(threadId) ? threadId.join(",") : threadId}: ${error$1 instanceof Error ? error$1.message : String(error$1)}`,
           details: {
-            threadId,
+            threadId: Array.isArray(threadId) ? threadId.join(",") : threadId,
             resourceId: resourceId ?? ""
           }
         },
         error$1
       );
-      this.logger?.trackException?.(mastraError);
       this.logger?.error?.(mastraError.toString());
-      return { messages: [], total: 0, page, perPage: perPage || 40, hasMore: false };
+      this.logger?.trackException?.(mastraError);
+      return {
+        messages: [],
+        total: 0,
+        page,
+        perPage: perPageForResponse,
+        hasMore: false
+      };
     }
   }
   async updateMessages(args) {
@@ -914,7 +882,7 @@ var MemoryStorageCloudflare = class extends storage.MemoryStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_STORAGE_UPDATE_MESSAGES_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE", "UPDATE_MESSAGES", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           text: "Failed to update messages"
@@ -937,7 +905,7 @@ var MemoryStorageCloudflare = class extends storage.MemoryStorage {
     } catch (error$1) {
       const mastraError = new error.MastraError(
         {
-          id: "CLOUDFLARE_STORAGE_GET_RESOURCE_BY_ID_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE", "GET_RESOURCE_BY_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -966,7 +934,7 @@ var MemoryStorageCloudflare = class extends storage.MemoryStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_STORAGE_SAVE_RESOURCE_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE", "SAVE_RESOURCE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -1037,7 +1005,7 @@ var StoreOperationsCloudflare = class extends storage.StoreOperations {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_STORAGE_CLEAR_TABLE_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE", "CLEAR_TABLE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -1057,7 +1025,7 @@ var StoreOperationsCloudflare = class extends storage.StoreOperations {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_STORAGE_DROP_TABLE_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE", "DROP_TABLE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -1097,10 +1065,6 @@ var StoreOperationsCloudflare = class extends storage.StoreOperations {
       case storage.TABLE_TRACES:
         if (!record.id) throw new Error("Trace ID is required");
         return `${prefix}${tableName}:${record.id}`;
-      case storage.TABLE_EVALS:
-        const evalId = record.id || record.run_id;
-        if (!evalId) throw new Error("Eval ID or run_id is required");
-        return `${prefix}${tableName}:${evalId}`;
       case storage.TABLE_SCORERS:
         if (!record.id) throw new Error("Score ID is required");
         return `${prefix}${tableName}:${record.id}`;
@@ -1340,11 +1304,6 @@ var StoreOperationsCloudflare = class extends storage.StoreOperations {
             throw new Error("Trace record missing required fields");
           }
           break;
-        case storage.TABLE_EVALS:
-          if (!("agent_name" in recordTyped) || !("run_id" in recordTyped)) {
-            throw new Error("Eval record missing required fields");
-          }
-          break;
         case storage.TABLE_SCORERS:
           if (!("id" in recordTyped) || !("scorerId" in recordTyped)) {
             throw new Error("Score record missing required fields");
@@ -1362,18 +1321,13 @@ var StoreOperationsCloudflare = class extends storage.StoreOperations {
   async insert({ tableName, record }) {
     try {
       const key = this.getKey(tableName, record);
-      const processedRecord = {
-        ...record,
-        createdAt: record.createdAt ? storage.serializeDate(record.createdAt) : void 0,
-        updatedAt: record.updatedAt ? storage.serializeDate(record.updatedAt) : void 0,
-        metadata: record.metadata ? JSON.stringify(record.metadata) : ""
-      };
+      const processedRecord = { ...record };
       await this.validateRecord(processedRecord, tableName);
       await this.putKV({ tableName, key, value: processedRecord });
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_STORAGE_INSERT_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE", "INSERT", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -1384,26 +1338,16 @@ var StoreOperationsCloudflare = class extends storage.StoreOperations {
       );
     }
   }
-  ensureMetadata(metadata) {
-    if (!metadata) return {};
-    return typeof metadata === "string" ? JSON.parse(metadata) : metadata;
-  }
   async load({ tableName, keys }) {
     try {
       const key = this.getKey(tableName, keys);
       const data = await this.getKV(tableName, key);
       if (!data) return null;
-      const processed = {
-        ...data,
-        createdAt: storage.ensureDate(data.createdAt),
-        updatedAt: storage.ensureDate(data.updatedAt),
-        metadata: this.ensureMetadata(data.metadata)
-      };
-      return processed;
+      return data;
     } catch (error$1) {
       const mastraError = new error.MastraError(
         {
-          id: "CLOUDFLARE_STORAGE_LOAD_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE", "LOAD", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -1423,19 +1367,13 @@ var StoreOperationsCloudflare = class extends storage.StoreOperations {
       await Promise.all(
         input.records.map(async (record) => {
           const key = this.getKey(input.tableName, record);
-          const processedRecord = {
-            ...record,
-            createdAt: record.createdAt ? storage.serializeDate(record.createdAt) : void 0,
-            updatedAt: record.updatedAt ? storage.serializeDate(record.updatedAt) : void 0,
-            metadata: record.metadata ? JSON.stringify(record.metadata) : void 0
-          };
-          await this.putKV({ tableName: input.tableName, key, value: processedRecord });
+          await this.putKV({ tableName: input.tableName, key, value: record });
         })
       );
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_STORAGE_BATCH_INSERT_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE", "BATCH_INSERT", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           text: `Error in batch insert for table ${input.tableName}`,
@@ -1507,7 +1445,7 @@ var StoreOperationsCloudflare = class extends storage.StoreOperations {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_STORAGE_CREATE_TABLE_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE", "CREATE_TABLE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -1539,7 +1477,7 @@ var StoreOperationsCloudflare = class extends storage.StoreOperations {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_STORAGE_LIST_NAMESPACE_KEYS_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE", "LIST_NAMESPACE_KEYS", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -1579,17 +1517,7 @@ var StoreOperationsCloudflare = class extends storage.StoreOperations {
   }
 };
 function transformScoreRow(row) {
-  const deserialized = { ...row };
-  deserialized.input = storage.safelyParseJSON(row.input);
-  deserialized.output = storage.safelyParseJSON(row.output);
-  deserialized.scorer = storage.safelyParseJSON(row.scorer);
-  deserialized.preprocessStepResult = storage.safelyParseJSON(row.preprocessStepResult);
-  deserialized.analyzeStepResult = storage.safelyParseJSON(row.analyzeStepResult);
-  deserialized.metadata = storage.safelyParseJSON(row.metadata);
-  deserialized.additionalContext = storage.safelyParseJSON(row.additionalContext);
-  deserialized.runtimeContext = storage.safelyParseJSON(row.runtimeContext);
-  deserialized.entity = storage.safelyParseJSON(row.entity);
-  return deserialized;
+  return storage.transformScoreRow(row);
 }
 var ScoresStorageCloudflare = class extends storage.ScoresStorage {
   operations;
@@ -1607,7 +1535,7 @@ var ScoresStorageCloudflare = class extends storage.ScoresStorage {
     } catch (error$1) {
       const mastraError = new error.MastraError(
         {
-          id: "CLOUDFLARE_STORAGE_SCORES_GET_SCORE_BY_ID_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE", "GET_SCORE_BY_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           text: `Failed to get score by id: ${id}`
@@ -1620,11 +1548,30 @@ var ScoresStorageCloudflare = class extends storage.ScoresStorage {
     }
   }
   async saveScore(score) {
+    let parsedScore;
+    try {
+      parsedScore = evals.saveScorePayloadSchema.parse(score);
+    } catch (error$1) {
+      throw new error.MastraError(
+        {
+          id: storage.createStorageErrorId("CLOUDFLARE", "SAVE_SCORE", "VALIDATION_FAILED"),
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.USER,
+          details: {
+            scorer: score.scorer?.id ?? "unknown",
+            entityId: score.entityId ?? "unknown",
+            entityType: score.entityType ?? "unknown",
+            traceId: score.traceId ?? "",
+            spanId: score.spanId ?? ""
+          }
+        },
+        error$1
+      );
+    }
+    const id = crypto.randomUUID();
     try {
-      const id = crypto.randomUUID();
-      const { input, ...rest } = score;
       const serializedRecord = {};
-      for (const [key, value] of Object.entries(rest)) {
+      for (const [key, value] of Object.entries(parsedScore)) {
         if (value !== null && value !== void 0) {
           if (typeof value === "object") {
             serializedRecord[key] = JSON.stringify(value);
@@ -1635,23 +1582,23 @@ var ScoresStorageCloudflare = class extends storage.ScoresStorage {
           serializedRecord[key] = null;
         }
       }
+      const now = /* @__PURE__ */ new Date();
       serializedRecord.id = id;
-      serializedRecord.createdAt = (/* @__PURE__ */ new Date()).toISOString();
-      serializedRecord.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+      serializedRecord.createdAt = now.toISOString();
+      serializedRecord.updatedAt = now.toISOString();
       await this.operations.putKV({
         tableName: storage.TABLE_SCORERS,
         key: id,
         value: serializedRecord
       });
-      const scoreFromDb = await this.getScoreById({ id: score.id });
-      return { score: scoreFromDb };
+      return { score: { ...parsedScore, id, createdAt: now, updatedAt: now } };
     } catch (error$1) {
       const mastraError = new error.MastraError(
         {
-          id: "CLOUDFLARE_STORAGE_SCORES_SAVE_SCORE_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE", "SAVE_SCORE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
-          text: `Failed to save score: ${score.id}`
+          details: { id }
         },
         error$1
       );
@@ -1660,7 +1607,7 @@ var ScoresStorageCloudflare = class extends storage.ScoresStorage {
       throw mastraError;
     }
   }
-  async getScoresByScorerId({
+  async listScoresByScorerId({
     scorerId,
     entityId,
     entityType,
@@ -1690,15 +1637,17 @@ var ScoresStorageCloudflare = class extends storage.ScoresStorage {
         const dateB = new Date(b.createdAt || 0).getTime();
         return dateB - dateA;
       });
+      const { page, perPage: perPageInput } = pagination;
+      const perPage = storage.normalizePerPage(perPageInput, 100);
+      const { offset: start, perPage: perPageForResponse } = storage.calculatePagination(page, perPageInput, perPage);
       const total = scores.length;
-      const start = pagination.page * pagination.perPage;
-      const end = start + pagination.perPage;
+      const end = perPageInput === false ? scores.length : start + perPage;
       const pagedScores = scores.slice(start, end);
       return {
         pagination: {
           total,
-          page: pagination.page,
-          perPage: pagination.perPage,
+          page,
+          perPage: perPageForResponse,
           hasMore: end < total
         },
         scores: pagedScores
@@ -1706,7 +1655,7 @@ var ScoresStorageCloudflare = class extends storage.ScoresStorage {
     } catch (error$1) {
       const mastraError = new error.MastraError(
         {
-          id: "CLOUDFLARE_STORAGE_SCORES_GET_SCORES_BY_SCORER_ID_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE", "GET_SCORES_BY_SCORER_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           text: `Failed to get scores by scorer id: ${scorerId}`
@@ -1718,7 +1667,7 @@ var ScoresStorageCloudflare = class extends storage.ScoresStorage {
       return { pagination: { total: 0, page: 0, perPage: 100, hasMore: false }, scores: [] };
     }
   }
-  async getScoresByRunId({
+  async listScoresByRunId({
     runId,
     pagination
   }) {
@@ -1736,15 +1685,17 @@ var ScoresStorageCloudflare = class extends storage.ScoresStorage {
         const dateB = new Date(b.createdAt || 0).getTime();
         return dateB - dateA;
       });
+      const { page, perPage: perPageInput } = pagination;
+      const perPage = storage.normalizePerPage(perPageInput, 100);
+      const { offset: start, perPage: perPageForResponse } = storage.calculatePagination(page, perPageInput, perPage);
       const total = scores.length;
-      const start = pagination.page * pagination.perPage;
-      const end = start + pagination.perPage;
+      const end = perPageInput === false ? scores.length : start + perPage;
       const pagedScores = scores.slice(start, end);
       return {
         pagination: {
           total,
-          page: pagination.page,
-          perPage: pagination.perPage,
+          page,
+          perPage: perPageForResponse,
           hasMore: end < total
         },
         scores: pagedScores
@@ -1752,7 +1703,7 @@ var ScoresStorageCloudflare = class extends storage.ScoresStorage {
     } catch (error$1) {
       const mastraError = new error.MastraError(
         {
-          id: "CLOUDFLARE_STORAGE_SCORES_GET_SCORES_BY_RUN_ID_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE", "GET_SCORES_BY_RUN_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           text: `Failed to get scores by run id: ${runId}`
@@ -1764,7 +1715,7 @@ var ScoresStorageCloudflare = class extends storage.ScoresStorage {
       return { pagination: { total: 0, page: 0, perPage: 100, hasMore: false }, scores: [] };
     }
   }
-  async getScoresByEntityId({
+  async listScoresByEntityId({
     entityId,
     entityType,
     pagination
@@ -1783,15 +1734,17 @@ var ScoresStorageCloudflare = class extends storage.ScoresStorage {
         const dateB = new Date(b.createdAt || 0).getTime();
         return dateB - dateA;
       });
+      const { page, perPage: perPageInput } = pagination;
+      const perPage = storage.normalizePerPage(perPageInput, 100);
+      const { offset: start, perPage: perPageForResponse } = storage.calculatePagination(page, perPageInput, perPage);
       const total = scores.length;
-      const start = pagination.page * pagination.perPage;
-      const end = start + pagination.perPage;
+      const end = perPageInput === false ? scores.length : start + perPage;
       const pagedScores = scores.slice(start, end);
       return {
         pagination: {
           total,
-          page: pagination.page,
-          perPage: pagination.perPage,
+          page,
+          perPage: perPageForResponse,
           hasMore: end < total
         },
         scores: pagedScores
@@ -1799,7 +1752,7 @@ var ScoresStorageCloudflare = class extends storage.ScoresStorage {
     } catch (error$1) {
       const mastraError = new error.MastraError(
         {
-          id: "CLOUDFLARE_STORAGE_SCORES_GET_SCORES_BY_ENTITY_ID_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE", "GET_SCORES_BY_ENTITY_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           text: `Failed to get scores by entity id: ${entityId}, type: ${entityType}`
@@ -1811,126 +1764,55 @@ var ScoresStorageCloudflare = class extends storage.ScoresStorage {
       return { pagination: { total: 0, page: 0, perPage: 100, hasMore: false }, scores: [] };
     }
   }
-};
-var TracesStorageCloudflare = class extends storage.TracesStorage {
-  operations;
-  constructor({ operations }) {
-    super();
-    this.operations = operations;
-  }
-  async getTraces(args) {
-    const paginatedArgs = {
-      name: args.name,
-      scope: args.scope,
-      page: args.page,
-      perPage: args.perPage,
-      attributes: args.attributes,
-      filters: args.filters,
-      dateRange: args.fromDate || args.toDate ? {
-        start: args.fromDate,
-        end: args.toDate
-      } : void 0
-    };
-    try {
-      const result = await this.getTracesPaginated(paginatedArgs);
-      return result.traces;
-    } catch (error$1) {
-      throw new error.MastraError(
-        {
-          id: "CLOUDFLARE_STORAGE_GET_TRACES_ERROR",
-          domain: error.ErrorDomain.STORAGE,
-          category: error.ErrorCategory.THIRD_PARTY,
-          text: `Failed to retrieve traces: ${error$1 instanceof Error ? error$1.message : String(error$1)}`,
-          details: {
-            name: args.name ?? "",
-            scope: args.scope ?? ""
-          }
-        },
-        error$1
-      );
-    }
-  }
-  async getTracesPaginated(args) {
+  async listScoresBySpan({
+    traceId,
+    spanId,
+    pagination
+  }) {
     try {
-      const { name, scope, attributes, filters, page = 0, perPage = 100, dateRange } = args;
-      const prefix = this.operations.namespacePrefix ? `${this.operations.namespacePrefix}:` : "";
-      const keyObjs = await this.operations.listKV(storage.TABLE_TRACES, { prefix: `${prefix}${storage.TABLE_TRACES}` });
-      const traces = [];
-      for (const { name: key } of keyObjs) {
-        try {
-          const data = await this.operations.getKV(storage.TABLE_TRACES, key);
-          if (!data) continue;
-          if (name && data.name !== name) continue;
-          if (scope && data.scope !== scope) continue;
-          if (attributes) {
-            const dataAttributes = data.attributes || {};
-            let shouldSkip = false;
-            for (const [key2, value] of Object.entries(attributes)) {
-              if (dataAttributes[key2] !== value) {
-                shouldSkip = true;
-                break;
-              }
-            }
-            if (shouldSkip) continue;
-          }
-          if (dateRange?.start || dateRange?.end) {
-            const traceDate = new Date(data.createdAt || 0);
-            if (dateRange.start && traceDate < dateRange.start) continue;
-            if (dateRange.end && traceDate > dateRange.end) continue;
-          }
-          if (filters) {
-            let shouldSkip = false;
-            for (const [key2, value] of Object.entries(filters)) {
-              if (data[key2] !== value) {
-                shouldSkip = true;
-                break;
-              }
-            }
-            if (shouldSkip) continue;
-          }
-          traces.push(data);
-        } catch (err) {
-          this.logger.error("Failed to parse trace:", { key, error: err });
+      const keys = await this.operations.listKV(storage.TABLE_SCORERS);
+      const scores = [];
+      for (const { name: key } of keys) {
+        const score = await this.operations.getKV(storage.TABLE_SCORERS, key);
+        if (score && score.traceId === traceId && score.spanId === spanId) {
+          scores.push(transformScoreRow(score));
         }
       }
-      traces.sort((a, b) => {
-        const aTime = new Date(a.createdAt || 0).getTime();
-        const bTime = new Date(b.createdAt || 0).getTime();
-        return bTime - aTime;
+      scores.sort((a, b) => {
+        const dateA = new Date(a.createdAt || 0).getTime();
+        const dateB = new Date(b.createdAt || 0).getTime();
+        return dateB - dateA;
       });
-      const total = traces.length;
-      const start = page * perPage;
-      const end = start + perPage;
-      const pagedTraces = traces.slice(start, end);
+      const { page, perPage: perPageInput } = pagination;
+      const perPage = storage.normalizePerPage(perPageInput, 100);
+      const { offset: start, perPage: perPageForResponse } = storage.calculatePagination(page, perPageInput, perPage);
+      const total = scores.length;
+      const end = perPageInput === false ? scores.length : start + perPage;
+      const pagedScores = scores.slice(start, end);
       return {
-        traces: pagedTraces,
-        total,
-        page,
-        perPage,
-        hasMore: end < total
+        pagination: {
+          total,
+          page,
+          perPage: perPageForResponse,
+          hasMore: end < total
+        },
+        scores: pagedScores
       };
     } catch (error$1) {
       const mastraError = new error.MastraError(
         {
-          id: "CLOUDFLARE_STORAGE_GET_TRACES_PAGINATED_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE", "GET_SCORES_BY_SPAN", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
-          text: "Error getting traces with pagination"
+          text: `Failed to get scores by span: traceId=${traceId}, spanId=${spanId}`
         },
         error$1
       );
-      this.logger.trackException?.(mastraError);
-      this.logger.error(mastraError.toString());
-      return { traces: [], total: 0, page: 0, perPage: 100, hasMore: false };
+      this.logger?.trackException(mastraError);
+      this.logger?.error(mastraError.toString());
+      return { pagination: { total: 0, page: 0, perPage: 100, hasMore: false }, scores: [] };
     }
   }
-  async batchTraceInsert({ records }) {
-    this.logger.debug("Batch inserting traces", { count: records.length });
-    await this.operations.batchInsert({
-      tableName: storage.TABLE_TRACES,
-      records
-    });
-  }
 };
 var WorkflowsStorageCloudflare = class extends storage.WorkflowsStorage {
   operations;
@@ -1949,7 +1831,7 @@ var WorkflowsStorageCloudflare = class extends storage.WorkflowsStorage {
     // runId,
     // stepId,
     // result,
-    // runtimeContext,
+    // requestContext,
   }) {
     throw new Error("Method not implemented.");
   }
@@ -1970,7 +1852,7 @@ var WorkflowsStorageCloudflare = class extends storage.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()
         }
@@ -1978,7 +1860,7 @@ var WorkflowsStorageCloudflare = class extends storage.WorkflowsStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_STORAGE_PERSIST_WORKFLOW_SNAPSHOT_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE", "PERSIST_WORKFLOW_SNAPSHOT", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           text: `Error persisting workflow snapshot for workflow ${params.workflowName}, run ${params.runId}`,
@@ -2003,7 +1885,7 @@ var WorkflowsStorageCloudflare = class extends storage.WorkflowsStorage {
     } catch (error$1) {
       const mastraError = new error.MastraError(
         {
-          id: "CLOUDFLARE_STORAGE_LOAD_WORKFLOW_SNAPSHOT_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE", "LOAD_WORKFLOW_SNAPSHOT", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           text: `Error loading workflow snapshot for workflow ${params.workflowName}, run ${params.runId}`,
@@ -2049,15 +1931,29 @@ var WorkflowsStorageCloudflare = class extends storage.WorkflowsStorage {
     if (resourceId) key += `:${resourceId}`;
     return key;
   }
-  async getWorkflowRuns({
+  async listWorkflowRuns({
     workflowName,
-    limit = 20,
-    offset = 0,
+    page = 0,
+    perPage = 20,
     resourceId,
     fromDate,
-    toDate
+    toDate,
+    status
   } = {}) {
     try {
+      if (page < 0 || !Number.isInteger(page)) {
+        throw new error.MastraError(
+          {
+            id: storage.createStorageErrorId("CLOUDFLARE", "LIST_WORKFLOW_RUNS", "INVALID_PAGE"),
+            domain: error.ErrorDomain.STORAGE,
+            category: error.ErrorCategory.USER,
+            details: { page }
+          },
+          new Error("page must be a non-negative integer")
+        );
+      }
+      const normalizedPerPage = storage.normalizePerPage(perPage, 20);
+      const offset = page * normalizedPerPage;
       const prefix = this.buildWorkflowSnapshotPrefix({ workflowName });
       const keyObjs = await this.operations.listKV(storage.TABLE_WORKFLOW_SNAPSHOT, { prefix });
       const runs = [];
@@ -2073,10 +1969,11 @@ var WorkflowsStorageCloudflare = class extends storage.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 = storage.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,
@@ -2094,7 +1991,7 @@ var WorkflowsStorageCloudflare = class extends storage.WorkflowsStorage {
         const bDate = b.createdAt ? new Date(b.createdAt).getTime() : 0;
         return bDate - aDate;
       });
-      const pagedRuns = runs.slice(offset, offset + limit);
+      const pagedRuns = runs.slice(offset, offset + normalizedPerPage);
       return {
         runs: pagedRuns,
         total: runs.length
@@ -2102,7 +1999,7 @@ var WorkflowsStorageCloudflare = class extends storage.WorkflowsStorage {
     } catch (error$1) {
       const mastraError = new error.MastraError(
         {
-          id: "CLOUDFLARE_STORAGE_GET_WORKFLOW_RUNS_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE", "LIST_WORKFLOW_RUNS", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY
         },
@@ -2140,7 +2037,7 @@ var WorkflowsStorageCloudflare = class extends storage.WorkflowsStorage {
     } catch (error$1) {
       const mastraError = new error.MastraError(
         {
-          id: "CLOUDFLARE_STORAGE_GET_WORKFLOW_RUN_BY_ID_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE", "GET_WORKFLOW_RUN_BY_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -2155,6 +2052,28 @@ var WorkflowsStorageCloudflare = class extends storage.WorkflowsStorage {
       return null;
     }
   }
+  async deleteWorkflowRunById({ runId, workflowName }) {
+    try {
+      if (!runId || !workflowName) {
+        throw new Error("runId and workflowName are required");
+      }
+      const key = this.operations.getKey(storage.TABLE_WORKFLOW_SNAPSHOT, { workflow_name: workflowName, run_id: runId });
+      await this.operations.deleteKV(storage.TABLE_WORKFLOW_SNAPSHOT, key);
+    } catch (error$1) {
+      throw new error.MastraError(
+        {
+          id: storage.createStorageErrorId("CLOUDFLARE", "DELETE_WORKFLOW_RUN_BY_ID", "FAILED"),
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          details: {
+            workflowName,
+            runId
+          }
+        },
+        error$1
+      );
+    }
+  }
 };
 
 // src/storage/types.ts
@@ -2176,14 +2095,7 @@ var CloudflareStore = class extends storage.MastraStorage {
     if (!config.bindings) {
       throw new Error("KV bindings are required when using Workers Binding API");
     }
-    const requiredTables = [
-      storage.TABLE_THREADS,
-      storage.TABLE_MESSAGES,
-      storage.TABLE_WORKFLOW_SNAPSHOT,
-      storage.TABLE_EVALS,
-      storage.TABLE_SCORERS,
-      storage.TABLE_TRACES
-    ];
+    const requiredTables = [storage.TABLE_THREADS, storage.TABLE_MESSAGES, storage.TABLE_WORKFLOW_SNAPSHOT, storage.TABLE_SCORERS];
     for (const table of requiredTables) {
       if (!(table in config.bindings)) {
         throw new Error(`Missing KV binding for table: ${table}`);
@@ -2201,8 +2113,15 @@ var CloudflareStore = class extends storage.MastraStorage {
       throw new Error("apiToken is required for REST API");
     }
   }
+  get supports() {
+    const supports = super.supports;
+    supports.listScoresBySpan = true;
+    supports.resourceWorkingMemory = true;
+    supports.selectByIncludeResourceScope = true;
+    return supports;
+  }
   constructor(config) {
-    super({ name: "Cloudflare" });
+    super({ id: config.id, name: "Cloudflare", disableInit: config.disableInit });
     try {
       if (isWorkersConfig(config)) {
         this.validateWorkersConfig(config);
@@ -2224,15 +2143,9 @@ var CloudflareStore = class extends storage.MastraStorage {
         namespacePrefix: this.namespacePrefix,
         bindings: this.bindings
       });
-      const legacyEvals = new LegacyEvalsStorageCloudflare({
-        operations
-      });
       const workflows = new WorkflowsStorageCloudflare({
         operations
       });
-      const traces = new TracesStorageCloudflare({
-        operations
-      });
       const memory = new MemoryStorageCloudflare({
         operations
       });
@@ -2241,16 +2154,14 @@ var CloudflareStore = class extends storage.MastraStorage {
       });
       this.stores = {
         operations,
-        legacyEvals,
         workflows,
-        traces,
         memory,
         scores
       };
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_STORAGE_INIT_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE", "INIT", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY
         },
@@ -2285,9 +2196,6 @@ var CloudflareStore = class extends storage.MastraStorage {
   async getThreadById({ threadId }) {
     return this.stores.memory.getThreadById({ threadId });
   }
-  async getThreadsByResourceId({ resourceId }) {
-    return this.stores.memory.getThreadsByResourceId({ resourceId });
-  }
   async saveThread({ thread }) {
     return this.stores.memory.saveThread({ thread });
   }
@@ -2304,22 +2212,14 @@ var CloudflareStore = class extends storage.MastraStorage {
   async saveMessages(args) {
     return this.stores.memory.saveMessages(args);
   }
-  async getMessages({
-    threadId,
-    resourceId,
-    selectBy,
-    format
-  }) {
-    return this.stores.memory.getMessages({ threadId, resourceId, selectBy, format });
-  }
   async updateWorkflowResults({
     workflowName,
     runId,
     stepId,
     result,
-    runtimeContext
+    requestContext
   }) {
-    return this.stores.workflows.updateWorkflowResults({ workflowName, runId, stepId, result, runtimeContext });
+    return this.stores.workflows.updateWorkflowResults({ workflowName, runId, stepId, result, requestContext });
   }
   async updateWorkflowState({
     workflowName,
@@ -2328,11 +2228,8 @@ var CloudflareStore = class extends storage.MastraStorage {
   }) {
     return this.stores.workflows.updateWorkflowState({ workflowName, runId, opts });
   }
-  async getMessagesById({
-    messageIds,
-    format
-  }) {
-    return this.stores.memory.getMessagesById({ messageIds, format });
+  async listMessagesById({ messageIds }) {
+    return this.stores.memory.listMessagesById({ messageIds });
   }
   async persistWorkflowSnapshot(params) {
     return this.stores.workflows.persistWorkflowSnapshot(params);
@@ -2343,46 +2240,23 @@ var CloudflareStore = class extends storage.MastraStorage {
   async batchInsert(input) {
     return this.stores.operations.batchInsert(input);
   }
-  async getTraces({
-    name,
-    scope,
-    page = 0,
-    perPage = 100,
-    attributes,
-    fromDate,
-    toDate
-  }) {
-    return this.stores.traces.getTraces({
-      name,
-      scope,
-      page,
-      perPage,
-      attributes,
-      fromDate,
-      toDate
-    });
-  }
-  async getEvalsByAgentName(agentName, type) {
-    return this.stores.legacyEvals.getEvalsByAgentName(agentName, type);
-  }
-  async getEvals(options) {
-    return this.stores.legacyEvals.getEvals(options);
-  }
-  async getWorkflowRuns({
+  async listWorkflowRuns({
     workflowName,
-    limit = 20,
-    offset = 0,
+    perPage = 20,
+    page = 0,
     resourceId,
     fromDate,
-    toDate
+    toDate,
+    status
   } = {}) {
-    return this.stores.workflows.getWorkflowRuns({
+    return this.stores.workflows.listWorkflowRuns({
       workflowName,
-      limit,
-      offset,
+      perPage,
+      page,
       resourceId,
       fromDate,
-      toDate
+      toDate,
+      status
     });
   }
   async getWorkflowRunById({
@@ -2391,14 +2265,8 @@ var CloudflareStore = class extends storage.MastraStorage {
   }) {
     return this.stores.workflows.getWorkflowRunById({ runId, workflowName });
   }
-  async getTracesPaginated(args) {
-    return this.stores.traces.getTracesPaginated(args);
-  }
-  async getThreadsByResourceIdPaginated(args) {
-    return this.stores.memory.getThreadsByResourceIdPaginated(args);
-  }
-  async getMessagesPaginated(args) {
-    return this.stores.memory.getMessagesPaginated(args);
+  async deleteWorkflowRunById({ runId, workflowName }) {
+    return this.stores.workflows.deleteWorkflowRunById({ runId, workflowName });
   }
   async updateMessages(args) {
     return this.stores.memory.updateMessages(args);
@@ -2409,27 +2277,34 @@ var CloudflareStore = class extends storage.MastraStorage {
   async saveScore(score) {
     return this.stores.scores.saveScore(score);
   }
-  async getScoresByRunId({
+  async listScoresByRunId({
     runId,
     pagination
   }) {
-    return this.stores.scores.getScoresByRunId({ runId, pagination });
+    return this.stores.scores.listScoresByRunId({ runId, pagination });
   }
-  async getScoresByEntityId({
+  async listScoresByEntityId({
     entityId,
     entityType,
     pagination
   }) {
-    return this.stores.scores.getScoresByEntityId({ entityId, entityType, pagination });
+    return this.stores.scores.listScoresByEntityId({ entityId, entityType, pagination });
   }
-  async getScoresByScorerId({
+  async listScoresByScorerId({
     scorerId,
     entityId,
     entityType,
     source,
     pagination
   }) {
-    return this.stores.scores.getScoresByScorerId({ scorerId, entityId, entityType, source, pagination });
+    return this.stores.scores.listScoresByScorerId({ scorerId, entityId, entityType, source, pagination });
+  }
+  async listScoresBySpan({
+    traceId,
+    spanId,
+    pagination
+  }) {
+    return this.stores.scores.listScoresBySpan({ traceId, spanId, pagination });
   }
   async getResourceById({ resourceId }) {
     return this.stores.memory.getResourceById({ resourceId });