@mastra/cloudflare 0.0.0-vnext-inngest-20250508131921 → 0.0.0-vnext-20251104230439

package/dist/index.js

@@ -1,327 +1,436 @@
-import { MastraStorage, TABLE_THREADS, TABLE_MESSAGES, TABLE_WORKFLOW_SNAPSHOT, TABLE_EVALS, TABLE_TRACES } from '@mastra/core/storage';
+import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
+import { MastraStorage, TABLE_THREADS, TABLE_MESSAGES, TABLE_WORKFLOW_SNAPSHOT, TABLE_SCORERS, StoreOperations, TABLE_TRACES, WorkflowsStorage, ensureDate, normalizePerPage, MemoryStorage, calculatePagination, serializeDate, resolveMessageLimit, TABLE_RESOURCES, ScoresStorage, safelyParseJSON } from '@mastra/core/storage';
 import Cloudflare from 'cloudflare';
+import { MessageList } from '@mastra/core/agent';
+import { saveScorePayloadSchema } from '@mastra/core/evals';
 
 // src/storage/index.ts
-
-// src/storage/types.ts
-function isWorkersConfig(config) {
-  return "bindings" in config;
-}
-
-// src/storage/index.ts
-var CloudflareStore = class extends MastraStorage {
-  client;
-  accountId;
-  namespacePrefix;
-  bindings;
-  validateWorkersConfig(config) {
-    if (!isWorkersConfig(config)) {
-      throw new Error("Invalid Workers API configuration");
-    }
-    if (!config.bindings) {
-      throw new Error("KV bindings are required when using Workers Binding API");
-    }
-    const requiredTables = [TABLE_THREADS, TABLE_MESSAGES, TABLE_WORKFLOW_SNAPSHOT, TABLE_EVALS, TABLE_TRACES];
-    for (const table of requiredTables) {
-      if (!(table in config.bindings)) {
-        throw new Error(`Missing KV binding for table: ${table}`);
-      }
-    }
+var MemoryStorageCloudflare = class extends MemoryStorage {
+  operations;
+  constructor({ operations }) {
+    super();
+    this.operations = operations;
   }
-  validateRestConfig(config) {
-    if (isWorkersConfig(config)) {
-      throw new Error("Invalid REST API configuration");
-    }
-    if (!config.accountId?.trim()) {
-      throw new Error("accountId is required for REST API");
-    }
-    if (!config.apiToken?.trim()) {
-      throw new Error("apiToken is required for REST API");
-    }
+  ensureMetadata(metadata) {
+    if (!metadata) return void 0;
+    return typeof metadata === "string" ? JSON.parse(metadata) : metadata;
   }
-  constructor(config) {
-    super({ name: "Cloudflare" });
+  async getThreadById({ threadId }) {
+    const thread = await this.operations.load({ tableName: TABLE_THREADS, keys: { id: threadId } });
+    if (!thread) return null;
     try {
-      if (isWorkersConfig(config)) {
-        this.validateWorkersConfig(config);
-        this.bindings = config.bindings;
-        this.namespacePrefix = config.keyPrefix?.trim() || "";
-        this.logger.info("Using Cloudflare KV Workers Binding API");
-      } else {
-        this.validateRestConfig(config);
-        this.accountId = config.accountId.trim();
-        this.namespacePrefix = config.namespacePrefix?.trim() || "";
-        this.client = new Cloudflare({
-          apiToken: config.apiToken.trim()
-        });
-        this.logger.info("Using Cloudflare KV REST API");
-      }
+      return {
+        ...thread,
+        createdAt: ensureDate(thread.createdAt),
+        updatedAt: ensureDate(thread.updatedAt),
+        metadata: this.ensureMetadata(thread.metadata)
+      };
     } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      this.logger.error("Failed to initialize CloudflareStore:", { message });
-      throw error;
-    }
-  }
-  getBinding(tableName) {
-    if (!this.bindings) {
-      throw new Error(`Cannot use Workers API binding for ${tableName}: Store initialized with REST API configuration`);
+      const mastraError = new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_GET_THREAD_BY_ID_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            threadId
+          }
+        },
+        error
+      );
+      this.logger?.trackException(mastraError);
+      this.logger?.error(mastraError.toString());
+      return null;
     }
-    const binding = this.bindings[tableName];
-    if (!binding) throw new Error(`No binding found for namespace ${tableName}`);
-    return binding;
   }
-  async listNamespaces() {
-    if (this.bindings) {
+  async listThreadsByResourceId(args) {
+    try {
+      const { resourceId, page = 0, perPage: perPageInput, orderBy } = args;
+      const perPage = normalizePerPage(perPageInput, 100);
+      if (page < 0) {
+        throw new MastraError(
+          {
+            id: "STORAGE_CLOUDFLARE_LIST_THREADS_BY_RESOURCE_ID_INVALID_PAGE",
+            domain: ErrorDomain.STORAGE,
+            category: ErrorCategory.USER,
+            details: { page }
+          },
+          new Error("page must be >= 0")
+        );
+      }
+      const { offset, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
+      const { field, direction } = this.parseOrderBy(orderBy);
+      const prefix = this.operations.namespacePrefix ? `${this.operations.namespacePrefix}:` : "";
+      const keyObjs = await this.operations.listKV(TABLE_THREADS, { prefix: `${prefix}${TABLE_THREADS}` });
+      const threads = [];
+      for (const { name: key } of keyObjs) {
+        const data = await this.operations.getKV(TABLE_THREADS, key);
+        if (!data) continue;
+        if (data.resourceId !== resourceId) continue;
+        threads.push(data);
+      }
+      threads.sort((a, b) => {
+        const aTime = new Date(a[field] || 0).getTime();
+        const bTime = new Date(b[field] || 0).getTime();
+        return direction === "ASC" ? aTime - bTime : bTime - aTime;
+      });
+      const end = perPageInput === false ? threads.length : offset + perPage;
+      const paginatedThreads = threads.slice(offset, end);
       return {
-        result: Object.keys(this.bindings).map((name) => ({
-          id: name,
-          title: name,
-          supports_url_encoding: true
-        }))
+        page,
+        perPage: perPageForResponse,
+        total: threads.length,
+        hasMore: perPageInput === false ? false : offset + perPage < threads.length,
+        threads: paginatedThreads
       };
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_LIST_THREADS_BY_RESOURCE_ID_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: "Failed to get threads by resource ID with pagination"
+        },
+        error
+      );
     }
-    return await this.client.kv.namespaces.list({ account_id: this.accountId });
   }
-  async getNamespaceValue(tableName, key) {
+  async saveThread({ thread }) {
     try {
-      if (this.bindings) {
-        const binding = this.getBinding(tableName);
-        const result = await binding.getWithMetadata(key, "text");
-        if (!result) return null;
-        return JSON.stringify(result);
-      } else {
-        const namespaceId = await this.getNamespaceId(tableName);
-        const response = await this.client.kv.namespaces.values.get(namespaceId, key, {
-          account_id: this.accountId
-        });
-        return await response.text();
-      }
+      await this.operations.insert({ tableName: TABLE_THREADS, record: thread });
+      return thread;
     } catch (error) {
-      if (error.message && error.message.includes("key not found")) {
-        return null;
-      }
-      const message = error instanceof Error ? error.message : String(error);
-      this.logger.error(`Failed to get value for ${tableName} ${key}:`, { message });
-      throw error;
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_SAVE_THREAD_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            threadId: thread.id
+          }
+        },
+        error
+      );
     }
   }
-  async putNamespaceValue({
-    tableName,
-    key,
-    value,
+  async updateThread({
+    id,
+    title,
     metadata
   }) {
     try {
-      const serializedValue = this.safeSerialize(value);
-      const serializedMetadata = metadata ? this.safeSerialize(metadata) : "";
-      if (this.bindings) {
-        const binding = this.getBinding(tableName);
-        await binding.put(key, serializedValue, { metadata: serializedMetadata });
-      } else {
-        const namespaceId = await this.getNamespaceId(tableName);
-        await this.client.kv.namespaces.values.update(namespaceId, key, {
-          account_id: this.accountId,
-          value: serializedValue,
-          metadata: serializedMetadata
-        });
+      const thread = await this.getThreadById({ threadId: id });
+      if (!thread) {
+        throw new Error(`Thread ${id} not found`);
       }
+      const updatedThread = {
+        ...thread,
+        title,
+        metadata: this.ensureMetadata({
+          ...thread.metadata ?? {},
+          ...metadata
+        }),
+        updatedAt: /* @__PURE__ */ new Date()
+      };
+      await this.operations.insert({ tableName: TABLE_THREADS, record: updatedThread });
+      return updatedThread;
     } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      this.logger.error(`Failed to put value for ${tableName} ${key}:`, { message });
-      throw error;
-    }
-  }
-  async deleteNamespaceValue(tableName, key) {
-    if (this.bindings) {
-      const binding = this.getBinding(tableName);
-      await binding.delete(key);
-    } else {
-      const namespaceId = await this.getNamespaceId(tableName);
-      await this.client.kv.namespaces.values.delete(namespaceId, key, {
-        account_id: this.accountId
-      });
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_UPDATE_THREAD_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            threadId: id,
+            title
+          }
+        },
+        error
+      );
     }
   }
-  async listNamespaceKeys(tableName, options) {
+  getMessageKey(threadId, messageId) {
     try {
-      if (this.bindings) {
-        const binding = this.getBinding(tableName);
-        const response = await binding.list({
-          limit: options?.limit || 1e3,
-          prefix: options?.prefix
-        });
-        return response.keys;
-      } else {
-        const namespaceId = await this.getNamespaceId(tableName);
-        const response = await this.client.kv.namespaces.keys.list(namespaceId, {
-          account_id: this.accountId,
-          limit: options?.limit || 1e3,
-          prefix: options?.prefix
-        });
-        return response.result;
-      }
+      return this.operations.getKey(TABLE_MESSAGES, { threadId, id: messageId });
     } catch (error) {
-      this.logger.error(`Failed to list keys for ${tableName}:`, error);
-      throw new Error(`Failed to list keys: ${error.message}`);
-    }
-  }
-  async createNamespaceById(title) {
-    if (this.bindings) {
-      return {
-        id: title,
-        // Use title as ID since that's what we need
-        title,
-        supports_url_encoding: true
-      };
+      const message = error instanceof Error ? error.message : String(error);
+      this.logger.error(`Error getting message key for thread ${threadId} and message ${messageId}:`, { message });
+      throw error;
     }
-    return await this.client.kv.namespaces.create({
-      account_id: this.accountId,
-      title
-    });
   }
-  async getNamespaceIdByName(namespaceName) {
+  getThreadMessagesKey(threadId) {
     try {
-      const response = await this.listNamespaces();
-      const namespace = response.result.find((ns) => ns.title === namespaceName);
-      return namespace ? namespace.id : null;
+      return this.operations.getKey(TABLE_MESSAGES, { threadId, id: "messages" });
     } catch (error) {
-      this.logger.error(`Failed to get namespace ID for ${namespaceName}:`, error);
-      return null;
+      const message = error instanceof Error ? error.message : String(error);
+      this.logger.error(`Error getting thread messages key for thread ${threadId}:`, { message });
+      throw error;
     }
   }
-  async createNamespace(namespaceName) {
+  async deleteThread({ threadId }) {
     try {
-      const response = await this.createNamespaceById(namespaceName);
-      return response.id;
-    } catch (error) {
-      if (error.message && error.message.includes("already exists")) {
-        const namespaces = await this.listNamespaces();
-        const namespace = namespaces.result.find((ns) => ns.title === namespaceName);
-        if (namespace) return namespace.id;
+      const thread = await this.getThreadById({ threadId });
+      if (!thread) {
+        throw new Error(`Thread ${threadId} not found`);
       }
-      this.logger.error("Error creating namespace:", error);
-      throw new Error(`Failed to create namespace ${namespaceName}: ${error.message}`);
-    }
-  }
-  async getOrCreateNamespaceId(namespaceName) {
-    let namespaceId = await this.getNamespaceIdByName(namespaceName);
-    if (!namespaceId) {
-      namespaceId = await this.createNamespace(namespaceName);
+      const messageKeys = await this.operations.listKV(TABLE_MESSAGES);
+      const threadMessageKeys = messageKeys.filter((key) => key.name.includes(`${TABLE_MESSAGES}:${threadId}:`));
+      await Promise.all([
+        // Delete message order
+        this.operations.deleteKV(TABLE_MESSAGES, this.getThreadMessagesKey(threadId)),
+        // Delete all messages
+        ...threadMessageKeys.map((key) => this.operations.deleteKV(TABLE_MESSAGES, key.name)),
+        // Delete thread
+        this.operations.deleteKV(TABLE_THREADS, this.operations.getKey(TABLE_THREADS, { id: threadId }))
+      ]);
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_DELETE_THREAD_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            threadId
+          }
+        },
+        error
+      );
     }
-    return namespaceId;
   }
-  async getNamespaceId(tableName) {
-    const prefix = this.namespacePrefix ? `${this.namespacePrefix}_` : "";
+  async findMessageInAnyThread(messageId) {
     try {
-      if (tableName === TABLE_MESSAGES || tableName === TABLE_THREADS) {
-        return await this.getOrCreateNamespaceId(`${prefix}mastra_threads`);
-      } else if (tableName === TABLE_WORKFLOW_SNAPSHOT) {
-        return await this.getOrCreateNamespaceId(`${prefix}mastra_workflows`);
-      } else {
-        return await this.getOrCreateNamespaceId(`${prefix}mastra_evals`);
+      const prefix = this.operations.namespacePrefix ? `${this.operations.namespacePrefix}:` : "";
+      const threadKeys = await this.operations.listKV(TABLE_THREADS, { prefix: `${prefix}${TABLE_THREADS}` });
+      for (const { name: threadKey } of threadKeys) {
+        const threadId = threadKey.split(":").pop();
+        if (!threadId || threadId === "messages") continue;
+        const messageKey = this.getMessageKey(threadId, messageId);
+        const message = await this.operations.getKV(TABLE_MESSAGES, messageKey);
+        if (message) {
+          return { ...message, threadId };
+        }
       }
+      return null;
     } catch (error) {
-      this.logger.error("Error fetching namespace ID:", error);
-      throw new Error(`Failed to fetch namespace ID for table ${tableName}: ${error.message}`);
+      this.logger?.error(`Error finding message ${messageId} in any thread:`, error);
+      return null;
     }
   }
   /**
-   * Helper to safely serialize data for KV storage
+   * Queue for serializing sorted order updates.
+   * Updates the sorted order for a given key. This operation is eventually consistent.
    */
-  safeSerialize(data) {
-    return typeof data === "string" ? data : JSON.stringify(data);
+  updateQueue = /* @__PURE__ */ new Map();
+  async updateSorting(threadMessages) {
+    return threadMessages.map((msg) => ({
+      message: msg,
+      // Use _index if available, otherwise timestamp, matching Upstash
+      score: msg._index !== void 0 ? msg._index : msg.createdAt.getTime()
+    })).sort((a, b) => a.score - b.score).map((item) => ({
+      id: item.message.id,
+      score: item.score
+    }));
   }
   /**
-   * Helper to safely parse data from KV storage
+   * Updates the sorted order for a given key. This operation is eventually consistent.
+   * Note: Operations on the same orderKey are serialized using a queue to prevent
+   * concurrent updates from conflicting with each other.
    */
-  safeParse(text) {
-    if (!text) return null;
-    try {
-      const data = JSON.parse(text);
-      if (data && typeof data === "object" && "value" in data) {
-        if (typeof data.value === "string") {
-          try {
-            return JSON.parse(data.value);
-          } catch {
-            return data.value;
-          }
+  async updateSortedMessages(orderKey, newEntries) {
+    const currentPromise = this.updateQueue.get(orderKey) || Promise.resolve();
+    const nextPromise = currentPromise.then(async () => {
+      try {
+        const currentOrder = await this.getSortedMessages(orderKey);
+        const orderMap = new Map(currentOrder.map((entry) => [entry.id, entry]));
+        for (const entry of newEntries) {
+          orderMap.set(entry.id, entry);
+        }
+        const updatedOrder = Array.from(orderMap.values()).sort((a, b) => a.score - b.score);
+        await this.operations.putKV({
+          tableName: TABLE_MESSAGES,
+          key: orderKey,
+          value: JSON.stringify(updatedOrder)
+        });
+      } catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        this.logger.error(`Error updating sorted order for key ${orderKey}:`, { message });
+        throw error;
+      } finally {
+        if (this.updateQueue.get(orderKey) === nextPromise) {
+          this.updateQueue.delete(orderKey);
         }
-        return null;
       }
-      return data;
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      this.logger.error("Failed to parse text:", { message, text });
-      return null;
+    });
+    this.updateQueue.set(orderKey, nextPromise);
+    return nextPromise;
+  }
+  async getSortedMessages(orderKey) {
+    const raw = await this.operations.getKV(TABLE_MESSAGES, orderKey);
+    if (!raw) return [];
+    try {
+      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 });
+      return [];
     }
   }
-  async putKV({
-    tableName,
-    key,
-    value,
-    metadata
-  }) {
+  async migrateMessage(messageId, fromThreadId, toThreadId) {
     try {
-      await this.putNamespaceValue({ tableName, key, value, metadata });
+      const oldMessageKey = this.getMessageKey(fromThreadId, messageId);
+      const message = await this.operations.getKV(TABLE_MESSAGES, oldMessageKey);
+      if (!message) return;
+      const updatedMessage = {
+        ...message,
+        threadId: toThreadId
+      };
+      const newMessageKey = this.getMessageKey(toThreadId, messageId);
+      await this.operations.putKV({ tableName: TABLE_MESSAGES, key: newMessageKey, value: updatedMessage });
+      const oldOrderKey = this.getThreadMessagesKey(fromThreadId);
+      const oldEntries = await this.getSortedMessages(oldOrderKey);
+      const filteredEntries = oldEntries.filter((entry) => entry.id !== messageId);
+      await this.updateSortedMessages(oldOrderKey, filteredEntries);
+      const newOrderKey = this.getThreadMessagesKey(toThreadId);
+      const newEntries = await this.getSortedMessages(newOrderKey);
+      const newEntry = { id: messageId, score: Date.now() };
+      newEntries.push(newEntry);
+      await this.updateSortedMessages(newOrderKey, newEntries);
+      await this.operations.deleteKV(TABLE_MESSAGES, oldMessageKey);
     } catch (error) {
-      this.logger.error(`Failed to put KV value for ${tableName}:${key}:`, error);
-      throw new Error(`Failed to put KV value: ${error.message}`);
+      this.logger?.error(`Error migrating message ${messageId} from ${fromThreadId} to ${toThreadId}:`, error);
+      throw error;
     }
   }
-  async getKV(tableName, key) {
+  async saveMessages(args) {
+    const { messages } = args;
+    if (!Array.isArray(messages) || messages.length === 0) return { messages: [] };
     try {
-      const text = await this.getNamespaceValue(tableName, key);
-      return this.safeParse(text);
+      const validatedMessages = messages.map((message, index) => {
+        const errors = [];
+        if (!message.id) errors.push("id is required");
+        if (!message.threadId) errors.push("threadId is required");
+        if (!message.content) errors.push("content is required");
+        if (!message.role) errors.push("role is required");
+        if (!message.createdAt) errors.push("createdAt is required");
+        if (message.resourceId === null || message.resourceId === void 0) errors.push("resourceId is required");
+        if (errors.length > 0) {
+          throw new Error(`Invalid message at index ${index}: ${errors.join(", ")}`);
+        }
+        return {
+          ...message,
+          createdAt: ensureDate(message.createdAt),
+          type: message.type || "v2",
+          _index: index
+        };
+      }).filter((m) => !!m);
+      const messageMigrationTasks = [];
+      for (const message of validatedMessages) {
+        const existingMessage = await this.findMessageInAnyThread(message.id);
+        console.info(`Checking message ${message.id}: existing=${existingMessage?.threadId}, new=${message.threadId}`);
+        if (existingMessage && existingMessage.threadId && existingMessage.threadId !== message.threadId) {
+          console.info(`Migrating message ${message.id} from ${existingMessage.threadId} to ${message.threadId}`);
+          messageMigrationTasks.push(this.migrateMessage(message.id, existingMessage.threadId, message.threadId));
+        }
+      }
+      await Promise.all(messageMigrationTasks);
+      const messagesByThread = validatedMessages.reduce((acc, message) => {
+        if (message.threadId && !acc.has(message.threadId)) {
+          acc.set(message.threadId, []);
+        }
+        if (message.threadId) {
+          acc.get(message.threadId).push(message);
+        }
+        return acc;
+      }, /* @__PURE__ */ new Map());
+      await Promise.all(
+        Array.from(messagesByThread.entries()).map(async ([threadId, threadMessages]) => {
+          try {
+            const thread = await this.getThreadById({ threadId });
+            if (!thread) {
+              throw new Error(`Thread ${threadId} not found`);
+            }
+            await Promise.all(
+              threadMessages.map(async (message) => {
+                const key = this.getMessageKey(threadId, message.id);
+                const { _index, ...cleanMessage } = message;
+                const serializedMessage = {
+                  ...cleanMessage,
+                  createdAt: serializeDate(cleanMessage.createdAt)
+                };
+                console.info(`Saving message ${message.id} with content:`, {
+                  content: serializedMessage.content,
+                  contentType: typeof serializedMessage.content,
+                  isArray: Array.isArray(serializedMessage.content)
+                });
+                await this.operations.putKV({ tableName: TABLE_MESSAGES, key, value: serializedMessage });
+              })
+            );
+            const orderKey = this.getThreadMessagesKey(threadId);
+            const entries = await this.updateSorting(threadMessages);
+            await this.updateSortedMessages(orderKey, entries);
+            const updatedThread = {
+              ...thread,
+              updatedAt: /* @__PURE__ */ new Date()
+            };
+            await this.operations.putKV({
+              tableName: TABLE_THREADS,
+              key: this.operations.getKey(TABLE_THREADS, { id: threadId }),
+              value: updatedThread
+            });
+          } catch (error) {
+            throw new MastraError(
+              {
+                id: "CLOUDFLARE_STORAGE_SAVE_MESSAGES_FAILED",
+                domain: ErrorDomain.STORAGE,
+                category: ErrorCategory.THIRD_PARTY,
+                details: {
+                  threadId
+                }
+              },
+              error
+            );
+          }
+        })
+      );
+      const prepared = validatedMessages.map(
+        ({ _index, ...message }) => ({ ...message, type: message.type !== "v2" ? message.type : void 0 })
+      );
+      const list = new MessageList().add(prepared, "memory");
+      return { messages: list.get.all.db() };
     } catch (error) {
-      this.logger.error(`Failed to get KV value for ${tableName}:${key}:`, error);
-      throw new Error(`Failed to get KV value: ${error.message}`);
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_SAVE_MESSAGES_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY
+        },
+        error
+      );
     }
   }
-  async deleteKV(tableName, key) {
-    try {
-      await this.deleteNamespaceValue(tableName, key);
-    } catch (error) {
-      this.logger.error(`Failed to delete KV value for ${tableName}:${key}:`, error);
-      throw new Error(`Failed to delete KV value: ${error.message}`);
-    }
+  async getRank(orderKey, id) {
+    const order = await this.getSortedMessages(orderKey);
+    const index = order.findIndex((item) => item.id === id);
+    return index >= 0 ? index : null;
   }
-  async listKV(tableName, options) {
-    try {
-      return await this.listNamespaceKeys(tableName, options);
-    } catch (error) {
-      this.logger.error(`Failed to list KV for ${tableName}:`, error);
-      throw new Error(`Failed to list KV: ${error.message}`);
-    }
+  async getRange(orderKey, start, end) {
+    const order = await this.getSortedMessages(orderKey);
+    const actualStart = start < 0 ? Math.max(0, order.length + start) : start;
+    const actualEnd = end < 0 ? order.length + end : Math.min(end, order.length - 1);
+    const sliced = order.slice(actualStart, actualEnd + 1);
+    return sliced.map((item) => item.id);
   }
-  /*---------------------------------------------------------------------------
-    Sorted set simulation helpers for message ordering.
-    We store an array of objects { id, score } as JSON under a dedicated key.
-  ---------------------------------------------------------------------------*/
-  async getSortedMessages(orderKey) {
-    const raw = await this.getKV(TABLE_MESSAGES, orderKey);
-    if (!raw) return [];
-    try {
-      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 });
-      return [];
-    }
+  async getLastN(orderKey, n) {
+    return this.getRange(orderKey, -n, -1);
   }
-  async updateSorting(threadMessages) {
-    return threadMessages.map((msg) => ({
-      message: msg,
-      // Use _index if available, otherwise timestamp, matching Upstash
-      score: msg._index !== void 0 ? msg._index : msg.createdAt.getTime()
-    })).sort((a, b) => a.score - b.score).map((item) => ({
-      id: item.message.id,
-      score: item.score
-    }));
+  async getFullOrder(orderKey) {
+    return this.getRange(orderKey, 0, -1);
   }
   async getIncludedMessagesWithContext(threadId, include, messageIds) {
-    const threadMessagesKey = this.getThreadMessagesKey(threadId);
     await Promise.all(
       include.map(async (item) => {
+        const targetThreadId = item.threadId || threadId;
+        if (!targetThreadId) return;
+        const threadMessagesKey = this.getThreadMessagesKey(targetThreadId);
         messageIds.add(item.id);
         if (!item.withPreviousMessages && !item.withNextMessages) return;
         const rank = await this.getRank(threadMessagesKey, item.id);
@@ -342,23 +451,50 @@ var CloudflareStore = class extends MastraStorage {
     );
   }
   async getRecentMessages(threadId, limit, messageIds) {
+    if (!threadId.trim()) throw new Error("threadId must be a non-empty string");
     if (limit <= 0) return;
     try {
       const threadMessagesKey = this.getThreadMessagesKey(threadId);
       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`);
+      console.info(`No message order found for thread ${threadId}, skipping latest messages`);
     }
   }
-  async fetchAndParseMessages(threadId, messageIds) {
+  async fetchAndParseMessagesFromMultipleThreads(messageIds, include, targetThreadId) {
+    const messageIdToThreadId = /* @__PURE__ */ new Map();
+    if (include) {
+      for (const item of include) {
+        if (item.threadId) {
+          messageIdToThreadId.set(item.id, item.threadId);
+        }
+      }
+    }
     const messages = await Promise.all(
       messageIds.map(async (id) => {
         try {
+          let threadId = messageIdToThreadId.get(id);
+          if (!threadId) {
+            if (targetThreadId) {
+              threadId = targetThreadId;
+            } else {
+              const foundMessage = await this.findMessageInAnyThread(id);
+              if (foundMessage) {
+                threadId = foundMessage.threadId;
+              }
+            }
+          }
+          if (!threadId) return null;
           const key = this.getMessageKey(threadId, id);
-          const data = await this.getKV(TABLE_MESSAGES, key);
+          const data = await this.operations.getKV(TABLE_MESSAGES, key);
           if (!data) return null;
-          return typeof data === "string" ? JSON.parse(data) : data;
+          const parsed = typeof data === "string" ? JSON.parse(data) : data;
+          console.info(`Retrieved message ${id} from thread ${threadId} with content:`, {
+            content: parsed.content,
+            contentType: typeof parsed.content,
+            isArray: Array.isArray(parsed.content)
+          });
+          return parsed;
         } catch (error) {
           const message = error instanceof Error ? error.message : String(error);
           this.logger.error(`Error retrieving message ${id}:`, { message });
@@ -368,61 +504,581 @@ var CloudflareStore = class extends MastraStorage {
     );
     return messages.filter((msg) => msg !== null);
   }
-  /**
-   * Queue for serializing sorted order updates.
-   * Updates the sorted order for a given key. This operation is eventually consistent.
-   */
-  updateQueue = /* @__PURE__ */ new Map();
-  /**
-   * Updates the sorted order for a given key. This operation is eventually consistent.
-   * Note: Operations on the same orderKey are serialized using a queue to prevent
-   * concurrent updates from conflicting with each other.
-   */
-  async updateSortedMessages(orderKey, newEntries) {
-    const currentPromise = this.updateQueue.get(orderKey) || Promise.resolve();
-    const nextPromise = currentPromise.then(async () => {
+  async getMessages({
+    threadId,
+    resourceId,
+    selectBy
+  }) {
+    console.info(`getMessages called with threadId: ${threadId}`);
+    const limit = resolveMessageLimit({ last: selectBy?.last, defaultLimit: 40 });
+    const messageIds = /* @__PURE__ */ new Set();
+    if (limit === 0 && !selectBy?.include?.length) return { messages: [] };
+    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 { messages: [] };
       try {
-        const currentOrder = await this.getSortedMessages(orderKey);
-        const orderMap = new Map(currentOrder.map((entry) => [entry.id, entry]));
-        for (const entry of newEntries) {
-          orderMap.set(entry.id, entry);
-        }
-        const updatedOrder = Array.from(orderMap.values()).sort((a, b) => a.score - b.score);
-        await this.putKV({
-          tableName: TABLE_MESSAGES,
-          key: orderKey,
-          value: JSON.stringify(updatedOrder)
+        const threadMessagesKey = this.getThreadMessagesKey(threadId);
+        const messageOrder = await this.getFullOrder(threadMessagesKey);
+        const orderMap = new Map(messageOrder.map((id, index) => [id, index]));
+        messages.sort((a, b) => {
+          const indexA = orderMap.get(a.id);
+          const indexB = orderMap.get(b.id);
+          if (indexA !== void 0 && indexB !== void 0) return orderMap.get(a.id) - orderMap.get(b.id);
+          return new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime();
         });
       } catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        this.logger.error(`Error updating sorted order for key ${orderKey}:`, { message });
-        throw error;
-      } finally {
-        if (this.updateQueue.get(orderKey) === nextPromise) {
-          this.updateQueue.delete(orderKey);
+        const mastraError = new MastraError(
+          {
+            id: "CLOUDFLARE_STORAGE_SORT_MESSAGES_FAILED",
+            domain: ErrorDomain.STORAGE,
+            category: ErrorCategory.THIRD_PARTY,
+            text: `Error sorting messages for thread ${threadId} falling back to creation time`,
+            details: {
+              threadId
+            }
+          },
+          error
+        );
+        this.logger?.trackException(mastraError);
+        this.logger?.error(mastraError.toString());
+        messages.sort((a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime());
+      }
+      const prepared = messages.map(({ _index, ...message }) => ({
+        ...message,
+        type: message.type === `v2` ? void 0 : message.type,
+        createdAt: ensureDate(message.createdAt)
+      }));
+      const list = new MessageList({ threadId, resourceId }).add(
+        prepared,
+        "memory"
+      );
+      return { messages: list.get.all.db() };
+    } catch (error) {
+      const mastraError = new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_GET_MESSAGES_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Error retrieving messages for thread ${threadId}`,
+          details: {
+            threadId,
+            resourceId: resourceId ?? ""
+          }
+        },
+        error
+      );
+      this.logger?.trackException(mastraError);
+      this.logger?.error(mastraError.toString());
+      return { messages: [] };
+    }
+  }
+  async listMessagesById({ messageIds }) {
+    if (messageIds.length === 0) return { messages: [] };
+    try {
+      const messages = (await Promise.all(messageIds.map((id) => this.findMessageInAnyThread(id)))).filter(
+        (result) => !!result
+      );
+      const prepared = messages.map(({ _index, ...message }) => ({
+        ...message,
+        ...message.type !== `v2` && { type: message.type },
+        createdAt: ensureDate(message.createdAt)
+      }));
+      const list = new MessageList().add(prepared, "memory");
+      return { messages: list.get.all.db() };
+    } catch (error) {
+      const mastraError = new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_LIST_MESSAGES_BY_ID_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Error retrieving messages by ID`,
+          details: {
+            messageIds: JSON.stringify(messageIds)
+          }
+        },
+        error
+      );
+      this.logger?.trackException(mastraError);
+      this.logger?.error(mastraError.toString());
+      return { messages: [] };
+    }
+  }
+  async listMessages(args) {
+    const { threadId, resourceId, include, filter, perPage: perPageInput, page = 0, orderBy } = args;
+    if (!threadId.trim()) {
+      throw new MastraError(
+        {
+          id: "STORAGE_CLOUDFLARE_LIST_MESSAGES_INVALID_THREAD_ID",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { threadId }
+        },
+        new Error("threadId must be a non-empty string")
+      );
+    }
+    const perPage = normalizePerPage(perPageInput, 40);
+    const { offset, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
+    try {
+      if (page < 0) {
+        throw new MastraError(
+          {
+            id: "STORAGE_CLOUDFLARE_LIST_MESSAGES_INVALID_PAGE",
+            domain: ErrorDomain.STORAGE,
+            category: ErrorCategory.USER,
+            details: { page }
+          },
+          new Error("page must be >= 0")
+        );
+      }
+      const { field, direction } = this.parseOrderBy(orderBy);
+      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 {
+          }
         }
       }
-    });
-    this.updateQueue.set(orderKey, nextPromise);
-    return nextPromise;
+      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 (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;
+        });
+      }
+      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) {
+        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` ? void 0 : message.type,
+        createdAt: ensureDate(message.createdAt)
+      }));
+      const list = new MessageList({ threadId, resourceId }).add(prepared, "memory");
+      let finalMessages = list.get.all.db();
+      finalMessages = finalMessages.sort((a, b) => {
+        const aValue = field === "createdAt" ? new Date(a.createdAt).getTime() : a[field];
+        const bValue = field === "createdAt" ? new Date(b.createdAt).getTime() : b[field];
+        if (aValue === bValue) {
+          return a.id.localeCompare(b.id);
+        }
+        return direction === "ASC" ? aValue - bValue : bValue - aValue;
+      });
+      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: perPageForResponse,
+        hasMore
+      };
+    } catch (error) {
+      const mastraError = new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_LIST_MESSAGES_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Failed to list messages for thread ${threadId}: ${error instanceof Error ? error.message : String(error)}`,
+          details: {
+            threadId,
+            resourceId: resourceId ?? ""
+          }
+        },
+        error
+      );
+      this.logger?.error?.(mastraError.toString());
+      this.logger?.trackException?.(mastraError);
+      return {
+        messages: [],
+        total: 0,
+        page,
+        perPage: perPageForResponse,
+        hasMore: false
+      };
+    }
   }
-  async getRank(orderKey, id) {
-    const order = await this.getSortedMessages(orderKey);
-    const index = order.findIndex((item) => item.id === id);
-    return index >= 0 ? index : null;
+  async updateMessages(args) {
+    try {
+      const { messages } = args;
+      const updatedMessages = [];
+      for (const messageUpdate of messages) {
+        const { id, content, ...otherFields } = messageUpdate;
+        const prefix = this.operations.namespacePrefix ? `${this.operations.namespacePrefix}:` : "";
+        const keyObjs = await this.operations.listKV(TABLE_MESSAGES, { prefix: `${prefix}${TABLE_MESSAGES}` });
+        let existingMessage = null;
+        let messageKey = "";
+        for (const { name: key } of keyObjs) {
+          const data = await this.operations.getKV(TABLE_MESSAGES, key);
+          if (data && data.id === id) {
+            existingMessage = data;
+            messageKey = key;
+            break;
+          }
+        }
+        if (!existingMessage) {
+          continue;
+        }
+        const updatedMessage = {
+          ...existingMessage,
+          ...otherFields,
+          id
+        };
+        if (content) {
+          if (content.metadata !== void 0) {
+            updatedMessage.content = {
+              ...updatedMessage.content,
+              metadata: {
+                ...updatedMessage.content?.metadata,
+                ...content.metadata
+              }
+            };
+          }
+          if (content.content !== void 0) {
+            updatedMessage.content = {
+              ...updatedMessage.content,
+              content: content.content
+            };
+          }
+        }
+        if ("threadId" in messageUpdate && messageUpdate.threadId && messageUpdate.threadId !== existingMessage.threadId) {
+          await this.operations.deleteKV(TABLE_MESSAGES, messageKey);
+          updatedMessage.threadId = messageUpdate.threadId;
+          const newMessageKey = this.getMessageKey(messageUpdate.threadId, id);
+          await this.operations.putKV({
+            tableName: TABLE_MESSAGES,
+            key: newMessageKey,
+            value: updatedMessage
+          });
+          if (existingMessage.threadId) {
+            const sourceOrderKey = this.getThreadMessagesKey(existingMessage.threadId);
+            const sourceEntries = await this.getSortedMessages(sourceOrderKey);
+            const filteredEntries = sourceEntries.filter((entry) => entry.id !== id);
+            await this.updateSortedMessages(sourceOrderKey, filteredEntries);
+          }
+          const destOrderKey = this.getThreadMessagesKey(messageUpdate.threadId);
+          const destEntries = await this.getSortedMessages(destOrderKey);
+          const newEntry = { id, score: Date.now() };
+          destEntries.push(newEntry);
+          await this.updateSortedMessages(destOrderKey, destEntries);
+        } else {
+          await this.operations.putKV({
+            tableName: TABLE_MESSAGES,
+            key: messageKey,
+            value: updatedMessage
+          });
+        }
+        const threadsToUpdate = /* @__PURE__ */ new Set();
+        if (updatedMessage.threadId) {
+          threadsToUpdate.add(updatedMessage.threadId);
+        }
+        if ("threadId" in messageUpdate && messageUpdate.threadId && messageUpdate.threadId !== existingMessage.threadId) {
+          if (existingMessage.threadId) {
+            threadsToUpdate.add(existingMessage.threadId);
+          }
+          threadsToUpdate.add(messageUpdate.threadId);
+        }
+        for (const threadId of threadsToUpdate) {
+          const thread = await this.getThreadById({ threadId });
+          if (thread) {
+            const updatedThread = {
+              ...thread,
+              updatedAt: /* @__PURE__ */ new Date()
+            };
+            await this.operations.putKV({
+              tableName: TABLE_THREADS,
+              key: this.operations.getKey(TABLE_THREADS, { id: threadId }),
+              value: updatedThread
+            });
+          }
+        }
+        updatedMessages.push(updatedMessage);
+      }
+      return updatedMessages;
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_UPDATE_MESSAGES_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: "Failed to update messages"
+        },
+        error
+      );
+    }
+  }
+  async getResourceById({ resourceId }) {
+    try {
+      const data = await this.operations.getKV(TABLE_RESOURCES, resourceId);
+      if (!data) return null;
+      const resource = typeof data === "string" ? JSON.parse(data) : data;
+      return {
+        ...resource,
+        createdAt: ensureDate(resource.createdAt),
+        updatedAt: ensureDate(resource.updatedAt),
+        metadata: this.ensureMetadata(resource.metadata)
+      };
+    } catch (error) {
+      const mastraError = new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_GET_RESOURCE_BY_ID_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            resourceId
+          }
+        },
+        error
+      );
+      this.logger?.trackException(mastraError);
+      this.logger?.error(mastraError.toString());
+      return null;
+    }
+  }
+  async saveResource({ resource }) {
+    try {
+      const resourceToSave = {
+        ...resource,
+        metadata: resource.metadata ? JSON.stringify(resource.metadata) : null
+      };
+      await this.operations.putKV({
+        tableName: TABLE_RESOURCES,
+        key: resource.id,
+        value: resourceToSave
+      });
+      return resource;
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_SAVE_RESOURCE_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            resourceId: resource.id
+          }
+        },
+        error
+      );
+    }
+  }
+  async updateResource({
+    resourceId,
+    workingMemory,
+    metadata
+  }) {
+    const existingResource = await this.getResourceById({ resourceId });
+    if (!existingResource) {
+      const newResource = {
+        id: resourceId,
+        workingMemory,
+        metadata: metadata || {},
+        createdAt: /* @__PURE__ */ new Date(),
+        updatedAt: /* @__PURE__ */ new Date()
+      };
+      return this.saveResource({ resource: newResource });
+    }
+    const updatedAt = /* @__PURE__ */ new Date();
+    const updatedResource = {
+      ...existingResource,
+      workingMemory: workingMemory !== void 0 ? workingMemory : existingResource.workingMemory,
+      metadata: {
+        ...existingResource.metadata,
+        ...metadata
+      },
+      updatedAt
+    };
+    return this.saveResource({ resource: updatedResource });
+  }
+};
+var StoreOperationsCloudflare = class extends StoreOperations {
+  bindings;
+  client;
+  accountId;
+  namespacePrefix;
+  constructor({
+    namespacePrefix,
+    bindings,
+    client,
+    accountId
+  }) {
+    super();
+    this.bindings = bindings;
+    this.namespacePrefix = namespacePrefix;
+    this.client = client;
+    this.accountId = accountId;
   }
-  async getRange(orderKey, start, end) {
-    const order = await this.getSortedMessages(orderKey);
-    const actualStart = start < 0 ? Math.max(0, order.length + start) : start;
-    const actualEnd = end < 0 ? order.length + end : Math.min(end, order.length - 1);
-    const sliced = order.slice(actualStart, actualEnd + 1);
-    return sliced.map((item) => item.id);
+  async hasColumn() {
+    return true;
   }
-  async getLastN(orderKey, n) {
-    return this.getRange(orderKey, -n, -1);
+  async alterTable(_args) {
   }
-  async getFullOrder(orderKey) {
-    return this.getRange(orderKey, 0, -1);
+  async clearTable({ tableName }) {
+    try {
+      const keys = await this.listKV(tableName);
+      if (keys.length > 0) {
+        await Promise.all(keys.map((keyObj) => this.deleteKV(tableName, keyObj.name)));
+      }
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_CLEAR_TABLE_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            tableName
+          }
+        },
+        error
+      );
+    }
+  }
+  async dropTable({ tableName }) {
+    try {
+      const keys = await this.listKV(tableName);
+      if (keys.length > 0) {
+        await Promise.all(keys.map((keyObj) => this.deleteKV(tableName, keyObj.name)));
+      }
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_DROP_TABLE_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            tableName
+          }
+        },
+        error
+      );
+    }
+  }
+  getBinding(tableName) {
+    if (!this.bindings) {
+      throw new Error(`Cannot use Workers API binding for ${tableName}: Store initialized with REST API configuration`);
+    }
+    const binding = this.bindings[tableName];
+    if (!binding) throw new Error(`No binding found for namespace ${tableName}`);
+    return binding;
   }
   getKey(tableName, record) {
     const prefix = this.namespacePrefix ? `${this.namespacePrefix}:` : "";
@@ -434,10 +1090,10 @@ var CloudflareStore = class extends MastraStorage {
         if (!record.threadId || !record.id) throw new Error("Thread ID and Message ID are required");
         return `${prefix}${tableName}:${record.threadId}:${record.id}`;
       case TABLE_WORKFLOW_SNAPSHOT:
-        if (!record.namespace || !record.workflow_name || !record.run_id) {
-          throw new Error("Namespace, workflow name, and run ID are required");
+        if (!record.workflow_name || !record.run_id) {
+          throw new Error("Workflow name, and run ID are required");
         }
-        let key = `${prefix}${tableName}:${record.namespace}:${record.workflow_name}:${record.run_id}`;
+        let key = `${prefix}${tableName}:${record.workflow_name}:${record.run_id}`;
         if (record.resourceId) {
           key = `${key}:${record.resourceId}`;
         }
@@ -445,6 +1101,9 @@ var CloudflareStore = class extends MastraStorage {
       case TABLE_TRACES:
         if (!record.id) throw new Error("Trace ID is required");
         return `${prefix}${tableName}:${record.id}`;
+      case TABLE_SCORERS:
+        if (!record.id) throw new Error("Score ID is required");
+        return `${prefix}${tableName}:${record.id}`;
       default:
         throw new Error(`Unsupported table: ${tableName}`);
     }
@@ -453,6 +1112,146 @@ var CloudflareStore = class extends MastraStorage {
     const prefix = this.namespacePrefix ? `${this.namespacePrefix}:` : "";
     return `${prefix}schema:${tableName}`;
   }
+  /**
+   * Helper to safely parse data from KV storage
+   */
+  safeParse(text) {
+    if (!text) return null;
+    try {
+      const data = JSON.parse(text);
+      if (data && typeof data === "object" && "value" in data) {
+        if (typeof data.value === "string") {
+          try {
+            return JSON.parse(data.value);
+          } catch {
+            return data.value;
+          }
+        }
+        return null;
+      }
+      return data;
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      this.logger.error("Failed to parse text:", { message, text });
+      return null;
+    }
+  }
+  async createNamespaceById(title) {
+    if (this.bindings) {
+      return {
+        id: title,
+        // Use title as ID since that's what we need
+        title,
+        supports_url_encoding: true
+      };
+    }
+    return await this.client.kv.namespaces.create({
+      account_id: this.accountId,
+      title
+    });
+  }
+  async createNamespace(namespaceName) {
+    try {
+      const response = await this.createNamespaceById(namespaceName);
+      return response.id;
+    } catch (error) {
+      if (error.message && error.message.includes("already exists")) {
+        const namespaces = await this.listNamespaces();
+        const namespace = namespaces.result.find((ns) => ns.title === namespaceName);
+        if (namespace) return namespace.id;
+      }
+      this.logger.error("Error creating namespace:", error);
+      throw new Error(`Failed to create namespace ${namespaceName}: ${error.message}`);
+    }
+  }
+  async listNamespaces() {
+    if (this.bindings) {
+      return {
+        result: Object.keys(this.bindings).map((name) => ({
+          id: name,
+          title: name,
+          supports_url_encoding: true
+        }))
+      };
+    }
+    let allNamespaces = [];
+    let currentPage = 1;
+    const perPage = 50;
+    let morePagesExist = true;
+    while (morePagesExist) {
+      const response = await this.client.kv.namespaces.list({
+        account_id: this.accountId,
+        page: currentPage,
+        per_page: perPage
+      });
+      if (response.result) {
+        allNamespaces = allNamespaces.concat(response.result);
+      }
+      morePagesExist = response.result ? response.result.length === perPage : false;
+      if (morePagesExist) {
+        currentPage++;
+      }
+    }
+    return { result: allNamespaces };
+  }
+  async getNamespaceIdByName(namespaceName) {
+    try {
+      const response = await this.listNamespaces();
+      const namespace = response.result.find((ns) => ns.title === namespaceName);
+      return namespace ? namespace.id : null;
+    } catch (error) {
+      this.logger.error(`Failed to get namespace ID for ${namespaceName}:`, error);
+      return null;
+    }
+  }
+  async getOrCreateNamespaceId(namespaceName) {
+    let namespaceId = await this.getNamespaceIdByName(namespaceName);
+    if (!namespaceId) {
+      namespaceId = await this.createNamespace(namespaceName);
+    }
+    return namespaceId;
+  }
+  async getNamespaceId(tableName) {
+    const prefix = this.namespacePrefix ? `${this.namespacePrefix}_` : "";
+    try {
+      return await this.getOrCreateNamespaceId(`${prefix}${tableName}`);
+    } catch (error) {
+      this.logger.error("Error fetching namespace ID:", error);
+      throw new Error(`Failed to fetch namespace ID for table ${tableName}: ${error.message}`);
+    }
+  }
+  async getNamespaceValue(tableName, key) {
+    try {
+      if (this.bindings) {
+        const binding = this.getBinding(tableName);
+        const result = await binding.getWithMetadata(key, "text");
+        if (!result) return null;
+        return JSON.stringify(result);
+      } else {
+        const namespaceId = await this.getNamespaceId(tableName);
+        const response = await this.client.kv.namespaces.values.get(namespaceId, key, {
+          account_id: this.accountId
+        });
+        return await response.text();
+      }
+    } catch (error) {
+      if (error.message && error.message.includes("key not found")) {
+        return null;
+      }
+      const message = error instanceof Error ? error.message : String(error);
+      this.logger.error(`Failed to get value for ${tableName} ${key}:`, { message });
+      throw error;
+    }
+  }
+  async getKV(tableName, key) {
+    try {
+      const text = await this.getNamespaceValue(tableName, key);
+      return this.safeParse(text);
+    } catch (error) {
+      this.logger.error(`Failed to get KV value for ${tableName}:${key}:`, error);
+      throw new Error(`Failed to get KV value: ${error.message}`);
+    }
+  }
   async getTableSchema(tableName) {
     try {
       const schemaKey = this.getSchemaKey(tableName);
@@ -505,64 +1304,168 @@ var CloudflareStore = class extends MastraStorage {
       }
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
-      this.logger.error(`Error validating record against schema:`, { message, record, schema });
+      this.logger.error(`Error validating record against schema:`, { message, record, schema });
+      throw error;
+    }
+  }
+  async validateRecord(record, tableName) {
+    try {
+      if (!record || typeof record !== "object") {
+        throw new Error("Record must be an object");
+      }
+      const recordTyped = record;
+      const schema = await this.getTableSchema(tableName);
+      if (schema) {
+        await this.validateAgainstSchema(recordTyped, schema);
+        return;
+      }
+      switch (tableName) {
+        case TABLE_THREADS:
+          if (!("id" in recordTyped) || !("resourceId" in recordTyped) || !("title" in recordTyped)) {
+            throw new Error("Thread record missing required fields");
+          }
+          break;
+        case TABLE_MESSAGES:
+          if (!("id" in recordTyped) || !("threadId" in recordTyped) || !("content" in recordTyped) || !("role" in recordTyped)) {
+            throw new Error("Message record missing required fields");
+          }
+          break;
+        case TABLE_WORKFLOW_SNAPSHOT:
+          if (!("workflow_name" in recordTyped) || !("run_id" in recordTyped)) {
+            throw new Error("Workflow record missing required fields");
+          }
+          break;
+        case TABLE_TRACES:
+          if (!("id" in recordTyped)) {
+            throw new Error("Trace record missing required fields");
+          }
+          break;
+        case TABLE_SCORERS:
+          if (!("id" in recordTyped) || !("scorerId" in recordTyped)) {
+            throw new Error("Score record missing required fields");
+          }
+          break;
+        default:
+          throw new Error(`Unknown table type: ${tableName}`);
+      }
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      this.logger.error(`Failed to validate record for ${tableName}:`, { message, record });
+      throw error;
+    }
+  }
+  async insert({ tableName, record }) {
+    try {
+      const key = this.getKey(tableName, record);
+      const processedRecord = { ...record };
+      await this.validateRecord(processedRecord, tableName);
+      await this.putKV({ tableName, key, value: processedRecord });
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_INSERT_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            tableName
+          }
+        },
+        error
+      );
+    }
+  }
+  async load({ tableName, keys }) {
+    try {
+      const key = this.getKey(tableName, keys);
+      const data = await this.getKV(tableName, key);
+      if (!data) return null;
+      return data;
+    } catch (error) {
+      const mastraError = new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_LOAD_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            tableName
+          }
+        },
+        error
+      );
+      this.logger?.trackException(mastraError);
+      this.logger?.error(mastraError.toString());
+      return null;
+    }
+  }
+  async batchInsert(input) {
+    if (!input.records || input.records.length === 0) return;
+    try {
+      await Promise.all(
+        input.records.map(async (record) => {
+          const key = this.getKey(input.tableName, record);
+          await this.putKV({ tableName: input.tableName, key, value: record });
+        })
+      );
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_BATCH_INSERT_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Error in batch insert for table ${input.tableName}`,
+          details: {
+            tableName: input.tableName
+          }
+        },
+        error
+      );
+    }
+  }
+  /**
+   * Helper to safely serialize data for KV storage
+   */
+  safeSerialize(data) {
+    return typeof data === "string" ? data : JSON.stringify(data);
+  }
+  async putNamespaceValue({
+    tableName,
+    key,
+    value,
+    metadata
+  }) {
+    try {
+      const serializedValue = this.safeSerialize(value);
+      const serializedMetadata = metadata ? this.safeSerialize(metadata) : "";
+      if (this.bindings) {
+        const binding = this.getBinding(tableName);
+        await binding.put(key, serializedValue, { metadata: serializedMetadata });
+      } else {
+        const namespaceId = await this.getNamespaceId(tableName);
+        await this.client.kv.namespaces.values.update(namespaceId, key, {
+          account_id: this.accountId,
+          value: serializedValue,
+          metadata: serializedMetadata
+        });
+      }
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      this.logger.error(`Failed to put value for ${tableName} ${key}:`, { message });
       throw error;
     }
   }
-  async validateRecord(record, tableName) {
+  async putKV({
+    tableName,
+    key,
+    value,
+    metadata
+  }) {
     try {
-      if (!record || typeof record !== "object") {
-        throw new Error("Record must be an object");
-      }
-      const recordTyped = record;
-      const schema = await this.getTableSchema(tableName);
-      if (schema) {
-        await this.validateAgainstSchema(recordTyped, schema);
-        return;
-      }
-      switch (tableName) {
-        case TABLE_THREADS:
-          if (!("id" in recordTyped) || !("resourceId" in recordTyped) || !("title" in recordTyped)) {
-            throw new Error("Thread record missing required fields");
-          }
-          break;
-        case TABLE_MESSAGES:
-          if (!("id" in recordTyped) || !("threadId" in recordTyped) || !("content" in recordTyped) || !("role" in recordTyped)) {
-            throw new Error("Message record missing required fields");
-          }
-          break;
-        case TABLE_WORKFLOW_SNAPSHOT:
-          if (!("namespace" in recordTyped) || !("workflow_name" in recordTyped) || !("run_id" in recordTyped)) {
-            throw new Error("Workflow record missing required fields");
-          }
-          break;
-        case TABLE_TRACES:
-          if (!("id" in recordTyped)) {
-            throw new Error("Trace record missing required fields");
-          }
-          break;
-        default:
-          throw new Error(`Unknown table type: ${tableName}`);
-      }
+      await this.putNamespaceValue({ tableName, key, value, metadata });
     } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      this.logger.error(`Failed to validate record for ${tableName}:`, { message, record });
-      throw error;
+      this.logger.error(`Failed to put KV value for ${tableName}:${key}:`, error);
+      throw new Error(`Failed to put KV value: ${error.message}`);
     }
   }
-  ensureDate(date) {
-    if (!date) return void 0;
-    return date instanceof Date ? date : new Date(date);
-  }
-  serializeDate(date) {
-    if (!date) return void 0;
-    const dateObj = this.ensureDate(date);
-    return dateObj?.toISOString();
-  }
-  ensureMetadata(metadata) {
-    if (!metadata) return {};
-    return typeof metadata === "string" ? JSON.parse(metadata) : metadata;
-  }
   async createTable({
     tableName,
     schema
@@ -576,475 +1479,467 @@ var CloudflareStore = class extends MastraStorage {
       };
       await this.putKV({ tableName, key: schemaKey, value: schema, metadata });
     } catch (error) {
-      this.logger.error(`Failed to store schema for ${tableName}:`, error);
-      throw new Error(`Failed to store schema: ${error.message}`);
-    }
-  }
-  async clearTable({ tableName }) {
-    const keys = await this.listKV(tableName);
-    if (keys.length > 0) {
-      await Promise.all(keys.map((keyObj) => this.deleteKV(tableName, keyObj.name)));
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_CREATE_TABLE_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            tableName
+          }
+        },
+        error
+      );
     }
   }
-  async insert({
-    tableName,
-    record
-  }) {
+  async listNamespaceKeys(tableName, options) {
     try {
-      const key = this.getKey(tableName, record);
-      const processedRecord = {
-        ...record,
-        createdAt: record.createdAt ? this.serializeDate(record.createdAt) : void 0,
-        updatedAt: record.updatedAt ? this.serializeDate(record.updatedAt) : void 0,
-        metadata: record.metadata ? JSON.stringify(record.metadata) : ""
-      };
-      await this.validateRecord(processedRecord, tableName);
-      await this.putKV({ tableName, key, value: processedRecord });
+      if (this.bindings) {
+        const binding = this.getBinding(tableName);
+        const response = await binding.list({
+          limit: options?.limit || 1e3,
+          prefix: options?.prefix
+        });
+        return response.keys;
+      } else {
+        const namespaceId = await this.getNamespaceId(tableName);
+        const response = await this.client.kv.namespaces.keys.list(namespaceId, {
+          account_id: this.accountId,
+          limit: options?.limit || 1e3,
+          prefix: options?.prefix
+        });
+        return response.result;
+      }
     } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      this.logger.error(`Failed to insert record for ${tableName}:`, { message });
-      throw error;
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_LIST_NAMESPACE_KEYS_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            tableName
+          }
+        },
+        error
+      );
     }
   }
-  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: this.ensureDate(data.createdAt),
-        updatedAt: this.ensureDate(data.updatedAt),
-        metadata: this.ensureMetadata(data.metadata)
-      };
-      return processed;
-    } catch (error) {
-      this.logger.error(`Failed to load data for ${tableName}:`, {
-        error: error instanceof Error ? error.message : String(error)
+  async deleteNamespaceValue(tableName, key) {
+    if (this.bindings) {
+      const binding = this.getBinding(tableName);
+      await binding.delete(key);
+    } else {
+      const namespaceId = await this.getNamespaceId(tableName);
+      await this.client.kv.namespaces.values.delete(namespaceId, key, {
+        account_id: this.accountId
       });
-      return null;
     }
   }
-  async getThreadById({ threadId }) {
-    const thread = await this.load({ tableName: TABLE_THREADS, keys: { id: threadId } });
-    if (!thread) return null;
+  async deleteKV(tableName, key) {
     try {
-      return {
-        ...thread,
-        createdAt: this.ensureDate(thread.createdAt),
-        updatedAt: this.ensureDate(thread.updatedAt),
-        metadata: this.ensureMetadata(thread.metadata)
-      };
+      await this.deleteNamespaceValue(tableName, key);
     } catch (error) {
-      this.logger.error(`Error processing thread ${threadId}:`, {
-        error: error instanceof Error ? error.message : String(error)
-      });
-      return null;
+      this.logger.error(`Failed to delete KV value for ${tableName}:${key}:`, error);
+      throw new Error(`Failed to delete KV value: ${error.message}`);
     }
   }
-  async getThreadsByResourceId({ resourceId }) {
+  async listKV(tableName, options) {
     try {
-      const keyList = await this.listKV(TABLE_THREADS);
-      const threads = await Promise.all(
-        keyList.map(async (keyObj) => {
-          try {
-            const data = await this.getKV(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: this.ensureDate(thread.createdAt),
-              updatedAt: this.ensureDate(thread.updatedAt),
-              metadata: this.ensureMetadata(thread.metadata)
-            };
-          } catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            this.logger.error(`Error processing thread from key ${keyObj.name}:`, { message });
-            return null;
-          }
-        })
-      );
-      return threads.filter((thread) => thread !== null);
+      return await this.listNamespaceKeys(tableName, options);
     } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      this.logger.error(`Error getting threads for resourceId ${resourceId}:`, { message });
-      return [];
+      this.logger.error(`Failed to list KV for ${tableName}:`, error);
+      throw new Error(`Failed to list KV: ${error.message}`);
     }
   }
-  async saveThread({ thread }) {
-    try {
-      await this.insert({ tableName: TABLE_THREADS, record: thread });
-      return thread;
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      this.logger.error("Error saving thread:", { message });
-      throw error;
-    }
+};
+function transformScoreRow(row) {
+  const deserialized = { ...row };
+  deserialized.input = safelyParseJSON(row.input);
+  deserialized.output = safelyParseJSON(row.output);
+  deserialized.scorer = safelyParseJSON(row.scorer);
+  deserialized.preprocessStepResult = safelyParseJSON(row.preprocessStepResult);
+  deserialized.analyzeStepResult = safelyParseJSON(row.analyzeStepResult);
+  deserialized.metadata = safelyParseJSON(row.metadata);
+  deserialized.additionalContext = safelyParseJSON(row.additionalContext);
+  deserialized.requestContext = safelyParseJSON(row.requestContext);
+  deserialized.entity = safelyParseJSON(row.entity);
+  return deserialized;
+}
+var ScoresStorageCloudflare = class extends ScoresStorage {
+  operations;
+  constructor({ operations }) {
+    super();
+    this.operations = operations;
   }
-  async updateThread({
-    id,
-    title,
-    metadata
-  }) {
+  async getScoreById({ id }) {
     try {
-      const thread = await this.getThreadById({ threadId: id });
-      if (!thread) {
-        throw new Error(`Thread ${id} not found`);
+      const score = await this.operations.getKV(TABLE_SCORERS, id);
+      if (!score) {
+        return null;
       }
-      const updatedThread = {
-        ...thread,
-        title,
-        metadata: this.ensureMetadata({
-          ...thread.metadata ?? {},
-          ...metadata
-        }),
-        updatedAt: /* @__PURE__ */ new Date()
-      };
-      await this.insert({ tableName: TABLE_THREADS, record: updatedThread });
-      return updatedThread;
+      return transformScoreRow(score);
     } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      this.logger.error(`Error updating thread ${id}:`, { message });
-      throw error;
+      const mastraError = new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_SCORES_GET_SCORE_BY_ID_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Failed to get score by id: ${id}`
+        },
+        error
+      );
+      this.logger.trackException(mastraError);
+      this.logger.error(mastraError.toString());
+      return null;
     }
   }
-  async deleteThread({ threadId }) {
+  async saveScore(score) {
+    let parsedScore;
     try {
-      const thread = await this.getThreadById({ threadId });
-      if (!thread) {
-        throw new Error(`Thread ${threadId} not found`);
-      }
-      const messageKeys = await this.listKV(TABLE_MESSAGES);
-      const threadMessageKeys = messageKeys.filter((key) => key.name.includes(`${TABLE_MESSAGES}:${threadId}:`));
-      await Promise.all([
-        // Delete message order
-        this.deleteKV(TABLE_MESSAGES, this.getThreadMessagesKey(threadId)),
-        // Delete all messages
-        ...threadMessageKeys.map((key) => this.deleteKV(TABLE_MESSAGES, key.name)),
-        // Delete thread
-        this.deleteKV(TABLE_THREADS, this.getKey(TABLE_THREADS, { id: threadId }))
-      ]);
+      parsedScore = saveScorePayloadSchema.parse(score);
     } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      this.logger.error(`Error deleting thread ${threadId}:`, { message });
-      throw error;
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_SAVE_SCORE_FAILED_INVALID_SCORE_PAYLOAD",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER,
+          details: { scoreId: score.id }
+        },
+        error
+      );
     }
-  }
-  getMessageKey(threadId, messageId) {
     try {
-      return this.getKey(TABLE_MESSAGES, { threadId, id: messageId });
+      const id = crypto.randomUUID();
+      const serializedRecord = {};
+      for (const [key, value] of Object.entries(parsedScore)) {
+        if (value !== null && value !== void 0) {
+          if (typeof value === "object") {
+            serializedRecord[key] = JSON.stringify(value);
+          } else {
+            serializedRecord[key] = value;
+          }
+        } else {
+          serializedRecord[key] = null;
+        }
+      }
+      serializedRecord.id = id;
+      serializedRecord.createdAt = (/* @__PURE__ */ new Date()).toISOString();
+      serializedRecord.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+      await this.operations.putKV({
+        tableName: TABLE_SCORERS,
+        key: id,
+        value: serializedRecord
+      });
+      const scoreFromDb = await this.getScoreById({ id: score.id });
+      return { score: scoreFromDb };
     } 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 });
-      throw error;
+      const mastraError = new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_SCORES_SAVE_SCORE_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Failed to save score: ${score.id}`
+        },
+        error
+      );
+      this.logger.trackException(mastraError);
+      this.logger.error(mastraError.toString());
+      throw mastraError;
     }
   }
-  getThreadMessagesKey(threadId) {
+  async listScoresByScorerId({
+    scorerId,
+    entityId,
+    entityType,
+    source,
+    pagination
+  }) {
     try {
-      return this.getKey(TABLE_MESSAGES, { threadId, id: "messages" });
+      const keys = await this.operations.listKV(TABLE_SCORERS);
+      const scores = [];
+      for (const { name: key } of keys) {
+        const score = await this.operations.getKV(TABLE_SCORERS, key);
+        if (entityId && score.entityId !== entityId) {
+          continue;
+        }
+        if (entityType && score.entityType !== entityType) {
+          continue;
+        }
+        if (source && score.source !== source) {
+          continue;
+        }
+        if (score && score.scorerId === scorerId) {
+          scores.push(transformScoreRow(score));
+        }
+      }
+      scores.sort((a, b) => {
+        const dateA = new Date(a.createdAt || 0).getTime();
+        const dateB = new Date(b.createdAt || 0).getTime();
+        return dateB - dateA;
+      });
+      const { page, perPage: perPageInput } = pagination;
+      const perPage = normalizePerPage(perPageInput, 100);
+      const { offset: start, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
+      const total = scores.length;
+      const end = perPageInput === false ? scores.length : start + perPage;
+      const pagedScores = scores.slice(start, end);
+      return {
+        pagination: {
+          total,
+          page,
+          perPage: perPageForResponse,
+          hasMore: end < total
+        },
+        scores: pagedScores
+      };
     } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      this.logger.error(`Error getting thread messages key for thread ${threadId}:`, { message });
-      throw error;
+      const mastraError = new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_SCORES_GET_SCORES_BY_SCORER_ID_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Failed to get scores by scorer id: ${scorerId}`
+        },
+        error
+      );
+      this.logger?.trackException(mastraError);
+      this.logger?.error(mastraError.toString());
+      return { pagination: { total: 0, page: 0, perPage: 100, hasMore: false }, scores: [] };
     }
   }
-  async saveMessages({ messages }) {
-    if (!Array.isArray(messages) || messages.length === 0) return [];
+  async listScoresByRunId({
+    runId,
+    pagination
+  }) {
     try {
-      const validatedMessages = messages.map((message, index) => {
-        const errors = [];
-        if (!message.id) errors.push("id is required");
-        if (!message.threadId) errors.push("threadId is required");
-        if (!message.content) errors.push("content is required");
-        if (!message.role) errors.push("role is required");
-        if (!message.createdAt) errors.push("createdAt is required");
-        if (errors.length > 0) {
-          throw new Error(`Invalid message at index ${index}: ${errors.join(", ")}`);
+      const keys = await this.operations.listKV(TABLE_SCORERS);
+      const scores = [];
+      for (const { name: key } of keys) {
+        const score = await this.operations.getKV(TABLE_SCORERS, key);
+        if (score && score.runId === runId) {
+          scores.push(transformScoreRow(score));
         }
-        return {
-          ...message,
-          createdAt: this.ensureDate(message.createdAt),
-          type: message.type || "text",
-          _index: index
-        };
+      }
+      scores.sort((a, b) => {
+        const dateA = new Date(a.createdAt || 0).getTime();
+        const dateB = new Date(b.createdAt || 0).getTime();
+        return dateB - dateA;
       });
-      const messagesByThread = validatedMessages.reduce((acc, message) => {
-        if (!acc.has(message.threadId)) {
-          acc.set(message.threadId, []);
-        }
-        acc.get(message.threadId).push(message);
-        return acc;
-      }, /* @__PURE__ */ new Map());
-      await Promise.all(
-        Array.from(messagesByThread.entries()).map(async ([threadId, threadMessages]) => {
-          try {
-            const thread = await this.getThreadById({ threadId });
-            if (!thread) {
-              throw new Error(`Thread ${threadId} not found`);
-            }
-            await Promise.all(
-              threadMessages.map(async (message) => {
-                const key = await this.getMessageKey(threadId, message.id);
-                const { _index, ...cleanMessage } = message;
-                const serializedMessage = {
-                  ...cleanMessage,
-                  createdAt: this.serializeDate(cleanMessage.createdAt)
-                };
-                await this.putKV({ tableName: TABLE_MESSAGES, key, value: serializedMessage });
-              })
-            );
-            const orderKey = this.getThreadMessagesKey(threadId);
-            const entries = await this.updateSorting(threadMessages);
-            await this.updateSortedMessages(orderKey, entries);
-          } catch (error) {
-            const errorMessage = error instanceof Error ? error.message : String(error);
-            this.logger.error(`Error processing messages for thread ${threadId}: ${errorMessage}`);
-            throw error;
-          }
-        })
-      );
-      return validatedMessages.map(({ _index, ...message }) => message);
+      const { page, perPage: perPageInput } = pagination;
+      const perPage = normalizePerPage(perPageInput, 100);
+      const { offset: start, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
+      const total = scores.length;
+      const end = perPageInput === false ? scores.length : start + perPage;
+      const pagedScores = scores.slice(start, end);
+      return {
+        pagination: {
+          total,
+          page,
+          perPage: perPageForResponse,
+          hasMore: end < total
+        },
+        scores: pagedScores
+      };
     } catch (error) {
-      const errorMessage = error instanceof Error ? error.message : String(error);
-      this.logger.error(`Error saving messages: ${errorMessage}`);
-      throw error;
+      const mastraError = new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_SCORES_GET_SCORES_BY_RUN_ID_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Failed to get scores by run id: ${runId}`
+        },
+        error
+      );
+      this.logger.trackException(mastraError);
+      this.logger.error(mastraError.toString());
+      return { pagination: { total: 0, page: 0, perPage: 100, hasMore: false }, scores: [] };
     }
   }
-  async getMessages({ threadId, selectBy }) {
-    if (!threadId) throw new Error("threadId is required");
-    let limit = 40;
-    if (typeof selectBy?.last === "number") {
-      limit = Math.max(0, selectBy.last);
-    } else if (selectBy?.last === false) {
-      limit = 0;
+  async listScoresByEntityId({
+    entityId,
+    entityType,
+    pagination
+  }) {
+    try {
+      const keys = await this.operations.listKV(TABLE_SCORERS);
+      const scores = [];
+      for (const { name: key } of keys) {
+        const score = await this.operations.getKV(TABLE_SCORERS, key);
+        if (score && score.entityId === entityId && score.entityType === entityType) {
+          scores.push(transformScoreRow(score));
+        }
+      }
+      scores.sort((a, b) => {
+        const dateA = new Date(a.createdAt || 0).getTime();
+        const dateB = new Date(b.createdAt || 0).getTime();
+        return dateB - dateA;
+      });
+      const { page, perPage: perPageInput } = pagination;
+      const perPage = normalizePerPage(perPageInput, 100);
+      const { offset: start, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
+      const total = scores.length;
+      const end = perPageInput === false ? scores.length : start + perPage;
+      const pagedScores = scores.slice(start, end);
+      return {
+        pagination: {
+          total,
+          page,
+          perPage: perPageForResponse,
+          hasMore: end < total
+        },
+        scores: pagedScores
+      };
+    } catch (error) {
+      const mastraError = new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_SCORES_GET_SCORES_BY_ENTITY_ID_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Failed to get scores by entity id: ${entityId}, type: ${entityType}`
+        },
+        error
+      );
+      this.logger.trackException(mastraError);
+      this.logger.error(mastraError.toString());
+      return { pagination: { total: 0, page: 0, perPage: 100, hasMore: false }, scores: [] };
     }
-    const messageIds = /* @__PURE__ */ new Set();
-    if (limit === 0 && !selectBy?.include?.length) return [];
+  }
+  async listScoresBySpan({
+    traceId,
+    spanId,
+    pagination
+  }) {
     try {
-      await Promise.all([
-        selectBy?.include?.length ? this.getIncludedMessagesWithContext(threadId, selectBy.include, messageIds) : Promise.resolve(),
-        limit > 0 && !selectBy?.include?.length ? this.getRecentMessages(threadId, limit, messageIds) : Promise.resolve()
-      ]);
-      const messages = await this.fetchAndParseMessages(threadId, Array.from(messageIds));
-      if (!messages.length) return [];
-      try {
-        const threadMessagesKey = this.getThreadMessagesKey(threadId);
-        const messageOrder = await this.getFullOrder(threadMessagesKey);
-        const orderMap = new Map(messageOrder.map((id, index) => [id, index]));
-        messages.sort((a, b) => {
-          const indexA = orderMap.get(a.id);
-          const indexB = orderMap.get(b.id);
-          if (indexA !== void 0 && indexB !== void 0) return orderMap.get(a.id) - orderMap.get(b.id);
-          return new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime();
-        });
-      } catch (error) {
-        const errorMessage = error instanceof Error ? error.message : String(error);
-        this.logger.warn(`Error sorting messages, falling back to creation time: ${errorMessage}`);
-        messages.sort((a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime());
+      const keys = await this.operations.listKV(TABLE_SCORERS);
+      const scores = [];
+      for (const { name: key } of keys) {
+        const score = await this.operations.getKV(TABLE_SCORERS, key);
+        if (score && score.traceId === traceId && score.spanId === spanId) {
+          scores.push(transformScoreRow(score));
+        }
       }
-      return messages.map(({ _index, ...message }) => ({
-        ...message,
-        createdAt: this.ensureDate(message.createdAt)
-      }));
+      scores.sort((a, b) => {
+        const dateA = new Date(a.createdAt || 0).getTime();
+        const dateB = new Date(b.createdAt || 0).getTime();
+        return dateB - dateA;
+      });
+      const { page, perPage: perPageInput } = pagination;
+      const perPage = normalizePerPage(perPageInput, 100);
+      const { offset: start, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
+      const total = scores.length;
+      const end = perPageInput === false ? scores.length : start + perPage;
+      const pagedScores = scores.slice(start, end);
+      return {
+        pagination: {
+          total,
+          page,
+          perPage: perPageForResponse,
+          hasMore: end < total
+        },
+        scores: pagedScores
+      };
     } catch (error) {
-      const errorMessage = error instanceof Error ? error.message : String(error);
-      this.logger.error(`Error retrieving messages for thread ${threadId}: ${errorMessage}`);
-      return [];
+      const mastraError = new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_SCORES_GET_SCORES_BY_SPAN_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Failed to get scores by span: traceId=${traceId}, spanId=${spanId}`
+        },
+        error
+      );
+      this.logger?.trackException(mastraError);
+      this.logger?.error(mastraError.toString());
+      return { pagination: { total: 0, page: 0, perPage: 100, hasMore: false }, scores: [] };
     }
   }
+};
+var WorkflowsStorageCloudflare = class extends WorkflowsStorage {
+  operations;
+  constructor({ operations }) {
+    super();
+    this.operations = operations;
+  }
   validateWorkflowParams(params) {
-    const { namespace, workflowName, runId } = params;
-    if (!namespace || !workflowName || !runId) {
+    const { workflowName, runId } = params;
+    if (!workflowName || !runId) {
       throw new Error("Invalid workflow snapshot parameters");
     }
   }
-  validateWorkflowState(state) {
-    if (!state?.runId || !state?.value || !state?.context?.steps || !state?.context?.triggerData || !state?.context?.attempts || !state?.activePaths) {
-      throw new Error("Invalid workflow state structure");
-    }
-  }
-  normalizeSteps(steps) {
-    const normalizedSteps = {};
-    for (const [stepId, step] of Object.entries(steps)) {
-      normalizedSteps[stepId] = {
-        status: step.status,
-        payload: step.payload || step.result,
-        error: step.error
-      };
-    }
-    return normalizedSteps;
+  updateWorkflowResults({
+    // workflowName,
+    // runId,
+    // stepId,
+    // result,
+    // requestContext,
+  }) {
+    throw new Error("Method not implemented.");
   }
-  normalizeWorkflowState(data) {
-    const steps = data.context?.stepResults || data.context?.steps || {};
-    return {
-      runId: data.runId,
-      value: data.value,
-      context: {
-        steps: this.normalizeSteps(steps),
-        triggerData: data.context?.triggerData || {},
-        attempts: data.context?.attempts || {}
-      },
-      suspendedPaths: data.suspendedPaths || {},
-      activePaths: data.activePaths || [],
-      timestamp: data.timestamp || Date.now()
-    };
+  updateWorkflowState({
+    // workflowName,
+    // runId,
+    // opts,
+  }) {
+    throw new Error("Method not implemented.");
   }
   async persistWorkflowSnapshot(params) {
     try {
-      this.validateWorkflowParams(params);
-      const { namespace, workflowName, runId, snapshot } = params;
-      const normalizedState = this.normalizeWorkflowState(snapshot);
-      this.validateWorkflowState(normalizedState);
-      await this.insert({
+      const { workflowName, runId, resourceId, snapshot } = params;
+      await this.operations.putKV({
         tableName: TABLE_WORKFLOW_SNAPSHOT,
-        record: {
-          namespace,
+        key: this.operations.getKey(TABLE_WORKFLOW_SNAPSHOT, { workflow_name: workflowName, run_id: runId }),
+        value: {
           workflow_name: workflowName,
           run_id: runId,
-          snapshot: normalizedState,
+          resourceId,
+          snapshot: typeof snapshot === "string" ? snapshot : JSON.stringify(snapshot),
           createdAt: /* @__PURE__ */ new Date(),
           updatedAt: /* @__PURE__ */ new Date()
         }
       });
     } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      this.logger.error("Error persisting workflow snapshot:", { message });
-      throw error;
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_PERSIST_WORKFLOW_SNAPSHOT_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Error persisting workflow snapshot for workflow ${params.workflowName}, run ${params.runId}`,
+          details: {
+            workflowName: params.workflowName,
+            runId: params.runId
+          }
+        },
+        error
+      );
     }
   }
   async loadWorkflowSnapshot(params) {
     try {
       this.validateWorkflowParams(params);
-      const { namespace, workflowName, runId } = params;
-      const key = this.getKey(TABLE_WORKFLOW_SNAPSHOT, { namespace, workflow_name: workflowName, run_id: runId });
-      const data = await this.getKV(TABLE_WORKFLOW_SNAPSHOT, key);
+      const { workflowName, runId } = params;
+      const key = this.operations.getKey(TABLE_WORKFLOW_SNAPSHOT, { workflow_name: workflowName, run_id: runId });
+      const data = await this.operations.getKV(TABLE_WORKFLOW_SNAPSHOT, key);
       if (!data) return null;
-      const state = this.normalizeWorkflowState(data.snapshot || data);
-      this.validateWorkflowState(state);
-      return state;
-    } catch (error) {
-      this.logger.error("Error loading workflow snapshot:", {
-        error: error instanceof Error ? error.message : String(error)
-      });
-      return null;
-    }
-  }
-  async batchInsert(input) {
-    if (!input.records || input.records.length === 0) return;
-    try {
-      await Promise.all(
-        input.records.map(async (record) => {
-          const key = this.getKey(input.tableName, record);
-          const processedRecord = {
-            ...record,
-            createdAt: record.createdAt ? this.serializeDate(record.createdAt) : void 0,
-            updatedAt: record.updatedAt ? this.serializeDate(record.updatedAt) : void 0,
-            metadata: record.metadata ? JSON.stringify(record.metadata) : void 0
-          };
-          await this.putKV({ tableName: input.tableName, key, value: processedRecord });
-        })
-      );
+      const snapshotData = typeof data.snapshot === "string" ? JSON.parse(data.snapshot) : data.snapshot;
+      return snapshotData;
     } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      this.logger.error("Error in batch insert:", { message });
-      throw error;
-    }
-  }
-  async getTraces({
-    name,
-    scope,
-    page = 0,
-    perPage = 100,
-    attributes,
-    fromDate,
-    toDate
-  }) {
-    try {
-      let keys;
-      if (this.bindings) {
-        keys = (await this.listKV(TABLE_TRACES))?.map((k) => k.name) || [];
-      } else {
-        const namespaceId = await this.getNamespaceId(TABLE_TRACES);
-        const result = await this.client.kv.namespaces.keys.list(namespaceId, {
-          prefix: "",
-          limit: 1e3,
-          account_id: this.accountId
-        });
-        keys = result.result?.map((k) => k.name) || [];
-      }
-      const traceRecords = await Promise.all(
-        keys.map(async (key) => {
-          const record = await this.getKV(TABLE_TRACES, key);
-          if (!record) return null;
-          return record;
-        })
-      );
-      let filteredTraces = traceRecords.filter(
-        (record) => record !== null && typeof record === "object"
+      const mastraError = new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_LOAD_WORKFLOW_SNAPSHOT_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Error loading workflow snapshot for workflow ${params.workflowName}, run ${params.runId}`,
+          details: {
+            workflowName: params.workflowName,
+            runId: params.runId
+          }
+        },
+        error
       );
-      if (name) {
-        filteredTraces = filteredTraces.filter((record) => record.name?.toLowerCase().startsWith(name.toLowerCase()));
-      }
-      if (scope) {
-        filteredTraces = filteredTraces.filter((record) => record.scope === scope);
-      }
-      if (attributes) {
-        filteredTraces = filteredTraces.filter((record) => {
-          if (!record.attributes) return false;
-          const recordAttrs = this.parseJSON(record.attributes);
-          if (!recordAttrs) return false;
-          return Object.entries(attributes).every(([key, value]) => recordAttrs[key] === value);
-        });
-      }
-      if (fromDate) {
-        filteredTraces = filteredTraces.filter((record) => new Date(record.createdAt).getTime() >= fromDate.getTime());
-      }
-      if (toDate) {
-        filteredTraces = filteredTraces.filter((record) => new Date(record.createdAt).getTime() <= toDate.getTime());
-      }
-      filteredTraces.sort((a, b) => {
-        const dateA = new Date(a.createdAt).getTime();
-        const dateB = new Date(b.createdAt).getTime();
-        return dateB - dateA;
-      });
-      const start = page * perPage;
-      const end = start + perPage;
-      const paginatedTraces = filteredTraces.slice(start, end);
-      return paginatedTraces.map((record) => ({
-        id: record.id,
-        parentSpanId: record.parentSpanId,
-        traceId: record.traceId,
-        name: record.name,
-        scope: record.scope,
-        kind: record.kind,
-        status: this.parseJSON(record.status),
-        events: this.parseJSON(record.events) || [],
-        links: this.parseJSON(record.links) || [],
-        attributes: this.parseJSON(record?.attributes) || {},
-        startTime: record.startTime,
-        endTime: record.endTime,
-        other: this.parseJSON(record.other) || {},
-        createdAt: record.createdAt
-      }));
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      this.logger.error("Failed to get traces:", { message });
-      return [];
-    }
-  }
-  parseJSON(value) {
-    if (typeof value === "string") {
-      try {
-        return JSON.parse(value);
-      } catch {
-        return value;
-      }
+      this.logger.trackException?.(mastraError);
+      this.logger.error(mastraError.toString());
+      return null;
     }
-    return value;
-  }
-  getEvalsByAgentName(_agentName, _type) {
-    throw new Error("Method not implemented.");
   }
   parseWorkflowRun(row) {
     let parsedSnapshot = row.snapshot;
@@ -1059,58 +1954,71 @@ var CloudflareStore = class extends MastraStorage {
       workflowName: row.workflow_name,
       runId: row.run_id,
       snapshot: parsedSnapshot,
-      createdAt: this.ensureDate(row.createdAt),
-      updatedAt: this.ensureDate(row.updatedAt),
+      createdAt: ensureDate(row.createdAt),
+      updatedAt: ensureDate(row.updatedAt),
       resourceId: row.resourceId
     };
   }
   buildWorkflowSnapshotPrefix({
-    namespace,
     workflowName,
     runId,
     resourceId
   }) {
-    const prefix = this.namespacePrefix ? `${this.namespacePrefix}:` : "";
+    const prefix = this.operations.namespacePrefix ? `${this.operations.namespacePrefix}:` : "";
     let key = `${prefix}${TABLE_WORKFLOW_SNAPSHOT}`;
-    if (namespace) key += `:${namespace}`;
     if (workflowName) key += `:${workflowName}`;
     if (runId) key += `:${runId}`;
     if (resourceId) key += `:${resourceId}`;
-    if (!resourceId && (runId || workflowName || namespace)) key += ":";
     return key;
   }
-  async getWorkflowRuns({
-    namespace,
+  async listWorkflowRuns({
     workflowName,
-    limit = 20,
-    offset = 0,
+    page = 0,
+    perPage = 20,
     resourceId,
     fromDate,
     toDate
   } = {}) {
     try {
-      const prefix = this.buildWorkflowSnapshotPrefix({ namespace, workflowName });
-      const keyObjs = await this.listKV(TABLE_WORKFLOW_SNAPSHOT, { prefix });
+      if (page < 0 || !Number.isInteger(page)) {
+        throw new MastraError(
+          {
+            id: "CLOUDFLARE_STORE_INVALID_PAGE",
+            domain: ErrorDomain.STORAGE,
+            category: ErrorCategory.USER,
+            details: { page }
+          },
+          new Error("page must be a non-negative integer")
+        );
+      }
+      const normalizedPerPage = normalizePerPage(perPage, 20);
+      const offset = page * normalizedPerPage;
+      const prefix = this.buildWorkflowSnapshotPrefix({ workflowName });
+      const keyObjs = await this.operations.listKV(TABLE_WORKFLOW_SNAPSHOT, { prefix });
       const runs = [];
       for (const { name: key } of keyObjs) {
         const parts = key.split(":");
         const idx = parts.indexOf(TABLE_WORKFLOW_SNAPSHOT);
-        if (idx === -1 || parts.length < idx + 4) continue;
-        const ns = parts[idx + 1];
-        const wfName = parts[idx + 2];
-        const keyResourceId = parts.length > idx + 4 ? parts[idx + 4] : void 0;
-        if (namespace && ns !== namespace || workflowName && wfName !== workflowName) continue;
-        if (resourceId && keyResourceId && keyResourceId !== resourceId) continue;
-        const data = await this.getKV(TABLE_WORKFLOW_SNAPSHOT, key);
+        if (idx === -1 || parts.length < idx + 3) continue;
+        const wfName = parts[idx + 1];
+        const keyResourceId = parts.length > idx + 3 ? parts[idx + 3] : void 0;
+        if (workflowName && wfName !== workflowName) continue;
+        if (resourceId && keyResourceId !== resourceId) continue;
+        const data = await this.operations.getKV(TABLE_WORKFLOW_SNAPSHOT, key);
         if (!data) continue;
         try {
-          if (resourceId && data.resourceId && data.resourceId !== resourceId) continue;
-          const createdAt = this.ensureDate(data.createdAt);
+          if (resourceId && !keyResourceId) continue;
+          const createdAt = ensureDate(data.createdAt);
           if (fromDate && createdAt && createdAt < fromDate) continue;
           if (toDate && createdAt && createdAt > toDate) continue;
-          const state = this.normalizeWorkflowState(data.snapshot || data);
-          this.validateWorkflowState(state);
-          const run = this.parseWorkflowRun({ ...data, snapshot: state });
+          const snapshotData = typeof data.snapshot === "string" ? JSON.parse(data.snapshot) : data.snapshot;
+          const resourceIdToUse = keyResourceId || data.resourceId;
+          const run = this.parseWorkflowRun({
+            ...data,
+            workflow_name: wfName,
+            resourceId: resourceIdToUse,
+            snapshot: snapshotData
+          });
           runs.push(run);
         } catch (err) {
           this.logger.error("Failed to parse workflow snapshot:", { key, error: err });
@@ -1121,43 +2029,318 @@ var CloudflareStore = class extends MastraStorage {
         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
       };
     } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      this.logger.error("Error in getWorkflowRuns:", { message });
+      const mastraError = new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_LIST_WORKFLOW_RUNS_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY
+        },
+        error
+      );
+      this.logger.trackException?.(mastraError);
+      this.logger.error(mastraError.toString());
       return { runs: [], total: 0 };
     }
   }
   async getWorkflowRunById({
-    namespace,
     runId,
     workflowName
   }) {
     try {
-      if (!runId || !workflowName || !namespace) {
-        throw new Error("runId, workflowName, and namespace are required");
+      if (!runId || !workflowName) {
+        throw new Error("runId, workflowName, are required");
       }
-      const prefix = this.buildWorkflowSnapshotPrefix({ namespace, workflowName, runId });
-      const keyObjs = await this.listKV(TABLE_WORKFLOW_SNAPSHOT, { prefix });
+      const prefix = this.buildWorkflowSnapshotPrefix({ workflowName, runId });
+      const keyObjs = await this.operations.listKV(TABLE_WORKFLOW_SNAPSHOT, { prefix });
       if (!keyObjs.length) return null;
-      const key = keyObjs[0]?.name;
-      const data = await this.getKV(TABLE_WORKFLOW_SNAPSHOT, key);
+      const exactKey = keyObjs.find((k) => {
+        const parts = k.name.split(":");
+        const idx = parts.indexOf(TABLE_WORKFLOW_SNAPSHOT);
+        if (idx === -1 || parts.length < idx + 3) return false;
+        const wfName = parts[idx + 1];
+        const rId = parts[idx + 2];
+        return wfName === workflowName && rId === runId;
+      });
+      if (!exactKey) return null;
+      const data = await this.operations.getKV(TABLE_WORKFLOW_SNAPSHOT, exactKey.name);
       if (!data) return null;
-      const state = this.normalizeWorkflowState(data.snapshot || data);
-      this.validateWorkflowState(state);
-      return this.parseWorkflowRun({ ...data, snapshot: state });
+      const snapshotData = typeof data.snapshot === "string" ? JSON.parse(data.snapshot) : data.snapshot;
+      return this.parseWorkflowRun({ ...data, snapshot: snapshotData });
     } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      this.logger.error("Error in getWorkflowRunById:", { message });
+      const mastraError = new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_GET_WORKFLOW_RUN_BY_ID_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            workflowName,
+            runId
+          }
+        },
+        error
+      );
+      this.logger.trackException?.(mastraError);
+      this.logger.error(mastraError.toString());
       return null;
     }
   }
+};
+
+// src/storage/types.ts
+function isWorkersConfig(config) {
+  return "bindings" in config;
+}
+
+// src/storage/index.ts
+var CloudflareStore = class extends MastraStorage {
+  stores;
+  client;
+  accountId;
+  namespacePrefix;
+  bindings;
+  validateWorkersConfig(config) {
+    if (!isWorkersConfig(config)) {
+      throw new Error("Invalid Workers API configuration");
+    }
+    if (!config.bindings) {
+      throw new Error("KV bindings are required when using Workers Binding API");
+    }
+    const requiredTables = [TABLE_THREADS, TABLE_MESSAGES, TABLE_WORKFLOW_SNAPSHOT, TABLE_SCORERS];
+    for (const table of requiredTables) {
+      if (!(table in config.bindings)) {
+        throw new Error(`Missing KV binding for table: ${table}`);
+      }
+    }
+  }
+  validateRestConfig(config) {
+    if (isWorkersConfig(config)) {
+      throw new Error("Invalid REST API configuration");
+    }
+    if (!config.accountId?.trim()) {
+      throw new Error("accountId is required for REST API");
+    }
+    if (!config.apiToken?.trim()) {
+      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" });
+    try {
+      if (isWorkersConfig(config)) {
+        this.validateWorkersConfig(config);
+        this.bindings = config.bindings;
+        this.namespacePrefix = config.keyPrefix?.trim() || "";
+        this.logger.info("Using Cloudflare KV Workers Binding API");
+      } else {
+        this.validateRestConfig(config);
+        this.accountId = config.accountId.trim();
+        this.namespacePrefix = config.namespacePrefix?.trim() || "";
+        this.client = new Cloudflare({
+          apiToken: config.apiToken.trim()
+        });
+        this.logger.info("Using Cloudflare KV REST API");
+      }
+      const operations = new StoreOperationsCloudflare({
+        accountId: this.accountId,
+        client: this.client,
+        namespacePrefix: this.namespacePrefix,
+        bindings: this.bindings
+      });
+      const workflows = new WorkflowsStorageCloudflare({
+        operations
+      });
+      const memory = new MemoryStorageCloudflare({
+        operations
+      });
+      const scores = new ScoresStorageCloudflare({
+        operations
+      });
+      this.stores = {
+        operations,
+        workflows,
+        memory,
+        scores
+      };
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_INIT_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY
+        },
+        error
+      );
+    }
+  }
+  async createTable({
+    tableName,
+    schema
+  }) {
+    return this.stores.operations.createTable({ tableName, schema });
+  }
+  async alterTable(_args) {
+    return this.stores.operations.alterTable(_args);
+  }
+  async clearTable({ tableName }) {
+    return this.stores.operations.clearTable({ tableName });
+  }
+  async dropTable({ tableName }) {
+    return this.stores.operations.dropTable({ tableName });
+  }
+  async insert({
+    tableName,
+    record
+  }) {
+    return this.stores.operations.insert({ tableName, record });
+  }
+  async load({ tableName, keys }) {
+    return this.stores.operations.load({ tableName, keys });
+  }
+  async getThreadById({ threadId }) {
+    return this.stores.memory.getThreadById({ threadId });
+  }
+  async saveThread({ thread }) {
+    return this.stores.memory.saveThread({ thread });
+  }
+  async updateThread({
+    id,
+    title,
+    metadata
+  }) {
+    return this.stores.memory.updateThread({ id, title, metadata });
+  }
+  async deleteThread({ threadId }) {
+    return this.stores.memory.deleteThread({ threadId });
+  }
+  async saveMessages(args) {
+    return this.stores.memory.saveMessages(args);
+  }
+  async getMessages({
+    threadId,
+    resourceId,
+    selectBy
+  }) {
+    return this.stores.memory.getMessages({ threadId, resourceId, selectBy });
+  }
+  async updateWorkflowResults({
+    workflowName,
+    runId,
+    stepId,
+    result,
+    requestContext
+  }) {
+    return this.stores.workflows.updateWorkflowResults({ workflowName, runId, stepId, result, requestContext });
+  }
+  async updateWorkflowState({
+    workflowName,
+    runId,
+    opts
+  }) {
+    return this.stores.workflows.updateWorkflowState({ workflowName, runId, opts });
+  }
+  async listMessagesById({ messageIds }) {
+    return this.stores.memory.listMessagesById({ messageIds });
+  }
+  async persistWorkflowSnapshot(params) {
+    return this.stores.workflows.persistWorkflowSnapshot(params);
+  }
+  async loadWorkflowSnapshot(params) {
+    return this.stores.workflows.loadWorkflowSnapshot(params);
+  }
+  async batchInsert(input) {
+    return this.stores.operations.batchInsert(input);
+  }
+  async listWorkflowRuns({
+    workflowName,
+    perPage = 20,
+    page = 0,
+    resourceId,
+    fromDate,
+    toDate
+  } = {}) {
+    return this.stores.workflows.listWorkflowRuns({
+      workflowName,
+      perPage,
+      page,
+      resourceId,
+      fromDate,
+      toDate
+    });
+  }
+  async getWorkflowRunById({
+    runId,
+    workflowName
+  }) {
+    return this.stores.workflows.getWorkflowRunById({ runId, workflowName });
+  }
+  async updateMessages(args) {
+    return this.stores.memory.updateMessages(args);
+  }
+  async getScoreById({ id }) {
+    return this.stores.scores.getScoreById({ id });
+  }
+  async saveScore(score) {
+    return this.stores.scores.saveScore(score);
+  }
+  async listScoresByRunId({
+    runId,
+    pagination
+  }) {
+    return this.stores.scores.listScoresByRunId({ runId, pagination });
+  }
+  async listScoresByEntityId({
+    entityId,
+    entityType,
+    pagination
+  }) {
+    return this.stores.scores.listScoresByEntityId({ entityId, entityType, pagination });
+  }
+  async listScoresByScorerId({
+    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 });
+  }
+  async saveResource({ resource }) {
+    return this.stores.memory.saveResource({ resource });
+  }
+  async updateResource({
+    resourceId,
+    workingMemory,
+    metadata
+  }) {
+    return this.stores.memory.updateResource({ resourceId, workingMemory, metadata });
+  }
   async close() {
   }
 };
 
 export { CloudflareStore };
+//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.js.map