@mastra/lance 0.0.0-fix-backport-setserver-20251201151948 → 0.0.0-fix-request-context-as-query-key-20251209130646

package/dist/index.cjs

@@ -5,131 +5,15 @@ var error = require('@mastra/core/error');
 var storage = require('@mastra/core/storage');
 var agent = require('@mastra/core/agent');
 var apacheArrow = require('apache-arrow');
-var scores = require('@mastra/core/scores');
+var evals = require('@mastra/core/evals');
 var vector = require('@mastra/core/vector');
 var filter = require('@mastra/core/vector/filter');
 
 // src/storage/index.ts
-var StoreLegacyEvalsLance = class extends storage.LegacyEvalsStorage {
-  client;
-  constructor({ client }) {
-    super();
-    this.client = client;
-  }
-  async getEvalsByAgentName(agentName, type) {
-    try {
-      const table = await this.client.openTable(storage.TABLE_EVALS);
-      const query = table.query().where(`agent_name = '${agentName}'`);
-      const records = await query.toArray();
-      let filteredRecords = records;
-      if (type === "live") {
-        filteredRecords = records.filter((record) => record.test_info === null);
-      } else if (type === "test") {
-        filteredRecords = records.filter((record) => record.test_info !== null);
-      }
-      return filteredRecords.map((record) => {
-        return {
-          id: record.id,
-          input: record.input,
-          output: record.output,
-          agentName: record.agent_name,
-          metricName: record.metric_name,
-          result: JSON.parse(record.result),
-          instructions: record.instructions,
-          testInfo: record.test_info ? JSON.parse(record.test_info) : null,
-          globalRunId: record.global_run_id,
-          runId: record.run_id,
-          createdAt: new Date(record.created_at).toString()
-        };
-      });
-    } catch (error$1) {
-      throw new error.MastraError(
-        {
-          id: "LANCE_STORE_GET_EVALS_BY_AGENT_NAME_FAILED",
-          domain: error.ErrorDomain.STORAGE,
-          category: error.ErrorCategory.THIRD_PARTY,
-          details: { agentName }
-        },
-        error$1
-      );
-    }
-  }
-  async getEvals(options) {
-    try {
-      const table = await this.client.openTable(storage.TABLE_EVALS);
-      const conditions = [];
-      if (options.agentName) {
-        conditions.push(`agent_name = '${options.agentName}'`);
-      }
-      if (options.type === "live") {
-        conditions.push("test_info IS NULL");
-      } else if (options.type === "test") {
-        conditions.push("test_info IS NOT NULL");
-      }
-      const startDate = options.dateRange?.start || options.fromDate;
-      const endDate = options.dateRange?.end || options.toDate;
-      if (startDate) {
-        conditions.push(`\`created_at\` >= ${startDate.getTime()}`);
-      }
-      if (endDate) {
-        conditions.push(`\`created_at\` <= ${endDate.getTime()}`);
-      }
-      let total = 0;
-      if (conditions.length > 0) {
-        total = await table.countRows(conditions.join(" AND "));
-      } else {
-        total = await table.countRows();
-      }
-      const query = table.query();
-      if (conditions.length > 0) {
-        const whereClause = conditions.join(" AND ");
-        query.where(whereClause);
-      }
-      const records = await query.toArray();
-      const evals = records.sort((a, b) => b.created_at - a.created_at).map((record) => {
-        return {
-          id: record.id,
-          input: record.input,
-          output: record.output,
-          agentName: record.agent_name,
-          metricName: record.metric_name,
-          result: JSON.parse(record.result),
-          instructions: record.instructions,
-          testInfo: record.test_info ? JSON.parse(record.test_info) : null,
-          globalRunId: record.global_run_id,
-          runId: record.run_id,
-          createdAt: new Date(record.created_at).toISOString()
-        };
-      });
-      const page = options.page || 0;
-      const perPage = options.perPage || 10;
-      const pagedEvals = evals.slice(page * perPage, (page + 1) * perPage);
-      return {
-        evals: pagedEvals,
-        total,
-        page,
-        perPage,
-        hasMore: total > (page + 1) * perPage
-      };
-    } catch (error$1) {
-      throw new error.MastraError(
-        {
-          id: "LANCE_STORE_GET_EVALS_FAILED",
-          domain: error.ErrorDomain.STORAGE,
-          category: error.ErrorCategory.THIRD_PARTY,
-          details: { agentName: options.agentName ?? "" }
-        },
-        error$1
-      );
-    }
-  }
-};
 function getPrimaryKeys(tableName) {
   let primaryId = ["id"];
   if (tableName === storage.TABLE_WORKFLOW_SNAPSHOT) {
     primaryId = ["workflow_name", "run_id"];
-  } else if (tableName === storage.TABLE_EVALS) {
-    primaryId = ["agent_name", "metric_name", "run_id"];
   }
   return primaryId;
 }
@@ -207,7 +91,7 @@ async function getTableSchema({
   } catch (validationError) {
     throw new error.MastraError(
       {
-        id: "STORAGE_LANCE_STORAGE_GET_TABLE_SCHEMA_INVALID_ARGS",
+        id: storage.createStorageErrorId("LANCE", "GET_TABLE_SCHEMA", "INVALID_ARGS"),
         domain: error.ErrorDomain.STORAGE,
         category: error.ErrorCategory.USER,
         text: validationError.message,
@@ -230,7 +114,7 @@ async function getTableSchema({
   } catch (error$1) {
     throw new error.MastraError(
       {
-        id: "STORAGE_LANCE_STORAGE_GET_TABLE_SCHEMA_FAILED",
+        id: storage.createStorageErrorId("LANCE", "GET_TABLE_SCHEMA", "FAILED"),
         domain: error.ErrorDomain.STORAGE,
         category: error.ErrorCategory.THIRD_PARTY,
         details: { tableName }
@@ -249,6 +133,10 @@ var StoreMemoryLance = class extends storage.MemoryStorage {
     this.client = client;
     this.operations = operations;
   }
+  // Utility to escape single quotes in SQL strings
+  escapeSql(str) {
+    return str.replace(/'/g, "''");
+  }
   async getThreadById({ threadId }) {
     try {
       const thread = await this.operations.load({ tableName: storage.TABLE_THREADS, keys: { id: threadId } });
@@ -263,27 +151,7 @@ var StoreMemoryLance = class extends storage.MemoryStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "LANCE_STORE_GET_THREAD_BY_ID_FAILED",
-          domain: error.ErrorDomain.STORAGE,
-          category: error.ErrorCategory.THIRD_PARTY
-        },
-        error$1
-      );
-    }
-  }
-  async getThreadsByResourceId({ resourceId }) {
-    try {
-      const table = await this.client.openTable(storage.TABLE_THREADS);
-      const query = table.query().where(`\`resourceId\` = '${resourceId}'`);
-      const records = await query.toArray();
-      return processResultWithTypeConversion(
-        records,
-        await getTableSchema({ tableName: storage.TABLE_THREADS, client: this.client })
-      );
-    } catch (error$1) {
-      throw new error.MastraError(
-        {
-          id: "LANCE_STORE_GET_THREADS_BY_RESOURCE_ID_FAILED",
+          id: storage.createStorageErrorId("LANCE", "GET_THREAD_BY_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY
         },
@@ -305,7 +173,7 @@ var StoreMemoryLance = class extends storage.MemoryStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "LANCE_STORE_SAVE_THREAD_FAILED",
+          id: storage.createStorageErrorId("LANCE", "SAVE_THREAD", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY
         },
@@ -347,7 +215,7 @@ var StoreMemoryLance = class extends storage.MemoryStorage {
         }
         throw new error.MastraError(
           {
-            id: "LANCE_STORE_UPDATE_THREAD_FAILED",
+            id: storage.createStorageErrorId("LANCE", "UPDATE_THREAD", "FAILED"),
             domain: error.ErrorDomain.STORAGE,
             category: error.ErrorCategory.THIRD_PARTY
           },
@@ -357,7 +225,7 @@ var StoreMemoryLance = class extends storage.MemoryStorage {
     }
     throw new error.MastraError(
       {
-        id: "LANCE_STORE_UPDATE_THREAD_FAILED",
+        id: storage.createStorageErrorId("LANCE", "UPDATE_THREAD", "FAILED"),
         domain: error.ErrorDomain.STORAGE,
         category: error.ErrorCategory.THIRD_PARTY
       },
@@ -373,7 +241,7 @@ var StoreMemoryLance = class extends storage.MemoryStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "LANCE_STORE_DELETE_THREAD_FAILED",
+          id: storage.createStorageErrorId("LANCE", "DELETE_THREAD", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY
         },
@@ -395,100 +263,176 @@ var StoreMemoryLance = class extends storage.MemoryStorage {
       })() : message.content
     };
   }
-  async getMessages({
-    threadId,
-    resourceId,
-    selectBy,
-    format,
-    threadConfig
-  }) {
+  async listMessagesById({ messageIds }) {
+    if (messageIds.length === 0) return { messages: [] };
     try {
-      if (!threadId.trim()) throw new Error("threadId must be a non-empty string");
-      if (threadConfig) {
-        throw new Error("ThreadConfig is not supported by LanceDB storage");
-      }
-      const limit = storage.resolveMessageLimit({ last: selectBy?.last, defaultLimit: Number.MAX_SAFE_INTEGER });
       const table = await this.client.openTable(storage.TABLE_MESSAGES);
-      let allRecords = [];
-      if (selectBy?.include && selectBy.include.length > 0) {
-        const threadIds = [...new Set(selectBy.include.map((item) => item.threadId))];
-        for (const threadId2 of threadIds) {
-          const threadQuery = table.query().where(`thread_id = '${threadId2}'`);
-          let threadRecords = await threadQuery.toArray();
-          allRecords.push(...threadRecords);
-        }
-      } else {
-        let query = table.query().where(`\`thread_id\` = '${threadId}'`);
-        allRecords = await query.toArray();
-      }
-      allRecords.sort((a, b) => {
-        const dateA = new Date(a.createdAt).getTime();
-        const dateB = new Date(b.createdAt).getTime();
-        return dateA - dateB;
-      });
-      if (selectBy?.include && selectBy.include.length > 0) {
-        allRecords = this.processMessagesWithContext(allRecords, selectBy.include);
-      }
-      if (limit !== Number.MAX_SAFE_INTEGER) {
-        allRecords = allRecords.slice(-limit);
-      }
+      const quotedIds = messageIds.map((id) => `'${id}'`).join(", ");
+      const allRecords = await table.query().where(`id IN (${quotedIds})`).toArray();
       const messages = processResultWithTypeConversion(
         allRecords,
         await getTableSchema({ tableName: storage.TABLE_MESSAGES, client: this.client })
       );
-      const list = new agent.MessageList({ threadId, resourceId }).add(messages.map(this.normalizeMessage), "memory");
-      if (format === "v2") return list.get.all.v2();
-      return list.get.all.v1();
+      const list = new agent.MessageList().add(
+        messages.map(this.normalizeMessage),
+        "memory"
+      );
+      return { messages: list.get.all.db() };
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "LANCE_STORE_GET_MESSAGES_FAILED",
+          id: storage.createStorageErrorId("LANCE", "LIST_MESSAGES_BY_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
-            threadId,
-            resourceId: resourceId ?? ""
+            messageIds: JSON.stringify(messageIds)
           }
         },
         error$1
       );
     }
   }
-  async getMessagesById({
-    messageIds,
-    format
-  }) {
-    if (messageIds.length === 0) return [];
+  async listMessages(args) {
+    const { threadId, resourceId, include, filter, perPage: perPageInput, page = 0, orderBy } = args;
+    const threadIds = Array.isArray(threadId) ? threadId : [threadId];
+    if (threadIds.length === 0 || threadIds.some((id) => !id.trim())) {
+      throw new error.MastraError(
+        {
+          id: storage.createStorageErrorId("LANCE", "LIST_MESSAGES", "INVALID_THREAD_ID"),
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          details: { threadId: Array.isArray(threadId) ? threadId.join(",") : threadId }
+        },
+        new Error("threadId must be a non-empty string or array of non-empty strings")
+      );
+    }
+    const perPage = storage.normalizePerPage(perPageInput, 40);
+    const { offset, perPage: perPageForResponse } = storage.calculatePagination(page, perPageInput, perPage);
     try {
+      if (page < 0) {
+        throw new error.MastraError(
+          {
+            id: storage.createStorageErrorId("LANCE", "LIST_MESSAGES", "INVALID_PAGE"),
+            domain: error.ErrorDomain.STORAGE,
+            category: error.ErrorCategory.USER,
+            details: { page }
+          },
+          new Error("page must be >= 0")
+        );
+      }
+      const { field, direction } = this.parseOrderBy(orderBy, "ASC");
       const table = await this.client.openTable(storage.TABLE_MESSAGES);
-      const quotedIds = messageIds.map((id) => `'${id}'`).join(", ");
-      const allRecords = await table.query().where(`id IN (${quotedIds})`).toArray();
-      const messages = processResultWithTypeConversion(
-        allRecords,
-        await getTableSchema({ tableName: storage.TABLE_MESSAGES, client: this.client })
-      );
-      const list = new agent.MessageList().add(messages.map(this.normalizeMessage), "memory");
-      if (format === `v1`) return list.get.all.v1();
-      return list.get.all.v2();
+      const threadCondition = threadIds.length === 1 ? `thread_id = '${this.escapeSql(threadIds[0])}'` : `thread_id IN (${threadIds.map((t) => `'${this.escapeSql(t)}'`).join(", ")})`;
+      const conditions = [threadCondition];
+      if (resourceId) {
+        conditions.push(`\`resourceId\` = '${this.escapeSql(resourceId)}'`);
+      }
+      if (filter?.dateRange?.start) {
+        const startTime = filter.dateRange.start instanceof Date ? filter.dateRange.start.getTime() : new Date(filter.dateRange.start).getTime();
+        conditions.push(`\`createdAt\` >= ${startTime}`);
+      }
+      if (filter?.dateRange?.end) {
+        const endTime = filter.dateRange.end instanceof Date ? filter.dateRange.end.getTime() : new Date(filter.dateRange.end).getTime();
+        conditions.push(`\`createdAt\` <= ${endTime}`);
+      }
+      const whereClause = conditions.join(" AND ");
+      const total = await table.countRows(whereClause);
+      const query = table.query().where(whereClause);
+      let allRecords = await query.toArray();
+      allRecords.sort((a, b) => {
+        const aValue = field === "createdAt" ? a.createdAt : a[field];
+        const bValue = field === "createdAt" ? b.createdAt : b[field];
+        if (aValue == null && bValue == null) return 0;
+        if (aValue == null) return direction === "ASC" ? -1 : 1;
+        if (bValue == null) return direction === "ASC" ? 1 : -1;
+        if (typeof aValue === "string" && typeof bValue === "string") {
+          return direction === "ASC" ? aValue.localeCompare(bValue) : bValue.localeCompare(aValue);
+        }
+        return direction === "ASC" ? aValue - bValue : bValue - aValue;
+      });
+      const paginatedRecords = allRecords.slice(offset, offset + perPage);
+      const messages = paginatedRecords.map((row) => this.normalizeMessage(row));
+      if (total === 0 && messages.length === 0 && (!include || include.length === 0)) {
+        return {
+          messages: [],
+          total: 0,
+          page,
+          perPage: perPageForResponse,
+          hasMore: false
+        };
+      }
+      const messageIds = new Set(messages.map((m) => m.id));
+      if (include && include.length > 0) {
+        const threadIds2 = [...new Set(include.map((item) => item.threadId || threadId))];
+        const allThreadMessages = [];
+        for (const tid of threadIds2) {
+          const threadQuery = table.query().where(`thread_id = '${tid}'`);
+          let threadRecords = await threadQuery.toArray();
+          allThreadMessages.push(...threadRecords);
+        }
+        allThreadMessages.sort((a, b) => a.createdAt - b.createdAt);
+        const contextMessages = this.processMessagesWithContext(allThreadMessages, include);
+        const includedMessages = contextMessages.map((row) => this.normalizeMessage(row));
+        for (const includeMsg of includedMessages) {
+          if (!messageIds.has(includeMsg.id)) {
+            messages.push(includeMsg);
+            messageIds.add(includeMsg.id);
+          }
+        }
+      }
+      const list = new agent.MessageList().add(messages, "memory");
+      let finalMessages = list.get.all.db();
+      finalMessages = finalMessages.sort((a, b) => {
+        const aValue = field === "createdAt" ? new Date(a.createdAt).getTime() : a[field];
+        const bValue = field === "createdAt" ? new Date(b.createdAt).getTime() : b[field];
+        if (aValue == null && bValue == null) return 0;
+        if (aValue == null) return direction === "ASC" ? -1 : 1;
+        if (bValue == null) return direction === "ASC" ? 1 : -1;
+        if (typeof aValue === "string" && typeof bValue === "string") {
+          return direction === "ASC" ? aValue.localeCompare(bValue) : bValue.localeCompare(aValue);
+        }
+        return direction === "ASC" ? aValue - bValue : bValue - aValue;
+      });
+      const returnedThreadMessageIds = new Set(finalMessages.filter((m) => m.threadId === threadId).map((m) => m.id));
+      const allThreadMessagesReturned = returnedThreadMessageIds.size >= total;
+      const fetchedAll = perPageInput === false || allThreadMessagesReturned;
+      const hasMore = !fetchedAll && offset + perPage < total;
+      return {
+        messages: finalMessages,
+        total,
+        page,
+        perPage: perPageForResponse,
+        hasMore
+      };
     } catch (error$1) {
-      throw new error.MastraError(
+      const mastraError = new error.MastraError(
         {
-          id: "LANCE_STORE_GET_MESSAGES_BY_ID_FAILED",
+          id: storage.createStorageErrorId("LANCE", "LIST_MESSAGES", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
-            messageIds: JSON.stringify(messageIds)
+            threadId: Array.isArray(threadId) ? threadId.join(",") : threadId,
+            resourceId: resourceId ?? ""
           }
         },
         error$1
       );
+      this.logger?.error?.(mastraError.toString());
+      this.logger?.trackException?.(mastraError);
+      return {
+        messages: [],
+        total: 0,
+        page,
+        perPage: perPageForResponse,
+        hasMore: false
+      };
     }
   }
   async saveMessages(args) {
     try {
-      const { messages, format = "v1" } = args;
+      const { messages } = args;
       if (messages.length === 0) {
-        return [];
+        return { messages: [] };
       }
       const threadId = messages[0]?.threadId;
       if (!threadId) {
@@ -524,12 +468,11 @@ var StoreMemoryLance = class extends storage.MemoryStorage {
       const updateRecord = { id: threadId, updatedAt: currentTime };
       await threadsTable.mergeInsert("id").whenMatchedUpdateAll().whenNotMatchedInsertAll().execute([updateRecord]);
       const list = new agent.MessageList().add(messages, "memory");
-      if (format === `v2`) return list.get.all.v2();
-      return list.get.all.v1();
+      return { messages: list.get.all.db() };
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "LANCE_STORE_SAVE_MESSAGES_FAILED",
+          id: storage.createStorageErrorId("LANCE", "SAVE_MESSAGES", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY
         },
@@ -537,32 +480,54 @@ var StoreMemoryLance = class extends storage.MemoryStorage {
       );
     }
   }
-  async getThreadsByResourceIdPaginated(args) {
+  async listThreadsByResourceId(args) {
     try {
-      const { resourceId, page = 0, perPage = 10 } = args;
-      const table = await this.client.openTable(storage.TABLE_THREADS);
-      const total = await table.countRows(`\`resourceId\` = '${resourceId}'`);
-      const query = table.query().where(`\`resourceId\` = '${resourceId}'`);
-      const offset = page * perPage;
-      query.limit(perPage);
-      if (offset > 0) {
-        query.offset(offset);
+      const { resourceId, page = 0, perPage: perPageInput, orderBy } = args;
+      const perPage = storage.normalizePerPage(perPageInput, 100);
+      if (page < 0) {
+        throw new error.MastraError(
+          {
+            id: storage.createStorageErrorId("LANCE", "LIST_THREADS_BY_RESOURCE_ID", "INVALID_PAGE"),
+            domain: error.ErrorDomain.STORAGE,
+            category: error.ErrorCategory.USER,
+            details: { page }
+          },
+          new Error("page must be >= 0")
+        );
       }
+      const { offset, perPage: perPageForResponse } = storage.calculatePagination(page, perPageInput, perPage);
+      const { field, direction } = this.parseOrderBy(orderBy);
+      const table = await this.client.openTable(storage.TABLE_THREADS);
+      const total = await table.countRows(`\`resourceId\` = '${this.escapeSql(resourceId)}'`);
+      const query = table.query().where(`\`resourceId\` = '${this.escapeSql(resourceId)}'`);
       const records = await query.toArray();
-      records.sort((a, b) => new Date(b.updatedAt).getTime() - new Date(a.updatedAt).getTime());
+      records.sort((a, b) => {
+        const aValue = ["createdAt", "updatedAt"].includes(field) ? new Date(a[field]).getTime() : a[field];
+        const bValue = ["createdAt", "updatedAt"].includes(field) ? new Date(b[field]).getTime() : b[field];
+        if (aValue == null && bValue == null) return 0;
+        if (aValue == null) return direction === "ASC" ? -1 : 1;
+        if (bValue == null) return direction === "ASC" ? 1 : -1;
+        if (typeof aValue === "string" && typeof bValue === "string") {
+          return direction === "ASC" ? aValue.localeCompare(bValue) : bValue.localeCompare(aValue);
+        }
+        return direction === "ASC" ? aValue - bValue : bValue - aValue;
+      });
+      const paginatedRecords = records.slice(offset, offset + perPage);
       const schema = await getTableSchema({ tableName: storage.TABLE_THREADS, client: this.client });
-      const threads = records.map((record) => processResultWithTypeConversion(record, schema));
+      const threads = paginatedRecords.map(
+        (record) => processResultWithTypeConversion(record, schema)
+      );
       return {
         threads,
         total,
         page,
-        perPage,
-        hasMore: total > (page + 1) * perPage
+        perPage: perPageForResponse,
+        hasMore: offset + perPage < total
       };
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "LANCE_STORE_GET_THREADS_BY_RESOURCE_ID_PAGINATED_FAILED",
+          id: storage.createStorageErrorId("LANCE", "LIST_THREADS_BY_RESOURCE_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY
         },
@@ -618,132 +583,8 @@ var StoreMemoryLance = class extends storage.MemoryStorage {
     });
     return Array.from(allIndices).sort((a, b) => a - b).map((index) => records[index]);
   }
-  async getMessagesPaginated(args) {
-    const { threadId, resourceId, selectBy, format = "v1" } = args;
-    const page = selectBy?.pagination?.page ?? 0;
-    const perPage = selectBy?.pagination?.perPage ?? 10;
-    try {
-      if (!threadId.trim()) throw new Error("threadId must be a non-empty string");
-      const dateRange = selectBy?.pagination?.dateRange;
-      const fromDate = dateRange?.start;
-      const toDate = dateRange?.end;
-      const table = await this.client.openTable(storage.TABLE_MESSAGES);
-      const messages = [];
-      if (selectBy?.include && Array.isArray(selectBy.include)) {
-        const threadIds = [...new Set(selectBy.include.map((item) => item.threadId))];
-        const allThreadMessages = [];
-        for (const threadId2 of threadIds) {
-          const threadQuery = table.query().where(`thread_id = '${threadId2}'`);
-          let threadRecords = await threadQuery.toArray();
-          if (fromDate) threadRecords = threadRecords.filter((m) => m.createdAt >= fromDate.getTime());
-          if (toDate) threadRecords = threadRecords.filter((m) => m.createdAt <= toDate.getTime());
-          allThreadMessages.push(...threadRecords);
-        }
-        allThreadMessages.sort((a, b) => a.createdAt - b.createdAt);
-        const contextMessages = this.processMessagesWithContext(allThreadMessages, selectBy.include);
-        messages.push(...contextMessages);
-      }
-      const conditions = [`thread_id = '${threadId}'`];
-      if (resourceId) {
-        conditions.push(`\`resourceId\` = '${resourceId}'`);
-      }
-      if (fromDate) {
-        conditions.push(`\`createdAt\` >= ${fromDate.getTime()}`);
-      }
-      if (toDate) {
-        conditions.push(`\`createdAt\` <= ${toDate.getTime()}`);
-      }
-      let total = 0;
-      if (conditions.length > 0) {
-        total = await table.countRows(conditions.join(" AND "));
-      } else {
-        total = await table.countRows();
-      }
-      if (total === 0 && messages.length === 0) {
-        return {
-          messages: [],
-          total: 0,
-          page,
-          perPage,
-          hasMore: false
-        };
-      }
-      const excludeIds = messages.map((m) => m.id);
-      let selectedMessages = [];
-      if (selectBy?.last && selectBy.last > 0) {
-        const query = table.query();
-        if (conditions.length > 0) {
-          query.where(conditions.join(" AND "));
-        }
-        let records = await query.toArray();
-        records = records.sort((a, b) => a.createdAt - b.createdAt);
-        if (excludeIds.length > 0) {
-          records = records.filter((m) => !excludeIds.includes(m.id));
-        }
-        selectedMessages = records.slice(-selectBy.last);
-      } else {
-        const query = table.query();
-        if (conditions.length > 0) {
-          query.where(conditions.join(" AND "));
-        }
-        let records = await query.toArray();
-        records = records.sort((a, b) => a.createdAt - b.createdAt);
-        if (excludeIds.length > 0) {
-          records = records.filter((m) => !excludeIds.includes(m.id));
-        }
-        selectedMessages = records.slice(page * perPage, (page + 1) * perPage);
-      }
-      const allMessages = [...messages, ...selectedMessages];
-      const seen = /* @__PURE__ */ new Set();
-      const dedupedMessages = allMessages.filter((m) => {
-        const key = `${m.id}:${m.thread_id}`;
-        if (seen.has(key)) return false;
-        seen.add(key);
-        return true;
-      });
-      const formattedMessages = dedupedMessages.map((msg) => {
-        const { thread_id, ...rest } = msg;
-        return {
-          ...rest,
-          threadId: thread_id,
-          content: typeof msg.content === "string" ? (() => {
-            try {
-              return JSON.parse(msg.content);
-            } catch {
-              return msg.content;
-            }
-          })() : msg.content
-        };
-      });
-      const list = new agent.MessageList().add(formattedMessages, "memory");
-      return {
-        messages: format === "v2" ? list.get.all.v2() : list.get.all.v1(),
-        total,
-        // Total should be the count of messages matching the filters
-        page,
-        perPage,
-        hasMore: total > (page + 1) * perPage
-      };
-    } catch (error$1) {
-      const mastraError = new error.MastraError(
-        {
-          id: "LANCE_STORE_GET_MESSAGES_PAGINATED_FAILED",
-          domain: error.ErrorDomain.STORAGE,
-          category: error.ErrorCategory.THIRD_PARTY,
-          details: {
-            threadId,
-            resourceId: resourceId ?? ""
-          }
-        },
-        error$1
-      );
-      this.logger?.trackException?.(mastraError);
-      this.logger?.error?.(mastraError.toString());
-      return { messages: [], total: 0, page, perPage, hasMore: false };
-    }
-  }
   /**
-   * Parse message data from LanceDB record format to MastraMessageV2 format
+   * Parse message data from LanceDB record format to MastraDBMessage format
    */
   parseMessageData(data) {
     const { thread_id, ...rest } = data;
@@ -821,7 +662,7 @@ var StoreMemoryLance = class extends storage.MemoryStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "LANCE_STORE_UPDATE_MESSAGES_FAILED",
+          id: storage.createStorageErrorId("LANCE", "UPDATE_MESSAGES", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { count: messages.length }
@@ -898,7 +739,7 @@ var StoreMemoryLance = class extends storage.MemoryStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "LANCE_STORE_GET_RESOURCE_BY_ID_FAILED",
+          id: storage.createStorageErrorId("LANCE", "GET_RESOURCE_BY_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY
         },
@@ -922,7 +763,7 @@ var StoreMemoryLance = class extends storage.MemoryStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "LANCE_STORE_SAVE_RESOURCE_FAILED",
+          id: storage.createStorageErrorId("LANCE", "SAVE_RESOURCE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY
         },
@@ -976,7 +817,7 @@ var StoreMemoryLance = class extends storage.MemoryStorage {
         }
         throw new error.MastraError(
           {
-            id: "LANCE_STORE_UPDATE_RESOURCE_FAILED",
+            id: storage.createStorageErrorId("LANCE", "UPDATE_RESOURCE", "FAILED"),
             domain: error.ErrorDomain.STORAGE,
             category: error.ErrorCategory.THIRD_PARTY
           },
@@ -1067,7 +908,7 @@ var StoreOperationsLance = class extends storage.StoreOperations {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "STORAGE_LANCE_STORAGE_CREATE_TABLE_INVALID_ARGS",
+          id: storage.createStorageErrorId("LANCE", "CREATE_TABLE", "INVALID_ARGS"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER,
           details: { tableName }
@@ -1085,7 +926,7 @@ var StoreOperationsLance = class extends storage.StoreOperations {
       }
       throw new error.MastraError(
         {
-          id: "STORAGE_LANCE_STORAGE_CREATE_TABLE_FAILED",
+          id: storage.createStorageErrorId("LANCE", "CREATE_TABLE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { tableName }
@@ -1105,7 +946,7 @@ var StoreOperationsLance = class extends storage.StoreOperations {
     } catch (validationError) {
       throw new error.MastraError(
         {
-          id: "STORAGE_LANCE_STORAGE_DROP_TABLE_INVALID_ARGS",
+          id: storage.createStorageErrorId("LANCE", "DROP_TABLE", "INVALID_ARGS"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER,
           text: validationError.message,
@@ -1123,7 +964,7 @@ var StoreOperationsLance = class extends storage.StoreOperations {
       }
       throw new error.MastraError(
         {
-          id: "STORAGE_LANCE_STORAGE_DROP_TABLE_FAILED",
+          id: storage.createStorageErrorId("LANCE", "DROP_TABLE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { tableName }
@@ -1154,7 +995,7 @@ var StoreOperationsLance = class extends storage.StoreOperations {
     } catch (validationError) {
       throw new error.MastraError(
         {
-          id: "STORAGE_LANCE_STORAGE_ALTER_TABLE_INVALID_ARGS",
+          id: storage.createStorageErrorId("LANCE", "ALTER_TABLE", "INVALID_ARGS"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER,
           text: validationError.message,
@@ -1189,7 +1030,7 @@ var StoreOperationsLance = class extends storage.StoreOperations {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "STORAGE_LANCE_STORAGE_ALTER_TABLE_FAILED",
+          id: storage.createStorageErrorId("LANCE", "ALTER_TABLE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { tableName }
@@ -1209,7 +1050,7 @@ var StoreOperationsLance = class extends storage.StoreOperations {
     } catch (validationError) {
       throw new error.MastraError(
         {
-          id: "STORAGE_LANCE_STORAGE_CLEAR_TABLE_INVALID_ARGS",
+          id: storage.createStorageErrorId("LANCE", "CLEAR_TABLE", "INVALID_ARGS"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER,
           text: validationError.message,
@@ -1224,7 +1065,7 @@ var StoreOperationsLance = class extends storage.StoreOperations {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "STORAGE_LANCE_STORAGE_CLEAR_TABLE_FAILED",
+          id: storage.createStorageErrorId("LANCE", "CLEAR_TABLE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { tableName }
@@ -1247,7 +1088,7 @@ var StoreOperationsLance = class extends storage.StoreOperations {
     } catch (validationError) {
       throw new error.MastraError(
         {
-          id: "STORAGE_LANCE_STORAGE_INSERT_INVALID_ARGS",
+          id: storage.createStorageErrorId("LANCE", "INSERT", "INVALID_ARGS"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER,
           text: validationError.message,
@@ -1266,12 +1107,11 @@ var StoreOperationsLance = class extends storage.StoreOperations {
           processedRecord[key] = JSON.stringify(processedRecord[key]);
         }
       }
-      console.info(await table.schema());
       await table.mergeInsert(primaryId).whenMatchedUpdateAll().whenNotMatchedInsertAll().execute([processedRecord]);
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "STORAGE_LANCE_STORAGE_INSERT_FAILED",
+          id: storage.createStorageErrorId("LANCE", "INSERT", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { tableName }
@@ -1294,7 +1134,7 @@ var StoreOperationsLance = class extends storage.StoreOperations {
     } catch (validationError) {
       throw new error.MastraError(
         {
-          id: "STORAGE_LANCE_STORAGE_BATCH_INSERT_INVALID_ARGS",
+          id: storage.createStorageErrorId("LANCE", "BATCH_INSERT", "INVALID_ARGS"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER,
           text: validationError.message,
@@ -1320,7 +1160,7 @@ var StoreOperationsLance = class extends storage.StoreOperations {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "STORAGE_LANCE_STORAGE_BATCH_INSERT_FAILED",
+          id: storage.createStorageErrorId("LANCE", "BATCH_INSERT", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { tableName }
@@ -1343,7 +1183,7 @@ var StoreOperationsLance = class extends storage.StoreOperations {
     } catch (validationError) {
       throw new error.MastraError(
         {
-          id: "STORAGE_LANCE_STORAGE_LOAD_INVALID_ARGS",
+          id: storage.createStorageErrorId("LANCE", "LOAD", "INVALID_ARGS"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER,
           text: validationError.message,
@@ -1382,7 +1222,7 @@ var StoreOperationsLance = class extends storage.StoreOperations {
       if (error$1 instanceof error.MastraError) throw error$1;
       throw new error.MastraError(
         {
-          id: "STORAGE_LANCE_STORAGE_LOAD_FAILED",
+          id: storage.createStorageErrorId("LANCE", "LOAD", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { tableName, keyCount: Object.keys(keys).length, firstKey: Object.keys(keys)[0] ?? "" }
@@ -1401,43 +1241,51 @@ var StoreScoresLance = class extends storage.ScoresStorage {
   async saveScore(score) {
     let validatedScore;
     try {
-      validatedScore = scores.saveScorePayloadSchema.parse(score);
+      validatedScore = evals.saveScorePayloadSchema.parse(score);
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "LANCE_STORAGE_SAVE_SCORE_FAILED",
+          id: storage.createStorageErrorId("LANCE", "SAVE_SCORE", "VALIDATION_FAILED"),
           text: "Failed to save score in LanceStorage",
           domain: error.ErrorDomain.STORAGE,
-          category: error.ErrorCategory.THIRD_PARTY
+          category: error.ErrorCategory.USER,
+          details: {
+            scorer: score.scorer?.id ?? "unknown",
+            entityId: score.entityId ?? "unknown",
+            entityType: score.entityType ?? "unknown",
+            traceId: score.traceId ?? "",
+            spanId: score.spanId ?? ""
+          }
         },
         error$1
       );
     }
+    const id = crypto.randomUUID();
+    const now = /* @__PURE__ */ new Date();
     try {
-      const id = crypto.randomUUID();
       const table = await this.client.openTable(storage.TABLE_SCORERS);
       const schema = await getTableSchema({ tableName: storage.TABLE_SCORERS, client: this.client });
       const allowedFields = new Set(schema.fields.map((f) => f.name));
       const filteredScore = {};
-      Object.keys(validatedScore).forEach((key) => {
+      for (const key of Object.keys(validatedScore)) {
         if (allowedFields.has(key)) {
-          filteredScore[key] = score[key];
+          filteredScore[key] = validatedScore[key];
         }
-      });
+      }
       for (const key in filteredScore) {
         if (filteredScore[key] !== null && typeof filteredScore[key] === "object" && !(filteredScore[key] instanceof Date)) {
           filteredScore[key] = JSON.stringify(filteredScore[key]);
         }
       }
-      filteredScore.createdAt = /* @__PURE__ */ new Date();
-      filteredScore.updatedAt = /* @__PURE__ */ new Date();
       filteredScore.id = id;
+      filteredScore.createdAt = now;
+      filteredScore.updatedAt = now;
       await table.add([filteredScore], { mode: "append" });
-      return { score };
+      return { score: { ...validatedScore, id, createdAt: now, updatedAt: now } };
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "LANCE_STORAGE_SAVE_SCORE_FAILED",
+          id: storage.createStorageErrorId("LANCE", "SAVE_SCORE", "FAILED"),
           text: "Failed to save score in LanceStorage",
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
@@ -1453,12 +1301,11 @@ var StoreScoresLance = class extends storage.ScoresStorage {
       const query = table.query().where(`id = '${id}'`).limit(1);
       const records = await query.toArray();
       if (records.length === 0) return null;
-      const schema = await getTableSchema({ tableName: storage.TABLE_SCORERS, client: this.client });
-      return processResultWithTypeConversion(records[0], schema);
+      return await this.transformScoreRow(records[0]);
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "LANCE_STORAGE_GET_SCORE_BY_ID_FAILED",
+          id: storage.createStorageErrorId("LANCE", "GET_SCORE_BY_ID", "FAILED"),
           text: "Failed to get score by id in LanceStorage",
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
@@ -1468,7 +1315,23 @@ var StoreScoresLance = class extends storage.ScoresStorage {
       );
     }
   }
-  async getScoresByScorerId({
+  /**
+   * LanceDB-specific score row transformation.
+   *
+   * Note: This implementation does NOT use coreTransformScoreRow because:
+   * 1. LanceDB stores schema information in the table itself (requires async fetch)
+   * 2. Uses processResultWithTypeConversion utility for LanceDB-specific type handling
+   */
+  async transformScoreRow(row) {
+    const schema = await getTableSchema({ tableName: storage.TABLE_SCORERS, client: this.client });
+    const transformed = processResultWithTypeConversion(row, schema);
+    return {
+      ...transformed,
+      createdAt: row.createdAt,
+      updatedAt: row.updatedAt
+    };
+  }
+  async listScoresByScorerId({
     scorerId,
     pagination,
     entityId,
@@ -1476,9 +1339,10 @@ var StoreScoresLance = class extends storage.ScoresStorage {
     source
   }) {
     try {
+      const { page, perPage: perPageInput } = pagination;
+      const perPage = storage.normalizePerPage(perPageInput, 100);
+      const { offset: start, perPage: perPageForResponse } = storage.calculatePagination(page, perPageInput, perPage);
       const table = await this.client.openTable(storage.TABLE_SCORERS);
-      const { page = 0, perPage = 10 } = pagination || {};
-      const offset = page * perPage;
       let query = table.query().where(`\`scorerId\` = '${scorerId}'`);
       if (source) {
         query = query.where(`\`source\` = '${source}'`);
@@ -1489,30 +1353,38 @@ var StoreScoresLance = class extends storage.ScoresStorage {
       if (entityType) {
         query = query.where(`\`entityType\` = '${entityType}'`);
       }
-      query = query.limit(perPage);
-      if (offset > 0) query.offset(offset);
-      const records = await query.toArray();
-      const schema = await getTableSchema({ tableName: storage.TABLE_SCORERS, client: this.client });
-      const scores = processResultWithTypeConversion(records, schema);
       let totalQuery = table.query().where(`\`scorerId\` = '${scorerId}'`);
       if (source) {
         totalQuery = totalQuery.where(`\`source\` = '${source}'`);
       }
+      if (entityId) {
+        totalQuery = totalQuery.where(`\`entityId\` = '${entityId}'`);
+      }
+      if (entityType) {
+        totalQuery = totalQuery.where(`\`entityType\` = '${entityType}'`);
+      }
       const allRecords = await totalQuery.toArray();
       const total = allRecords.length;
+      const end = perPageInput === false ? total : start + perPage;
+      if (perPageInput !== false) {
+        query = query.limit(perPage);
+        if (start > 0) query = query.offset(start);
+      }
+      const records = await query.toArray();
+      const scores = await Promise.all(records.map(async (record) => await this.transformScoreRow(record)));
       return {
         pagination: {
           page,
-          perPage,
+          perPage: perPageForResponse,
           total,
-          hasMore: offset + scores.length < total
+          hasMore: end < total
         },
         scores
       };
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "LANCE_STORAGE_GET_SCORES_BY_SCORER_ID_FAILED",
+          id: storage.createStorageErrorId("LANCE", "LIST_SCORES_BY_SCORER_ID", "FAILED"),
           text: "Failed to get scores by scorerId in LanceStorage",
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
@@ -1522,34 +1394,38 @@ var StoreScoresLance = class extends storage.ScoresStorage {
       );
     }
   }
-  async getScoresByRunId({
+  async listScoresByRunId({
     runId,
     pagination
   }) {
     try {
+      const { page, perPage: perPageInput } = pagination;
+      const perPage = storage.normalizePerPage(perPageInput, 100);
+      const { offset: start, perPage: perPageForResponse } = storage.calculatePagination(page, perPageInput, perPage);
       const table = await this.client.openTable(storage.TABLE_SCORERS);
-      const { page = 0, perPage = 10 } = pagination || {};
-      const offset = page * perPage;
-      const query = table.query().where(`\`runId\` = '${runId}'`).limit(perPage);
-      if (offset > 0) query.offset(offset);
-      const records = await query.toArray();
-      const schema = await getTableSchema({ tableName: storage.TABLE_SCORERS, client: this.client });
-      const scores = processResultWithTypeConversion(records, schema);
       const allRecords = await table.query().where(`\`runId\` = '${runId}'`).toArray();
       const total = allRecords.length;
+      const end = perPageInput === false ? total : start + perPage;
+      let query = table.query().where(`\`runId\` = '${runId}'`);
+      if (perPageInput !== false) {
+        query = query.limit(perPage);
+        if (start > 0) query = query.offset(start);
+      }
+      const records = await query.toArray();
+      const scores = await Promise.all(records.map(async (record) => await this.transformScoreRow(record)));
       return {
         pagination: {
           page,
-          perPage,
+          perPage: perPageForResponse,
           total,
-          hasMore: offset + scores.length < total
+          hasMore: end < total
         },
         scores
       };
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "LANCE_STORAGE_GET_SCORES_BY_RUN_ID_FAILED",
+          id: storage.createStorageErrorId("LANCE", "LIST_SCORES_BY_RUN_ID", "FAILED"),
           text: "Failed to get scores by runId in LanceStorage",
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
@@ -1559,35 +1435,39 @@ var StoreScoresLance = class extends storage.ScoresStorage {
       );
     }
   }
-  async getScoresByEntityId({
+  async listScoresByEntityId({
     entityId,
     entityType,
     pagination
   }) {
     try {
+      const { page, perPage: perPageInput } = pagination;
+      const perPage = storage.normalizePerPage(perPageInput, 100);
+      const { offset: start, perPage: perPageForResponse } = storage.calculatePagination(page, perPageInput, perPage);
       const table = await this.client.openTable(storage.TABLE_SCORERS);
-      const { page = 0, perPage = 10 } = pagination || {};
-      const offset = page * perPage;
-      const query = table.query().where(`\`entityId\` = '${entityId}' AND \`entityType\` = '${entityType}'`).limit(perPage);
-      if (offset > 0) query.offset(offset);
-      const records = await query.toArray();
-      const schema = await getTableSchema({ tableName: storage.TABLE_SCORERS, client: this.client });
-      const scores = processResultWithTypeConversion(records, schema);
       const allRecords = await table.query().where(`\`entityId\` = '${entityId}' AND \`entityType\` = '${entityType}'`).toArray();
       const total = allRecords.length;
+      const end = perPageInput === false ? total : start + perPage;
+      let query = table.query().where(`\`entityId\` = '${entityId}' AND \`entityType\` = '${entityType}'`);
+      if (perPageInput !== false) {
+        query = query.limit(perPage);
+        if (start > 0) query = query.offset(start);
+      }
+      const records = await query.toArray();
+      const scores = await Promise.all(records.map(async (record) => await this.transformScoreRow(record)));
       return {
         pagination: {
           page,
-          perPage,
+          perPage: perPageForResponse,
           total,
-          hasMore: offset + scores.length < total
+          hasMore: end < total
         },
         scores
       };
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "LANCE_STORAGE_GET_SCORES_BY_ENTITY_ID_FAILED",
+          id: storage.createStorageErrorId("LANCE", "LIST_SCORES_BY_ENTITY_ID", "FAILED"),
           text: "Failed to get scores by entityId and entityType in LanceStorage",
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
@@ -1597,35 +1477,39 @@ var StoreScoresLance = class extends storage.ScoresStorage {
       );
     }
   }
-  async getScoresBySpan({
+  async listScoresBySpan({
     traceId,
     spanId,
     pagination
   }) {
     try {
+      const { page, perPage: perPageInput } = pagination;
+      const perPage = storage.normalizePerPage(perPageInput, 100);
+      const { offset: start, perPage: perPageForResponse } = storage.calculatePagination(page, perPageInput, perPage);
       const table = await this.client.openTable(storage.TABLE_SCORERS);
-      const { page = 0, perPage = 10 } = pagination || {};
-      const offset = page * perPage;
-      const query = table.query().where(`\`traceId\` = '${traceId}' AND \`spanId\` = '${spanId}'`).limit(perPage);
-      if (offset > 0) query.offset(offset);
-      const records = await query.toArray();
-      const schema = await getTableSchema({ tableName: storage.TABLE_SCORERS, client: this.client });
-      const scores = processResultWithTypeConversion(records, schema);
       const allRecords = await table.query().where(`\`traceId\` = '${traceId}' AND \`spanId\` = '${spanId}'`).toArray();
       const total = allRecords.length;
+      const end = perPageInput === false ? total : start + perPage;
+      let query = table.query().where(`\`traceId\` = '${traceId}' AND \`spanId\` = '${spanId}'`);
+      if (perPageInput !== false) {
+        query = query.limit(perPage);
+        if (start > 0) query = query.offset(start);
+      }
+      const records = await query.toArray();
+      const scores = await Promise.all(records.map(async (record) => await this.transformScoreRow(record)));
       return {
         pagination: {
           page,
-          perPage,
+          perPage: perPageForResponse,
           total,
-          hasMore: offset + scores.length < total
+          hasMore: end < total
         },
         scores
       };
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "LANCE_STORAGE_GET_SCORES_BY_SPAN_FAILED",
+          id: storage.createStorageErrorId("LANCE", "LIST_SCORES_BY_SPAN", "FAILED"),
           text: "Failed to get scores by traceId and spanId in LanceStorage",
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
@@ -1636,198 +1520,6 @@ var StoreScoresLance = class extends storage.ScoresStorage {
     }
   }
 };
-var StoreTracesLance = class extends storage.TracesStorage {
-  client;
-  operations;
-  constructor({ client, operations }) {
-    super();
-    this.client = client;
-    this.operations = operations;
-  }
-  async saveTrace({ trace }) {
-    try {
-      const table = await this.client.openTable(storage.TABLE_TRACES);
-      const record = {
-        ...trace,
-        attributes: JSON.stringify(trace.attributes),
-        status: JSON.stringify(trace.status),
-        events: JSON.stringify(trace.events),
-        links: JSON.stringify(trace.links),
-        other: JSON.stringify(trace.other)
-      };
-      await table.add([record], { mode: "append" });
-      return trace;
-    } catch (error$1) {
-      throw new error.MastraError(
-        {
-          id: "LANCE_STORE_SAVE_TRACE_FAILED",
-          domain: error.ErrorDomain.STORAGE,
-          category: error.ErrorCategory.THIRD_PARTY
-        },
-        error$1
-      );
-    }
-  }
-  async getTraceById({ traceId }) {
-    try {
-      const table = await this.client.openTable(storage.TABLE_TRACES);
-      const query = table.query().where(`id = '${traceId}'`);
-      const records = await query.toArray();
-      return records[0];
-    } catch (error$1) {
-      throw new error.MastraError(
-        {
-          id: "LANCE_STORE_GET_TRACE_BY_ID_FAILED",
-          domain: error.ErrorDomain.STORAGE,
-          category: error.ErrorCategory.THIRD_PARTY
-        },
-        error$1
-      );
-    }
-  }
-  async getTraces({
-    name,
-    scope,
-    page = 1,
-    perPage = 10,
-    attributes
-  }) {
-    try {
-      const table = await this.client.openTable(storage.TABLE_TRACES);
-      const query = table.query();
-      if (name) {
-        query.where(`name = '${name}'`);
-      }
-      if (scope) {
-        query.where(`scope = '${scope}'`);
-      }
-      if (attributes) {
-        query.where(`attributes = '${JSON.stringify(attributes)}'`);
-      }
-      const offset = (page - 1) * perPage;
-      query.limit(perPage);
-      if (offset > 0) {
-        query.offset(offset);
-      }
-      const records = await query.toArray();
-      return records.map((record) => {
-        const processed = {
-          ...record,
-          attributes: record.attributes ? JSON.parse(record.attributes) : {},
-          status: record.status ? JSON.parse(record.status) : {},
-          events: record.events ? JSON.parse(record.events) : [],
-          links: record.links ? JSON.parse(record.links) : [],
-          other: record.other ? JSON.parse(record.other) : {},
-          startTime: new Date(record.startTime),
-          endTime: new Date(record.endTime),
-          createdAt: new Date(record.createdAt)
-        };
-        if (processed.parentSpanId === null || processed.parentSpanId === void 0) {
-          processed.parentSpanId = "";
-        } else {
-          processed.parentSpanId = String(processed.parentSpanId);
-        }
-        return processed;
-      });
-    } catch (error$1) {
-      throw new error.MastraError(
-        {
-          id: "LANCE_STORE_GET_TRACES_FAILED",
-          domain: error.ErrorDomain.STORAGE,
-          category: error.ErrorCategory.THIRD_PARTY,
-          details: { name: name ?? "", scope: scope ?? "" }
-        },
-        error$1
-      );
-    }
-  }
-  async getTracesPaginated(args) {
-    try {
-      const table = await this.client.openTable(storage.TABLE_TRACES);
-      const query = table.query();
-      const conditions = [];
-      if (args.name) {
-        conditions.push(`name = '${args.name}'`);
-      }
-      if (args.scope) {
-        conditions.push(`scope = '${args.scope}'`);
-      }
-      if (args.attributes) {
-        const attributesStr = JSON.stringify(args.attributes);
-        conditions.push(`attributes LIKE '%${attributesStr.replace(/"/g, '\\"')}%'`);
-      }
-      if (args.dateRange?.start) {
-        conditions.push(`\`createdAt\` >= ${args.dateRange.start.getTime()}`);
-      }
-      if (args.dateRange?.end) {
-        conditions.push(`\`createdAt\` <= ${args.dateRange.end.getTime()}`);
-      }
-      if (conditions.length > 0) {
-        const whereClause = conditions.join(" AND ");
-        query.where(whereClause);
-      }
-      let total = 0;
-      if (conditions.length > 0) {
-        const countQuery = table.query().where(conditions.join(" AND "));
-        const allRecords = await countQuery.toArray();
-        total = allRecords.length;
-      } else {
-        total = await table.countRows();
-      }
-      const page = args.page || 0;
-      const perPage = args.perPage || 10;
-      const offset = page * perPage;
-      query.limit(perPage);
-      if (offset > 0) {
-        query.offset(offset);
-      }
-      const records = await query.toArray();
-      const traces = records.map((record) => {
-        const processed = {
-          ...record,
-          attributes: record.attributes ? JSON.parse(record.attributes) : {},
-          status: record.status ? JSON.parse(record.status) : {},
-          events: record.events ? JSON.parse(record.events) : [],
-          links: record.links ? JSON.parse(record.links) : [],
-          other: record.other ? JSON.parse(record.other) : {},
-          startTime: new Date(record.startTime),
-          endTime: new Date(record.endTime),
-          createdAt: new Date(record.createdAt)
-        };
-        if (processed.parentSpanId === null || processed.parentSpanId === void 0) {
-          processed.parentSpanId = "";
-        } else {
-          processed.parentSpanId = String(processed.parentSpanId);
-        }
-        return processed;
-      });
-      return {
-        traces,
-        total,
-        page,
-        perPage,
-        hasMore: total > (page + 1) * perPage
-      };
-    } catch (error$1) {
-      throw new error.MastraError(
-        {
-          id: "LANCE_STORE_GET_TRACES_PAGINATED_FAILED",
-          domain: error.ErrorDomain.STORAGE,
-          category: error.ErrorCategory.THIRD_PARTY,
-          details: { name: args.name ?? "", scope: args.scope ?? "" }
-        },
-        error$1
-      );
-    }
-  }
-  async batchTraceInsert({ records }) {
-    this.logger.debug("Batch inserting traces", { count: records.length });
-    await this.operations.batchInsert({
-      tableName: storage.TABLE_TRACES,
-      records
-    });
-  }
-};
 function parseWorkflowRun(row) {
   let parsedSnapshot = row.snapshot;
   if (typeof parsedSnapshot === "string") {
@@ -1857,7 +1549,7 @@ var StoreWorkflowsLance = class extends storage.WorkflowsStorage {
     // runId,
     // stepId,
     // result,
-    // runtimeContext,
+    // requestContext,
   }) {
     throw new Error("Method not implemented.");
   }
@@ -1885,11 +1577,13 @@ var StoreWorkflowsLance = class extends storage.WorkflowsStorage {
       } else {
         createdAt = now;
       }
+      const { status, value, ...rest } = snapshot;
       const record = {
         workflow_name: workflowName,
         run_id: runId,
         resourceId,
-        snapshot: JSON.stringify(snapshot),
+        snapshot: JSON.stringify({ status, value, ...rest }),
+        // this is to ensure status is always just before value, for when querying the db by status
         createdAt,
         updatedAt: now
       };
@@ -1897,7 +1591,7 @@ var StoreWorkflowsLance = class extends storage.WorkflowsStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "LANCE_STORE_PERSIST_WORKFLOW_SNAPSHOT_FAILED",
+          id: storage.createStorageErrorId("LANCE", "PERSIST_WORKFLOW_SNAPSHOT", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { workflowName, runId }
@@ -1918,7 +1612,7 @@ var StoreWorkflowsLance = class extends storage.WorkflowsStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "LANCE_STORE_LOAD_WORKFLOW_SNAPSHOT_FAILED",
+          id: storage.createStorageErrorId("LANCE", "LOAD_WORKFLOW_SNAPSHOT", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { workflowName, runId }
@@ -1942,7 +1636,7 @@ var StoreWorkflowsLance = class extends storage.WorkflowsStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "LANCE_STORE_GET_WORKFLOW_RUN_BY_ID_FAILED",
+          id: storage.createStorageErrorId("LANCE", "GET_WORKFLOW_RUN_BY_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { runId: args.runId, workflowName: args.workflowName ?? "" }
@@ -1951,7 +1645,7 @@ var StoreWorkflowsLance = class extends storage.WorkflowsStorage {
       );
     }
   }
-  async getWorkflowRuns(args) {
+  async listWorkflowRuns(args) {
     try {
       const table = await this.client.openTable(storage.TABLE_WORKFLOW_SNAPSHOT);
       let query = table.query();
@@ -1959,6 +1653,10 @@ var StoreWorkflowsLance = class extends storage.WorkflowsStorage {
       if (args?.workflowName) {
         conditions.push(`workflow_name = '${args.workflowName.replace(/'/g, "''")}'`);
       }
+      if (args?.status) {
+        const escapedStatus = args.status.replace(/\\/g, "\\\\").replace(/'/g, "''").replace(/%/g, "\\%").replace(/_/g, "\\_");
+        conditions.push(`\`snapshot\` LIKE '%"status":"${escapedStatus}","value"%'`);
+      }
       if (args?.resourceId) {
         conditions.push(`\`resourceId\` = '${args.resourceId}'`);
       }
@@ -1975,11 +1673,22 @@ var StoreWorkflowsLance = class extends storage.WorkflowsStorage {
       } else {
         total = await table.countRows();
       }
-      if (args?.limit) {
-        query.limit(args.limit);
-      }
-      if (args?.offset) {
-        query.offset(args.offset);
+      if (args?.perPage !== void 0 && args?.page !== void 0) {
+        const normalizedPerPage = storage.normalizePerPage(args.perPage, Number.MAX_SAFE_INTEGER);
+        if (args.page < 0 || !Number.isInteger(args.page)) {
+          throw new error.MastraError(
+            {
+              id: storage.createStorageErrorId("LANCE", "LIST_WORKFLOW_RUNS", "INVALID_PAGINATION"),
+              domain: error.ErrorDomain.STORAGE,
+              category: error.ErrorCategory.USER,
+              details: { page: args.page, perPage: args.perPage }
+            },
+            new Error(`Invalid pagination parameters: page=${args.page}, perPage=${args.perPage}`)
+          );
+        }
+        const offset = args.page * normalizedPerPage;
+        query.limit(normalizedPerPage);
+        query.offset(offset);
       }
       const records = await query.toArray();
       return {
@@ -1989,10 +1698,10 @@ var StoreWorkflowsLance = class extends storage.WorkflowsStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "LANCE_STORE_GET_WORKFLOW_RUNS_FAILED",
+          id: storage.createStorageErrorId("LANCE", "LIST_WORKFLOW_RUNS", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
-          details: { namespace: args?.namespace ?? "", workflowName: args?.workflowName ?? "" }
+          details: { resourceId: args?.resourceId ?? "", workflowName: args?.workflowName ?? "" }
         },
         error$1
       );
@@ -2006,48 +1715,54 @@ var LanceStorage = class _LanceStorage extends storage.MastraStorage {
   lanceClient;
   /**
    * Creates a new instance of LanceStorage
+   * @param id The unique identifier for this storage instance
+   * @param name The name for this storage instance
    * @param uri The URI to connect to LanceDB
-   * @param options connection options
+   * @param connectionOptions connection options for LanceDB
+   * @param storageOptions storage options including disableInit
    *
    * Usage:
    *
    * Connect to a local database
    * ```ts
-   * const store = await LanceStorage.create('/path/to/db');
+   * const store = await LanceStorage.create('my-storage-id', 'MyStorage', '/path/to/db');
    * ```
    *
    * Connect to a LanceDB cloud database
    * ```ts
-   * const store = await LanceStorage.create('db://host:port');
+   * const store = await LanceStorage.create('my-storage-id', 'MyStorage', 'db://host:port');
    * ```
    *
    * Connect to a cloud database
    * ```ts
-   * const store = await LanceStorage.create('s3://bucket/db', { storageOptions: { timeout: '60s' } });
+   * const store = await LanceStorage.create('my-storage-id', 'MyStorage', 's3://bucket/db', { storageOptions: { timeout: '60s' } });
+   * ```
+   *
+   * Disable auto-init for runtime (after CI/CD has run migrations)
+   * ```ts
+   * const store = await LanceStorage.create('my-storage-id', 'MyStorage', '/path/to/db', undefined, { disableInit: true });
    * ```
    */
-  static async create(name, uri, options) {
-    const instance = new _LanceStorage(name);
+  static async create(id, name, uri, connectionOptions, storageOptions) {
+    const instance = new _LanceStorage(id, name, storageOptions?.disableInit);
     try {
-      instance.lanceClient = await lancedb.connect(uri, options);
+      instance.lanceClient = await lancedb.connect(uri, connectionOptions);
       const operations = new StoreOperationsLance({ client: instance.lanceClient });
       instance.stores = {
         operations: new StoreOperationsLance({ client: instance.lanceClient }),
         workflows: new StoreWorkflowsLance({ client: instance.lanceClient }),
-        traces: new StoreTracesLance({ client: instance.lanceClient, operations }),
         scores: new StoreScoresLance({ client: instance.lanceClient }),
-        memory: new StoreMemoryLance({ client: instance.lanceClient, operations }),
-        legacyEvals: new StoreLegacyEvalsLance({ client: instance.lanceClient })
+        memory: new StoreMemoryLance({ client: instance.lanceClient, operations })
       };
       return instance;
     } catch (e) {
       throw new error.MastraError(
         {
-          id: "STORAGE_LANCE_STORAGE_CONNECT_FAILED",
+          id: storage.createStorageErrorId("LANCE", "CONNECT", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           text: `Failed to connect to LanceDB: ${e.message || e}`,
-          details: { uri, optionsProvided: !!options }
+          details: { uri, optionsProvided: !!connectionOptions }
         },
         e
       );
@@ -2057,15 +1772,13 @@ var LanceStorage = class _LanceStorage extends storage.MastraStorage {
    * @internal
    * Private constructor to enforce using the create factory method
    */
-  constructor(name) {
-    super({ name });
+  constructor(id, name, disableInit) {
+    super({ id, name, disableInit });
     const operations = new StoreOperationsLance({ client: this.lanceClient });
     this.stores = {
       operations: new StoreOperationsLance({ client: this.lanceClient }),
       workflows: new StoreWorkflowsLance({ client: this.lanceClient }),
-      traces: new StoreTracesLance({ client: this.lanceClient, operations }),
       scores: new StoreScoresLance({ client: this.lanceClient }),
-      legacyEvals: new StoreLegacyEvalsLance({ client: this.lanceClient }),
       memory: new StoreMemoryLance({ client: this.lanceClient, operations })
     };
   }
@@ -2100,9 +1813,6 @@ var LanceStorage = class _LanceStorage extends storage.MastraStorage {
   async getThreadById({ threadId }) {
     return this.stores.memory.getThreadById({ threadId });
   }
-  async getThreadsByResourceId({ resourceId }) {
-    return this.stores.memory.getThreadsByResourceId({ resourceId });
-  }
   /**
    * Saves a thread to the database. This function doesn't overwrite existing threads.
    * @param thread - The thread to save
@@ -2128,7 +1838,7 @@ var LanceStorage = class _LanceStorage extends storage.MastraStorage {
       hasColumn: true,
       createTable: true,
       deleteMessages: false,
-      getScoresBySpan: true
+      listScoresBySpan: true
     };
   }
   async getResourceById({ resourceId }) {
@@ -2192,50 +1902,17 @@ var LanceStorage = class _LanceStorage extends storage.MastraStorage {
     });
     return Array.from(allIndices).sort((a, b) => a - b).map((index) => records[index]);
   }
-  async getMessages({
-    threadId,
-    resourceId,
-    selectBy,
-    format,
-    threadConfig
-  }) {
-    return this.stores.memory.getMessages({ threadId, resourceId, selectBy, format, threadConfig });
-  }
-  async getMessagesById({
-    messageIds,
-    format
-  }) {
-    return this.stores.memory.getMessagesById({ messageIds, format });
+  async listMessagesById({ messageIds }) {
+    return this.stores.memory.listMessagesById({ messageIds });
   }
   async saveMessages(args) {
     return this.stores.memory.saveMessages(args);
   }
-  async getThreadsByResourceIdPaginated(args) {
-    return this.stores.memory.getThreadsByResourceIdPaginated(args);
-  }
-  async getMessagesPaginated(args) {
-    return this.stores.memory.getMessagesPaginated(args);
-  }
   async updateMessages(_args) {
     return this.stores.memory.updateMessages(_args);
   }
-  async getTraceById(args) {
-    return this.stores.traces.getTraceById(args);
-  }
-  async getTraces(args) {
-    return this.stores.traces.getTraces(args);
-  }
-  async getTracesPaginated(args) {
-    return this.stores.traces.getTracesPaginated(args);
-  }
-  async getEvalsByAgentName(agentName, type) {
-    return this.stores.legacyEvals.getEvalsByAgentName(agentName, type);
-  }
-  async getEvals(options) {
-    return this.stores.legacyEvals.getEvals(options);
-  }
-  async getWorkflowRuns(args) {
-    return this.stores.workflows.getWorkflowRuns(args);
+  async listWorkflowRuns(args) {
+    return this.stores.workflows.listWorkflowRuns(args);
   }
   async getWorkflowRunById(args) {
     return this.stores.workflows.getWorkflowRunById(args);
@@ -2245,9 +1922,9 @@ var LanceStorage = class _LanceStorage extends storage.MastraStorage {
     runId,
     stepId,
     result,
-    runtimeContext
+    requestContext
   }) {
-    return this.stores.workflows.updateWorkflowResults({ workflowName, runId, stepId, result, runtimeContext });
+    return this.stores.workflows.updateWorkflowResults({ workflowName, runId, stepId, result, requestContext });
   }
   async updateWorkflowState({
     workflowName,
@@ -2273,37 +1950,37 @@ var LanceStorage = class _LanceStorage extends storage.MastraStorage {
   async getScoreById({ id: _id }) {
     return this.stores.scores.getScoreById({ id: _id });
   }
-  async getScoresByScorerId({
+  async listScoresByScorerId({
     scorerId,
     source,
     entityId,
     entityType,
     pagination
   }) {
-    return this.stores.scores.getScoresByScorerId({ scorerId, source, pagination, entityId, entityType });
+    return this.stores.scores.listScoresByScorerId({ scorerId, source, pagination, entityId, entityType });
   }
-  async saveScore(_score) {
-    return this.stores.scores.saveScore(_score);
+  async saveScore(score) {
+    return this.stores.scores.saveScore(score);
   }
-  async getScoresByRunId({
+  async listScoresByRunId({
     runId,
     pagination
   }) {
-    return this.stores.scores.getScoresByRunId({ runId, pagination });
+    return this.stores.scores.listScoresByRunId({ runId, pagination });
   }
-  async getScoresByEntityId({
+  async listScoresByEntityId({
     entityId,
     entityType,
     pagination
   }) {
-    return this.stores.scores.getScoresByEntityId({ entityId, entityType, pagination });
+    return this.stores.scores.listScoresByEntityId({ entityId, entityType, pagination });
   }
-  async getScoresBySpan({
+  async listScoresBySpan({
     traceId,
     spanId,
     pagination
   }) {
-    return this.stores.scores.getScoresBySpan({ traceId, spanId, pagination });
+    return this.stores.scores.listScoresBySpan({ traceId, spanId, pagination });
   }
 };
 var LanceFilterTranslator = class extends filter.BaseFilterTranslator {
@@ -2652,14 +2329,14 @@ var LanceVectorStore = class _LanceVectorStore extends vector.MastraVector {
    * ```
    */
   static async create(uri, options) {
-    const instance = new _LanceVectorStore();
+    const instance = new _LanceVectorStore(options?.id || crypto.randomUUID());
     try {
       instance.lanceClient = await lancedb.connect(uri, options);
       return instance;
     } catch (e) {
       throw new error.MastraError(
         {
-          id: "STORAGE_LANCE_VECTOR_CONNECT_FAILED",
+          id: storage.createVectorErrorId("LANCE", "CONNECT", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { uri }
@@ -2672,8 +2349,8 @@ var LanceVectorStore = class _LanceVectorStore extends vector.MastraVector {
    * @internal
    * Private constructor to enforce using the create factory method
    */
-  constructor() {
-    super();
+  constructor(id) {
+    super({ id });
   }
   close() {
     if (this.lanceClient) {
@@ -2702,7 +2379,7 @@ var LanceVectorStore = class _LanceVectorStore extends vector.MastraVector {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "STORAGE_LANCE_VECTOR_QUERY_FAILED_INVALID_ARGS",
+          id: storage.createVectorErrorId("LANCE", "QUERY", "INVALID_ARGS"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER,
           text: "LanceDB client not initialized. Use LanceVectorStore.create() to create an instance",
@@ -2750,7 +2427,7 @@ var LanceVectorStore = class _LanceVectorStore extends vector.MastraVector {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "STORAGE_LANCE_VECTOR_QUERY_FAILED",
+          id: storage.createVectorErrorId("LANCE", "QUERY", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { tableName, includeVector, columnsCount: columns?.length, includeAllColumns }
@@ -2802,7 +2479,7 @@ var LanceVectorStore = class _LanceVectorStore extends vector.MastraVector {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "STORAGE_LANCE_VECTOR_UPSERT_FAILED_INVALID_ARGS",
+          id: storage.createVectorErrorId("LANCE", "UPSERT", "INVALID_ARGS"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER,
           text: "LanceDB client not initialized. Use LanceVectorStore.create() to create an instance",
@@ -2838,7 +2515,7 @@ var LanceVectorStore = class _LanceVectorStore extends vector.MastraVector {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "STORAGE_LANCE_VECTOR_UPSERT_FAILED",
+          id: storage.createVectorErrorId("LANCE", "UPSERT", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { tableName, vectorCount: vectors.length, metadataCount: metadata.length, idsCount: ids.length }
@@ -2865,7 +2542,7 @@ var LanceVectorStore = class _LanceVectorStore extends vector.MastraVector {
   async createTable(tableName, data, options) {
     if (!this.lanceClient) {
       throw new error.MastraError({
-        id: "STORAGE_LANCE_VECTOR_CREATE_TABLE_FAILED_INVALID_ARGS",
+        id: storage.createVectorErrorId("LANCE", "CREATE_TABLE", "INVALID_ARGS"),
         domain: error.ErrorDomain.STORAGE,
         category: error.ErrorCategory.USER,
         text: "LanceDB client not initialized. Use LanceVectorStore.create() to create an instance",
@@ -2880,7 +2557,7 @@ var LanceVectorStore = class _LanceVectorStore extends vector.MastraVector {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "STORAGE_LANCE_VECTOR_CREATE_TABLE_FAILED",
+          id: storage.createVectorErrorId("LANCE", "CREATE_TABLE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { tableName }
@@ -2892,7 +2569,7 @@ var LanceVectorStore = class _LanceVectorStore extends vector.MastraVector {
   async listTables() {
     if (!this.lanceClient) {
       throw new error.MastraError({
-        id: "STORAGE_LANCE_VECTOR_LIST_TABLES_FAILED_INVALID_ARGS",
+        id: storage.createVectorErrorId("LANCE", "LIST_TABLES", "INVALID_ARGS"),
         domain: error.ErrorDomain.STORAGE,
         category: error.ErrorCategory.USER,
         text: "LanceDB client not initialized. Use LanceVectorStore.create() to create an instance",
@@ -2904,7 +2581,7 @@ var LanceVectorStore = class _LanceVectorStore extends vector.MastraVector {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "STORAGE_LANCE_VECTOR_LIST_TABLES_FAILED",
+          id: storage.createVectorErrorId("LANCE", "LIST_TABLES", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY
         },
@@ -2915,7 +2592,7 @@ var LanceVectorStore = class _LanceVectorStore extends vector.MastraVector {
   async getTableSchema(tableName) {
     if (!this.lanceClient) {
       throw new error.MastraError({
-        id: "STORAGE_LANCE_VECTOR_GET_TABLE_SCHEMA_FAILED_INVALID_ARGS",
+        id: storage.createVectorErrorId("LANCE", "GET_TABLE_SCHEMA", "INVALID_ARGS"),
         domain: error.ErrorDomain.STORAGE,
         category: error.ErrorCategory.USER,
         text: "LanceDB client not initialized. Use LanceVectorStore.create() to create an instance",
@@ -2928,7 +2605,7 @@ var LanceVectorStore = class _LanceVectorStore extends vector.MastraVector {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "STORAGE_LANCE_VECTOR_GET_TABLE_SCHEMA_FAILED",
+          id: storage.createVectorErrorId("LANCE", "GET_TABLE_SCHEMA", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { tableName }
@@ -2963,7 +2640,7 @@ var LanceVectorStore = class _LanceVectorStore extends vector.MastraVector {
     } catch (err) {
       throw new error.MastraError(
         {
-          id: "STORAGE_LANCE_VECTOR_CREATE_INDEX_FAILED_INVALID_ARGS",
+          id: storage.createVectorErrorId("LANCE", "CREATE_INDEX", "INVALID_ARGS"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER,
           details: { tableName: tableName || "", indexName, dimension, metric }
@@ -3008,7 +2685,7 @@ var LanceVectorStore = class _LanceVectorStore extends vector.MastraVector {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "STORAGE_LANCE_VECTOR_CREATE_INDEX_FAILED",
+          id: storage.createVectorErrorId("LANCE", "CREATE_INDEX", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { tableName: tableName || "", indexName, dimension }
@@ -3020,7 +2697,7 @@ var LanceVectorStore = class _LanceVectorStore extends vector.MastraVector {
   async listIndexes() {
     if (!this.lanceClient) {
       throw new error.MastraError({
-        id: "STORAGE_LANCE_VECTOR_LIST_INDEXES_FAILED_INVALID_ARGS",
+        id: storage.createVectorErrorId("LANCE", "LIST_INDEXES", "INVALID_ARGS"),
         domain: error.ErrorDomain.STORAGE,
         category: error.ErrorCategory.USER,
         text: "LanceDB client not initialized. Use LanceVectorStore.create() to create an instance",
@@ -3039,7 +2716,7 @@ var LanceVectorStore = class _LanceVectorStore extends vector.MastraVector {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "STORAGE_LANCE_VECTOR_LIST_INDEXES_FAILED",
+          id: storage.createVectorErrorId("LANCE", "LIST_INDEXES", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY
         },
@@ -3058,7 +2735,7 @@ var LanceVectorStore = class _LanceVectorStore extends vector.MastraVector {
     } catch (err) {
       throw new error.MastraError(
         {
-          id: "STORAGE_LANCE_VECTOR_DESCRIBE_INDEX_FAILED_INVALID_ARGS",
+          id: storage.createVectorErrorId("LANCE", "DESCRIBE_INDEX", "INVALID_ARGS"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER,
           details: { indexName }
@@ -3093,7 +2770,7 @@ var LanceVectorStore = class _LanceVectorStore extends vector.MastraVector {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "STORAGE_LANCE_VECTOR_DESCRIBE_INDEX_FAILED",
+          id: storage.createVectorErrorId("LANCE", "DESCRIBE_INDEX", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { indexName }
@@ -3113,7 +2790,7 @@ var LanceVectorStore = class _LanceVectorStore extends vector.MastraVector {
     } catch (err) {
       throw new error.MastraError(
         {
-          id: "STORAGE_LANCE_VECTOR_DELETE_INDEX_FAILED_INVALID_ARGS",
+          id: storage.createVectorErrorId("LANCE", "DELETE_INDEX", "INVALID_ARGS"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER,
           details: { indexName }
@@ -3136,7 +2813,7 @@ var LanceVectorStore = class _LanceVectorStore extends vector.MastraVector {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "STORAGE_LANCE_VECTOR_DELETE_INDEX_FAILED",
+          id: storage.createVectorErrorId("LANCE", "DELETE_INDEX", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { indexName }
@@ -3151,7 +2828,7 @@ var LanceVectorStore = class _LanceVectorStore extends vector.MastraVector {
   async deleteAllTables() {
     if (!this.lanceClient) {
       throw new error.MastraError({
-        id: "STORAGE_LANCE_VECTOR_DELETE_ALL_TABLES_FAILED_INVALID_ARGS",
+        id: storage.createVectorErrorId("LANCE", "DELETE_ALL_TABLES", "INVALID_ARGS"),
         domain: error.ErrorDomain.STORAGE,
         category: error.ErrorCategory.USER,
         details: { methodName: "deleteAllTables" },
@@ -3163,7 +2840,7 @@ var LanceVectorStore = class _LanceVectorStore extends vector.MastraVector {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "STORAGE_LANCE_VECTOR_DELETE_ALL_TABLES_FAILED",
+          id: storage.createVectorErrorId("LANCE", "DELETE_ALL_TABLES", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { methodName: "deleteAllTables" }
@@ -3175,7 +2852,7 @@ var LanceVectorStore = class _LanceVectorStore extends vector.MastraVector {
   async deleteTable(tableName) {
     if (!this.lanceClient) {
       throw new error.MastraError({
-        id: "STORAGE_LANCE_VECTOR_DELETE_TABLE_FAILED_INVALID_ARGS",
+        id: storage.createVectorErrorId("LANCE", "DELETE_TABLE", "INVALID_ARGS"),
         domain: error.ErrorDomain.STORAGE,
         category: error.ErrorCategory.USER,
         details: { tableName },
@@ -3187,7 +2864,7 @@ var LanceVectorStore = class _LanceVectorStore extends vector.MastraVector {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "STORAGE_LANCE_VECTOR_DELETE_TABLE_FAILED",
+          id: storage.createVectorErrorId("LANCE", "DELETE_TABLE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { tableName }
@@ -3200,7 +2877,7 @@ var LanceVectorStore = class _LanceVectorStore extends vector.MastraVector {
     const { indexName, update } = params;
     if ("id" in params && "filter" in params && params.id && params.filter) {
       throw new error.MastraError({
-        id: "STORAGE_LANCE_VECTOR_UPDATE_VECTOR_INVALID_ARGS",
+        id: storage.createVectorErrorId("LANCE", "UPDATE_VECTOR", "MUTUALLY_EXCLUSIVE"),
         domain: error.ErrorDomain.STORAGE,
         category: error.ErrorCategory.USER,
         text: "id and filter are mutually exclusive",
@@ -3209,7 +2886,7 @@ var LanceVectorStore = class _LanceVectorStore extends vector.MastraVector {
     }
     if (!("id" in params || "filter" in params) || !params.id && !params.filter) {
       throw new error.MastraError({
-        id: "STORAGE_LANCE_VECTOR_UPDATE_VECTOR_INVALID_ARGS",
+        id: storage.createVectorErrorId("LANCE", "UPDATE_VECTOR", "NO_TARGET"),
         domain: error.ErrorDomain.STORAGE,
         category: error.ErrorCategory.USER,
         text: "Either id or filter must be provided",
@@ -3218,7 +2895,7 @@ var LanceVectorStore = class _LanceVectorStore extends vector.MastraVector {
     }
     if ("filter" in params && params.filter && Object.keys(params.filter).length === 0) {
       throw new error.MastraError({
-        id: "STORAGE_LANCE_VECTOR_UPDATE_VECTOR_INVALID_ARGS",
+        id: storage.createVectorErrorId("LANCE", "UPDATE_VECTOR", "EMPTY_FILTER"),
         domain: error.ErrorDomain.STORAGE,
         category: error.ErrorCategory.USER,
         text: "Cannot update with empty filter",
@@ -3227,7 +2904,7 @@ var LanceVectorStore = class _LanceVectorStore extends vector.MastraVector {
     }
     if (!update.vector && !update.metadata) {
       throw new error.MastraError({
-        id: "STORAGE_LANCE_VECTOR_UPDATE_VECTOR_INVALID_ARGS",
+        id: storage.createVectorErrorId("LANCE", "UPDATE_VECTOR", "NO_PAYLOAD"),
         domain: error.ErrorDomain.STORAGE,
         category: error.ErrorCategory.USER,
         text: "No updates provided",
@@ -3322,7 +2999,7 @@ var LanceVectorStore = class _LanceVectorStore extends vector.MastraVector {
       if (error$1 instanceof error.MastraError) throw error$1;
       throw new error.MastraError(
         {
-          id: "STORAGE_LANCE_VECTOR_UPDATE_VECTOR_FAILED",
+          id: storage.createVectorErrorId("LANCE", "UPDATE_VECTOR", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -3351,7 +3028,7 @@ var LanceVectorStore = class _LanceVectorStore extends vector.MastraVector {
     } catch (err) {
       throw new error.MastraError(
         {
-          id: "STORAGE_LANCE_VECTOR_DELETE_VECTOR_FAILED_INVALID_ARGS",
+          id: storage.createVectorErrorId("LANCE", "DELETE_VECTOR", "INVALID_ARGS"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER,
           details: {
@@ -3384,7 +3061,7 @@ var LanceVectorStore = class _LanceVectorStore extends vector.MastraVector {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "STORAGE_LANCE_VECTOR_DELETE_VECTOR_FAILED",
+          id: storage.createVectorErrorId("LANCE", "DELETE_VECTOR", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -3424,7 +3101,7 @@ var LanceVectorStore = class _LanceVectorStore extends vector.MastraVector {
   async deleteVectors({ indexName, filter, ids }) {
     if (ids && filter) {
       throw new error.MastraError({
-        id: "STORAGE_LANCE_VECTOR_DELETE_VECTORS_INVALID_ARGS",
+        id: storage.createVectorErrorId("LANCE", "DELETE_VECTORS", "MUTUALLY_EXCLUSIVE"),
         domain: error.ErrorDomain.STORAGE,
         category: error.ErrorCategory.USER,
         text: "ids and filter are mutually exclusive",
@@ -3433,7 +3110,7 @@ var LanceVectorStore = class _LanceVectorStore extends vector.MastraVector {
     }
     if (!ids && !filter) {
       throw new error.MastraError({
-        id: "STORAGE_LANCE_VECTOR_DELETE_VECTORS_INVALID_ARGS",
+        id: storage.createVectorErrorId("LANCE", "DELETE_VECTORS", "NO_TARGET"),
         domain: error.ErrorDomain.STORAGE,
         category: error.ErrorCategory.USER,
         text: "Either filter or ids must be provided",
@@ -3442,7 +3119,7 @@ var LanceVectorStore = class _LanceVectorStore extends vector.MastraVector {
     }
     if (ids && ids.length === 0) {
       throw new error.MastraError({
-        id: "STORAGE_LANCE_VECTOR_DELETE_VECTORS_INVALID_ARGS",
+        id: storage.createVectorErrorId("LANCE", "DELETE_VECTORS", "EMPTY_IDS"),
         domain: error.ErrorDomain.STORAGE,
         category: error.ErrorCategory.USER,
         text: "Cannot delete with empty ids array",
@@ -3451,7 +3128,7 @@ var LanceVectorStore = class _LanceVectorStore extends vector.MastraVector {
     }
     if (filter && Object.keys(filter).length === 0) {
       throw new error.MastraError({
-        id: "STORAGE_LANCE_VECTOR_DELETE_VECTORS_INVALID_ARGS",
+        id: storage.createVectorErrorId("LANCE", "DELETE_VECTORS", "EMPTY_FILTER"),
         domain: error.ErrorDomain.STORAGE,
         category: error.ErrorCategory.USER,
         text: "Cannot delete with empty filter",
@@ -3511,7 +3188,7 @@ var LanceVectorStore = class _LanceVectorStore extends vector.MastraVector {
       if (error$1 instanceof error.MastraError) throw error$1;
       throw new error.MastraError(
         {
-          id: "STORAGE_LANCE_VECTOR_DELETE_VECTORS_FAILED",
+          id: storage.createVectorErrorId("LANCE", "DELETE_VECTORS", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {