@mastra/cloudflare-d1 0.11.1-alpha.0 → 0.11.1-alpha.1

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
@@ -462,16 +475,25 @@ 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
+      );
     }
   }
   /**
@@ -501,10 +523,16 @@ var D1Store = class extends MastraStorage {
         }
       }
     } catch (error) {
-      this.logger.error(`Error altering table ${fullTableName}:`, {
-        message: error instanceof Error ? error.message : String(error)
-      });
-      throw new Error(`Failed to alter table ${fullTableName}: ${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 }) {
@@ -515,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) {
@@ -538,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 }) {
@@ -566,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 }) {
@@ -586,9 +633,18 @@ 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;
     }
   }
@@ -608,9 +664,18 @@ 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 [];
     }
   }
@@ -623,19 +688,41 @@ var D1Store = class extends MastraStorage {
       updatedAt: this.ensureDate(row.updatedAt),
       metadata: typeof row.metadata === "string" ? JSON.parse(row.metadata || "{}") : row.metadata || {}
     });
-    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
-    };
+    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);
@@ -663,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({
@@ -674,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,
@@ -698,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 }) {
@@ -714,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) {
@@ -764,8 +871,15 @@ var D1Store = class extends MastraStorage {
       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 _getIncludedMessages(threadId, selectBy) {
@@ -820,7 +934,7 @@ var D1Store = class extends MastraStorage {
     format
   }) {
     const fullTableName = this.getTableName(TABLE_MESSAGES);
-    const limit = typeof selectBy?.last === "number" ? selectBy.last : 40;
+    const limit = this.resolveMessageLimit({ last: selectBy?.last, defaultLimit: 40 });
     const include = selectBy?.include || [];
     const messages = [];
     try {
@@ -857,11 +971,19 @@ 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({
@@ -873,37 +995,59 @@ var D1Store = class extends MastraStorage {
     const { start: fromDate, end: toDate } = dateRange || {};
     const fullTableName = this.getTableName(TABLE_MESSAGES);
     const messages = [];
-    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));
+    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
+      };
     }
-    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
-    };
   }
   async persistWorkflowSnapshot({
     workflowName,
@@ -940,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
@@ -991,10 +1154,16 @@ 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
+      );
     }
   }
   /**
@@ -1043,7 +1212,21 @@ var D1Store = class extends MastraStorage {
         })
       ) : [];
     } 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 [];
     }
   }
@@ -1099,7 +1282,18 @@ var D1Store = class extends MastraStorage {
         hasMore: page * perPage + traces.length < total
       };
     } 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 { traces: [], total: 0, page, perPage, hasMore: false };
     }
   }
@@ -1135,9 +1329,18 @@ 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 [];
     }
   }
@@ -1168,52 +1371,65 @@ var D1Store = class extends MastraStorage {
       countQueryBuilder.where(conditions.join(" AND "), ...queryParams);
     }
     const { sql: countSql, params: countParams } = countQueryBuilder.build();
-    const countResult = await this.executeQuery({ sql: countSql, params: countParams, first: true });
-    const total = Number(countResult?.count || 0);
-    const currentOffset = page * perPage;
-    if (total === 0) {
+    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: 0,
+        evals,
+        total,
         page,
         perPage,
-        hasMore: false
+        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
+      );
     }
-    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
-    };
   }
   parseWorkflowRun(row) {
     let parsedSnapshot = row.snapshot;
@@ -1283,10 +1499,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({
@@ -1311,10 +1533,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
+      );
     }
   }
   /**