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

package/dist/index.cjs

@@ -3,8 +3,9 @@
 var error = require('@mastra/core/error');
 var storage = require('@mastra/core/storage');
 var Cloudflare = require('cloudflare');
-var utils = require('@mastra/core/utils');
 var agent = require('@mastra/core/agent');
+var utils = require('@mastra/core/utils');
+var evals = require('@mastra/core/evals');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
@@ -247,16 +248,6 @@ function isArrayOfRecords(value) {
 }
 function deserializeValue(value, type) {
   if (value === null || value === void 0) return null;
-  if (type === "date" && typeof value === "string") {
-    return new Date(value);
-  }
-  if (type === "jsonb" && typeof value === "string") {
-    try {
-      return JSON.parse(value);
-    } catch {
-      return value;
-    }
-  }
   if (typeof value === "string" && (value.startsWith("{") || value.startsWith("["))) {
     try {
       return JSON.parse(value);
@@ -267,155 +258,7 @@ function deserializeValue(value, type) {
   return value;
 }
 
-// src/storage/domains/legacy-evals/index.ts
-var LegacyEvalsStorageD1 = class extends storage.LegacyEvalsStorage {
-  operations;
-  constructor({ operations }) {
-    super();
-    this.operations = operations;
-  }
-  async getEvals(options) {
-    const { agentName, type, page = 0, perPage = 40, dateRange } = options || {};
-    const fullTableName = this.operations.getTableName(storage.TABLE_EVALS);
-    const conditions = [];
-    const queryParams = [];
-    if (agentName) {
-      conditions.push(`agent_name = ?`);
-      queryParams.push(agentName);
-    }
-    if (type === "test") {
-      conditions.push(`(test_info IS NOT NULL AND json_extract(test_info, '$.testPath') IS NOT NULL)`);
-    } else if (type === "live") {
-      conditions.push(`(test_info IS NULL OR json_extract(test_info, '$.testPath') IS NULL)`);
-    }
-    if (dateRange?.start) {
-      conditions.push(`created_at >= ?`);
-      queryParams.push(storage.serializeDate(dateRange.start));
-    }
-    if (dateRange?.end) {
-      conditions.push(`created_at <= ?`);
-      queryParams.push(storage.serializeDate(dateRange.end));
-    }
-    const countQueryBuilder = createSqlBuilder().count().from(fullTableName);
-    if (conditions.length > 0) {
-      countQueryBuilder.where(conditions.join(" AND "), ...queryParams);
-    }
-    const { sql: countSql, params: countParams } = countQueryBuilder.build();
-    try {
-      const countResult = await this.operations.executeQuery({
-        sql: countSql,
-        params: countParams,
-        first: true
-      });
-      const total = Number(countResult?.count || 0);
-      const currentOffset = page * perPage;
-      if (total === 0) {
-        return {
-          evals: [],
-          total: 0,
-          page,
-          perPage,
-          hasMore: false
-        };
-      }
-      const dataQueryBuilder = createSqlBuilder().select("*").from(fullTableName);
-      if (conditions.length > 0) {
-        dataQueryBuilder.where(conditions.join(" AND "), ...queryParams);
-      }
-      dataQueryBuilder.orderBy("created_at", "DESC").limit(perPage).offset(currentOffset);
-      const { sql: dataSql, params: dataParams } = dataQueryBuilder.build();
-      const rows = await this.operations.executeQuery({
-        sql: dataSql,
-        params: dataParams
-      });
-      const evals = (isArrayOfRecords(rows) ? rows : []).map((row) => {
-        const result = deserializeValue(row.result);
-        const testInfo = row.test_info ? deserializeValue(row.test_info) : void 0;
-        if (!result || typeof result !== "object" || !("score" in result)) {
-          throw new Error(`Invalid MetricResult format: ${JSON.stringify(result)}`);
-        }
-        return {
-          input: row.input,
-          output: row.output,
-          result,
-          agentName: row.agent_name,
-          metricName: row.metric_name,
-          instructions: row.instructions,
-          testInfo,
-          globalRunId: row.global_run_id,
-          runId: row.run_id,
-          createdAt: row.created_at
-        };
-      });
-      const hasMore = currentOffset + evals.length < total;
-      return {
-        evals,
-        total,
-        page,
-        perPage,
-        hasMore
-      };
-    } catch (error$1) {
-      throw new error.MastraError(
-        {
-          id: "CLOUDFLARE_D1_STORAGE_GET_EVALS_ERROR",
-          domain: error.ErrorDomain.STORAGE,
-          category: error.ErrorCategory.THIRD_PARTY,
-          text: `Failed to retrieve evals for agent ${agentName}: ${error$1 instanceof Error ? error$1.message : String(error$1)}`,
-          details: { agentName: agentName ?? "", type: type ?? "" }
-        },
-        error$1
-      );
-    }
-  }
-  /**
-   * @deprecated use getEvals instead
-   */
-  async getEvalsByAgentName(agentName, type) {
-    const fullTableName = this.operations.getTableName(storage.TABLE_EVALS);
-    try {
-      let query = createSqlBuilder().select("*").from(fullTableName).where("agent_name = ?", agentName);
-      if (type === "test") {
-        query = query.andWhere("test_info IS NOT NULL AND json_extract(test_info, '$.testPath') IS NOT NULL");
-      } else if (type === "live") {
-        query = query.andWhere("(test_info IS NULL OR json_extract(test_info, '$.testPath') IS NULL)");
-      }
-      query.orderBy("created_at", "DESC");
-      const { sql, params } = query.build();
-      const results = await this.operations.executeQuery({ sql, params });
-      return isArrayOfRecords(results) ? results.map((row) => {
-        const result = deserializeValue(row.result);
-        const testInfo = row.test_info ? deserializeValue(row.test_info) : void 0;
-        return {
-          input: row.input || "",
-          output: row.output || "",
-          result,
-          agentName: row.agent_name || "",
-          metricName: row.metric_name || "",
-          instructions: row.instructions || "",
-          runId: row.run_id || "",
-          globalRunId: row.global_run_id || "",
-          createdAt: row.created_at || "",
-          testInfo
-        };
-      }) : [];
-    } catch (error$1) {
-      const mastraError = new error.MastraError(
-        {
-          id: "CLOUDFLARE_D1_STORAGE_GET_EVALS_ERROR",
-          domain: error.ErrorDomain.STORAGE,
-          category: error.ErrorCategory.THIRD_PARTY,
-          text: `Failed to retrieve evals for agent ${agentName}: ${error$1 instanceof Error ? error$1.message : String(error$1)}`,
-          details: { agentName }
-        },
-        error$1
-      );
-      this.logger?.error(mastraError.toString());
-      this.logger?.trackException(mastraError);
-      return [];
-    }
-  }
-};
+// src/storage/domains/memory/index.ts
 var MemoryStorageD1 = class extends storage.MemoryStorage {
   operations;
   constructor({ operations }) {
@@ -438,7 +281,7 @@ var MemoryStorageD1 = class extends storage.MemoryStorage {
     } catch (error$1) {
       const mastraError = new error.MastraError(
         {
-          id: "CLOUDFLARE_D1_STORAGE_GET_RESOURCE_BY_ID_ERROR",
+          id: storage.createStorageErrorId("CLOUDFLARE_D1", "GET_RESOURCE_BY_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           text: `Error processing resource ${resourceId}: ${error$1 instanceof Error ? error$1.message : String(error$1)}`,
@@ -477,7 +320,7 @@ var MemoryStorageD1 = class extends storage.MemoryStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_D1_STORAGE_SAVE_RESOURCE_ERROR",
+          id: storage.createStorageErrorId("CLOUDFLARE_D1", "SAVE_RESOURCE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           text: `Failed to save resource to ${fullTableName}: ${error$1 instanceof Error ? error$1.message : String(error$1)}`,
@@ -524,7 +367,7 @@ var MemoryStorageD1 = class extends storage.MemoryStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_D1_STORAGE_UPDATE_RESOURCE_ERROR",
+          id: storage.createStorageErrorId("CLOUDFLARE_D1", "UPDATE_RESOURCE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           text: `Failed to update resource ${resourceId}: ${error$1 instanceof Error ? error$1.message : String(error$1)}`,
@@ -550,7 +393,7 @@ var MemoryStorageD1 = class extends storage.MemoryStorage {
     } catch (error$1) {
       const mastraError = new error.MastraError(
         {
-          id: "CLOUDFLARE_D1_STORAGE_GET_THREAD_BY_ID_ERROR",
+          id: storage.createStorageErrorId("CLOUDFLARE_D1", "GET_THREAD_BY_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           text: `Error processing thread ${threadId}: ${error$1 instanceof Error ? error$1.message : String(error$1)}`,
@@ -563,39 +406,22 @@ var MemoryStorageD1 = class extends storage.MemoryStorage {
       return null;
     }
   }
-  /**
-   * @deprecated use getThreadsByResourceIdPaginated instead
-   */
-  async getThreadsByResourceId({ resourceId }) {
-    const fullTableName = this.operations.getTableName(storage.TABLE_THREADS);
-    try {
-      const query = createSqlBuilder().select("*").from(fullTableName).where("resourceId = ?", resourceId);
-      const { sql, params } = query.build();
-      const results = await this.operations.executeQuery({ sql, params });
-      return (isArrayOfRecords(results) ? results : []).map((thread) => ({
-        ...thread,
-        createdAt: storage.ensureDate(thread.createdAt),
-        updatedAt: storage.ensureDate(thread.updatedAt),
-        metadata: typeof thread.metadata === "string" ? JSON.parse(thread.metadata || "{}") : thread.metadata || {}
-      }));
-    } catch (error$1) {
-      const mastraError = new error.MastraError(
+  async listThreadsByResourceId(args) {
+    const { resourceId, page = 0, perPage: perPageInput, orderBy } = args;
+    const perPage = storage.normalizePerPage(perPageInput, 100);
+    if (page < 0) {
+      throw new error.MastraError(
         {
-          id: "CLOUDFLARE_D1_STORAGE_GET_THREADS_BY_RESOURCE_ID_ERROR",
+          id: storage.createStorageErrorId("CLOUDFLARE_D1", "LIST_THREADS_BY_RESOURCE_ID", "INVALID_PAGE"),
           domain: error.ErrorDomain.STORAGE,
-          category: error.ErrorCategory.THIRD_PARTY,
-          text: `Error getting threads by resourceId ${resourceId}: ${error$1 instanceof Error ? error$1.message : String(error$1)}`,
-          details: { resourceId }
+          category: error.ErrorCategory.USER,
+          details: { page }
         },
-        error$1
+        new Error("page must be >= 0")
       );
-      this.logger?.error(mastraError.toString());
-      this.logger?.trackException(mastraError);
-      return [];
     }
-  }
-  async getThreadsByResourceIdPaginated(args) {
-    const { resourceId, page, perPage } = args;
+    const { offset, perPage: perPageForResponse } = storage.calculatePagination(page, perPageInput, perPage);
+    const { field, direction } = this.parseOrderBy(orderBy);
     const fullTableName = this.operations.getTableName(storage.TABLE_THREADS);
     const mapRowToStorageThreadType = (row) => ({
       ...row,
@@ -607,20 +433,21 @@ var MemoryStorageD1 = class extends storage.MemoryStorage {
       const countQuery = createSqlBuilder().count().from(fullTableName).where("resourceId = ?", resourceId);
       const countResult = await this.operations.executeQuery(countQuery.build());
       const total = Number(countResult?.[0]?.count ?? 0);
-      const selectQuery = createSqlBuilder().select("*").from(fullTableName).where("resourceId = ?", resourceId).orderBy("createdAt", "DESC").limit(perPage).offset(page * perPage);
+      const limitValue = perPageInput === false ? total : perPage;
+      const selectQuery = createSqlBuilder().select("*").from(fullTableName).where("resourceId = ?", resourceId).orderBy(field, direction).limit(limitValue).offset(offset);
       const results = await this.operations.executeQuery(selectQuery.build());
       const threads = results.map(mapRowToStorageThreadType);
       return {
         threads,
         total,
         page,
-        perPage,
-        hasMore: page * perPage + threads.length < total
+        perPage: perPageForResponse,
+        hasMore: perPageInput === false ? false : offset + perPage < total
       };
     } catch (error$1) {
       const mastraError = new error.MastraError(
         {
-          id: "CLOUDFLARE_D1_STORAGE_GET_THREADS_BY_RESOURCE_ID_PAGINATED_ERROR",
+          id: storage.createStorageErrorId("CLOUDFLARE_D1", "LIST_THREADS_BY_RESOURCE_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           text: `Error getting threads by resourceId ${resourceId}: ${error$1 instanceof Error ? error$1.message : String(error$1)}`,
@@ -634,7 +461,7 @@ var MemoryStorageD1 = class extends storage.MemoryStorage {
         threads: [],
         total: 0,
         page,
-        perPage,
+        perPage: perPageForResponse,
         hasMore: false
       };
     }
@@ -667,7 +494,7 @@ var MemoryStorageD1 = class extends storage.MemoryStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_D1_STORAGE_SAVE_THREAD_ERROR",
+          id: storage.createStorageErrorId("CLOUDFLARE_D1", "SAVE_THREAD", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           text: `Failed to save thread to ${fullTableName}: ${error$1 instanceof Error ? error$1.message : String(error$1)}`,
@@ -710,7 +537,7 @@ var MemoryStorageD1 = class extends storage.MemoryStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_D1_STORAGE_UPDATE_THREAD_ERROR",
+          id: storage.createStorageErrorId("CLOUDFLARE_D1", "UPDATE_THREAD", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           text: `Failed to update thread ${id}: ${error$1 instanceof Error ? error$1.message : String(error$1)}`,
@@ -733,7 +560,7 @@ var MemoryStorageD1 = class extends storage.MemoryStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_D1_STORAGE_DELETE_THREAD_ERROR",
+          id: storage.createStorageErrorId("CLOUDFLARE_D1", "DELETE_THREAD", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           text: `Failed to delete thread ${threadId}: ${error$1 instanceof Error ? error$1.message : String(error$1)}`,
@@ -744,8 +571,8 @@ var MemoryStorageD1 = class extends storage.MemoryStorage {
     }
   }
   async saveMessages(args) {
-    const { messages, format = "v1" } = args;
-    if (messages.length === 0) return [];
+    const { messages } = args;
+    if (messages.length === 0) return { messages: [] };
     try {
       const now = /* @__PURE__ */ new Date();
       const threadId = messages[0]?.threadId;
@@ -793,12 +620,11 @@ var MemoryStorageD1 = class extends storage.MemoryStorage {
       ]);
       this.logger.debug(`Saved ${messages.length} messages`);
       const list = new agent.MessageList().add(messages, "memory");
-      if (format === `v2`) return list.get.all.v2();
-      return list.get.all.v1();
+      return { messages: list.get.all.db() };
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_D1_STORAGE_SAVE_MESSAGES_ERROR",
+          id: storage.createStorageErrorId("CLOUDFLARE_D1", "SAVE_MESSAGES", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           text: `Failed to save messages: ${error$1 instanceof Error ? error$1.message : String(error$1)}`
@@ -807,24 +633,25 @@ var MemoryStorageD1 = class extends storage.MemoryStorage {
       );
     }
   }
-  async _getIncludedMessages(threadId, selectBy) {
-    if (!threadId.trim()) throw new Error("threadId must be a non-empty string");
-    const include = selectBy?.include;
-    if (!include) return null;
+  async _getIncludedMessages(include) {
+    if (!include || include.length === 0) return null;
     const unionQueries = [];
     const params = [];
     let paramIdx = 1;
+    const tableName = this.operations.getTableName(storage.TABLE_MESSAGES);
     for (const inc of include) {
       const { id, withPreviousMessages = 0, withNextMessages = 0 } = inc;
-      const searchId = inc.threadId || threadId;
       unionQueries.push(`
                 SELECT * FROM (
-                  WITH ordered_messages AS (
+                  WITH target_thread AS (
+                    SELECT thread_id FROM ${tableName} WHERE id = ?
+                  ),
+                  ordered_messages AS (
                     SELECT
                       *,
                       ROW_NUMBER() OVER (ORDER BY createdAt ASC) AS row_num
-                    FROM ${this.operations.getTableName(storage.TABLE_MESSAGES)}
-                    WHERE thread_id = ?
+                    FROM ${tableName}
+                    WHERE thread_id = (SELECT thread_id FROM target_thread)
                   )
                   SELECT
                     m.id,
@@ -847,7 +674,7 @@ var MemoryStorageD1 = class extends storage.MemoryStorage {
                   )
                 ) AS query_${paramIdx}
             `);
-      params.push(searchId, id, id, withNextMessages, withPreviousMessages);
+      params.push(id, id, id, withNextMessages, withPreviousMessages);
       paramIdx++;
     }
     const finalQuery = unionQueries.join(" UNION ALL ") + " ORDER BY createdAt ASC";
@@ -865,74 +692,8 @@ var MemoryStorageD1 = class extends storage.MemoryStorage {
     });
     return processedMessages;
   }
-  async getMessages({
-    threadId,
-    resourceId,
-    selectBy,
-    format
-  }) {
-    try {
-      if (!threadId.trim()) throw new Error("threadId must be a non-empty string");
-      const fullTableName = this.operations.getTableName(storage.TABLE_MESSAGES);
-      const limit = storage.resolveMessageLimit({
-        last: selectBy?.last,
-        defaultLimit: 40
-      });
-      const include = selectBy?.include || [];
-      const messages = [];
-      if (include.length) {
-        const includeResult = await this._getIncludedMessages(threadId, selectBy);
-        if (Array.isArray(includeResult)) messages.push(...includeResult);
-      }
-      const excludeIds = messages.map((m) => m.id);
-      const query = createSqlBuilder().select(["id", "content", "role", "type", "createdAt", "thread_id AS threadId"]).from(fullTableName).where("thread_id = ?", threadId);
-      if (excludeIds.length > 0) {
-        query.andWhere(`id NOT IN (${excludeIds.map(() => "?").join(",")})`, ...excludeIds);
-      }
-      query.orderBy("createdAt", "DESC").limit(limit);
-      const { sql, params } = query.build();
-      const result = await this.operations.executeQuery({ sql, params });
-      if (Array.isArray(result)) messages.push(...result);
-      messages.sort((a, b) => {
-        const aRecord = a;
-        const bRecord = b;
-        const timeA = new Date(aRecord.createdAt).getTime();
-        const timeB = new Date(bRecord.createdAt).getTime();
-        return timeA - timeB;
-      });
-      const processedMessages = messages.map((message) => {
-        const processedMsg = {};
-        for (const [key, value] of Object.entries(message)) {
-          if (key === `type` && value === `v2`) continue;
-          processedMsg[key] = deserializeValue(value);
-        }
-        return processedMsg;
-      });
-      this.logger.debug(`Retrieved ${messages.length} messages for thread ${threadId}`);
-      const list = new agent.MessageList().add(processedMessages, "memory");
-      if (format === `v2`) return list.get.all.v2();
-      return list.get.all.v1();
-    } catch (error$1) {
-      const mastraError = new error.MastraError(
-        {
-          id: "CLOUDFLARE_D1_STORAGE_GET_MESSAGES_ERROR",
-          domain: error.ErrorDomain.STORAGE,
-          category: error.ErrorCategory.THIRD_PARTY,
-          text: `Failed to retrieve messages for thread ${threadId}: ${error$1 instanceof Error ? error$1.message : String(error$1)}`,
-          details: { threadId, resourceId: resourceId ?? "" }
-        },
-        error$1
-      );
-      this.logger?.error(mastraError.toString());
-      this.logger?.trackException(mastraError);
-      throw mastraError;
-    }
-  }
-  async getMessagesById({
-    messageIds,
-    format
-  }) {
-    if (messageIds.length === 0) return [];
+  async listMessagesById({ messageIds }) {
+    if (messageIds.length === 0) return { messages: [] };
     const fullTableName = this.operations.getTableName(storage.TABLE_MESSAGES);
     const messages = [];
     try {
@@ -951,12 +712,11 @@ var MemoryStorageD1 = class extends storage.MemoryStorage {
       });
       this.logger.debug(`Retrieved ${messages.length} messages`);
       const list = new agent.MessageList().add(processedMessages, "memory");
-      if (format === `v1`) return list.get.all.v1();
-      return list.get.all.v2();
+      return { messages: list.get.all.db() };
     } catch (error$1) {
       const mastraError = new error.MastraError(
         {
-          id: "CLOUDFLARE_D1_STORAGE_GET_MESSAGES_BY_ID_ERROR",
+          id: storage.createStorageErrorId("CLOUDFLARE_D1", "LIST_MESSAGES_BY_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           text: `Failed to retrieve messages by ID: ${error$1 instanceof Error ? error$1.message : String(error$1)}`,
@@ -969,118 +729,158 @@ var MemoryStorageD1 = class extends storage.MemoryStorage {
       throw mastraError;
     }
   }
-  async getMessagesPaginated({
-    threadId,
-    resourceId,
-    selectBy,
-    format
-  }) {
-    const { dateRange, page = 0, perPage: perPageInput } = selectBy?.pagination || {};
-    const { start: fromDate, end: toDate } = dateRange || {};
-    const perPage = perPageInput !== void 0 ? perPageInput : storage.resolveMessageLimit({ last: selectBy?.last, defaultLimit: 40 });
-    const fullTableName = this.operations.getTableName(storage.TABLE_MESSAGES);
-    const messages = [];
+  async listMessages(args) {
+    const { threadId, resourceId, include, filter, perPage: perPageInput, page = 0, orderBy } = args;
+    const threadIds = Array.isArray(threadId) ? threadId : [threadId];
+    if (threadIds.length === 0 || threadIds.some((id) => !id.trim())) {
+      throw new error.MastraError(
+        {
+          id: storage.createStorageErrorId("CLOUDFLARE_D1", "LIST_MESSAGES", "INVALID_THREAD_ID"),
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          details: { threadId: Array.isArray(threadId) ? threadId.join(",") : threadId }
+        },
+        new Error("threadId must be a non-empty string or array of non-empty strings")
+      );
+    }
+    if (page < 0) {
+      throw new error.MastraError(
+        {
+          id: storage.createStorageErrorId("CLOUDFLARE_D1", "LIST_MESSAGES", "INVALID_PAGE"),
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.USER,
+          details: { page }
+        },
+        new Error("page must be >= 0")
+      );
+    }
+    const perPage = storage.normalizePerPage(perPageInput, 40);
+    const { offset, perPage: perPageForResponse } = storage.calculatePagination(page, perPageInput, perPage);
     try {
-      if (!threadId.trim()) throw new Error("threadId must be a non-empty string");
-      if (selectBy?.include?.length) {
-        const includeResult = await this._getIncludedMessages(threadId, selectBy);
-        if (Array.isArray(includeResult)) messages.push(...includeResult);
+      const fullTableName = this.operations.getTableName(storage.TABLE_MESSAGES);
+      let query = `
+        SELECT id, content, role, type, createdAt, thread_id AS threadId, resourceId
+        FROM ${fullTableName}
+        WHERE thread_id = ?
+      `;
+      const queryParams = [threadId];
+      if (resourceId) {
+        query += ` AND resourceId = ?`;
+        queryParams.push(resourceId);
       }
-      const countQuery = createSqlBuilder().count().from(fullTableName).where("thread_id = ?", threadId);
-      if (fromDate) {
-        countQuery.andWhere("createdAt >= ?", storage.serializeDate(fromDate));
+      const dateRange = filter?.dateRange;
+      if (dateRange?.start) {
+        const startDate = dateRange.start instanceof Date ? storage.serializeDate(dateRange.start) : storage.serializeDate(new Date(dateRange.start));
+        query += ` AND createdAt >= ?`;
+        queryParams.push(startDate);
       }
-      if (toDate) {
-        countQuery.andWhere("createdAt <= ?", storage.serializeDate(toDate));
+      if (dateRange?.end) {
+        const endDate = dateRange.end instanceof Date ? storage.serializeDate(dateRange.end) : storage.serializeDate(new Date(dateRange.end));
+        query += ` AND createdAt <= ?`;
+        queryParams.push(endDate);
       }
-      const countResult = await this.operations.executeQuery(countQuery.build());
+      const { field, direction } = this.parseOrderBy(orderBy, "ASC");
+      query += ` ORDER BY "${field}" ${direction}`;
+      if (perPage !== Number.MAX_SAFE_INTEGER) {
+        query += ` LIMIT ? OFFSET ?`;
+        queryParams.push(perPage, offset);
+      }
+      const results = await this.operations.executeQuery({ sql: query, params: queryParams });
+      const paginatedMessages = (isArrayOfRecords(results) ? results : []).map((message) => {
+        const processedMsg = {};
+        for (const [key, value] of Object.entries(message)) {
+          if (key === `type` && value === `v2`) continue;
+          processedMsg[key] = deserializeValue(value);
+        }
+        return processedMsg;
+      });
+      const paginatedCount = paginatedMessages.length;
+      let countQuery = `SELECT count() as count FROM ${fullTableName} WHERE thread_id = ?`;
+      const countParams = [threadId];
+      if (resourceId) {
+        countQuery += ` AND resourceId = ?`;
+        countParams.push(resourceId);
+      }
+      if (dateRange?.start) {
+        const startDate = dateRange.start instanceof Date ? storage.serializeDate(dateRange.start) : storage.serializeDate(new Date(dateRange.start));
+        countQuery += ` AND createdAt >= ?`;
+        countParams.push(startDate);
+      }
+      if (dateRange?.end) {
+        const endDate = dateRange.end instanceof Date ? storage.serializeDate(dateRange.end) : storage.serializeDate(new Date(dateRange.end));
+        countQuery += ` AND createdAt <= ?`;
+        countParams.push(endDate);
+      }
+      const countResult = await this.operations.executeQuery({ sql: countQuery, params: countParams });
       const total = Number(countResult[0]?.count ?? 0);
-      if (total === 0 && messages.length === 0) {
+      if (total === 0 && paginatedCount === 0 && (!include || include.length === 0)) {
         return {
           messages: [],
           total: 0,
           page,
-          perPage,
+          perPage: perPageForResponse,
           hasMore: false
         };
       }
-      const excludeIds = messages.map((m) => m.id);
-      const excludeCondition = excludeIds.length > 0 ? `AND id NOT IN (${excludeIds.map(() => "?").join(",")})` : "";
-      let query;
-      let queryParams = [threadId];
-      if (fromDate) {
-        queryParams.push(storage.serializeDate(fromDate));
-      }
-      if (toDate) {
-        queryParams.push(storage.serializeDate(toDate));
-      }
-      if (excludeIds.length > 0) {
-        queryParams.push(...excludeIds);
-      }
-      if (selectBy?.last && selectBy.last > 0) {
-        query = `
-                    SELECT id, content, role, type, createdAt, thread_id AS threadId, resourceId
-                    FROM ${fullTableName}
-                    WHERE thread_id = ?
-                    ${fromDate ? "AND createdAt >= ?" : ""}
-                    ${toDate ? "AND createdAt <= ?" : ""}
-                    ${excludeCondition}
-                    ORDER BY createdAt DESC
-                    LIMIT ?
-                `;
-        queryParams.push(selectBy.last);
-      } else {
-        query = `
-                    SELECT id, content, role, type, createdAt, thread_id AS threadId, resourceId
-                    FROM ${fullTableName}
-                    WHERE thread_id = ?
-                    ${fromDate ? "AND createdAt >= ?" : ""}
-                    ${toDate ? "AND createdAt <= ?" : ""}
-                    ${excludeCondition}
-                    ORDER BY createdAt DESC
-                    LIMIT ? OFFSET ?
-                `;
-        queryParams.push(perPage, page * perPage);
+      const messageIds = new Set(paginatedMessages.map((m) => m.id));
+      let includeMessages = [];
+      if (include && include.length > 0) {
+        const includeResult = await this._getIncludedMessages(include);
+        if (Array.isArray(includeResult)) {
+          includeMessages = includeResult;
+          for (const includeMsg of includeMessages) {
+            if (!messageIds.has(includeMsg.id)) {
+              paginatedMessages.push(includeMsg);
+              messageIds.add(includeMsg.id);
+            }
+          }
+        }
       }
-      const results = await this.operations.executeQuery({ sql: query, params: queryParams });
-      const processedMessages = results.map((message) => {
-        const processedMsg = {};
-        for (const [key, value] of Object.entries(message)) {
-          if (key === `type` && value === `v2`) continue;
-          processedMsg[key] = deserializeValue(value);
+      const list = new agent.MessageList().add(paginatedMessages, "memory");
+      let finalMessages = list.get.all.db();
+      finalMessages = finalMessages.sort((a, b) => {
+        const isDateField = field === "createdAt" || field === "updatedAt";
+        const aValue = isDateField ? new Date(a[field]).getTime() : a[field];
+        const bValue = isDateField ? new Date(b[field]).getTime() : b[field];
+        if (aValue === bValue) {
+          return a.id.localeCompare(b.id);
         }
-        return processedMsg;
+        if (typeof aValue === "number" && typeof bValue === "number") {
+          return direction === "ASC" ? aValue - bValue : bValue - aValue;
+        }
+        return direction === "ASC" ? String(aValue).localeCompare(String(bValue)) : String(bValue).localeCompare(String(aValue));
       });
-      if (selectBy?.last) {
-        processedMessages.sort((a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime());
-      }
-      const list = new agent.MessageList().add(processedMessages, "memory");
-      messages.push(...format === `v2` ? list.get.all.v2() : list.get.all.v1());
+      const returnedThreadMessageIds = new Set(finalMessages.filter((m) => m.threadId === threadId).map((m) => m.id));
+      const allThreadMessagesReturned = returnedThreadMessageIds.size >= total;
+      const hasMore = perPageInput === false ? false : allThreadMessagesReturned ? false : offset + paginatedCount < total;
       return {
-        messages,
+        messages: finalMessages,
         total,
         page,
-        perPage,
-        hasMore: selectBy?.last ? false : page * perPage + messages.length < total
+        perPage: perPageForResponse,
+        hasMore
       };
     } catch (error$1) {
       const mastraError = new error.MastraError(
         {
-          id: "CLOUDFLARE_D1_STORAGE_GET_MESSAGES_PAGINATED_ERROR",
+          id: storage.createStorageErrorId("CLOUDFLARE_D1", "LIST_MESSAGES", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
-          text: `Failed to retrieve messages for thread ${threadId}: ${error$1 instanceof Error ? error$1.message : String(error$1)}`,
-          details: { threadId, resourceId: resourceId ?? "" }
+          text: `Failed to list messages for thread ${Array.isArray(threadId) ? threadId.join(",") : threadId}: ${error$1 instanceof Error ? error$1.message : String(error$1)}`,
+          details: {
+            threadId: Array.isArray(threadId) ? threadId.join(",") : threadId,
+            resourceId: resourceId ?? ""
+          }
         },
         error$1
       );
-      this.logger?.error(mastraError.toString());
-      this.logger?.trackException(mastraError);
+      this.logger?.error?.(mastraError.toString());
+      this.logger?.trackException?.(mastraError);
       return {
         messages: [],
         total: 0,
         page,
-        perPage,
+        perPage: perPageForResponse,
         hasMore: false
       };
     }
@@ -1176,7 +976,7 @@ var MemoryStorageD1 = class extends storage.MemoryStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_D1_STORAGE_UPDATE_MESSAGES_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE_D1", "UPDATE_MESSAGES", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { count: messages.length }
@@ -1245,7 +1045,7 @@ var StoreOperationsD1 = class extends storage.StoreOperations {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_D1_STORE_OPERATIONS_WORKERS_BINDING_QUERY_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE_D1", "WORKERS_BINDING_QUERY", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { sql }
@@ -1277,7 +1077,7 @@ var StoreOperationsD1 = class extends storage.StoreOperations {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_D1_STORE_OPERATIONS_REST_QUERY_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE_D1", "REST_QUERY", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { sql }
@@ -1358,7 +1158,7 @@ var StoreOperationsD1 = class extends storage.StoreOperations {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_D1_STORE_OPERATIONS_CREATE_TABLE_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE_D1", "CREATE_TABLE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { tableName }
@@ -1377,7 +1177,7 @@ var StoreOperationsD1 = class extends storage.StoreOperations {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_D1_STORE_OPERATIONS_CLEAR_TABLE_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE_D1", "CLEAR_TABLE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { tableName }
@@ -1395,7 +1195,7 @@ var StoreOperationsD1 = class extends storage.StoreOperations {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_D1_STORE_OPERATIONS_DROP_TABLE_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE_D1", "DROP_TABLE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { tableName }
@@ -1421,7 +1221,7 @@ var StoreOperationsD1 = class extends storage.StoreOperations {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_D1_STORE_OPERATIONS_ALTER_TABLE_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE_D1", "ALTER_TABLE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { tableName: args.tableName }
@@ -1442,7 +1242,7 @@ var StoreOperationsD1 = class extends storage.StoreOperations {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_D1_STORE_OPERATIONS_INSERT_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE_D1", "INSERT", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { tableName }
@@ -1466,7 +1266,7 @@ var StoreOperationsD1 = class extends storage.StoreOperations {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_D1_STORE_OPERATIONS_BATCH_INSERT_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE_D1", "BATCH_INSERT", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { tableName }
@@ -1503,7 +1303,7 @@ var StoreOperationsD1 = class extends storage.StoreOperations {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_D1_STORE_OPERATIONS_LOAD_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE_D1", "LOAD", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { tableName }
@@ -1561,7 +1361,7 @@ var StoreOperationsD1 = class extends storage.StoreOperations {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_D1_STORAGE_BATCH_UPSERT_ERROR",
+          id: storage.createStorageErrorId("CLOUDFLARE_D1", "BATCH_UPSERT", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           text: `Failed to batch upsert into ${tableName}: ${error$1 instanceof Error ? error$1.message : String(error$1)}`,
@@ -1573,19 +1373,12 @@ var StoreOperationsD1 = class extends storage.StoreOperations {
   }
 };
 function transformScoreRow(row) {
-  const deserialized = { ...row };
-  deserialized.input = storage.safelyParseJSON(row.input);
-  deserialized.output = storage.safelyParseJSON(row.output);
-  deserialized.scorer = storage.safelyParseJSON(row.scorer);
-  deserialized.preprocessStepResult = storage.safelyParseJSON(row.preprocessStepResult);
-  deserialized.analyzeStepResult = storage.safelyParseJSON(row.analyzeStepResult);
-  deserialized.metadata = storage.safelyParseJSON(row.metadata);
-  deserialized.additionalContext = storage.safelyParseJSON(row.additionalContext);
-  deserialized.runtimeContext = storage.safelyParseJSON(row.runtimeContext);
-  deserialized.entity = storage.safelyParseJSON(row.entity);
-  deserialized.createdAt = row.createdAtZ || row.createdAt;
-  deserialized.updatedAt = row.updatedAtZ || row.updatedAt;
-  return deserialized;
+  return storage.transformScoreRow(row, {
+    preferredTimestampFields: {
+      createdAt: "createdAtZ",
+      updatedAt: "updatedAtZ"
+    }
+  });
 }
 var ScoresStorageD1 = class extends storage.ScoresStorage {
   operations;
@@ -1606,7 +1399,7 @@ var ScoresStorageD1 = class extends storage.ScoresStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_D1_STORE_SCORES_GET_SCORE_BY_ID_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE_D1", "GET_SCORE_BY_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY
         },
@@ -1615,12 +1408,31 @@ var ScoresStorageD1 = class extends storage.ScoresStorage {
     }
   }
   async saveScore(score) {
+    let parsedScore;
+    try {
+      parsedScore = evals.saveScorePayloadSchema.parse(score);
+    } catch (error$1) {
+      throw new error.MastraError(
+        {
+          id: storage.createStorageErrorId("CLOUDFLARE_D1", "SAVE_SCORE", "VALIDATION_FAILED"),
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.USER,
+          details: {
+            scorer: score.scorer?.id ?? "unknown",
+            entityId: score.entityId ?? "unknown",
+            entityType: score.entityType ?? "unknown",
+            traceId: score.traceId ?? "",
+            spanId: score.spanId ?? ""
+          }
+        },
+        error$1
+      );
+    }
+    const id = crypto.randomUUID();
     try {
-      const id = crypto.randomUUID();
       const fullTableName = this.operations.getTableName(storage.TABLE_SCORERS);
-      const { input, ...rest } = score;
       const serializedRecord = {};
-      for (const [key, value] of Object.entries(rest)) {
+      for (const [key, value] of Object.entries(parsedScore)) {
         if (value !== null && value !== void 0) {
           if (typeof value === "object") {
             serializedRecord[key] = JSON.stringify(value);
@@ -1631,29 +1443,29 @@ var ScoresStorageD1 = class extends storage.ScoresStorage {
           serializedRecord[key] = null;
         }
       }
+      const now = /* @__PURE__ */ new Date();
       serializedRecord.id = id;
-      serializedRecord.input = JSON.stringify(input);
-      serializedRecord.createdAt = (/* @__PURE__ */ new Date()).toISOString();
-      serializedRecord.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+      serializedRecord.createdAt = now.toISOString();
+      serializedRecord.updatedAt = now.toISOString();
       const columns = Object.keys(serializedRecord);
       const values = Object.values(serializedRecord);
       const query = createSqlBuilder().insert(fullTableName, columns, values);
       const { sql, params } = query.build();
       await this.operations.executeQuery({ sql, params });
-      const scoreFromDb = await this.getScoreById({ id });
-      return { score: scoreFromDb };
+      return { score: { ...parsedScore, id, createdAt: now, updatedAt: now } };
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_D1_STORE_SCORES_SAVE_SCORE_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE_D1", "SAVE_SCORE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
-          category: error.ErrorCategory.THIRD_PARTY
+          category: error.ErrorCategory.THIRD_PARTY,
+          details: { id }
         },
         error$1
       );
     }
   }
-  async getScoresByScorerId({
+  async listScoresByScorerId({
     scorerId,
     entityId,
     entityType,
@@ -1661,6 +1473,9 @@ var ScoresStorageD1 = class extends storage.ScoresStorage {
     pagination
   }) {
     try {
+      const { page, perPage: perPageInput } = pagination;
+      const perPage = storage.normalizePerPage(perPageInput, 100);
+      const { offset: start, perPage: perPageForResponse } = storage.calculatePagination(page, perPageInput, perPage);
       const fullTableName = this.operations.getTableName(storage.TABLE_SCORERS);
       const countQuery = createSqlBuilder().count().from(fullTableName).where("scorerId = ?", scorerId);
       if (entityId) {
@@ -1678,13 +1493,15 @@ var ScoresStorageD1 = class extends storage.ScoresStorage {
         return {
           pagination: {
             total: 0,
-            page: pagination.page,
-            perPage: pagination.perPage,
+            page,
+            perPage: perPageForResponse,
             hasMore: false
           },
           scores: []
         };
       }
+      const end = perPageInput === false ? total : start + perPage;
+      const limitValue = perPageInput === false ? total : perPage;
       const selectQuery = createSqlBuilder().select("*").from(fullTableName).where("scorerId = ?", scorerId);
       if (entityId) {
         selectQuery.andWhere("entityId = ?", entityId);
@@ -1695,23 +1512,23 @@ var ScoresStorageD1 = class extends storage.ScoresStorage {
       if (source) {
         selectQuery.andWhere("source = ?", source);
       }
-      selectQuery.limit(pagination.perPage).offset(pagination.page * pagination.perPage);
+      selectQuery.limit(limitValue).offset(start);
       const { sql, params } = selectQuery.build();
       const results = await this.operations.executeQuery({ sql, params });
       const scores = Array.isArray(results) ? results.map(transformScoreRow) : [];
       return {
         pagination: {
           total,
-          page: pagination.page,
-          perPage: pagination.perPage,
-          hasMore: total > (pagination.page + 1) * pagination.perPage
+          page,
+          perPage: perPageForResponse,
+          hasMore: end < total
         },
         scores
       };
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_D1_STORE_SCORES_GET_SCORES_BY_SCORER_ID_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE_D1", "GET_SCORES_BY_SCORER_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY
         },
@@ -1719,11 +1536,14 @@ var ScoresStorageD1 = class extends storage.ScoresStorage {
       );
     }
   }
-  async getScoresByRunId({
+  async listScoresByRunId({
     runId,
     pagination
   }) {
     try {
+      const { page, perPage: perPageInput } = pagination;
+      const perPage = storage.normalizePerPage(perPageInput, 100);
+      const { offset: start, perPage: perPageForResponse } = storage.calculatePagination(page, perPageInput, perPage);
       const fullTableName = this.operations.getTableName(storage.TABLE_SCORERS);
       const countQuery = createSqlBuilder().count().from(fullTableName).where("runId = ?", runId);
       const countResult = await this.operations.executeQuery(countQuery.build());
@@ -1732,30 +1552,32 @@ var ScoresStorageD1 = class extends storage.ScoresStorage {
         return {
           pagination: {
             total: 0,
-            page: pagination.page,
-            perPage: pagination.perPage,
+            page,
+            perPage: perPageForResponse,
             hasMore: false
           },
           scores: []
         };
       }
-      const selectQuery = createSqlBuilder().select("*").from(fullTableName).where("runId = ?", runId).limit(pagination.perPage).offset(pagination.page * pagination.perPage);
+      const end = perPageInput === false ? total : start + perPage;
+      const limitValue = perPageInput === false ? total : perPage;
+      const selectQuery = createSqlBuilder().select("*").from(fullTableName).where("runId = ?", runId).limit(limitValue).offset(start);
       const { sql, params } = selectQuery.build();
       const results = await this.operations.executeQuery({ sql, params });
       const scores = Array.isArray(results) ? results.map(transformScoreRow) : [];
       return {
         pagination: {
           total,
-          page: pagination.page,
-          perPage: pagination.perPage,
-          hasMore: total > (pagination.page + 1) * pagination.perPage
+          page,
+          perPage: perPageForResponse,
+          hasMore: end < total
         },
         scores
       };
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_D1_STORE_SCORES_GET_SCORES_BY_RUN_ID_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE_D1", "GET_SCORES_BY_RUN_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY
         },
@@ -1763,12 +1585,15 @@ var ScoresStorageD1 = class extends storage.ScoresStorage {
       );
     }
   }
-  async getScoresByEntityId({
+  async listScoresByEntityId({
     entityId,
     entityType,
     pagination
   }) {
     try {
+      const { page, perPage: perPageInput } = pagination;
+      const perPage = storage.normalizePerPage(perPageInput, 100);
+      const { offset: start, perPage: perPageForResponse } = storage.calculatePagination(page, perPageInput, perPage);
       const fullTableName = this.operations.getTableName(storage.TABLE_SCORERS);
       const countQuery = createSqlBuilder().count().from(fullTableName).where("entityId = ?", entityId).andWhere("entityType = ?", entityType);
       const countResult = await this.operations.executeQuery(countQuery.build());
@@ -1777,30 +1602,32 @@ var ScoresStorageD1 = class extends storage.ScoresStorage {
         return {
           pagination: {
             total: 0,
-            page: pagination.page,
-            perPage: pagination.perPage,
+            page,
+            perPage: perPageForResponse,
             hasMore: false
           },
           scores: []
         };
       }
-      const selectQuery = createSqlBuilder().select("*").from(fullTableName).where("entityId = ?", entityId).andWhere("entityType = ?", entityType).limit(pagination.perPage).offset(pagination.page * pagination.perPage);
+      const end = perPageInput === false ? total : start + perPage;
+      const limitValue = perPageInput === false ? total : perPage;
+      const selectQuery = createSqlBuilder().select("*").from(fullTableName).where("entityId = ?", entityId).andWhere("entityType = ?", entityType).limit(limitValue).offset(start);
       const { sql, params } = selectQuery.build();
       const results = await this.operations.executeQuery({ sql, params });
       const scores = Array.isArray(results) ? results.map(transformScoreRow) : [];
       return {
         pagination: {
           total,
-          page: pagination.page,
-          perPage: pagination.perPage,
-          hasMore: total > (pagination.page + 1) * pagination.perPage
+          page,
+          perPage: perPageForResponse,
+          hasMore: end < total
         },
         scores
       };
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_D1_STORE_SCORES_GET_SCORES_BY_ENTITY_ID_FAILED",
+          id: storage.createStorageErrorId("CLOUDFLARE_D1", "GET_SCORES_BY_ENTITY_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY
         },
@@ -1808,128 +1635,56 @@ var ScoresStorageD1 = class extends storage.ScoresStorage {
       );
     }
   }
-};
-function isArrayOfRecords2(value) {
-  return value && Array.isArray(value) && value.length > 0;
-}
-var TracesStorageD1 = class extends storage.TracesStorage {
-  operations;
-  constructor({ operations }) {
-    super();
-    this.operations = operations;
-  }
-  async getTraces(args) {
-    const paginatedArgs = {
-      name: args.name,
-      scope: args.scope,
-      page: args.page,
-      perPage: args.perPage,
-      attributes: args.attributes,
-      filters: args.filters,
-      dateRange: args.fromDate || args.toDate ? {
-        start: args.fromDate,
-        end: args.toDate
-      } : void 0
-    };
-    try {
-      const result = await this.getTracesPaginated(paginatedArgs);
-      return result.traces;
-    } catch (error$1) {
-      throw new error.MastraError(
-        {
-          id: "CLOUDFLARE_D1_STORAGE_GET_TRACES_ERROR",
-          domain: error.ErrorDomain.STORAGE,
-          category: error.ErrorCategory.THIRD_PARTY,
-          text: `Failed to retrieve traces: ${error$1 instanceof Error ? error$1.message : String(error$1)}`,
-          details: {
-            name: args.name ?? "",
-            scope: args.scope ?? ""
-          }
-        },
-        error$1
-      );
-    }
-  }
-  async getTracesPaginated(args) {
-    const { name, scope, page = 0, perPage = 100, attributes, dateRange } = args;
-    const fromDate = dateRange?.start;
-    const toDate = dateRange?.end;
-    const fullTableName = this.operations.getTableName(storage.TABLE_TRACES);
+  async listScoresBySpan({
+    traceId,
+    spanId,
+    pagination
+  }) {
     try {
-      const dataQuery = createSqlBuilder().select("*").from(fullTableName).where("1=1");
-      const countQuery = createSqlBuilder().count().from(fullTableName).where("1=1");
-      if (name) {
-        dataQuery.andWhere("name LIKE ?", `%${name}%`);
-        countQuery.andWhere("name LIKE ?", `%${name}%`);
-      }
-      if (scope) {
-        dataQuery.andWhere("scope = ?", scope);
-        countQuery.andWhere("scope = ?", scope);
-      }
-      if (attributes && Object.keys(attributes).length > 0) {
-        for (const [key, value] of Object.entries(attributes)) {
-          dataQuery.jsonLike("attributes", key, value);
-          countQuery.jsonLike("attributes", key, value);
-        }
-      }
-      if (fromDate) {
-        const fromDateStr = fromDate instanceof Date ? fromDate.toISOString() : fromDate;
-        dataQuery.andWhere("createdAt >= ?", fromDateStr);
-        countQuery.andWhere("createdAt >= ?", fromDateStr);
-      }
-      if (toDate) {
-        const toDateStr = toDate instanceof Date ? toDate.toISOString() : toDate;
-        dataQuery.andWhere("createdAt <= ?", toDateStr);
-        countQuery.andWhere("createdAt <= ?", toDateStr);
-      }
-      const allDataResult = await this.operations.executeQuery(
-        createSqlBuilder().select("*").from(fullTableName).where("1=1").build()
-      );
-      console.log("allDataResult", allDataResult);
+      const { page, perPage: perPageInput } = pagination;
+      const perPage = storage.normalizePerPage(perPageInput, 100);
+      const { offset: start, perPage: perPageForResponse } = storage.calculatePagination(page, perPageInput, perPage);
+      const fullTableName = this.operations.getTableName(storage.TABLE_SCORERS);
+      const countQuery = createSqlBuilder().count().from(fullTableName).where("traceId = ?", traceId).andWhere("spanId = ?", spanId);
       const countResult = await this.operations.executeQuery(countQuery.build());
-      const total = Number(countResult?.[0]?.count ?? 0);
-      dataQuery.orderBy("startTime", "DESC").limit(perPage).offset(page * perPage);
-      const results = await this.operations.executeQuery(dataQuery.build());
-      const traces = isArrayOfRecords2(results) ? results.map(
-        (trace) => ({
-          ...trace,
-          attributes: deserializeValue(trace.attributes, "jsonb"),
-          status: deserializeValue(trace.status, "jsonb"),
-          events: deserializeValue(trace.events, "jsonb"),
-          links: deserializeValue(trace.links, "jsonb"),
-          other: deserializeValue(trace.other, "jsonb")
-        })
-      ) : [];
+      const total = Array.isArray(countResult) ? Number(countResult?.[0]?.count ?? 0) : Number(countResult?.count ?? 0);
+      if (total === 0) {
+        return {
+          pagination: {
+            total: 0,
+            page,
+            perPage: perPageForResponse,
+            hasMore: false
+          },
+          scores: []
+        };
+      }
+      const end = perPageInput === false ? total : start + perPage;
+      const limitValue = perPageInput === false ? total : perPage;
+      const selectQuery = createSqlBuilder().select("*").from(fullTableName).where("traceId = ?", traceId).andWhere("spanId = ?", spanId).orderBy("createdAt", "DESC").limit(limitValue).offset(start);
+      const { sql, params } = selectQuery.build();
+      const results = await this.operations.executeQuery({ sql, params });
+      const scores = Array.isArray(results) ? results.map(transformScoreRow) : [];
       return {
-        traces,
-        total,
-        page,
-        perPage,
-        hasMore: page * perPage + traces.length < total
+        pagination: {
+          total,
+          page,
+          perPage: perPageForResponse,
+          hasMore: end < total
+        },
+        scores
       };
     } catch (error$1) {
-      const mastraError = new error.MastraError(
+      throw new error.MastraError(
         {
-          id: "CLOUDFLARE_D1_STORAGE_GET_TRACES_PAGINATED_ERROR",
+          id: storage.createStorageErrorId("CLOUDFLARE_D1", "GET_SCORES_BY_SPAN", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
-          category: error.ErrorCategory.THIRD_PARTY,
-          text: `Failed to retrieve traces: ${error$1 instanceof Error ? error$1.message : String(error$1)}`,
-          details: { name: name ?? "", scope: scope ?? "" }
+          category: error.ErrorCategory.THIRD_PARTY
         },
         error$1
       );
-      this.logger?.error(mastraError.toString());
-      this.logger?.trackException(mastraError);
-      return { traces: [], total: 0, page, perPage, hasMore: false };
     }
   }
-  async batchTraceInsert({ records }) {
-    this.logger.debug("Batch inserting traces", { count: records.length });
-    await this.operations.batchInsert({
-      tableName: storage.TABLE_TRACES,
-      records
-    });
-  }
 };
 var WorkflowsStorageD1 = class extends storage.WorkflowsStorage {
   operations;
@@ -1942,7 +1697,7 @@ var WorkflowsStorageD1 = class extends storage.WorkflowsStorage {
     // runId,
     // stepId,
     // result,
-    // runtimeContext,
+    // requestContext,
   }) {
     throw new Error("Method not implemented.");
   }
@@ -1993,7 +1748,7 @@ var WorkflowsStorageD1 = class extends storage.WorkflowsStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_D1_STORAGE_PERSIST_WORKFLOW_SNAPSHOT_ERROR",
+          id: storage.createStorageErrorId("CLOUDFLARE_D1", "PERSIST_WORKFLOW_SNAPSHOT", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           text: `Failed to persist workflow snapshot: ${error$1 instanceof Error ? error$1.message : String(error$1)}`,
@@ -2018,7 +1773,7 @@ var WorkflowsStorageD1 = class extends storage.WorkflowsStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_D1_STORAGE_LOAD_WORKFLOW_SNAPSHOT_ERROR",
+          id: storage.createStorageErrorId("CLOUDFLARE_D1", "LOAD_WORKFLOW_SNAPSHOT", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           text: `Failed to load workflow snapshot: ${error$1 instanceof Error ? error$1.message : String(error$1)}`,
@@ -2046,19 +1801,24 @@ var WorkflowsStorageD1 = class extends storage.WorkflowsStorage {
       resourceId: row.resourceId
     };
   }
-  async getWorkflowRuns({
+  async listWorkflowRuns({
     workflowName,
     fromDate,
     toDate,
-    limit,
-    offset,
-    resourceId
+    page,
+    perPage,
+    resourceId,
+    status
   } = {}) {
     const fullTableName = this.operations.getTableName(storage.TABLE_WORKFLOW_SNAPSHOT);
     try {
       const builder = createSqlBuilder().select().from(fullTableName);
       const countBuilder = createSqlBuilder().count().from(fullTableName);
       if (workflowName) builder.whereAnd("workflow_name = ?", workflowName);
+      if (status) {
+        builder.whereAnd("json_extract(snapshot, '$.status') = ?", status);
+        countBuilder.whereAnd("json_extract(snapshot, '$.status') = ?", status);
+      }
       if (resourceId) {
         const hasResourceId = await this.operations.hasColumn(fullTableName, "resourceId");
         if (hasResourceId) {
@@ -2077,11 +1837,14 @@ var WorkflowsStorageD1 = class extends storage.WorkflowsStorage {
         countBuilder.whereAnd("createdAt <= ?", toDate instanceof Date ? toDate.toISOString() : toDate);
       }
       builder.orderBy("createdAt", "DESC");
-      if (typeof limit === "number") builder.limit(limit);
-      if (typeof offset === "number") builder.offset(offset);
+      if (typeof perPage === "number" && typeof page === "number") {
+        const offset = page * perPage;
+        builder.limit(perPage);
+        builder.offset(offset);
+      }
       const { sql, params } = builder.build();
       let total = 0;
-      if (limit !== void 0 && offset !== void 0) {
+      if (perPage !== void 0 && page !== void 0) {
         const { sql: countSql, params: countParams } = countBuilder.build();
         const countResult = await this.operations.executeQuery({
           sql: countSql,
@@ -2096,7 +1859,7 @@ var WorkflowsStorageD1 = class extends storage.WorkflowsStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_D1_STORAGE_GET_WORKFLOW_RUNS_ERROR",
+          id: storage.createStorageErrorId("CLOUDFLARE_D1", "LIST_WORKFLOW_RUNS", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           text: `Failed to retrieve workflow runs: ${error$1 instanceof Error ? error$1.message : String(error$1)}`,
@@ -2133,7 +1896,7 @@ var WorkflowsStorageD1 = class extends storage.WorkflowsStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_D1_STORAGE_GET_WORKFLOW_RUN_BY_ID_ERROR",
+          id: storage.createStorageErrorId("CLOUDFLARE_D1", "GET_WORKFLOW_RUN_BY_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           text: `Failed to retrieve workflow run by ID: ${error$1 instanceof Error ? error$1.message : String(error$1)}`,
@@ -2143,6 +1906,25 @@ var WorkflowsStorageD1 = class extends storage.WorkflowsStorage {
       );
     }
   }
+  async deleteWorkflowRunById({ runId, workflowName }) {
+    const fullTableName = this.operations.getTableName(storage.TABLE_WORKFLOW_SNAPSHOT);
+    try {
+      const sql = `DELETE FROM ${fullTableName} WHERE workflow_name = ? AND run_id = ?`;
+      const params = [workflowName, runId];
+      await this.operations.executeQuery({ sql, params });
+    } catch (error$1) {
+      throw new error.MastraError(
+        {
+          id: storage.createStorageErrorId("CLOUDFLARE_D1", "DELETE_WORKFLOW_RUN_BY_ID", "FAILED"),
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          text: `Failed to delete workflow run by ID: ${error$1 instanceof Error ? error$1.message : String(error$1)}`,
+          details: { runId, workflowName }
+        },
+        error$1
+      );
+    }
+  }
 };
 
 // src/storage/index.ts
@@ -2158,7 +1940,7 @@ var D1Store = class extends storage.MastraStorage {
    */
   constructor(config) {
     try {
-      super({ name: "D1" });
+      super({ id: config.id, name: "D1", disableInit: config.disableInit });
       if (config.tablePrefix && !/^[a-zA-Z0-9_]*$/.test(config.tablePrefix)) {
         throw new Error("Invalid tablePrefix: only letters, numbers, and underscores are allowed.");
       }
@@ -2196,7 +1978,7 @@ var D1Store = class extends storage.MastraStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "CLOUDFLARE_D1_STORAGE_INITIALIZATION_ERROR",
+          id: storage.createStorageErrorId("CLOUDFLARE_D1", "INITIALIZATION", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.SYSTEM,
           text: "Error initializing D1Store"
@@ -2212,12 +1994,6 @@ var D1Store = class extends storage.MastraStorage {
     const scores = new ScoresStorageD1({
       operations
     });
-    const legacyEvals = new LegacyEvalsStorageD1({
-      operations
-    });
-    const traces = new TracesStorageD1({
-      operations
-    });
     const workflows = new WorkflowsStorageD1({
       operations
     });
@@ -2227,8 +2003,6 @@ var D1Store = class extends storage.MastraStorage {
     this.stores = {
       operations,
       scores,
-      legacyEvals,
-      traces,
       workflows,
       memory
     };
@@ -2239,7 +2013,8 @@ var D1Store = class extends storage.MastraStorage {
       resourceWorkingMemory: true,
       hasColumn: true,
       createTable: true,
-      deleteMessages: false
+      deleteMessages: false,
+      listScoresBySpan: true
     };
   }
   async createTable({
@@ -2279,15 +2054,6 @@ var D1Store = class extends storage.MastraStorage {
   async getThreadById({ threadId }) {
     return this.stores.memory.getThreadById({ threadId });
   }
-  /**
-   * @deprecated use getThreadsByResourceIdPaginated instead
-   */
-  async getThreadsByResourceId({ resourceId }) {
-    return this.stores.memory.getThreadsByResourceId({ resourceId });
-  }
-  async getThreadsByResourceIdPaginated(args) {
-    return this.stores.memory.getThreadsByResourceIdPaginated(args);
-  }
   async saveThread({ thread }) {
     return this.stores.memory.saveThread({ thread });
   }
@@ -2304,34 +2070,14 @@ var D1Store = class extends storage.MastraStorage {
   async saveMessages(args) {
     return this.stores.memory.saveMessages(args);
   }
-  async getMessages({
-    threadId,
-    selectBy,
-    format
-  }) {
-    return this.stores.memory.getMessages({ threadId, selectBy, format });
-  }
-  async getMessagesById({
-    messageIds,
-    format
-  }) {
-    return this.stores.memory.getMessagesById({ messageIds, format });
-  }
-  async getMessagesPaginated({
-    threadId,
-    selectBy,
-    format
-  }) {
-    return this.stores.memory.getMessagesPaginated({ threadId, selectBy, format });
-  }
   async updateWorkflowResults({
     workflowName,
     runId,
     stepId,
     result,
-    runtimeContext
+    requestContext
   }) {
-    return this.stores.workflows.updateWorkflowResults({ workflowName, runId, stepId, result, runtimeContext });
+    return this.stores.workflows.updateWorkflowResults({ workflowName, runId, stepId, result, requestContext });
   }
   async updateWorkflowState({
     workflowName,
@@ -2351,15 +2097,8 @@ var D1Store = class extends storage.MastraStorage {
   async loadWorkflowSnapshot(params) {
     return this.stores.workflows.loadWorkflowSnapshot(params);
   }
-  async getWorkflowRuns({
-    workflowName,
-    fromDate,
-    toDate,
-    limit,
-    offset,
-    resourceId
-  } = {}) {
-    return this.stores.workflows.getWorkflowRuns({ workflowName, fromDate, toDate, limit, offset, resourceId });
+  async listWorkflowRuns(args = {}) {
+    return this.stores.workflows.listWorkflowRuns(args);
   }
   async getWorkflowRunById({
     runId,
@@ -2367,6 +2106,9 @@ var D1Store = class extends storage.MastraStorage {
   }) {
     return this.stores.workflows.getWorkflowRunById({ runId, workflowName });
   }
+  async deleteWorkflowRunById({ runId, workflowName }) {
+    return this.stores.workflows.deleteWorkflowRunById({ runId, workflowName });
+  }
   /**
    * Insert multiple records in a batch operation
    * @param tableName The table to insert into
@@ -2375,24 +2117,6 @@ var D1Store = class extends storage.MastraStorage {
   async batchInsert({ tableName, records }) {
     return this.stores.operations.batchInsert({ tableName, records });
   }
-  /**
-   * @deprecated use getTracesPaginated instead
-   */
-  async getTraces(args) {
-    return this.stores.traces.getTraces(args);
-  }
-  async getTracesPaginated(args) {
-    return this.stores.traces.getTracesPaginated(args);
-  }
-  /**
-   * @deprecated use getEvals instead
-   */
-  async getEvalsByAgentName(agentName, type) {
-    return this.stores.legacyEvals.getEvalsByAgentName(agentName, type);
-  }
-  async getEvals(options) {
-    return this.stores.legacyEvals.getEvals(options);
-  }
   async updateMessages(_args) {
     return this.stores.memory.updateMessages(_args);
   }
@@ -2412,34 +2136,41 @@ var D1Store = class extends storage.MastraStorage {
   async getScoreById({ id: _id }) {
     return this.stores.scores.getScoreById({ id: _id });
   }
-  async saveScore(_score) {
-    return this.stores.scores.saveScore(_score);
+  async saveScore(score) {
+    return this.stores.scores.saveScore(score);
   }
-  async getScoresByRunId({
+  async listScoresByRunId({
     runId: _runId,
     pagination: _pagination
   }) {
-    return this.stores.scores.getScoresByRunId({ runId: _runId, pagination: _pagination });
+    return this.stores.scores.listScoresByRunId({ runId: _runId, pagination: _pagination });
   }
-  async getScoresByEntityId({
+  async listScoresByEntityId({
     entityId: _entityId,
     entityType: _entityType,
     pagination: _pagination
   }) {
-    return this.stores.scores.getScoresByEntityId({
+    return this.stores.scores.listScoresByEntityId({
       entityId: _entityId,
       entityType: _entityType,
       pagination: _pagination
     });
   }
-  async getScoresByScorerId({
+  async listScoresByScorerId({
     scorerId,
     pagination,
     entityId,
     entityType,
     source
   }) {
-    return this.stores.scores.getScoresByScorerId({ scorerId, pagination, entityId, entityType, source });
+    return this.stores.scores.listScoresByScorerId({ scorerId, pagination, entityId, entityType, source });
+  }
+  async listScoresBySpan({
+    traceId,
+    spanId,
+    pagination
+  }) {
+    return this.stores.scores.listScoresBySpan({ traceId, spanId, pagination });
   }
   /**
    * Close the database connection