@mastra/cloudflare-d1 0.0.0-taofeeqInngest-20250603090617 → 0.0.0-tool-call-parts-20250630193309

package/dist/index.js

@@ -1,4 +1,5 @@
 import { MessageList } from '@mastra/core/agent';
+import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
 import { MastraStorage, TABLE_THREADS, TABLE_MESSAGES, TABLE_WORKFLOW_SNAPSHOT, TABLE_TRACES, TABLE_EVALS } from '@mastra/core/storage';
 import Cloudflare from 'cloudflare';
 import { parseSqlIdentifier } from '@mastra/core/utils';
@@ -250,27 +251,39 @@ var D1Store = class extends MastraStorage {
    * @param config Configuration for D1 access (either REST API or Workers Binding API)
    */
   constructor(config) {
-    super({ name: "D1" });
-    if (config.tablePrefix && !/^[a-zA-Z0-9_]*$/.test(config.tablePrefix)) {
-      throw new Error("Invalid tablePrefix: only letters, numbers, and underscores are allowed.");
-    }
-    this.tablePrefix = config.tablePrefix || "";
-    if ("binding" in config) {
-      if (!config.binding) {
-        throw new Error("D1 binding is required when using Workers Binding API");
+    try {
+      super({ name: "D1" });
+      if (config.tablePrefix && !/^[a-zA-Z0-9_]*$/.test(config.tablePrefix)) {
+        throw new Error("Invalid tablePrefix: only letters, numbers, and underscores are allowed.");
       }
-      this.binding = config.binding;
-      this.logger.info("Using D1 Workers Binding API");
-    } else {
-      if (!config.accountId || !config.databaseId || !config.apiToken) {
-        throw new Error("accountId, databaseId, and apiToken are required when using REST API");
+      this.tablePrefix = config.tablePrefix || "";
+      if ("binding" in config) {
+        if (!config.binding) {
+          throw new Error("D1 binding is required when using Workers Binding API");
+        }
+        this.binding = config.binding;
+        this.logger.info("Using D1 Workers Binding API");
+      } else {
+        if (!config.accountId || !config.databaseId || !config.apiToken) {
+          throw new Error("accountId, databaseId, and apiToken are required when using REST API");
+        }
+        this.accountId = config.accountId;
+        this.databaseId = config.databaseId;
+        this.client = new Cloudflare({
+          apiToken: config.apiToken
+        });
+        this.logger.info("Using D1 REST API");
       }
-      this.accountId = config.accountId;
-      this.databaseId = config.databaseId;
-      this.client = new Cloudflare({
-        apiToken: config.apiToken
-      });
-      this.logger.info("Using D1 REST API");
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_D1_STORAGE_INITIALIZATION_ERROR",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.SYSTEM,
+          text: "Error initializing D1Store"
+        },
+        error
+      );
     }
   }
   // Helper method to get the full table name with prefix
@@ -383,34 +396,25 @@ var D1Store = class extends MastraStorage {
       throw new Error(`D1 query error: ${error.message}`);
     }
   }
-  // Helper to convert storage type to SQL type
-  getSqlType(type) {
-    switch (type) {
-      case "text":
-        return "TEXT";
-      case "timestamp":
-        return "TIMESTAMP";
-      case "integer":
-        return "INTEGER";
-      case "bigint":
-        return "INTEGER";
-      // SQLite doesn't have a separate BIGINT type
-      case "jsonb":
-        return "TEXT";
-      // Store JSON as TEXT in SQLite
-      default:
-        return "TEXT";
+  // Helper to get existing table columns
+  async getTableColumns(tableName) {
+    try {
+      const sql = `PRAGMA table_info(${tableName})`;
+      const result = await this.executeQuery({ sql, params: [] });
+      if (!result || !Array.isArray(result)) {
+        return [];
+      }
+      return result.map((row) => ({
+        name: row.name,
+        type: row.type
+      }));
+    } catch (error) {
+      this.logger.error(`Error getting table columns for ${tableName}:`, {
+        message: error instanceof Error ? error.message : String(error)
+      });
+      return [];
     }
   }
-  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();
-  }
   // Helper to serialize objects to JSON strings
   serializeValue(value) {
     if (value === null || value === void 0) return null;
@@ -444,6 +448,18 @@ var D1Store = class extends MastraStorage {
     }
     return value;
   }
+  getSqlType(type) {
+    switch (type) {
+      case "bigint":
+        return "INTEGER";
+      // SQLite uses INTEGER for all integer sizes
+      case "jsonb":
+        return "TEXT";
+      // Store JSON as TEXT in SQLite
+      default:
+        return super.getSqlType(type);
+    }
+  }
   async createTable({
     tableName,
     schema
@@ -459,16 +475,64 @@ var D1Store = class extends MastraStorage {
     if (tableName === TABLE_WORKFLOW_SNAPSHOT) {
       tableConstraints.push("UNIQUE (workflow_name, run_id)");
     }
-    const query = createSqlBuilder().createTable(fullTableName, columnDefinitions, tableConstraints);
-    const { sql, params } = query.build();
     try {
+      const query = createSqlBuilder().createTable(fullTableName, columnDefinitions, tableConstraints);
+      const { sql, params } = query.build();
       await this.executeQuery({ sql, params });
       this.logger.debug(`Created table ${fullTableName}`);
     } catch (error) {
       this.logger.error(`Error creating table ${fullTableName}:`, {
         message: error instanceof Error ? error.message : String(error)
       });
-      throw new Error(`Failed to create table ${fullTableName}: ${error}`);
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_D1_STORAGE_CREATE_TABLE_ERROR",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Failed to create table ${fullTableName}: ${error instanceof Error ? error.message : String(error)}`,
+          details: { tableName }
+        },
+        error
+      );
+    }
+  }
+  /**
+   * Alters table schema to add columns if they don't exist
+   * @param tableName Name of the table
+   * @param schema Schema of the table
+   * @param ifNotExists Array of column names to add if they don't exist
+   */
+  async alterTable({
+    tableName,
+    schema,
+    ifNotExists
+  }) {
+    const fullTableName = this.getTableName(tableName);
+    try {
+      const existingColumns = await this.getTableColumns(fullTableName);
+      const existingColumnNames = new Set(existingColumns.map((col) => col.name.toLowerCase()));
+      for (const columnName of ifNotExists) {
+        if (!existingColumnNames.has(columnName.toLowerCase()) && schema[columnName]) {
+          const columnDef = schema[columnName];
+          const sqlType = this.getSqlType(columnDef.type);
+          const nullable = columnDef.nullable === false ? "NOT NULL" : "";
+          const defaultValue = columnDef.nullable === false ? this.getDefaultValue(columnDef.type) : "";
+          const alterSql = `ALTER TABLE ${fullTableName} ADD COLUMN ${columnName} ${sqlType} ${nullable} ${defaultValue}`.trim();
+          await this.executeQuery({ sql: alterSql, params: [] });
+          this.logger.debug(`Added column ${columnName} to table ${fullTableName}`);
+        }
+      }
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_D1_STORAGE_ALTER_TABLE_ERROR",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Failed to alter table ${fullTableName}: ${error instanceof Error ? error.message : String(error)}`,
+          details: { tableName }
+        },
+        error
+      );
     }
   }
   async clearTable({ tableName }) {
@@ -479,10 +543,16 @@ var D1Store = class extends MastraStorage {
       await this.executeQuery({ sql, params });
       this.logger.debug(`Cleared table ${fullTableName}`);
     } catch (error) {
-      this.logger.error(`Error clearing table ${fullTableName}:`, {
-        message: error instanceof Error ? error.message : String(error)
-      });
-      throw new Error(`Failed to clear table ${fullTableName}: ${error}`);
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_D1_STORAGE_CLEAR_TABLE_ERROR",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Failed to clear table ${fullTableName}: ${error instanceof Error ? error.message : String(error)}`,
+          details: { tableName }
+        },
+        error
+      );
     }
   }
   async processRecord(record) {
@@ -502,9 +572,16 @@ var D1Store = class extends MastraStorage {
     try {
       await this.executeQuery({ sql, params });
     } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      this.logger.error(`Error inserting into ${fullTableName}:`, { message });
-      throw new Error(`Failed to insert into ${fullTableName}: ${error}`);
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_D1_STORAGE_INSERT_ERROR",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Failed to insert into ${fullTableName}: ${error instanceof Error ? error.message : String(error)}`,
+          details: { tableName }
+        },
+        error
+      );
     }
   }
   async load({ tableName, keys }) {
@@ -530,10 +607,16 @@ var D1Store = class extends MastraStorage {
       }
       return processedResult;
     } catch (error) {
-      this.logger.error(`Error loading from ${fullTableName}:`, {
-        message: error instanceof Error ? error.message : String(error)
-      });
-      return null;
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_D1_STORAGE_LOAD_ERROR",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Failed to load from ${fullTableName}: ${error instanceof Error ? error.message : String(error)}`,
+          details: { tableName }
+        },
+        error
+      );
     }
   }
   async getThreadById({ threadId }) {
@@ -550,12 +633,24 @@ var D1Store = class extends MastraStorage {
         metadata: typeof thread.metadata === "string" ? JSON.parse(thread.metadata || "{}") : thread.metadata || {}
       };
     } catch (error) {
-      this.logger.error(`Error processing thread ${threadId}:`, {
-        message: error instanceof Error ? error.message : String(error)
-      });
+      const mastraError = new MastraError(
+        {
+          id: "CLOUDFLARE_D1_STORAGE_GET_THREAD_BY_ID_ERROR",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Error processing thread ${threadId}: ${error instanceof Error ? error.message : String(error)}`,
+          details: { threadId }
+        },
+        error
+      );
+      this.logger?.error(mastraError.toString());
+      this.logger?.trackException(mastraError);
       return null;
     }
   }
+  /**
+   * @deprecated use getThreadsByResourceIdPaginated instead
+   */
   async getThreadsByResourceId({ resourceId }) {
     const fullTableName = this.getTableName(TABLE_THREADS);
     try {
@@ -569,12 +664,66 @@ var D1Store = class extends MastraStorage {
         metadata: typeof thread.metadata === "string" ? JSON.parse(thread.metadata || "{}") : thread.metadata || {}
       }));
     } catch (error) {
-      this.logger.error(`Error getting threads by resourceId ${resourceId}:`, {
-        message: error instanceof Error ? error.message : String(error)
-      });
+      const mastraError = new MastraError(
+        {
+          id: "CLOUDFLARE_D1_STORAGE_GET_THREADS_BY_RESOURCE_ID_ERROR",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Error getting threads by resourceId ${resourceId}: ${error instanceof Error ? error.message : String(error)}`,
+          details: { resourceId }
+        },
+        error
+      );
+      this.logger?.error(mastraError.toString());
+      this.logger?.trackException(mastraError);
       return [];
     }
   }
+  async getThreadsByResourceIdPaginated(args) {
+    const { resourceId, page, perPage } = args;
+    const fullTableName = this.getTableName(TABLE_THREADS);
+    const mapRowToStorageThreadType = (row) => ({
+      ...row,
+      createdAt: this.ensureDate(row.createdAt),
+      updatedAt: this.ensureDate(row.updatedAt),
+      metadata: typeof row.metadata === "string" ? JSON.parse(row.metadata || "{}") : row.metadata || {}
+    });
+    try {
+      const countQuery = createSqlBuilder().count().from(fullTableName).where("resourceId = ?", resourceId);
+      const countResult = await this.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 results = await this.executeQuery(selectQuery.build());
+      const threads = results.map(mapRowToStorageThreadType);
+      return {
+        threads,
+        total,
+        page,
+        perPage,
+        hasMore: page * perPage + threads.length < total
+      };
+    } catch (error) {
+      const mastraError = new MastraError(
+        {
+          id: "CLOUDFLARE_D1_STORAGE_GET_THREADS_BY_RESOURCE_ID_PAGINATED_ERROR",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Error getting threads by resourceId ${resourceId}: ${error instanceof Error ? error.message : String(error)}`,
+          details: { resourceId }
+        },
+        error
+      );
+      this.logger?.error(mastraError.toString());
+      this.logger?.trackException(mastraError);
+      return {
+        threads: [],
+        total: 0,
+        page,
+        perPage,
+        hasMore: false
+      };
+    }
+  }
   async saveThread({ thread }) {
     const fullTableName = this.getTableName(TABLE_THREADS);
     const threadToSave = {
@@ -601,9 +750,16 @@ var D1Store = class extends MastraStorage {
       await this.executeQuery({ sql, params });
       return thread;
     } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      this.logger.error(`Error saving thread to ${fullTableName}:`, { message });
-      throw error;
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_D1_STORAGE_SAVE_THREAD_ERROR",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Failed to save thread to ${fullTableName}: ${error instanceof Error ? error.message : String(error)}`,
+          details: { threadId: thread.id }
+        },
+        error
+      );
     }
   }
   async updateThread({
@@ -612,19 +768,19 @@ var D1Store = class extends MastraStorage {
     metadata
   }) {
     const thread = await this.getThreadById({ threadId: id });
-    if (!thread) {
-      throw new Error(`Thread ${id} not found`);
-    }
-    const fullTableName = this.getTableName(TABLE_THREADS);
-    const mergedMetadata = {
-      ...typeof thread.metadata === "string" ? JSON.parse(thread.metadata) : thread.metadata,
-      ...metadata
-    };
-    const columns = ["title", "metadata", "updatedAt"];
-    const values = [title, JSON.stringify(mergedMetadata), (/* @__PURE__ */ new Date()).toISOString()];
-    const query = createSqlBuilder().update(fullTableName, columns, values).where("id = ?", id);
-    const { sql, params } = query.build();
     try {
+      if (!thread) {
+        throw new Error(`Thread ${id} not found`);
+      }
+      const fullTableName = this.getTableName(TABLE_THREADS);
+      const mergedMetadata = {
+        ...typeof thread.metadata === "string" ? JSON.parse(thread.metadata) : thread.metadata,
+        ...metadata
+      };
+      const columns = ["title", "metadata", "updatedAt"];
+      const values = [title, JSON.stringify(mergedMetadata), (/* @__PURE__ */ new Date()).toISOString()];
+      const query = createSqlBuilder().update(fullTableName, columns, values).where("id = ?", id);
+      const { sql, params } = query.build();
       await this.executeQuery({ sql, params });
       return {
         ...thread,
@@ -636,9 +792,16 @@ var D1Store = class extends MastraStorage {
         updatedAt: /* @__PURE__ */ new Date()
       };
     } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      this.logger.error("Error updating thread:", { message });
-      throw error;
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_D1_STORAGE_UPDATE_THREAD_ERROR",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Failed to update thread ${id}: ${error instanceof Error ? error.message : String(error)}`,
+          details: { threadId: id }
+        },
+        error
+      );
     }
   }
   async deleteThread({ threadId }) {
@@ -652,10 +815,16 @@ var D1Store = class extends MastraStorage {
       const { sql: messagesSql, params: messagesParams } = deleteMessagesQuery.build();
       await this.executeQuery({ sql: messagesSql, params: messagesParams });
     } catch (error) {
-      this.logger.error(`Error deleting thread ${threadId}:`, {
-        message: error instanceof Error ? error.message : String(error)
-      });
-      throw new Error(`Failed to delete thread ${threadId}: ${error}`);
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_D1_STORAGE_DELETE_THREAD_ERROR",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Failed to delete thread ${threadId}: ${error instanceof Error ? error.message : String(error)}`,
+          details: { threadId }
+        },
+        error
+      );
     }
   }
   async saveMessages(args) {
@@ -663,6 +832,7 @@ var D1Store = class extends MastraStorage {
     if (messages.length === 0) return [];
     try {
       const now = /* @__PURE__ */ new Date();
+      const threadId = messages[0]?.threadId;
       for (const [i, message] of messages.entries()) {
         if (!message.id) throw new Error(`Message at index ${i} missing id`);
         if (!message.threadId) throw new Error(`Message at index ${i} missing threadId`);
@@ -681,42 +851,49 @@ var D1Store = class extends MastraStorage {
           content: typeof message.content === "string" ? message.content : JSON.stringify(message.content),
           createdAt: createdAt.toISOString(),
           role: message.role,
-          type: message.type || "v2"
+          type: message.type || "v2",
+          resourceId: message.resourceId
         };
       });
-      await this.batchInsert({
-        tableName: TABLE_MESSAGES,
-        records: messagesToInsert
-      });
+      await Promise.all([
+        this.batchUpsert({
+          tableName: TABLE_MESSAGES,
+          records: messagesToInsert
+        }),
+        // Update thread's updatedAt timestamp
+        this.executeQuery({
+          sql: `UPDATE ${this.getTableName(TABLE_THREADS)} SET updatedAt = ? WHERE id = ?`,
+          params: [now.toISOString(), threadId]
+        })
+      ]);
       this.logger.debug(`Saved ${messages.length} messages`);
       const list = new MessageList().add(messages, "memory");
       if (format === `v2`) return list.get.all.v2();
       return list.get.all.v1();
     } catch (error) {
-      this.logger.error("Error saving messages:", { message: error instanceof Error ? error.message : String(error) });
-      throw error;
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_D1_STORAGE_SAVE_MESSAGES_ERROR",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Failed to save messages: ${error instanceof Error ? error.message : String(error)}`
+        },
+        error
+      );
     }
   }
-  async getMessages({
-    threadId,
-    selectBy,
-    format
-  }) {
-    const fullTableName = this.getTableName(TABLE_MESSAGES);
-    const limit = typeof selectBy?.last === "number" ? selectBy.last : 40;
-    const include = selectBy?.include || [];
-    const messages = [];
-    try {
-      if (include.length) {
-        const prevMax = Math.max(...include.map((i) => i.withPreviousMessages || 0));
-        const nextMax = Math.max(...include.map((i) => i.withNextMessages || 0));
-        const includeIds = include.map((i) => i.id);
-        const sql2 = `
+  async _getIncludedMessages(threadId, selectBy) {
+    const include = selectBy?.include;
+    if (!include) return null;
+    const prevMax = Math.max(...include.map((i) => i.withPreviousMessages || 0));
+    const nextMax = Math.max(...include.map((i) => i.withNextMessages || 0));
+    const includeIds = include.map((i) => i.id);
+    const sql = `
         WITH ordered_messages AS (
           SELECT
             *,
             ROW_NUMBER() OVER (ORDER BY createdAt DESC) AS row_num
-          FROM ${fullTableName}
+          FROM ${this.getTableName(TABLE_MESSAGES)}
           WHERE thread_id = ?
         )
         SELECT
@@ -739,20 +916,38 @@ var D1Store = class extends MastraStorage {
         )
         ORDER BY m.createdAt DESC
       `;
-        const params2 = [
-          threadId,
-          ...includeIds,
-          // for m.id IN (...)
-          ...includeIds,
-          // for target.id IN (...)
-          prevMax,
-          nextMax
-        ];
-        const includeResult = await this.executeQuery({ sql: sql2, params: params2 });
+    const params = [
+      threadId,
+      ...includeIds,
+      // for m.id IN (...)
+      ...includeIds,
+      // for target.id IN (...)
+      prevMax,
+      nextMax
+    ];
+    const messages = await this.executeQuery({ sql, params });
+    return messages;
+  }
+  async getMessages({
+    threadId,
+    selectBy,
+    format
+  }) {
+    const fullTableName = this.getTableName(TABLE_MESSAGES);
+    const limit = this.resolveMessageLimit({ last: selectBy?.last, defaultLimit: 40 });
+    const include = selectBy?.include || [];
+    const messages = [];
+    try {
+      if (include.length) {
+        const includeResult = await this._getIncludedMessages(threadId, selectBy);
         if (Array.isArray(includeResult)) messages.push(...includeResult);
       }
       const excludeIds = messages.map((m) => m.id);
-      let query = createSqlBuilder().select(["id", "content", "role", "type", "createdAt", "thread_id AS threadId"]).from(fullTableName).where("thread_id = ?", threadId).andWhere(`id NOT IN (${excludeIds.map(() => "?").join(",")})`, ...excludeIds).orderBy("createdAt", "DESC").limit(limit);
+      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.executeQuery({ sql, params });
       if (Array.isArray(result)) messages.push(...result);
@@ -776,11 +971,82 @@ var D1Store = class extends MastraStorage {
       if (format === `v2`) return list.get.all.v2();
       return list.get.all.v1();
     } catch (error) {
-      this.logger.error("Error retrieving messages for thread", {
-        threadId,
-        message: error instanceof Error ? error.message : String(error)
-      });
-      return [];
+      const mastraError = new MastraError(
+        {
+          id: "CLOUDFLARE_D1_STORAGE_GET_MESSAGES_ERROR",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Failed to retrieve messages for thread ${threadId}: ${error instanceof Error ? error.message : String(error)}`,
+          details: { threadId }
+        },
+        error
+      );
+      this.logger?.error(mastraError.toString());
+      this.logger?.trackException(mastraError);
+      throw mastraError;
+    }
+  }
+  async getMessagesPaginated({
+    threadId,
+    selectBy,
+    format
+  }) {
+    const { dateRange, page = 0, perPage = 40 } = selectBy?.pagination || {};
+    const { start: fromDate, end: toDate } = dateRange || {};
+    const fullTableName = this.getTableName(TABLE_MESSAGES);
+    const messages = [];
+    try {
+      if (selectBy?.include?.length) {
+        const includeResult = await this._getIncludedMessages(threadId, selectBy);
+        if (Array.isArray(includeResult)) messages.push(...includeResult);
+      }
+      const countQuery = createSqlBuilder().count().from(fullTableName).where("thread_id = ?", threadId);
+      if (fromDate) {
+        countQuery.andWhere("createdAt >= ?", this.serializeDate(fromDate));
+      }
+      if (toDate) {
+        countQuery.andWhere("createdAt <= ?", this.serializeDate(toDate));
+      }
+      const countResult = await this.executeQuery(countQuery.build());
+      const total = Number(countResult[0]?.count ?? 0);
+      const query = createSqlBuilder().select(["id", "content", "role", "type", "createdAt", "thread_id AS threadId"]).from(fullTableName).where("thread_id = ?", threadId);
+      if (fromDate) {
+        query.andWhere("createdAt >= ?", this.serializeDate(fromDate));
+      }
+      if (toDate) {
+        query.andWhere("createdAt <= ?", this.serializeDate(toDate));
+      }
+      query.orderBy("createdAt", "DESC").limit(perPage).offset(page * perPage);
+      const results = await this.executeQuery(query.build());
+      const list = new MessageList().add(results, "memory");
+      messages.push(...format === `v2` ? list.get.all.v2() : list.get.all.v1());
+      return {
+        messages,
+        total,
+        page,
+        perPage,
+        hasMore: page * perPage + messages.length < total
+      };
+    } catch (error) {
+      const mastraError = new MastraError(
+        {
+          id: "CLOUDFLARE_D1_STORAGE_GET_MESSAGES_PAGINATED_ERROR",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Failed to retrieve messages for thread ${threadId}: ${error instanceof Error ? error.message : String(error)}`,
+          details: { threadId }
+        },
+        error
+      );
+      this.logger?.error(mastraError.toString());
+      this.logger?.trackException(mastraError);
+      return {
+        messages: [],
+        total: 0,
+        page,
+        perPage,
+        hasMore: false
+      };
     }
   }
   async persistWorkflowSnapshot({
@@ -818,23 +1084,42 @@ var D1Store = class extends MastraStorage {
     try {
       await this.executeQuery({ sql, params });
     } catch (error) {
-      this.logger.error("Error persisting workflow snapshot:", {
-        message: error instanceof Error ? error.message : String(error)
-      });
-      throw error;
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_D1_STORAGE_PERSIST_WORKFLOW_SNAPSHOT_ERROR",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Failed to persist workflow snapshot: ${error instanceof Error ? error.message : String(error)}`,
+          details: { workflowName, runId }
+        },
+        error
+      );
     }
   }
   async loadWorkflowSnapshot(params) {
     const { workflowName, runId } = params;
     this.logger.debug("Loading workflow snapshot", { workflowName, runId });
-    const d = await this.load({
-      tableName: TABLE_WORKFLOW_SNAPSHOT,
-      keys: {
-        workflow_name: workflowName,
-        run_id: runId
-      }
-    });
-    return d ? d.snapshot : null;
+    try {
+      const d = await this.load({
+        tableName: TABLE_WORKFLOW_SNAPSHOT,
+        keys: {
+          workflow_name: workflowName,
+          run_id: runId
+        }
+      });
+      return d ? d.snapshot : null;
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_D1_STORAGE_LOAD_WORKFLOW_SNAPSHOT_ERROR",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Failed to load workflow snapshot: ${error instanceof Error ? error.message : String(error)}`,
+          details: { workflowName, runId }
+        },
+        error
+      );
+    }
   }
   /**
    * Insert multiple records in a batch operation
@@ -869,12 +1154,76 @@ var D1Store = class extends MastraStorage {
       }
       this.logger.debug(`Successfully batch inserted ${records.length} records into ${tableName}`);
     } catch (error) {
-      this.logger.error(`Error batch inserting into ${tableName}:`, {
-        message: error instanceof Error ? error.message : String(error)
-      });
-      throw new Error(`Failed to batch insert into ${tableName}: ${error}`);
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_D1_STORAGE_BATCH_INSERT_ERROR",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Failed to batch insert into ${tableName}: ${error instanceof Error ? error.message : String(error)}`,
+          details: { tableName }
+        },
+        error
+      );
+    }
+  }
+  /**
+   * Upsert multiple records in a batch operation
+   * @param tableName The table to insert into
+   * @param records The records to insert
+   */
+  async batchUpsert({
+    tableName,
+    records
+  }) {
+    if (records.length === 0) return;
+    const fullTableName = this.getTableName(tableName);
+    try {
+      const batchSize = 50;
+      for (let i = 0; i < records.length; i += batchSize) {
+        const batch = records.slice(i, i + batchSize);
+        const recordsToInsert = batch;
+        if (recordsToInsert.length > 0) {
+          const firstRecord = recordsToInsert[0];
+          const columns = Object.keys(firstRecord || {});
+          for (const record of recordsToInsert) {
+            const values = columns.map((col) => {
+              if (!record) return null;
+              const value = typeof col === "string" ? record[col] : null;
+              return this.serializeValue(value);
+            });
+            const recordToUpsert = columns.reduce(
+              (acc, col) => {
+                if (col !== "createdAt") acc[col] = `excluded.${col}`;
+                return acc;
+              },
+              {}
+            );
+            const query = createSqlBuilder().insert(fullTableName, columns, values, ["id"], recordToUpsert);
+            const { sql, params } = query.build();
+            await this.executeQuery({ sql, params });
+          }
+        }
+        this.logger.debug(
+          `Processed batch ${Math.floor(i / batchSize) + 1} of ${Math.ceil(records.length / batchSize)}`
+        );
+      }
+      this.logger.debug(`Successfully batch upserted ${records.length} records into ${tableName}`);
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_D1_STORAGE_BATCH_UPSERT_ERROR",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Failed to batch upsert into ${tableName}: ${error instanceof Error ? error.message : String(error)}`,
+          details: { tableName }
+        },
+        error
+      );
     }
   }
+  /**
+   * @deprecated use getTracesPaginated instead
+   */
   async getTraces({
     name,
     scope,
@@ -904,22 +1253,108 @@ var D1Store = class extends MastraStorage {
       if (toDate) {
         query.andWhere("createdAt <= ?", toDate instanceof Date ? toDate.toISOString() : toDate);
       }
-      query.orderBy("startTime", "DESC").limit(perPage).offset((page - 1) * perPage);
+      query.orderBy("startTime", "DESC").limit(perPage).offset(page * perPage);
       const { sql, params } = query.build();
       const results = await this.executeQuery({ sql, params });
-      return isArrayOfRecords(results) ? results.map((trace) => ({
-        ...trace,
-        attributes: this.deserializeValue(trace.attributes, "jsonb"),
-        status: this.deserializeValue(trace.status, "jsonb"),
-        events: this.deserializeValue(trace.events, "jsonb"),
-        links: this.deserializeValue(trace.links, "jsonb"),
-        other: this.deserializeValue(trace.other, "jsonb")
-      })) : [];
+      return isArrayOfRecords(results) ? results.map(
+        (trace) => ({
+          ...trace,
+          attributes: this.deserializeValue(trace.attributes, "jsonb"),
+          status: this.deserializeValue(trace.status, "jsonb"),
+          events: this.deserializeValue(trace.events, "jsonb"),
+          links: this.deserializeValue(trace.links, "jsonb"),
+          other: this.deserializeValue(trace.other, "jsonb")
+        })
+      ) : [];
     } catch (error) {
-      this.logger.error("Error getting traces:", { message: error instanceof Error ? error.message : String(error) });
+      const mastraError = new MastraError(
+        {
+          id: "CLOUDFLARE_D1_STORAGE_GET_TRACES_ERROR",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Failed to retrieve traces: ${error instanceof Error ? error.message : String(error)}`,
+          details: {
+            name: name ?? "",
+            scope: scope ?? ""
+          }
+        },
+        error
+      );
+      this.logger?.error(mastraError.toString());
+      this.logger?.trackException(mastraError);
       return [];
     }
   }
+  async getTracesPaginated(args) {
+    const { name, scope, page, perPage, attributes, fromDate, toDate } = args;
+    const fullTableName = this.getTableName(TABLE_TRACES);
+    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 countResult = await this.executeQuery(countQuery.build());
+      const total = Number(countResult?.[0]?.count ?? 0);
+      dataQuery.orderBy("startTime", "DESC").limit(perPage).offset(page * perPage);
+      const results = await this.executeQuery(dataQuery.build());
+      const traces = isArrayOfRecords(results) ? results.map(
+        (trace) => ({
+          ...trace,
+          attributes: this.deserializeValue(trace.attributes, "jsonb"),
+          status: this.deserializeValue(trace.status, "jsonb"),
+          events: this.deserializeValue(trace.events, "jsonb"),
+          links: this.deserializeValue(trace.links, "jsonb"),
+          other: this.deserializeValue(trace.other, "jsonb")
+        })
+      ) : [];
+      return {
+        traces,
+        total,
+        page,
+        perPage,
+        hasMore: page * perPage + traces.length < total
+      };
+    } catch (error) {
+      const mastraError = new MastraError(
+        {
+          id: "CLOUDFLARE_D1_STORAGE_GET_TRACES_ERROR",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Failed to retrieve traces: ${error instanceof Error ? error.message : String(error)}`,
+          details: { name: name ?? "", scope: scope ?? "" }
+        },
+        error
+      );
+      this.logger?.error(mastraError.toString());
+      this.logger?.trackException(mastraError);
+      return { traces: [], total: 0, page, perPage, hasMore: false };
+    }
+  }
+  /**
+   * @deprecated use getEvals instead
+   */
   async getEvalsByAgentName(agentName, type) {
     const fullTableName = this.getTableName(TABLE_EVALS);
     try {
@@ -949,12 +1384,108 @@ var D1Store = class extends MastraStorage {
         };
       }) : [];
     } catch (error) {
-      this.logger.error(`Error getting evals for agent ${agentName}:`, {
-        message: error instanceof Error ? error.message : String(error)
-      });
+      const mastraError = new MastraError(
+        {
+          id: "CLOUDFLARE_D1_STORAGE_GET_EVALS_ERROR",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Failed to retrieve evals for agent ${agentName}: ${error instanceof Error ? error.message : String(error)}`,
+          details: { agentName }
+        },
+        error
+      );
+      this.logger?.error(mastraError.toString());
+      this.logger?.trackException(mastraError);
       return [];
     }
   }
+  async getEvals(options) {
+    const { agentName, type, page = 0, perPage = 40, fromDate, toDate } = options || {};
+    const fullTableName = this.getTableName(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 (fromDate) {
+      conditions.push(`createdAt >= ?`);
+      queryParams.push(this.serializeDate(fromDate));
+    }
+    if (toDate) {
+      conditions.push(`createdAt <= ?`);
+      queryParams.push(this.serializeDate(toDate));
+    }
+    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.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("createdAt", "DESC").limit(perPage).offset(currentOffset);
+      const { sql: dataSql, params: dataParams } = dataQueryBuilder.build();
+      const rows = await this.executeQuery({ sql: dataSql, params: dataParams });
+      const evals = (isArrayOfRecords(rows) ? rows : []).map((row) => {
+        const result = this.deserializeValue(row.result);
+        const testInfo = row.test_info ? this.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.createdAt
+        };
+      });
+      const hasMore = currentOffset + evals.length < total;
+      return {
+        evals,
+        total,
+        page,
+        perPage,
+        hasMore
+      };
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_D1_STORAGE_GET_EVALS_ERROR",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Failed to retrieve evals for agent ${agentName}: ${error instanceof Error ? error.message : String(error)}`,
+          details: { agentName: agentName ?? "", type: type ?? "" }
+        },
+        error
+      );
+    }
+  }
   parseWorkflowRun(row) {
     let parsedSnapshot = row.snapshot;
     if (typeof parsedSnapshot === "string") {
@@ -1023,10 +1554,16 @@ var D1Store = class extends MastraStorage {
       const runs = (isArrayOfRecords(results) ? results : []).map((row) => this.parseWorkflowRun(row));
       return { runs, total: total || runs.length };
     } catch (error) {
-      this.logger.error("Error getting workflow runs:", {
-        message: error instanceof Error ? error.message : String(error)
-      });
-      throw error;
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_D1_STORAGE_GET_WORKFLOW_RUNS_ERROR",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Failed to retrieve workflow runs: ${error instanceof Error ? error.message : String(error)}`,
+          details: { workflowName: workflowName ?? "", resourceId: resourceId ?? "" }
+        },
+        error
+      );
     }
   }
   async getWorkflowRunById({
@@ -1051,10 +1588,16 @@ var D1Store = class extends MastraStorage {
       if (!result) return null;
       return this.parseWorkflowRun(result);
     } catch (error) {
-      this.logger.error("Error getting workflow run by ID:", {
-        message: error instanceof Error ? error.message : String(error)
-      });
-      throw error;
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_D1_STORAGE_GET_WORKFLOW_RUN_BY_ID_ERROR",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Failed to retrieve workflow run by ID: ${error instanceof Error ? error.message : String(error)}`,
+          details: { runId, workflowName: workflowName ?? "" }
+        },
+        error
+      );
     }
   }
   /**
@@ -1064,6 +1607,10 @@ var D1Store = class extends MastraStorage {
   async close() {
     this.logger.debug("Closing D1 connection");
   }
+  async updateMessages(_args) {
+    this.logger.error("updateMessages is not yet implemented in CloudflareD1Store");
+    throw new Error("Method not implemented");
+  }
 };
 
 export { D1Store };