@mastra/cloudflare 0.10.5-alpha.0 → 0.10.5-alpha.1

package/dist/index.cjs

@@ -1,6 +1,7 @@
 'use strict';
 
 var agent = require('@mastra/core/agent');
+var error = require('@mastra/core/error');
 var storage = require('@mastra/core/storage');
 var Cloudflare = require('cloudflare');
 
@@ -63,10 +64,15 @@ var CloudflareStore = class extends storage.MastraStorage {
         });
         this.logger.info("Using Cloudflare KV REST API");
       }
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      this.logger.error("Failed to initialize CloudflareStore:", { message });
-      throw error;
+    } catch (error$1) {
+      throw new error.MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_INIT_FAILED",
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY
+        },
+        error$1
+      );
     }
   }
   getBinding(tableName) {
@@ -185,9 +191,18 @@ var CloudflareStore = class extends storage.MastraStorage {
         });
         return response.result;
       }
-    } catch (error) {
-      this.logger.error(`Failed to list keys for ${tableName}:`, error);
-      throw new Error(`Failed to list keys: ${error.message}`);
+    } catch (error$1) {
+      throw new error.MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_LIST_NAMESPACE_KEYS_FAILED",
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          details: {
+            tableName
+          }
+        },
+        error$1
+      );
     }
   }
   async createNamespaceById(title) {
@@ -630,9 +645,18 @@ var CloudflareStore = class extends storage.MastraStorage {
         createdAt: (/* @__PURE__ */ new Date()).toISOString()
       };
       await this.putKV({ tableName, key: schemaKey, value: schema, metadata });
-    } catch (error) {
-      this.logger.error(`Failed to store schema for ${tableName}:`, error);
-      throw new Error(`Failed to store schema: ${error.message}`);
+    } catch (error$1) {
+      throw new error.MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_CREATE_TABLE_FAILED",
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          details: {
+            tableName
+          }
+        },
+        error$1
+      );
     }
   }
   /**
@@ -644,9 +668,23 @@ var CloudflareStore = class extends storage.MastraStorage {
   async alterTable(_args) {
   }
   async clearTable({ tableName }) {
-    const keys = await this.listKV(tableName);
-    if (keys.length > 0) {
-      await Promise.all(keys.map((keyObj) => this.deleteKV(tableName, keyObj.name)));
+    try {
+      const keys = await this.listKV(tableName);
+      if (keys.length > 0) {
+        await Promise.all(keys.map((keyObj) => this.deleteKV(tableName, keyObj.name)));
+      }
+    } catch (error$1) {
+      throw new error.MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_CLEAR_TABLE_FAILED",
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          details: {
+            tableName
+          }
+        },
+        error$1
+      );
     }
   }
   async insert({
@@ -663,10 +701,18 @@ var CloudflareStore = class extends storage.MastraStorage {
       };
       await this.validateRecord(processedRecord, tableName);
       await this.putKV({ tableName, key, value: processedRecord });
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      this.logger.error(`Failed to insert record for ${tableName}:`, { message });
-      throw error;
+    } catch (error$1) {
+      throw new error.MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_INSERT_FAILED",
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          details: {
+            tableName
+          }
+        },
+        error$1
+      );
     }
   }
   async load({ tableName, keys }) {
@@ -681,10 +727,20 @@ var CloudflareStore = class extends storage.MastraStorage {
         metadata: this.ensureMetadata(data.metadata)
       };
       return processed;
-    } catch (error) {
-      this.logger.error(`Failed to load data for ${tableName}:`, {
-        error: error instanceof Error ? error.message : String(error)
-      });
+    } catch (error$1) {
+      const mastraError = new error.MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_LOAD_FAILED",
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          details: {
+            tableName
+          }
+        },
+        error$1
+      );
+      this.logger?.trackException(mastraError);
+      this.logger?.error(mastraError.toString());
       return null;
     }
   }
@@ -698,10 +754,20 @@ var CloudflareStore = class extends storage.MastraStorage {
         updatedAt: this.ensureDate(thread.updatedAt),
         metadata: this.ensureMetadata(thread.metadata)
       };
-    } catch (error) {
-      this.logger.error(`Error processing thread ${threadId}:`, {
-        error: error instanceof Error ? error.message : String(error)
-      });
+    } catch (error$1) {
+      const mastraError = new error.MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_GET_THREAD_BY_ID_FAILED",
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          details: {
+            threadId
+          }
+        },
+        error$1
+      );
+      this.logger?.trackException(mastraError);
+      this.logger?.error(mastraError.toString());
       return null;
     }
   }
@@ -721,17 +787,39 @@ var CloudflareStore = class extends storage.MastraStorage {
               updatedAt: this.ensureDate(thread.updatedAt),
               metadata: this.ensureMetadata(thread.metadata)
             };
-          } catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            this.logger.error(`Error processing thread from key ${keyObj.name}:`, { message });
+          } catch (error$1) {
+            const mastraError = new error.MastraError(
+              {
+                id: "CLOUDFLARE_STORAGE_GET_THREADS_BY_RESOURCE_ID_FAILED",
+                domain: error.ErrorDomain.STORAGE,
+                category: error.ErrorCategory.THIRD_PARTY,
+                details: {
+                  resourceId
+                }
+              },
+              error$1
+            );
+            this.logger?.trackException(mastraError);
+            this.logger?.error(mastraError.toString());
             return null;
           }
         })
       );
       return threads.filter((thread) => thread !== null);
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      this.logger.error(`Error getting threads for resourceId ${resourceId}:`, { message });
+    } catch (error$1) {
+      const mastraError = new error.MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_GET_THREADS_BY_RESOURCE_ID_FAILED",
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          details: {
+            resourceId
+          }
+        },
+        error$1
+      );
+      this.logger?.trackException(mastraError);
+      this.logger?.error(mastraError.toString());
       return [];
     }
   }
@@ -739,10 +827,18 @@ var CloudflareStore = class extends storage.MastraStorage {
     try {
       await this.insert({ tableName: storage.TABLE_THREADS, record: thread });
       return thread;
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      this.logger.error("Error saving thread:", { message });
-      throw error;
+    } catch (error$1) {
+      throw new error.MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_SAVE_THREAD_FAILED",
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          details: {
+            threadId: thread.id
+          }
+        },
+        error$1
+      );
     }
   }
   async updateThread({
@@ -766,10 +862,19 @@ var CloudflareStore = class extends storage.MastraStorage {
       };
       await this.insert({ tableName: storage.TABLE_THREADS, record: updatedThread });
       return updatedThread;
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      this.logger.error(`Error updating thread ${id}:`, { message });
-      throw error;
+    } catch (error$1) {
+      throw new error.MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_UPDATE_THREAD_FAILED",
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          details: {
+            threadId: id,
+            title
+          }
+        },
+        error$1
+      );
     }
   }
   async deleteThread({ threadId }) {
@@ -788,10 +893,18 @@ var CloudflareStore = class extends storage.MastraStorage {
         // Delete thread
         this.deleteKV(storage.TABLE_THREADS, this.getKey(storage.TABLE_THREADS, { id: threadId }))
       ]);
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      this.logger.error(`Error deleting thread ${threadId}:`, { message });
-      throw error;
+    } catch (error$1) {
+      throw new error.MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_DELETE_THREAD_FAILED",
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          details: {
+            threadId
+          }
+        },
+        error$1
+      );
     }
   }
   getMessageKey(threadId, messageId) {
@@ -863,10 +976,18 @@ var CloudflareStore = class extends storage.MastraStorage {
             const orderKey = this.getThreadMessagesKey(threadId);
             const entries = await this.updateSorting(threadMessages);
             await this.updateSortedMessages(orderKey, entries);
-          } catch (error) {
-            const errorMessage = error instanceof Error ? error.message : String(error);
-            this.logger.error(`Error processing messages for thread ${threadId}: ${errorMessage}`);
-            throw error;
+          } catch (error$1) {
+            throw new error.MastraError(
+              {
+                id: "CLOUDFLARE_STORAGE_SAVE_MESSAGES_FAILED",
+                domain: error.ErrorDomain.STORAGE,
+                category: error.ErrorCategory.THIRD_PARTY,
+                details: {
+                  threadId
+                }
+              },
+              error$1
+            );
           }
         })
       );
@@ -876,10 +997,15 @@ var CloudflareStore = class extends storage.MastraStorage {
       const list = new agent.MessageList().add(prepared, "memory");
       if (format === `v2`) return list.get.all.v2();
       return list.get.all.v1();
-    } catch (error) {
-      const errorMessage = error instanceof Error ? error.message : String(error);
-      this.logger.error(`Error saving messages: ${errorMessage}`);
-      throw error;
+    } catch (error$1) {
+      throw new error.MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_SAVE_MESSAGES_FAILED",
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY
+        },
+        error$1
+      );
     }
   }
   async getMessages({
@@ -889,12 +1015,7 @@ var CloudflareStore = class extends storage.MastraStorage {
     format
   }) {
     if (!threadId) throw new Error("threadId is required");
-    let limit = 40;
-    if (typeof selectBy?.last === "number") {
-      limit = Math.max(0, selectBy.last);
-    } else if (selectBy?.last === false) {
-      limit = 0;
-    }
+    const limit = this.resolveMessageLimit({ last: selectBy?.last, defaultLimit: 40 });
     const messageIds = /* @__PURE__ */ new Set();
     if (limit === 0 && !selectBy?.include?.length) return [];
     try {
@@ -914,9 +1035,21 @@ var CloudflareStore = class extends storage.MastraStorage {
           if (indexA !== void 0 && indexB !== void 0) return orderMap.get(a.id) - orderMap.get(b.id);
           return new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime();
         });
-      } catch (error) {
-        const errorMessage = error instanceof Error ? error.message : String(error);
-        this.logger.warn(`Error sorting messages, falling back to creation time: ${errorMessage}`);
+      } catch (error$1) {
+        const mastraError = new error.MastraError(
+          {
+            id: "CLOUDFLARE_STORAGE_SORT_MESSAGES_FAILED",
+            domain: error.ErrorDomain.STORAGE,
+            category: error.ErrorCategory.THIRD_PARTY,
+            text: `Error sorting messages for thread ${threadId} falling back to creation time`,
+            details: {
+              threadId
+            }
+          },
+          error$1
+        );
+        this.logger?.trackException(mastraError);
+        this.logger?.error(mastraError.toString());
         messages.sort((a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime());
       }
       const prepared = messages.map(({ _index, ...message }) => ({
@@ -927,9 +1060,21 @@ var CloudflareStore = class extends storage.MastraStorage {
       const list = new agent.MessageList({ threadId, resourceId }).add(prepared, "memory");
       if (format === `v1`) return list.get.all.v1();
       return list.get.all.v2();
-    } catch (error) {
-      const errorMessage = error instanceof Error ? error.message : String(error);
-      this.logger.error(`Error retrieving messages for thread ${threadId}: ${errorMessage}`);
+    } catch (error$1) {
+      const mastraError = new error.MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_GET_MESSAGES_FAILED",
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          text: `Error retrieving messages for thread ${threadId}`,
+          details: {
+            threadId
+          }
+        },
+        error$1
+      );
+      this.logger?.trackException(mastraError);
+      this.logger?.error(mastraError.toString());
       return [];
     }
   }
@@ -986,10 +1131,21 @@ var CloudflareStore = class extends storage.MastraStorage {
           updatedAt: /* @__PURE__ */ new Date()
         }
       });
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      this.logger.error("Error persisting workflow snapshot:", { message });
-      throw error;
+    } catch (error$1) {
+      throw new error.MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_PERSIST_WORKFLOW_SNAPSHOT_FAILED",
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          text: `Error persisting workflow snapshot for namespace ${params.namespace}, workflow ${params.workflowName}, run ${params.runId}`,
+          details: {
+            namespace: params.namespace,
+            workflowName: params.workflowName,
+            runId: params.runId
+          }
+        },
+        error$1
+      );
     }
   }
   async loadWorkflowSnapshot(params) {
@@ -1002,10 +1158,23 @@ var CloudflareStore = class extends storage.MastraStorage {
       const state = this.normalizeWorkflowState(data.snapshot || data);
       this.validateWorkflowState(state);
       return state;
-    } catch (error) {
-      this.logger.error("Error loading workflow snapshot:", {
-        error: error instanceof Error ? error.message : String(error)
-      });
+    } catch (error$1) {
+      const mastraError = new error.MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_LOAD_WORKFLOW_SNAPSHOT_FAILED",
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          text: `Error loading workflow snapshot for namespace ${params.namespace}, workflow ${params.workflowName}, run ${params.runId}`,
+          details: {
+            namespace: params.namespace,
+            workflowName: params.workflowName,
+            runId: params.runId
+          }
+        },
+        error$1
+      );
+      this.logger?.trackException(mastraError);
+      this.logger?.error(mastraError.toString());
       return null;
     }
   }
@@ -1024,10 +1193,19 @@ var CloudflareStore = class extends storage.MastraStorage {
           await this.putKV({ tableName: input.tableName, key, value: processedRecord });
         })
       );
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      this.logger.error("Error in batch insert:", { message });
-      throw error;
+    } catch (error$1) {
+      throw new error.MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_BATCH_INSERT_FAILED",
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          text: `Error in batch insert for table ${input.tableName}`,
+          details: {
+            tableName: input.tableName
+          }
+        },
+        error$1
+      );
     }
   }
   async getTraces({
@@ -1106,9 +1284,18 @@ var CloudflareStore = class extends storage.MastraStorage {
         other: this.parseJSON(record.other) || {},
         createdAt: record.createdAt
       }));
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      this.logger.error("Failed to get traces:", { message });
+    } catch (error$1) {
+      const mastraError = new error.MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_GET_TRACES_FAILED",
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          text: `Failed to get traces`
+        },
+        error$1
+      );
+      this.logger?.trackException(mastraError);
+      this.logger?.error(mastraError.toString());
       return [];
     }
   }
@@ -1123,7 +1310,12 @@ var CloudflareStore = class extends storage.MastraStorage {
     return value;
   }
   getEvalsByAgentName(_agentName, _type) {
-    throw new Error("Method not implemented.");
+    throw new error.MastraError({
+      id: "CLOUDFLARE_STORAGE_GET_EVALS_BY_AGENT_NAME_FAILED",
+      domain: error.ErrorDomain.STORAGE,
+      category: error.ErrorCategory.THIRD_PARTY,
+      text: `Failed to get evals by agent name`
+    });
   }
   parseWorkflowRun(row) {
     let parsedSnapshot = row.snapshot;
@@ -1205,9 +1397,17 @@ var CloudflareStore = class extends storage.MastraStorage {
         runs: pagedRuns,
         total: runs.length
       };
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      this.logger.error("Error in getWorkflowRuns:", { message });
+    } catch (error$1) {
+      const mastraError = new error.MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_GET_WORKFLOW_RUNS_FAILED",
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY
+        },
+        error$1
+      );
+      this.logger?.trackException(mastraError);
+      this.logger?.error(mastraError.toString());
       return { runs: [], total: 0 };
     }
   }
@@ -1229,20 +1429,48 @@ var CloudflareStore = class extends storage.MastraStorage {
       const state = this.normalizeWorkflowState(data.snapshot || data);
       this.validateWorkflowState(state);
       return this.parseWorkflowRun({ ...data, snapshot: state });
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      this.logger.error("Error in getWorkflowRunById:", { message });
+    } catch (error$1) {
+      const mastraError = new error.MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_GET_WORKFLOW_RUN_BY_ID_FAILED",
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          details: {
+            namespace,
+            workflowName,
+            runId
+          }
+        },
+        error$1
+      );
+      this.logger?.trackException(mastraError);
+      this.logger?.error(mastraError.toString());
       return null;
     }
   }
   async getTracesPaginated(_args) {
-    throw new Error("Method not implemented.");
+    throw new error.MastraError({
+      id: "CLOUDFLARE_STORAGE_GET_TRACES_PAGINATED_FAILED",
+      domain: error.ErrorDomain.STORAGE,
+      category: error.ErrorCategory.THIRD_PARTY,
+      text: "Method not implemented."
+    });
   }
   async getThreadsByResourceIdPaginated(_args) {
-    throw new Error("Method not implemented.");
+    throw new error.MastraError({
+      id: "CLOUDFLARE_STORAGE_GET_THREADS_BY_RESOURCE_ID_PAGINATED_FAILED",
+      domain: error.ErrorDomain.STORAGE,
+      category: error.ErrorCategory.THIRD_PARTY,
+      text: "Method not implemented."
+    });
   }
   async getMessagesPaginated(_args) {
-    throw new Error("Method not implemented.");
+    throw new error.MastraError({
+      id: "CLOUDFLARE_STORAGE_GET_MESSAGES_PAGINATED_FAILED",
+      domain: error.ErrorDomain.STORAGE,
+      category: error.ErrorCategory.THIRD_PARTY,
+      text: "Method not implemented."
+    });
   }
   async close() {
   }

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_EVALS, TABLE_TRACES } from '@mastra/core/storage';
 import Cloudflare from 'cloudflare';
 
@@ -58,9 +59,14 @@ var CloudflareStore = class extends MastraStorage {
         this.logger.info("Using Cloudflare KV REST API");
       }
     } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      this.logger.error("Failed to initialize CloudflareStore:", { message });
-      throw error;
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_INIT_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY
+        },
+        error
+      );
     }
   }
   getBinding(tableName) {
@@ -180,8 +186,17 @@ var CloudflareStore = class extends MastraStorage {
         return response.result;
       }
     } catch (error) {
-      this.logger.error(`Failed to list keys for ${tableName}:`, error);
-      throw new Error(`Failed to list keys: ${error.message}`);
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_LIST_NAMESPACE_KEYS_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            tableName
+          }
+        },
+        error
+      );
     }
   }
   async createNamespaceById(title) {
@@ -625,8 +640,17 @@ var CloudflareStore = class extends MastraStorage {
       };
       await this.putKV({ tableName, key: schemaKey, value: schema, metadata });
     } catch (error) {
-      this.logger.error(`Failed to store schema for ${tableName}:`, error);
-      throw new Error(`Failed to store schema: ${error.message}`);
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_CREATE_TABLE_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            tableName
+          }
+        },
+        error
+      );
     }
   }
   /**
@@ -638,9 +662,23 @@ var CloudflareStore = class extends MastraStorage {
   async alterTable(_args) {
   }
   async clearTable({ tableName }) {
-    const keys = await this.listKV(tableName);
-    if (keys.length > 0) {
-      await Promise.all(keys.map((keyObj) => this.deleteKV(tableName, keyObj.name)));
+    try {
+      const keys = await this.listKV(tableName);
+      if (keys.length > 0) {
+        await Promise.all(keys.map((keyObj) => this.deleteKV(tableName, keyObj.name)));
+      }
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_CLEAR_TABLE_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            tableName
+          }
+        },
+        error
+      );
     }
   }
   async insert({
@@ -658,9 +696,17 @@ var CloudflareStore = class extends MastraStorage {
       await this.validateRecord(processedRecord, tableName);
       await this.putKV({ tableName, key, value: processedRecord });
     } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      this.logger.error(`Failed to insert record for ${tableName}:`, { message });
-      throw error;
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_INSERT_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            tableName
+          }
+        },
+        error
+      );
     }
   }
   async load({ tableName, keys }) {
@@ -676,9 +722,19 @@ var CloudflareStore = class extends MastraStorage {
       };
       return processed;
     } catch (error) {
-      this.logger.error(`Failed to load data for ${tableName}:`, {
-        error: error instanceof Error ? error.message : String(error)
-      });
+      const mastraError = new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_LOAD_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            tableName
+          }
+        },
+        error
+      );
+      this.logger?.trackException(mastraError);
+      this.logger?.error(mastraError.toString());
       return null;
     }
   }
@@ -693,9 +749,19 @@ var CloudflareStore = class extends MastraStorage {
         metadata: this.ensureMetadata(thread.metadata)
       };
     } catch (error) {
-      this.logger.error(`Error processing thread ${threadId}:`, {
-        error: error instanceof Error ? error.message : String(error)
-      });
+      const mastraError = new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_GET_THREAD_BY_ID_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            threadId
+          }
+        },
+        error
+      );
+      this.logger?.trackException(mastraError);
+      this.logger?.error(mastraError.toString());
       return null;
     }
   }
@@ -716,16 +782,38 @@ var CloudflareStore = class extends MastraStorage {
               metadata: this.ensureMetadata(thread.metadata)
             };
           } catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            this.logger.error(`Error processing thread from key ${keyObj.name}:`, { message });
+            const mastraError = new MastraError(
+              {
+                id: "CLOUDFLARE_STORAGE_GET_THREADS_BY_RESOURCE_ID_FAILED",
+                domain: ErrorDomain.STORAGE,
+                category: ErrorCategory.THIRD_PARTY,
+                details: {
+                  resourceId
+                }
+              },
+              error
+            );
+            this.logger?.trackException(mastraError);
+            this.logger?.error(mastraError.toString());
             return null;
           }
         })
       );
       return threads.filter((thread) => thread !== null);
     } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      this.logger.error(`Error getting threads for resourceId ${resourceId}:`, { message });
+      const mastraError = new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_GET_THREADS_BY_RESOURCE_ID_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            resourceId
+          }
+        },
+        error
+      );
+      this.logger?.trackException(mastraError);
+      this.logger?.error(mastraError.toString());
       return [];
     }
   }
@@ -734,9 +822,17 @@ var CloudflareStore = class extends MastraStorage {
       await this.insert({ tableName: TABLE_THREADS, record: thread });
       return thread;
     } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      this.logger.error("Error saving thread:", { message });
-      throw error;
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_SAVE_THREAD_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            threadId: thread.id
+          }
+        },
+        error
+      );
     }
   }
   async updateThread({
@@ -761,9 +857,18 @@ var CloudflareStore = class extends MastraStorage {
       await this.insert({ tableName: TABLE_THREADS, record: updatedThread });
       return updatedThread;
     } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      this.logger.error(`Error updating thread ${id}:`, { message });
-      throw error;
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_UPDATE_THREAD_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            threadId: id,
+            title
+          }
+        },
+        error
+      );
     }
   }
   async deleteThread({ threadId }) {
@@ -783,9 +888,17 @@ var CloudflareStore = class extends MastraStorage {
         this.deleteKV(TABLE_THREADS, this.getKey(TABLE_THREADS, { id: threadId }))
       ]);
     } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      this.logger.error(`Error deleting thread ${threadId}:`, { message });
-      throw error;
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_DELETE_THREAD_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            threadId
+          }
+        },
+        error
+      );
     }
   }
   getMessageKey(threadId, messageId) {
@@ -858,9 +971,17 @@ var CloudflareStore = class extends MastraStorage {
             const entries = await this.updateSorting(threadMessages);
             await this.updateSortedMessages(orderKey, entries);
           } catch (error) {
-            const errorMessage = error instanceof Error ? error.message : String(error);
-            this.logger.error(`Error processing messages for thread ${threadId}: ${errorMessage}`);
-            throw error;
+            throw new MastraError(
+              {
+                id: "CLOUDFLARE_STORAGE_SAVE_MESSAGES_FAILED",
+                domain: ErrorDomain.STORAGE,
+                category: ErrorCategory.THIRD_PARTY,
+                details: {
+                  threadId
+                }
+              },
+              error
+            );
           }
         })
       );
@@ -871,9 +992,14 @@ var CloudflareStore = class extends MastraStorage {
       if (format === `v2`) return list.get.all.v2();
       return list.get.all.v1();
     } catch (error) {
-      const errorMessage = error instanceof Error ? error.message : String(error);
-      this.logger.error(`Error saving messages: ${errorMessage}`);
-      throw error;
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_SAVE_MESSAGES_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY
+        },
+        error
+      );
     }
   }
   async getMessages({
@@ -883,12 +1009,7 @@ var CloudflareStore = class extends MastraStorage {
     format
   }) {
     if (!threadId) throw new Error("threadId is required");
-    let limit = 40;
-    if (typeof selectBy?.last === "number") {
-      limit = Math.max(0, selectBy.last);
-    } else if (selectBy?.last === false) {
-      limit = 0;
-    }
+    const limit = this.resolveMessageLimit({ last: selectBy?.last, defaultLimit: 40 });
     const messageIds = /* @__PURE__ */ new Set();
     if (limit === 0 && !selectBy?.include?.length) return [];
     try {
@@ -909,8 +1030,20 @@ var CloudflareStore = class extends MastraStorage {
           return new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime();
         });
       } catch (error) {
-        const errorMessage = error instanceof Error ? error.message : String(error);
-        this.logger.warn(`Error sorting messages, falling back to creation time: ${errorMessage}`);
+        const mastraError = new MastraError(
+          {
+            id: "CLOUDFLARE_STORAGE_SORT_MESSAGES_FAILED",
+            domain: ErrorDomain.STORAGE,
+            category: ErrorCategory.THIRD_PARTY,
+            text: `Error sorting messages for thread ${threadId} falling back to creation time`,
+            details: {
+              threadId
+            }
+          },
+          error
+        );
+        this.logger?.trackException(mastraError);
+        this.logger?.error(mastraError.toString());
         messages.sort((a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime());
       }
       const prepared = messages.map(({ _index, ...message }) => ({
@@ -922,8 +1055,20 @@ var CloudflareStore = class extends MastraStorage {
       if (format === `v1`) return list.get.all.v1();
       return list.get.all.v2();
     } catch (error) {
-      const errorMessage = error instanceof Error ? error.message : String(error);
-      this.logger.error(`Error retrieving messages for thread ${threadId}: ${errorMessage}`);
+      const mastraError = new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_GET_MESSAGES_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Error retrieving messages for thread ${threadId}`,
+          details: {
+            threadId
+          }
+        },
+        error
+      );
+      this.logger?.trackException(mastraError);
+      this.logger?.error(mastraError.toString());
       return [];
     }
   }
@@ -981,9 +1126,20 @@ var CloudflareStore = class extends MastraStorage {
         }
       });
     } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      this.logger.error("Error persisting workflow snapshot:", { message });
-      throw error;
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_PERSIST_WORKFLOW_SNAPSHOT_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Error persisting workflow snapshot for namespace ${params.namespace}, workflow ${params.workflowName}, run ${params.runId}`,
+          details: {
+            namespace: params.namespace,
+            workflowName: params.workflowName,
+            runId: params.runId
+          }
+        },
+        error
+      );
     }
   }
   async loadWorkflowSnapshot(params) {
@@ -997,9 +1153,22 @@ var CloudflareStore = class extends MastraStorage {
       this.validateWorkflowState(state);
       return state;
     } catch (error) {
-      this.logger.error("Error loading workflow snapshot:", {
-        error: error instanceof Error ? error.message : String(error)
-      });
+      const mastraError = new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_LOAD_WORKFLOW_SNAPSHOT_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Error loading workflow snapshot for namespace ${params.namespace}, workflow ${params.workflowName}, run ${params.runId}`,
+          details: {
+            namespace: params.namespace,
+            workflowName: params.workflowName,
+            runId: params.runId
+          }
+        },
+        error
+      );
+      this.logger?.trackException(mastraError);
+      this.logger?.error(mastraError.toString());
       return null;
     }
   }
@@ -1019,9 +1188,18 @@ var CloudflareStore = class extends MastraStorage {
         })
       );
     } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      this.logger.error("Error in batch insert:", { message });
-      throw error;
+      throw new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_BATCH_INSERT_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Error in batch insert for table ${input.tableName}`,
+          details: {
+            tableName: input.tableName
+          }
+        },
+        error
+      );
     }
   }
   async getTraces({
@@ -1101,8 +1279,17 @@ var CloudflareStore = class extends MastraStorage {
         createdAt: record.createdAt
       }));
     } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      this.logger.error("Failed to get traces:", { message });
+      const mastraError = new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_GET_TRACES_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Failed to get traces`
+        },
+        error
+      );
+      this.logger?.trackException(mastraError);
+      this.logger?.error(mastraError.toString());
       return [];
     }
   }
@@ -1117,7 +1304,12 @@ var CloudflareStore = class extends MastraStorage {
     return value;
   }
   getEvalsByAgentName(_agentName, _type) {
-    throw new Error("Method not implemented.");
+    throw new MastraError({
+      id: "CLOUDFLARE_STORAGE_GET_EVALS_BY_AGENT_NAME_FAILED",
+      domain: ErrorDomain.STORAGE,
+      category: ErrorCategory.THIRD_PARTY,
+      text: `Failed to get evals by agent name`
+    });
   }
   parseWorkflowRun(row) {
     let parsedSnapshot = row.snapshot;
@@ -1200,8 +1392,16 @@ var CloudflareStore = class extends MastraStorage {
         total: runs.length
       };
     } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      this.logger.error("Error in getWorkflowRuns:", { message });
+      const mastraError = new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_GET_WORKFLOW_RUNS_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY
+        },
+        error
+      );
+      this.logger?.trackException(mastraError);
+      this.logger?.error(mastraError.toString());
       return { runs: [], total: 0 };
     }
   }
@@ -1224,19 +1424,47 @@ var CloudflareStore = class extends MastraStorage {
       this.validateWorkflowState(state);
       return this.parseWorkflowRun({ ...data, snapshot: state });
     } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      this.logger.error("Error in getWorkflowRunById:", { message });
+      const mastraError = new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_GET_WORKFLOW_RUN_BY_ID_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            namespace,
+            workflowName,
+            runId
+          }
+        },
+        error
+      );
+      this.logger?.trackException(mastraError);
+      this.logger?.error(mastraError.toString());
       return null;
     }
   }
   async getTracesPaginated(_args) {
-    throw new Error("Method not implemented.");
+    throw new MastraError({
+      id: "CLOUDFLARE_STORAGE_GET_TRACES_PAGINATED_FAILED",
+      domain: ErrorDomain.STORAGE,
+      category: ErrorCategory.THIRD_PARTY,
+      text: "Method not implemented."
+    });
   }
   async getThreadsByResourceIdPaginated(_args) {
-    throw new Error("Method not implemented.");
+    throw new MastraError({
+      id: "CLOUDFLARE_STORAGE_GET_THREADS_BY_RESOURCE_ID_PAGINATED_FAILED",
+      domain: ErrorDomain.STORAGE,
+      category: ErrorCategory.THIRD_PARTY,
+      text: "Method not implemented."
+    });
   }
   async getMessagesPaginated(_args) {
-    throw new Error("Method not implemented.");
+    throw new MastraError({
+      id: "CLOUDFLARE_STORAGE_GET_MESSAGES_PAGINATED_FAILED",
+      domain: ErrorDomain.STORAGE,
+      category: ErrorCategory.THIRD_PARTY,
+      text: "Method not implemented."
+    });
   }
   async close() {
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/cloudflare",
-  "version": "0.10.5-alpha.0",
+  "version": "0.10.5-alpha.1",
   "description": "Cloudflare provider for Mastra - includes db storage capabilities",
   "type": "module",
   "files": [
@@ -36,8 +36,8 @@
     "typescript": "^5.8.3",
     "vitest": "^3.2.3",
     "@internal/lint": "0.0.13",
-    "@internal/storage-test-utils": "0.0.9",
-    "@mastra/core": "0.10.7-alpha.0"
+    "@mastra/core": "0.10.7-alpha.1",
+    "@internal/storage-test-utils": "0.0.9"
   },
   "peerDependencies": {
     "@mastra/core": ">=0.10.4-0 <0.11.0"