@mastra/cloudflare 0.13.2-alpha.0 → 1.0.0-beta.0

package/dist/index.cjs

@@ -4,113 +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 scores = require('@mastra/core/scores');
+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 }) {
@@ -148,61 +48,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_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 = [];
@@ -213,24 +75,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: "CLOUDFLARE_STORAGE_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"
@@ -446,8 +307,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 = [];
@@ -540,8 +401,7 @@ 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(
         {
@@ -650,96 +510,8 @@ var MemoryStorageCloudflare = class extends storage.MemoryStorage {
     );
     return messages.filter((msg) => msg !== null);
   }
-  async getMessages({
-    threadId,
-    resourceId,
-    selectBy,
-    format
-  }) {
-    console.info(`getMessages called with format: ${format}, threadId: ${threadId}`);
-    const actualFormat = format || "v1";
-    console.info(`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.info(`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 [];
+  async listMessagesById({ messageIds }) {
+    if (messageIds.length === 0) return { messages: [] };
     try {
       const messages = (await Promise.all(messageIds.map((id) => this.findMessageInAnyThread(id)))).filter(
         (result) => !!result
@@ -750,12 +522,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: "CLOUDFLARE_STORAGE_LIST_MESSAGES_BY_ID_FAILED",
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           text: `Error retrieving messages by ID`,
@@ -767,42 +538,202 @@ 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;
+    if (!threadId.trim()) {
+      throw new error.MastraError(
+        {
+          id: "STORAGE_CLOUDFLARE_LIST_MESSAGES_INVALID_THREAD_ID",
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          details: { threadId }
+        },
+        new Error("threadId must be a non-empty string")
+      );
+    }
+    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" });
+      if (page < 0) {
+        throw new error.MastraError(
+          {
+            id: "STORAGE_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 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 messages = await this.fetchAndParseMessagesFromMultipleThreads(
+        Array.from(messageIds),
+        include,
+        include && include.length > 0 ? void 0 : threadId
+      );
       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 (resourceId) {
+        filteredMessages = filteredMessages.filter((msg) => msg.resourceId === resourceId);
+      }
+      const dateRange = filter?.dateRange;
+      if (dateRange) {
+        filteredMessages = filteredMessages.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);
+      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;
+        }
+      }
+      if (perPage === 0 && (!include || include.length === 0)) {
+        return {
+          messages: [],
+          total,
+          page,
+          perPage: perPageForResponse,
+          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);
+        }
+      }
+      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;
+        });
+      }
+      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 list = new agent.MessageList({ threadId, 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 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;
+      }
       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: "CLOUDFLARE_STORAGE_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 ${threadId}: ${error$1 instanceof Error ? error$1.message : String(error$1)}`,
           details: {
             threadId,
             resourceId: resourceId ?? ""
@@ -810,9 +741,15 @@ var MemoryStorageCloudflare = class extends storage.MemoryStorage {
         },
         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) {
@@ -1098,10 +1035,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}`;
@@ -1341,11 +1274,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");
@@ -1363,12 +1291,7 @@ 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) {
@@ -1385,22 +1308,12 @@ 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(
         {
@@ -1424,13 +1337,7 @@ 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) {
@@ -1588,7 +1495,7 @@ function transformScoreRow(row) {
   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.requestContext = storage.safelyParseJSON(row.requestContext);
   deserialized.entity = storage.safelyParseJSON(row.entity);
   return deserialized;
 }
@@ -1623,7 +1530,7 @@ var ScoresStorageCloudflare = class extends storage.ScoresStorage {
   async saveScore(score) {
     let parsedScore;
     try {
-      parsedScore = scores.saveScorePayloadSchema.parse(score);
+      parsedScore = evals.saveScorePayloadSchema.parse(score);
     } catch (error$1) {
       throw new error.MastraError(
         {
@@ -1674,7 +1581,7 @@ var ScoresStorageCloudflare = class extends storage.ScoresStorage {
       throw mastraError;
     }
   }
-  async getScoresByScorerId({
+  async listScoresByScorerId({
     scorerId,
     entityId,
     entityType,
@@ -1704,15 +1611,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
@@ -1732,7 +1641,7 @@ var ScoresStorageCloudflare = class extends storage.ScoresStorage {
       return { pagination: { total: 0, page: 0, perPage: 100, hasMore: false }, scores: [] };
     }
   }
-  async getScoresByRunId({
+  async listScoresByRunId({
     runId,
     pagination
   }) {
@@ -1750,15 +1659,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
@@ -1778,7 +1689,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
@@ -1797,15 +1708,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
@@ -1825,7 +1738,7 @@ var ScoresStorageCloudflare = class extends storage.ScoresStorage {
       return { pagination: { total: 0, page: 0, perPage: 100, hasMore: false }, scores: [] };
     }
   }
-  async getScoresBySpan({
+  async listScoresBySpan({
     traceId,
     spanId,
     pagination
@@ -1844,21 +1757,23 @@ 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
       };
     } catch (error$1) {
-      throw new error.MastraError(
+      const mastraError = new error.MastraError(
         {
           id: "CLOUDFLARE_STORAGE_SCORES_GET_SCORES_BY_SPAN_FAILED",
           domain: error.ErrorDomain.STORAGE,
@@ -1867,129 +1782,12 @@ var ScoresStorageCloudflare = class extends storage.ScoresStorage {
         },
         error$1
       );
+      this.logger?.trackException(mastraError);
+      this.logger?.error(mastraError.toString());
+      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) {
-    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 });
-        }
-      }
-      traces.sort((a, b) => {
-        const aTime = new Date(a.createdAt || 0).getTime();
-        const bTime = new Date(b.createdAt || 0).getTime();
-        return bTime - aTime;
-      });
-      const total = traces.length;
-      const start = page * perPage;
-      const end = start + perPage;
-      const pagedTraces = traces.slice(start, end);
-      return {
-        traces: pagedTraces,
-        total,
-        page,
-        perPage,
-        hasMore: end < total
-      };
-    } catch (error$1) {
-      const mastraError = new error.MastraError(
-        {
-          id: "CLOUDFLARE_STORAGE_GET_TRACES_PAGINATED_FAILED",
-          domain: error.ErrorDomain.STORAGE,
-          category: error.ErrorCategory.THIRD_PARTY,
-          text: "Error getting traces with pagination"
-        },
-        error$1
-      );
-      this.logger.trackException?.(mastraError);
-      this.logger.error(mastraError.toString());
-      return { traces: [], total: 0, page: 0, perPage: 100, hasMore: false };
-    }
-  }
-  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;
   constructor({ operations }) {
@@ -2007,7 +1805,7 @@ var WorkflowsStorageCloudflare = class extends storage.WorkflowsStorage {
     // runId,
     // stepId,
     // result,
-    // runtimeContext,
+    // requestContext,
   }) {
     throw new Error("Method not implemented.");
   }
@@ -2107,15 +1905,28 @@ 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
   } = {}) {
     try {
+      if (page < 0 || !Number.isInteger(page)) {
+        throw new error.MastraError(
+          {
+            id: "CLOUDFLARE_STORE_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 = [];
@@ -2152,7 +1963,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
@@ -2160,7 +1971,7 @@ var WorkflowsStorageCloudflare = class extends storage.WorkflowsStorage {
     } catch (error$1) {
       const mastraError = new error.MastraError(
         {
-          id: "CLOUDFLARE_STORAGE_GET_WORKFLOW_RUNS_FAILED",
+          id: "CLOUDFLARE_STORAGE_LIST_WORKFLOW_RUNS_FAILED",
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY
         },
@@ -2234,14 +2045,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}`);
@@ -2261,11 +2065,13 @@ var CloudflareStore = class extends storage.MastraStorage {
   }
   get supports() {
     const supports = super.supports;
-    supports.getScoresBySpan = true;
+    supports.listScoresBySpan = true;
+    supports.resourceWorkingMemory = true;
+    supports.selectByIncludeResourceScope = true;
     return supports;
   }
   constructor(config) {
-    super({ name: "Cloudflare" });
+    super({ id: config.id, name: "Cloudflare" });
     try {
       if (isWorkersConfig(config)) {
         this.validateWorkersConfig(config);
@@ -2287,15 +2093,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
       });
@@ -2304,9 +2104,7 @@ var CloudflareStore = class extends storage.MastraStorage {
       });
       this.stores = {
         operations,
-        legacyEvals,
         workflows,
-        traces,
         memory,
         scores
       };
@@ -2348,9 +2146,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 });
   }
@@ -2367,22 +2162,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,
@@ -2391,11 +2178,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);
@@ -2406,43 +2190,18 @@ 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
   } = {}) {
-    return this.stores.workflows.getWorkflowRuns({
+    return this.stores.workflows.listWorkflowRuns({
       workflowName,
-      limit,
-      offset,
+      perPage,
+      page,
       resourceId,
       fromDate,
       toDate
@@ -2454,15 +2213,6 @@ 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 updateMessages(args) {
     return this.stores.memory.updateMessages(args);
   }
@@ -2472,34 +2222,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 getScoresBySpan({
+  async listScoresBySpan({
     traceId,
     spanId,
     pagination
   }) {
-    return this.stores.scores.getScoresBySpan({ traceId, spanId, pagination });
+    return this.stores.scores.listScoresBySpan({ traceId, spanId, pagination });
   }
   async getResourceById({ resourceId }) {
     return this.stores.memory.getResourceById({ resourceId });