@mastra/lance 0.0.0-error-handler-fix-20251020202607 → 0.0.0-execa-dynamic-import-20260304221256

package/dist/index.js

@@ -1,133 +1,18 @@
 import { connect, Index } from '@lancedb/lancedb';
 import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
-import { MastraStorage, StoreOperations, LegacyEvalsStorage, TABLE_EVALS, MemoryStorage, TABLE_THREADS, TABLE_MESSAGES, resolveMessageLimit, TABLE_RESOURCES, ScoresStorage, TABLE_SCORERS, TracesStorage, TABLE_TRACES, WorkflowsStorage, TABLE_WORKFLOW_SNAPSHOT, ensureDate } from '@mastra/core/storage';
+import { MemoryStorage, TABLE_SCHEMAS, TABLE_THREADS, TABLE_MESSAGES, TABLE_RESOURCES, createStorageErrorId, normalizePerPage, calculatePagination, ScoresStorage, SCORERS_SCHEMA, TABLE_SCORERS, WorkflowsStorage, ensureDate, TABLE_WORKFLOW_SNAPSHOT, MastraCompositeStore, createVectorErrorId, getDefaultValue } from '@mastra/core/storage';
 import { MessageList } from '@mastra/core/agent';
+import { MastraBase } from '@mastra/core/base';
 import { Utf8, Float64, Binary, Float32, Int32, Field, Schema } from 'apache-arrow';
-import { saveScorePayloadSchema } from '@mastra/core/scores';
+import { saveScorePayloadSchema } from '@mastra/core/evals';
 import { MastraVector } from '@mastra/core/vector';
 import { BaseFilterTranslator } from '@mastra/core/vector/filter';
 
 // src/storage/index.ts
-var StoreLegacyEvalsLance = class extends LegacyEvalsStorage {
-  client;
-  constructor({ client }) {
-    super();
-    this.client = client;
-  }
-  async getEvalsByAgentName(agentName, type) {
-    try {
-      const table = await this.client.openTable(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) {
-      throw new MastraError(
-        {
-          id: "LANCE_STORE_GET_EVALS_BY_AGENT_NAME_FAILED",
-          domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY,
-          details: { agentName }
-        },
-        error
-      );
-    }
-  }
-  async getEvals(options) {
-    try {
-      const table = await this.client.openTable(TABLE_EVALS);
-      const conditions = [];
-      if (options.agentName) {
-        conditions.push(`agent_name = '${options.agentName}'`);
-      }
-      if (options.type === "live") {
-        conditions.push("length(test_info) = 0");
-      } else if (options.type === "test") {
-        conditions.push("length(test_info) > 0");
-      }
-      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) {
-      throw new MastraError(
-        {
-          id: "LANCE_STORE_GET_EVALS_FAILED",
-          domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY,
-          details: { agentName: options.agentName ?? "" }
-        },
-        error
-      );
-    }
-  }
-};
 function getPrimaryKeys(tableName) {
   let primaryId = ["id"];
   if (tableName === TABLE_WORKFLOW_SNAPSHOT) {
     primaryId = ["workflow_name", "run_id"];
-  } else if (tableName === TABLE_EVALS) {
-    primaryId = ["agent_name", "metric_name", "run_id"];
   }
   return primaryId;
 }
@@ -205,7 +90,7 @@ async function getTableSchema({
   } catch (validationError) {
     throw new MastraError(
       {
-        id: "STORAGE_LANCE_STORAGE_GET_TABLE_SCHEMA_INVALID_ARGS",
+        id: createStorageErrorId("LANCE", "GET_TABLE_SCHEMA", "INVALID_ARGS"),
         domain: ErrorDomain.STORAGE,
         category: ErrorCategory.USER,
         text: validationError.message,
@@ -228,7 +113,7 @@ async function getTableSchema({
   } catch (error) {
     throw new MastraError(
       {
-        id: "STORAGE_LANCE_STORAGE_GET_TABLE_SCHEMA_FAILED",
+        id: createStorageErrorId("LANCE", "GET_TABLE_SCHEMA", "FAILED"),
         domain: ErrorDomain.STORAGE,
         category: ErrorCategory.THIRD_PARTY,
         details: { tableName }
@@ -238,1163 +123,1236 @@ async function getTableSchema({
   }
 }
 
-// src/storage/domains/memory/index.ts
-var StoreMemoryLance = class extends MemoryStorage {
+// src/storage/db/index.ts
+function resolveLanceConfig(config) {
+  return config.client;
+}
+var LanceDB = class extends MastraBase {
   client;
-  operations;
-  constructor({ client, operations }) {
-    super();
+  constructor({ client }) {
+    super({ name: "lance-db" });
     this.client = client;
-    this.operations = operations;
   }
-  async getThreadById({ threadId }) {
+  getDefaultValue(type) {
+    switch (type) {
+      case "text":
+        return "''";
+      case "timestamp":
+        return "CURRENT_TIMESTAMP";
+      case "integer":
+      case "bigint":
+        return "0";
+      case "jsonb":
+        return "'{}'";
+      case "uuid":
+        return "''";
+      default:
+        return getDefaultValue(type);
+    }
+  }
+  async hasColumn(tableName, columnName) {
+    const table = await this.client.openTable(tableName);
+    const schema = await table.schema();
+    return schema.fields.some((field) => field.name === columnName);
+  }
+  translateSchema(schema) {
+    const fields = Object.entries(schema).map(([name, column]) => {
+      let arrowType;
+      switch (column.type.toLowerCase()) {
+        case "text":
+        case "uuid":
+          arrowType = new Utf8();
+          break;
+        case "int":
+        case "integer":
+          arrowType = new Int32();
+          break;
+        case "bigint":
+          arrowType = new Float64();
+          break;
+        case "float":
+          arrowType = new Float32();
+          break;
+        case "jsonb":
+        case "json":
+          arrowType = new Utf8();
+          break;
+        case "binary":
+          arrowType = new Binary();
+          break;
+        case "timestamp":
+          arrowType = new Float64();
+          break;
+        default:
+          arrowType = new Utf8();
+      }
+      return new Field(name, arrowType, column.nullable ?? true);
+    });
+    return new Schema(fields);
+  }
+  async createTable({
+    tableName,
+    schema
+  }) {
     try {
-      const thread = await this.operations.load({ tableName: TABLE_THREADS, keys: { id: threadId } });
-      if (!thread) {
-        return null;
+      if (!this.client) {
+        throw new Error("LanceDB client not initialized. Call LanceStorage.create() first.");
+      }
+      if (!tableName) {
+        throw new Error("tableName is required for createTable.");
+      }
+      if (!schema) {
+        throw new Error("schema is required for createTable.");
       }
-      return {
-        ...thread,
-        createdAt: new Date(thread.createdAt),
-        updatedAt: new Date(thread.updatedAt)
-      };
     } catch (error) {
       throw new MastraError(
         {
-          id: "LANCE_STORE_GET_THREAD_BY_ID_FAILED",
+          id: createStorageErrorId("LANCE", "CREATE_TABLE", "INVALID_ARGS"),
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY
+          category: ErrorCategory.USER,
+          details: { tableName }
         },
         error
       );
     }
-  }
-  async getThreadsByResourceId({ resourceId }) {
     try {
-      const table = await this.client.openTable(TABLE_THREADS);
-      const query = table.query().where(`\`resourceId\` = '${resourceId}'`);
-      const records = await query.toArray();
-      return processResultWithTypeConversion(
-        records,
-        await getTableSchema({ tableName: TABLE_THREADS, client: this.client })
-      );
+      const arrowSchema = this.translateSchema(schema);
+      await this.client.createEmptyTable(tableName, arrowSchema);
     } catch (error) {
+      if (error.message?.includes("already exists")) {
+        this.logger.debug(`Table '${tableName}' already exists, skipping create`);
+        return;
+      }
       throw new MastraError(
         {
-          id: "LANCE_STORE_GET_THREADS_BY_RESOURCE_ID_FAILED",
+          id: createStorageErrorId("LANCE", "CREATE_TABLE", "FAILED"),
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY
+          category: ErrorCategory.THIRD_PARTY,
+          details: { tableName }
         },
         error
       );
     }
   }
-  /**
-   * Saves a thread to the database. This function doesn't overwrite existing threads.
-   * @param thread - The thread to save
-   * @returns The saved thread
-   */
-  async saveThread({ thread }) {
+  async dropTable({ tableName }) {
     try {
-      const record = { ...thread, metadata: JSON.stringify(thread.metadata) };
-      const table = await this.client.openTable(TABLE_THREADS);
-      await table.add([record], { mode: "append" });
-      return thread;
-    } catch (error) {
+      if (!this.client) {
+        throw new Error("LanceDB client not initialized. Call LanceStorage.create() first.");
+      }
+      if (!tableName) {
+        throw new Error("tableName is required for dropTable.");
+      }
+    } catch (validationError) {
       throw new MastraError(
         {
-          id: "LANCE_STORE_SAVE_THREAD_FAILED",
+          id: createStorageErrorId("LANCE", "DROP_TABLE", "INVALID_ARGS"),
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY
+          category: ErrorCategory.USER,
+          text: validationError.message,
+          details: { tableName }
         },
-        error
+        validationError
       );
     }
-  }
-  async updateThread({
-    id,
-    title,
-    metadata
-  }) {
-    const maxRetries = 5;
-    for (let attempt = 0; attempt < maxRetries; attempt++) {
-      try {
-        const current = await this.getThreadById({ threadId: id });
-        if (!current) {
-          throw new Error(`Thread with id ${id} not found`);
-        }
-        const mergedMetadata = { ...current.metadata, ...metadata };
-        const record = {
-          id,
-          title,
-          metadata: JSON.stringify(mergedMetadata),
-          updatedAt: (/* @__PURE__ */ new Date()).getTime()
-        };
-        const table = await this.client.openTable(TABLE_THREADS);
-        await table.mergeInsert("id").whenMatchedUpdateAll().whenNotMatchedInsertAll().execute([record]);
-        const updatedThread = await this.getThreadById({ threadId: id });
-        if (!updatedThread) {
-          throw new Error(`Failed to retrieve updated thread ${id}`);
-        }
-        return updatedThread;
-      } catch (error) {
-        if (error.message?.includes("Commit conflict") && attempt < maxRetries - 1) {
-          const delay = Math.pow(2, attempt) * 10;
-          await new Promise((resolve) => setTimeout(resolve, delay));
-          continue;
-        }
-        throw new MastraError(
-          {
-            id: "LANCE_STORE_UPDATE_THREAD_FAILED",
-            domain: ErrorDomain.STORAGE,
-            category: ErrorCategory.THIRD_PARTY
-          },
-          error
-        );
-      }
-    }
-    throw new MastraError(
-      {
-        id: "LANCE_STORE_UPDATE_THREAD_FAILED",
-        domain: ErrorDomain.STORAGE,
-        category: ErrorCategory.THIRD_PARTY
-      },
-      new Error("All retries exhausted")
-    );
-  }
-  async deleteThread({ threadId }) {
     try {
-      const table = await this.client.openTable(TABLE_THREADS);
-      await table.delete(`id = '${threadId}'`);
-      const messagesTable = await this.client.openTable(TABLE_MESSAGES);
-      await messagesTable.delete(`thread_id = '${threadId}'`);
+      await this.client.dropTable(tableName);
     } catch (error) {
+      if (error.toString().includes("was not found") || error.message?.includes("Table not found")) {
+        this.logger.debug(`Table '${tableName}' does not exist, skipping drop`);
+        return;
+      }
       throw new MastraError(
         {
-          id: "LANCE_STORE_DELETE_THREAD_FAILED",
+          id: createStorageErrorId("LANCE", "DROP_TABLE", "FAILED"),
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY
+          category: ErrorCategory.THIRD_PARTY,
+          details: { tableName }
         },
         error
       );
     }
   }
-  normalizeMessage(message) {
-    const { thread_id, ...rest } = message;
-    return {
-      ...rest,
-      threadId: thread_id,
-      content: typeof message.content === "string" ? (() => {
-        try {
-          return JSON.parse(message.content);
-        } catch {
-          return message.content;
-        }
-      })() : message.content
-    };
-  }
-  async getMessages({
-    threadId,
-    resourceId,
-    selectBy,
-    format,
-    threadConfig
-  }) {
+  async alterTable({
+    tableName,
+    schema,
+    ifNotExists
+  }) {
     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");
+      if (!this.client) {
+        throw new Error("LanceDB client not initialized. Call LanceStorage.create() first.");
       }
-      const limit = resolveMessageLimit({ last: selectBy?.last, defaultLimit: Number.MAX_SAFE_INTEGER });
-      const table = await this.client.openTable(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();
+      if (!tableName) {
+        throw new Error("tableName is required for alterTable.");
       }
-      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 (!schema) {
+        throw new Error("schema is required for alterTable.");
       }
-      if (limit !== Number.MAX_SAFE_INTEGER) {
-        allRecords = allRecords.slice(-limit);
+      if (!ifNotExists || ifNotExists.length === 0) {
+        this.logger.debug("No columns specified to add in alterTable, skipping.");
+        return;
       }
-      const messages = processResultWithTypeConversion(
-        allRecords,
-        await getTableSchema({ tableName: TABLE_MESSAGES, client: this.client })
-      );
-      const list = new MessageList({ threadId, resourceId }).add(messages.map(this.normalizeMessage), "memory");
-      if (format === "v2") return list.get.all.v2();
-      return list.get.all.v1();
-    } catch (error) {
+    } catch (validationError) {
       throw new MastraError(
         {
-          id: "LANCE_STORE_GET_MESSAGES_FAILED",
+          id: createStorageErrorId("LANCE", "ALTER_TABLE", "INVALID_ARGS"),
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY,
-          details: {
-            threadId,
-            resourceId: resourceId ?? ""
-          }
+          category: ErrorCategory.USER,
+          text: validationError.message,
+          details: { tableName }
         },
-        error
+        validationError
       );
     }
-  }
-  async getMessagesById({
-    messageIds,
-    format
-  }) {
-    if (messageIds.length === 0) return [];
     try {
-      const table = await this.client.openTable(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: TABLE_MESSAGES, client: this.client })
-      );
-      const list = new MessageList().add(messages.map(this.normalizeMessage), "memory");
-      if (format === `v1`) return list.get.all.v1();
-      return list.get.all.v2();
+      const table = await this.client.openTable(tableName);
+      const currentSchema = await table.schema();
+      const existingFields = new Set(currentSchema.fields.map((f) => f.name));
+      const typeMap = {
+        text: "string",
+        integer: "int",
+        bigint: "bigint",
+        timestamp: "timestamp",
+        jsonb: "string",
+        uuid: "string"
+      };
+      const columnsToAdd = ifNotExists.filter((col) => schema[col] && !existingFields.has(col)).map((col) => {
+        const colDef = schema[col];
+        return {
+          name: col,
+          valueSql: colDef?.nullable ? `cast(NULL as ${typeMap[colDef.type ?? "text"]})` : `cast(${this.getDefaultValue(colDef?.type ?? "text")} as ${typeMap[colDef?.type ?? "text"]})`
+        };
+      });
+      if (columnsToAdd.length > 0) {
+        await table.addColumns(columnsToAdd);
+        this.logger?.info?.(`Added columns [${columnsToAdd.map((c) => c.name).join(", ")}] to table ${tableName}`);
+      }
     } catch (error) {
       throw new MastraError(
         {
-          id: "LANCE_STORE_GET_MESSAGES_BY_ID_FAILED",
+          id: createStorageErrorId("LANCE", "ALTER_TABLE", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          details: {
-            messageIds: JSON.stringify(messageIds)
-          }
+          details: { tableName }
         },
         error
       );
     }
   }
-  async saveMessages(args) {
+  async clearTable({ tableName }) {
     try {
-      const { messages, format = "v1" } = args;
-      if (messages.length === 0) {
-        return [];
-      }
-      const threadId = messages[0]?.threadId;
-      if (!threadId) {
-        throw new Error("Thread ID is required");
+      if (!this.client) {
+        throw new Error("LanceDB client not initialized. Call LanceStorage.create() first.");
       }
-      for (const message of messages) {
-        if (!message.id) {
-          throw new Error("Message ID is required");
-        }
-        if (!message.threadId) {
-          throw new Error("Thread ID is required for all messages");
-        }
-        if (message.resourceId === null || message.resourceId === void 0) {
-          throw new Error("Resource ID cannot be null or undefined");
-        }
-        if (!message.content) {
-          throw new Error("Message content is required");
-        }
+      if (!tableName) {
+        throw new Error("tableName is required for clearTable.");
       }
-      const transformedMessages = messages.map((message) => {
-        const { threadId: threadId2, type, ...rest } = message;
-        return {
-          ...rest,
-          thread_id: threadId2,
-          type: type ?? "v2",
-          content: JSON.stringify(message.content)
-        };
-      });
-      const table = await this.client.openTable(TABLE_MESSAGES);
-      await table.mergeInsert("id").whenMatchedUpdateAll().whenNotMatchedInsertAll().execute(transformedMessages);
-      const threadsTable = await this.client.openTable(TABLE_THREADS);
-      const currentTime = (/* @__PURE__ */ new Date()).getTime();
-      const updateRecord = { id: threadId, updatedAt: currentTime };
-      await threadsTable.mergeInsert("id").whenMatchedUpdateAll().whenNotMatchedInsertAll().execute([updateRecord]);
-      const list = new MessageList().add(messages, "memory");
-      if (format === `v2`) return list.get.all.v2();
-      return list.get.all.v1();
-    } catch (error) {
+    } catch (validationError) {
       throw new MastraError(
         {
-          id: "LANCE_STORE_SAVE_MESSAGES_FAILED",
+          id: createStorageErrorId("LANCE", "CLEAR_TABLE", "INVALID_ARGS"),
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY
+          category: ErrorCategory.USER,
+          text: validationError.message,
+          details: { tableName }
         },
-        error
+        validationError
       );
     }
-  }
-  async getThreadsByResourceIdPaginated(args) {
     try {
-      const { resourceId, page = 0, perPage = 10 } = args;
-      const table = await this.client.openTable(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 records = await query.toArray();
-      records.sort((a, b) => new Date(b.updatedAt).getTime() - new Date(a.updatedAt).getTime());
-      const schema = await getTableSchema({ tableName: TABLE_THREADS, client: this.client });
-      const threads = records.map((record) => processResultWithTypeConversion(record, schema));
-      return {
-        threads,
-        total,
-        page,
-        perPage,
-        hasMore: total > (page + 1) * perPage
-      };
+      const table = await this.client.openTable(tableName);
+      await table.delete("1=1");
     } catch (error) {
       throw new MastraError(
         {
-          id: "LANCE_STORE_GET_THREADS_BY_RESOURCE_ID_PAGINATED_FAILED",
+          id: createStorageErrorId("LANCE", "CLEAR_TABLE", "FAILED"),
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY
+          category: ErrorCategory.THIRD_PARTY,
+          details: { tableName }
         },
         error
       );
     }
   }
-  /**
-   * Processes messages to include context messages based on withPreviousMessages and withNextMessages
-   * @param records - The sorted array of records to process
-   * @param include - The array of include specifications with context parameters
-   * @returns The processed array with context messages included
-   */
-  processMessagesWithContext(records, include) {
-    const messagesWithContext = include.filter((item) => item.withPreviousMessages || item.withNextMessages);
-    if (messagesWithContext.length === 0) {
-      return records;
-    }
-    const messageIndexMap = /* @__PURE__ */ new Map();
-    records.forEach((message, index) => {
-      messageIndexMap.set(message.id, index);
-    });
-    const additionalIndices = /* @__PURE__ */ new Set();
-    for (const item of messagesWithContext) {
-      const messageIndex = messageIndexMap.get(item.id);
-      if (messageIndex !== void 0) {
-        if (item.withPreviousMessages) {
-          const startIdx = Math.max(0, messageIndex - item.withPreviousMessages);
-          for (let i = startIdx; i < messageIndex; i++) {
-            additionalIndices.add(i);
-          }
-        }
-        if (item.withNextMessages) {
-          const endIdx = Math.min(records.length - 1, messageIndex + item.withNextMessages);
-          for (let i = messageIndex + 1; i <= endIdx; i++) {
-            additionalIndices.add(i);
-          }
-        }
-      }
-    }
-    if (additionalIndices.size === 0) {
-      return records;
-    }
-    const originalMatchIds = new Set(include.map((item) => item.id));
-    const allIndices = /* @__PURE__ */ new Set();
-    records.forEach((record, index) => {
-      if (originalMatchIds.has(record.id)) {
-        allIndices.add(index);
-      }
-    });
-    additionalIndices.forEach((index) => {
-      allIndices.add(index);
-    });
-    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;
+  async insert({ tableName, record }) {
     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(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()}`);
+      if (!this.client) {
+        throw new Error("LanceDB client not initialized. Call LanceStorage.create() first.");
       }
-      let total = 0;
-      if (conditions.length > 0) {
-        total = await table.countRows(conditions.join(" AND "));
-      } else {
-        total = await table.countRows();
+      if (!tableName) {
+        throw new Error("tableName is required for insert.");
       }
-      if (total === 0 && messages.length === 0) {
-        return {
-          messages: [],
-          total: 0,
-          page,
-          perPage,
-          hasMore: false
-        };
+      if (!record || Object.keys(record).length === 0) {
+        throw new Error("record is required and cannot be empty for insert.");
       }
-      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));
+    } catch (validationError) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("LANCE", "INSERT", "INVALID_ARGS"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER,
+          text: validationError.message,
+          details: { tableName }
+        },
+        validationError
+      );
+    }
+    try {
+      const table = await this.client.openTable(tableName);
+      const primaryId = getPrimaryKeys(tableName);
+      const processedRecord = { ...record };
+      for (const key in processedRecord) {
+        if (processedRecord[key] !== null && typeof processedRecord[key] === "object" && !(processedRecord[key] instanceof Date)) {
+          this.logger.debug("Converting object to JSON string: ", processedRecord[key]);
+          processedRecord[key] = JSON.stringify(processedRecord[key]);
         }
-        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 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
-      };
+      }
+      await table.mergeInsert(primaryId).whenMatchedUpdateAll().whenNotMatchedInsertAll().execute([processedRecord]);
     } catch (error) {
-      const mastraError = new MastraError(
+      throw new MastraError(
         {
-          id: "LANCE_STORE_GET_MESSAGES_PAGINATED_FAILED",
+          id: createStorageErrorId("LANCE", "INSERT", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          details: {
-            threadId,
-            resourceId: resourceId ?? ""
-          }
+          details: { tableName }
         },
         error
       );
-      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
-   */
-  parseMessageData(data) {
-    const { thread_id, ...rest } = data;
-    return {
-      ...rest,
-      threadId: thread_id,
-      content: typeof data.content === "string" ? (() => {
-        try {
-          return JSON.parse(data.content);
-        } catch {
-          return data.content;
-        }
-      })() : data.content,
-      createdAt: new Date(data.createdAt),
-      updatedAt: new Date(data.updatedAt)
-    };
-  }
-  async updateMessages(args) {
-    const { messages } = args;
-    this.logger.debug("Updating messages", { count: messages.length });
-    if (!messages.length) {
-      return [];
+  async batchInsert({ tableName, records }) {
+    try {
+      if (!this.client) {
+        throw new Error("LanceDB client not initialized. Call LanceStorage.create() first.");
+      }
+      if (!tableName) {
+        throw new Error("tableName is required for batchInsert.");
+      }
+      if (!records || records.length === 0) {
+        throw new Error("records array is required and cannot be empty for batchInsert.");
+      }
+    } catch (validationError) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("LANCE", "BATCH_INSERT", "INVALID_ARGS"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER,
+          text: validationError.message,
+          details: { tableName }
+        },
+        validationError
+      );
     }
-    const updatedMessages = [];
-    const affectedThreadIds = /* @__PURE__ */ new Set();
     try {
-      for (const updateData of messages) {
-        const { id, ...updates } = updateData;
-        const existingMessage = await this.operations.load({ tableName: TABLE_MESSAGES, keys: { id } });
-        if (!existingMessage) {
-          this.logger.warn("Message not found for update", { id });
-          continue;
-        }
-        const existingMsg = this.parseMessageData(existingMessage);
-        const originalThreadId = existingMsg.threadId;
-        affectedThreadIds.add(originalThreadId);
-        const updatePayload = {};
-        if ("role" in updates && updates.role !== void 0) updatePayload.role = updates.role;
-        if ("type" in updates && updates.type !== void 0) updatePayload.type = updates.type;
-        if ("resourceId" in updates && updates.resourceId !== void 0) updatePayload.resourceId = updates.resourceId;
-        if ("threadId" in updates && updates.threadId !== void 0 && updates.threadId !== null) {
-          updatePayload.thread_id = updates.threadId;
-          affectedThreadIds.add(updates.threadId);
-        }
-        if (updates.content) {
-          const existingContent = existingMsg.content;
-          let newContent = { ...existingContent };
-          if (updates.content.metadata !== void 0) {
-            newContent.metadata = {
-              ...existingContent.metadata || {},
-              ...updates.content.metadata || {}
-            };
-          }
-          if (updates.content.content !== void 0) {
-            newContent.content = updates.content.content;
-          }
-          if ("parts" in updates.content && updates.content.parts !== void 0) {
-            newContent.parts = updates.content.parts;
+      const table = await this.client.openTable(tableName);
+      const primaryId = getPrimaryKeys(tableName);
+      const processedRecords = records.map((record) => {
+        const processedRecord = { ...record };
+        for (const key in processedRecord) {
+          if (processedRecord[key] == null) continue;
+          if (processedRecord[key] !== null && typeof processedRecord[key] === "object" && !(processedRecord[key] instanceof Date)) {
+            processedRecord[key] = JSON.stringify(processedRecord[key]);
           }
-          updatePayload.content = JSON.stringify(newContent);
         }
-        await this.operations.insert({ tableName: TABLE_MESSAGES, record: { id, ...updatePayload } });
-        const updatedMessage = await this.operations.load({ tableName: TABLE_MESSAGES, keys: { id } });
-        if (updatedMessage) {
-          updatedMessages.push(this.parseMessageData(updatedMessage));
-        }
-      }
-      for (const threadId of affectedThreadIds) {
-        await this.operations.insert({
-          tableName: TABLE_THREADS,
-          record: { id: threadId, updatedAt: Date.now() }
-        });
-      }
-      return updatedMessages;
+        return processedRecord;
+      });
+      await table.mergeInsert(primaryId).whenMatchedUpdateAll().whenNotMatchedInsertAll().execute(processedRecords);
     } catch (error) {
       throw new MastraError(
         {
-          id: "LANCE_STORE_UPDATE_MESSAGES_FAILED",
+          id: createStorageErrorId("LANCE", "BATCH_INSERT", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          details: { count: messages.length }
+          details: { tableName }
         },
         error
       );
     }
   }
-  async getResourceById({ resourceId }) {
+  async load({ tableName, keys }) {
     try {
-      const resource = await this.operations.load({ tableName: TABLE_RESOURCES, keys: { id: resourceId } });
-      if (!resource) {
-        return null;
-      }
-      let createdAt;
-      let updatedAt;
-      try {
-        if (resource.createdAt instanceof Date) {
-          createdAt = resource.createdAt;
-        } else if (typeof resource.createdAt === "string") {
-          createdAt = new Date(resource.createdAt);
-        } else if (typeof resource.createdAt === "number") {
-          createdAt = new Date(resource.createdAt);
-        } else {
-          createdAt = /* @__PURE__ */ new Date();
-        }
-        if (isNaN(createdAt.getTime())) {
-          createdAt = /* @__PURE__ */ new Date();
-        }
-      } catch {
-        createdAt = /* @__PURE__ */ new Date();
-      }
-      try {
-        if (resource.updatedAt instanceof Date) {
-          updatedAt = resource.updatedAt;
-        } else if (typeof resource.updatedAt === "string") {
-          updatedAt = new Date(resource.updatedAt);
-        } else if (typeof resource.updatedAt === "number") {
-          updatedAt = new Date(resource.updatedAt);
-        } else {
-          updatedAt = /* @__PURE__ */ new Date();
-        }
-        if (isNaN(updatedAt.getTime())) {
-          updatedAt = /* @__PURE__ */ new Date();
-        }
-      } catch {
-        updatedAt = /* @__PURE__ */ new Date();
+      if (!this.client) {
+        throw new Error("LanceDB client not initialized. Call LanceStorage.create() first.");
       }
-      let workingMemory = resource.workingMemory;
-      if (workingMemory === null || workingMemory === void 0) {
-        workingMemory = void 0;
-      } else if (workingMemory === "") {
-        workingMemory = "";
-      } else if (typeof workingMemory === "object") {
-        workingMemory = JSON.stringify(workingMemory);
+      if (!tableName) {
+        throw new Error("tableName is required for load.");
       }
-      let metadata = resource.metadata;
-      if (metadata === "" || metadata === null || metadata === void 0) {
-        metadata = void 0;
-      } else if (typeof metadata === "string") {
-        try {
-          metadata = JSON.parse(metadata);
-        } catch {
-          metadata = metadata;
-        }
+      if (!keys || Object.keys(keys).length === 0) {
+        throw new Error("keys are required and cannot be empty for load.");
       }
-      return {
-        ...resource,
-        createdAt,
-        updatedAt,
-        workingMemory,
-        metadata
-      };
-    } catch (error) {
+    } catch (validationError) {
       throw new MastraError(
         {
-          id: "LANCE_STORE_GET_RESOURCE_BY_ID_FAILED",
+          id: createStorageErrorId("LANCE", "LOAD", "INVALID_ARGS"),
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY
+          category: ErrorCategory.USER,
+          text: validationError.message,
+          details: { tableName }
         },
-        error
+        validationError
       );
     }
-  }
-  async saveResource({ resource }) {
     try {
-      const record = {
-        ...resource,
-        metadata: resource.metadata ? JSON.stringify(resource.metadata) : "",
-        createdAt: resource.createdAt.getTime(),
-        // Store as timestamp (milliseconds)
-        updatedAt: resource.updatedAt.getTime()
-        // Store as timestamp (milliseconds)
-      };
-      const table = await this.client.openTable(TABLE_RESOURCES);
-      await table.add([record], { mode: "append" });
-      return resource;
+      const table = await this.client.openTable(tableName);
+      const tableSchema = await getTableSchema({ tableName, client: this.client });
+      const query = table.query();
+      if (Object.keys(keys).length > 0) {
+        validateKeyTypes(keys, tableSchema);
+        const filterConditions = Object.entries(keys).map(([key, value]) => {
+          const isCamelCase = /^[a-z][a-zA-Z]*$/.test(key) && /[A-Z]/.test(key);
+          const quotedKey = isCamelCase ? `\`${key}\`` : key;
+          if (typeof value === "string") {
+            return `${quotedKey} = '${value}'`;
+          } else if (value === null) {
+            return `${quotedKey} IS NULL`;
+          } else {
+            return `${quotedKey} = ${value}`;
+          }
+        }).join(" AND ");
+        this.logger.debug("where clause generated: " + filterConditions);
+        query.where(filterConditions);
+      }
+      const result = await query.limit(1).toArray();
+      if (result.length === 0) {
+        this.logger.debug("No record found");
+        return null;
+      }
+      return processResultWithTypeConversion(result[0], tableSchema);
     } catch (error) {
+      if (error instanceof MastraError) throw error;
       throw new MastraError(
         {
-          id: "LANCE_STORE_SAVE_RESOURCE_FAILED",
+          id: createStorageErrorId("LANCE", "LOAD", "FAILED"),
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY
+          category: ErrorCategory.THIRD_PARTY,
+          details: { tableName, keyCount: Object.keys(keys).length, firstKey: Object.keys(keys)[0] ?? "" }
         },
         error
       );
     }
   }
-  async updateResource({
-    resourceId,
-    workingMemory,
-    metadata
-  }) {
-    const maxRetries = 3;
-    for (let attempt = 0; attempt < maxRetries; attempt++) {
-      try {
-        const existingResource = await this.getResourceById({ resourceId });
-        if (!existingResource) {
-          const newResource = {
-            id: resourceId,
-            workingMemory,
-            metadata: metadata || {},
-            createdAt: /* @__PURE__ */ new Date(),
-            updatedAt: /* @__PURE__ */ new Date()
-          };
-          return this.saveResource({ resource: newResource });
-        }
-        const updatedResource = {
-          ...existingResource,
-          workingMemory: workingMemory !== void 0 ? workingMemory : existingResource.workingMemory,
-          metadata: {
-            ...existingResource.metadata,
-            ...metadata
-          },
-          updatedAt: /* @__PURE__ */ new Date()
-        };
-        const record = {
-          id: resourceId,
-          workingMemory: updatedResource.workingMemory || "",
-          metadata: updatedResource.metadata ? JSON.stringify(updatedResource.metadata) : "",
-          updatedAt: updatedResource.updatedAt.getTime()
-          // Store as timestamp (milliseconds)
-        };
-        const table = await this.client.openTable(TABLE_RESOURCES);
-        await table.mergeInsert("id").whenMatchedUpdateAll().whenNotMatchedInsertAll().execute([record]);
-        return updatedResource;
-      } catch (error) {
-        if (error.message?.includes("Commit conflict") && attempt < maxRetries - 1) {
-          const delay = Math.pow(2, attempt) * 10;
-          await new Promise((resolve) => setTimeout(resolve, delay));
-          continue;
-        }
-        throw new MastraError(
-          {
-            id: "LANCE_STORE_UPDATE_RESOURCE_FAILED",
-            domain: ErrorDomain.STORAGE,
-            category: ErrorCategory.THIRD_PARTY
-          },
-          error
-        );
-      }
-    }
-    throw new Error("Unexpected end of retry loop");
-  }
 };
-var StoreOperationsLance = class extends StoreOperations {
+
+// src/storage/domains/memory/index.ts
+var StoreMemoryLance = class extends MemoryStorage {
   client;
-  constructor({ client }) {
+  #db;
+  constructor(config) {
     super();
+    const client = resolveLanceConfig(config);
     this.client = client;
-  }
-  getDefaultValue(type) {
-    switch (type) {
-      case "text":
-        return "''";
-      case "timestamp":
-        return "CURRENT_TIMESTAMP";
-      case "integer":
-      case "bigint":
-        return "0";
-      case "jsonb":
-        return "'{}'";
-      case "uuid":
-        return "''";
-      default:
-        return super.getDefaultValue(type);
-    }
-  }
-  async hasColumn(tableName, columnName) {
-    const table = await this.client.openTable(tableName);
-    const schema = await table.schema();
-    return schema.fields.some((field) => field.name === columnName);
-  }
-  translateSchema(schema) {
-    const fields = Object.entries(schema).map(([name, column]) => {
-      let arrowType;
-      switch (column.type.toLowerCase()) {
-        case "text":
-        case "uuid":
-          arrowType = new Utf8();
-          break;
-        case "int":
-        case "integer":
-          arrowType = new Int32();
-          break;
-        case "bigint":
-          arrowType = new Float64();
-          break;
-        case "float":
-          arrowType = new Float32();
-          break;
-        case "jsonb":
-        case "json":
-          arrowType = new Utf8();
-          break;
-        case "binary":
-          arrowType = new Binary();
-          break;
-        case "timestamp":
-          arrowType = new Float64();
-          break;
-        default:
-          arrowType = new Utf8();
-      }
-      return new Field(name, arrowType, column.nullable ?? true);
+    this.#db = new LanceDB({ client });
+  }
+  async init() {
+    await this.#db.createTable({ tableName: TABLE_THREADS, schema: TABLE_SCHEMAS[TABLE_THREADS] });
+    await this.#db.createTable({ tableName: TABLE_MESSAGES, schema: TABLE_SCHEMAS[TABLE_MESSAGES] });
+    await this.#db.createTable({ tableName: TABLE_RESOURCES, schema: TABLE_SCHEMAS[TABLE_RESOURCES] });
+    await this.#db.alterTable({
+      tableName: TABLE_MESSAGES,
+      schema: TABLE_SCHEMAS[TABLE_MESSAGES],
+      ifNotExists: ["resourceId"]
     });
-    return new Schema(fields);
   }
-  async createTable({
-    tableName,
-    schema
-  }) {
+  async dangerouslyClearAll() {
+    await this.#db.clearTable({ tableName: TABLE_THREADS });
+    await this.#db.clearTable({ tableName: TABLE_MESSAGES });
+    await this.#db.clearTable({ tableName: TABLE_RESOURCES });
+  }
+  async deleteMessages(messageIds) {
+    if (!messageIds || messageIds.length === 0) {
+      return;
+    }
+    this.logger.debug("Deleting messages", { count: messageIds.length });
     try {
-      if (!this.client) {
-        throw new Error("LanceDB client not initialized. Call LanceStorage.create() first.");
+      const threadIds = /* @__PURE__ */ new Set();
+      for (const messageId of messageIds) {
+        const message = await this.#db.load({ tableName: TABLE_MESSAGES, keys: { id: messageId } });
+        if (message?.thread_id) {
+          threadIds.add(message.thread_id);
+        }
       }
-      if (!tableName) {
-        throw new Error("tableName is required for createTable.");
+      const messagesTable = await this.client.openTable(TABLE_MESSAGES);
+      const idConditions = messageIds.map((id) => `id = '${this.escapeSql(id)}'`).join(" OR ");
+      await messagesTable.delete(idConditions);
+      const now = (/* @__PURE__ */ new Date()).getTime();
+      const threadsTable = await this.client.openTable(TABLE_THREADS);
+      for (const threadId of threadIds) {
+        const thread = await this.getThreadById({ threadId });
+        if (thread) {
+          const record = {
+            id: threadId,
+            resourceId: thread.resourceId,
+            title: thread.title,
+            metadata: JSON.stringify(thread.metadata),
+            createdAt: new Date(thread.createdAt).getTime(),
+            updatedAt: now
+          };
+          await threadsTable.mergeInsert("id").whenMatchedUpdateAll().whenNotMatchedInsertAll().execute([record]);
+        }
       }
-      if (!schema) {
-        throw new Error("schema is required for createTable.");
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("LANCE", "DELETE_MESSAGES", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { count: messageIds.length }
+        },
+        error
+      );
+    }
+  }
+  // Utility to escape single quotes in SQL strings
+  escapeSql(str) {
+    return str.replace(/'/g, "''");
+  }
+  async getThreadById({ threadId }) {
+    try {
+      const thread = await this.#db.load({ tableName: TABLE_THREADS, keys: { id: threadId } });
+      if (!thread) {
+        return null;
       }
+      return {
+        ...thread,
+        createdAt: new Date(thread.createdAt),
+        updatedAt: new Date(thread.updatedAt)
+      };
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_LANCE_STORAGE_CREATE_TABLE_INVALID_ARGS",
+          id: createStorageErrorId("LANCE", "GET_THREAD_BY_ID", "FAILED"),
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.USER,
-          details: { tableName }
+          category: ErrorCategory.THIRD_PARTY
         },
         error
       );
     }
+  }
+  /**
+   * Saves a thread to the database. This function doesn't overwrite existing threads.
+   * @param thread - The thread to save
+   * @returns The saved thread
+   */
+  async saveThread({ thread }) {
     try {
-      const arrowSchema = this.translateSchema(schema);
-      await this.client.createEmptyTable(tableName, arrowSchema);
+      const record = { ...thread, metadata: JSON.stringify(thread.metadata) };
+      const table = await this.client.openTable(TABLE_THREADS);
+      await table.add([record], { mode: "append" });
+      return thread;
     } catch (error) {
-      if (error.message?.includes("already exists")) {
-        this.logger.debug(`Table '${tableName}' already exists, skipping create`);
-        return;
-      }
       throw new MastraError(
         {
-          id: "STORAGE_LANCE_STORAGE_CREATE_TABLE_FAILED",
+          id: createStorageErrorId("LANCE", "SAVE_THREAD", "FAILED"),
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY,
-          details: { tableName }
+          category: ErrorCategory.THIRD_PARTY
         },
         error
       );
     }
   }
-  async dropTable({ tableName }) {
-    try {
-      if (!this.client) {
-        throw new Error("LanceDB client not initialized. Call LanceStorage.create() first.");
-      }
-      if (!tableName) {
-        throw new Error("tableName is required for dropTable.");
+  async updateThread({
+    id,
+    title,
+    metadata
+  }) {
+    const maxRetries = 5;
+    for (let attempt = 0; attempt < maxRetries; attempt++) {
+      try {
+        const current = await this.getThreadById({ threadId: id });
+        if (!current) {
+          throw new Error(`Thread with id ${id} not found`);
+        }
+        const mergedMetadata = { ...current.metadata, ...metadata };
+        const record = {
+          id,
+          title,
+          metadata: JSON.stringify(mergedMetadata),
+          updatedAt: (/* @__PURE__ */ new Date()).getTime()
+        };
+        const table = await this.client.openTable(TABLE_THREADS);
+        await table.mergeInsert("id").whenMatchedUpdateAll().whenNotMatchedInsertAll().execute([record]);
+        const updatedThread = await this.getThreadById({ threadId: id });
+        if (!updatedThread) {
+          throw new Error(`Failed to retrieve updated thread ${id}`);
+        }
+        return updatedThread;
+      } catch (error) {
+        if (error.message?.includes("Commit conflict") && attempt < maxRetries - 1) {
+          const delay = Math.pow(2, attempt) * 10;
+          await new Promise((resolve) => setTimeout(resolve, delay));
+          continue;
+        }
+        throw new MastraError(
+          {
+            id: createStorageErrorId("LANCE", "UPDATE_THREAD", "FAILED"),
+            domain: ErrorDomain.STORAGE,
+            category: ErrorCategory.THIRD_PARTY
+          },
+          error
+        );
       }
-    } catch (validationError) {
+    }
+    throw new MastraError(
+      {
+        id: createStorageErrorId("LANCE", "UPDATE_THREAD", "FAILED"),
+        domain: ErrorDomain.STORAGE,
+        category: ErrorCategory.THIRD_PARTY
+      },
+      new Error("All retries exhausted")
+    );
+  }
+  async deleteThread({ threadId }) {
+    try {
+      const table = await this.client.openTable(TABLE_THREADS);
+      await table.delete(`id = '${threadId}'`);
+      const messagesTable = await this.client.openTable(TABLE_MESSAGES);
+      await messagesTable.delete(`thread_id = '${threadId}'`);
+    } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_LANCE_STORAGE_DROP_TABLE_INVALID_ARGS",
+          id: createStorageErrorId("LANCE", "DELETE_THREAD", "FAILED"),
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.USER,
-          text: validationError.message,
-          details: { tableName }
+          category: ErrorCategory.THIRD_PARTY
         },
-        validationError
+        error
       );
     }
+  }
+  normalizeMessage(message) {
+    const { thread_id, ...rest } = message;
+    return {
+      ...rest,
+      threadId: thread_id,
+      content: typeof message.content === "string" ? (() => {
+        try {
+          return JSON.parse(message.content);
+        } catch {
+          return message.content;
+        }
+      })() : message.content
+    };
+  }
+  async listMessagesById({ messageIds }) {
+    if (messageIds.length === 0) return { messages: [] };
     try {
-      await this.client.dropTable(tableName);
+      const table = await this.client.openTable(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: TABLE_MESSAGES, client: this.client })
+      );
+      const list = new MessageList().add(
+        messages.map(this.normalizeMessage),
+        "memory"
+      );
+      return { messages: list.get.all.db() };
     } catch (error) {
-      if (error.toString().includes("was not found") || error.message?.includes("Table not found")) {
-        this.logger.debug(`Table '${tableName}' does not exist, skipping drop`);
-        return;
-      }
       throw new MastraError(
         {
-          id: "STORAGE_LANCE_STORAGE_DROP_TABLE_FAILED",
+          id: createStorageErrorId("LANCE", "LIST_MESSAGES_BY_ID", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          details: { tableName }
+          details: {
+            messageIds: JSON.stringify(messageIds)
+          }
         },
         error
       );
     }
   }
-  async alterTable({
-    tableName,
-    schema,
-    ifNotExists
-  }) {
-    try {
-      if (!this.client) {
-        throw new Error("LanceDB client not initialized. Call LanceStorage.create() first.");
-      }
-      if (!tableName) {
-        throw new Error("tableName is required for alterTable.");
-      }
-      if (!schema) {
-        throw new Error("schema is required for alterTable.");
-      }
-      if (!ifNotExists || ifNotExists.length === 0) {
-        this.logger.debug("No columns specified to add in alterTable, skipping.");
-        return;
-      }
-    } catch (validationError) {
+  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 MastraError(
         {
-          id: "STORAGE_LANCE_STORAGE_ALTER_TABLE_INVALID_ARGS",
+          id: createStorageErrorId("LANCE", "LIST_MESSAGES", "INVALID_THREAD_ID"),
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.USER,
-          text: validationError.message,
-          details: { tableName }
+          category: ErrorCategory.THIRD_PARTY,
+          details: { threadId: Array.isArray(threadId) ? threadId.join(",") : threadId }
         },
-        validationError
+        new Error("threadId must be a non-empty string or array of non-empty strings")
       );
     }
+    const perPage = normalizePerPage(perPageInput, 40);
+    const { offset, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
     try {
-      const table = await this.client.openTable(tableName);
-      const currentSchema = await table.schema();
-      const existingFields = new Set(currentSchema.fields.map((f) => f.name));
-      const typeMap = {
-        text: "string",
-        integer: "int",
-        bigint: "bigint",
-        timestamp: "timestamp",
-        jsonb: "string",
-        uuid: "string"
-      };
-      const columnsToAdd = ifNotExists.filter((col) => schema[col] && !existingFields.has(col)).map((col) => {
-        const colDef = schema[col];
+      if (page < 0) {
+        throw new MastraError(
+          {
+            id: createStorageErrorId("LANCE", "LIST_MESSAGES", "INVALID_PAGE"),
+            domain: ErrorDomain.STORAGE,
+            category: ErrorCategory.USER,
+            details: { page }
+          },
+          new Error("page must be >= 0")
+        );
+      }
+      const { field, direction } = this.parseOrderBy(orderBy, "ASC");
+      const table = await this.client.openTable(TABLE_MESSAGES);
+      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();
+        const startOp = filter.dateRange.startExclusive ? ">" : ">=";
+        conditions.push(`\`createdAt\` ${startOp} ${startTime}`);
+      }
+      if (filter?.dateRange?.end) {
+        const endTime = filter.dateRange.end instanceof Date ? filter.dateRange.end.getTime() : new Date(filter.dateRange.end).getTime();
+        const endOp = filter.dateRange.endExclusive ? "<" : "<=";
+        conditions.push(`\`createdAt\` ${endOp} ${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 {
-          name: col,
-          valueSql: colDef?.nullable ? `cast(NULL as ${typeMap[colDef.type ?? "text"]})` : `cast(${this.getDefaultValue(colDef?.type ?? "text")} as ${typeMap[colDef?.type ?? "text"]})`
+          messages: [],
+          total: 0,
+          page,
+          perPage: perPageForResponse,
+          hasMore: false
         };
-      });
-      if (columnsToAdd.length > 0) {
-        await table.addColumns(columnsToAdd);
-        this.logger?.info?.(`Added columns [${columnsToAdd.map((c) => c.name).join(", ")}] to table ${tableName}`);
       }
+      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 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) {
-      throw new MastraError(
+      const mastraError = new MastraError(
         {
-          id: "STORAGE_LANCE_STORAGE_ALTER_TABLE_FAILED",
+          id: createStorageErrorId("LANCE", "LIST_MESSAGES", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          details: { tableName }
+          details: {
+            threadId: Array.isArray(threadId) ? threadId.join(",") : threadId,
+            resourceId: resourceId ?? ""
+          }
         },
         error
       );
+      this.logger?.error?.(mastraError.toString());
+      this.logger?.trackException?.(mastraError);
+      return {
+        messages: [],
+        total: 0,
+        page,
+        perPage: perPageForResponse,
+        hasMore: false
+      };
     }
   }
-  async clearTable({ tableName }) {
+  async saveMessages(args) {
     try {
-      if (!this.client) {
-        throw new Error("LanceDB client not initialized. Call LanceStorage.create() first.");
+      const { messages } = args;
+      if (messages.length === 0) {
+        return { messages: [] };
       }
-      if (!tableName) {
-        throw new Error("tableName is required for clearTable.");
+      const threadId = messages[0]?.threadId;
+      if (!threadId) {
+        throw new Error("Thread ID is required");
       }
-    } catch (validationError) {
+      for (const message of messages) {
+        if (!message.id) {
+          throw new Error("Message ID is required");
+        }
+        if (!message.threadId) {
+          throw new Error("Thread ID is required for all messages");
+        }
+        if (message.resourceId === null || message.resourceId === void 0) {
+          throw new Error("Resource ID cannot be null or undefined");
+        }
+        if (!message.content) {
+          throw new Error("Message content is required");
+        }
+      }
+      const transformedMessages = messages.map((message) => {
+        const { threadId: threadId2, type, ...rest } = message;
+        return {
+          ...rest,
+          thread_id: threadId2,
+          type: type ?? "v2",
+          content: JSON.stringify(message.content)
+        };
+      });
+      const table = await this.client.openTable(TABLE_MESSAGES);
+      await table.mergeInsert("id").whenMatchedUpdateAll().whenNotMatchedInsertAll().execute(transformedMessages);
+      const threadsTable = await this.client.openTable(TABLE_THREADS);
+      const currentTime = (/* @__PURE__ */ new Date()).getTime();
+      const updateRecord = { id: threadId, updatedAt: currentTime };
+      await threadsTable.mergeInsert("id").whenMatchedUpdateAll().whenNotMatchedInsertAll().execute([updateRecord]);
+      const list = new MessageList().add(messages, "memory");
+      return { messages: list.get.all.db() };
+    } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_LANCE_STORAGE_CLEAR_TABLE_INVALID_ARGS",
+          id: createStorageErrorId("LANCE", "SAVE_MESSAGES", "FAILED"),
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.USER,
-          text: validationError.message,
-          details: { tableName }
+          category: ErrorCategory.THIRD_PARTY
         },
-        validationError
+        error
       );
     }
+  }
+  async listThreads(args) {
+    const { page = 0, perPage: perPageInput, orderBy, filter } = args;
     try {
-      const table = await this.client.openTable(tableName);
-      await table.delete("1=1");
+      this.validatePaginationInput(page, perPageInput ?? 100);
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_LANCE_STORAGE_CLEAR_TABLE_FAILED",
+          id: createStorageErrorId("LANCE", "LIST_THREADS", "INVALID_PAGE"),
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY,
-          details: { tableName }
+          category: ErrorCategory.USER,
+          details: { page, ...perPageInput !== void 0 && { perPage: perPageInput } }
         },
-        error
+        error instanceof Error ? error : new Error("Invalid pagination parameters")
       );
     }
-  }
-  async insert({ tableName, record }) {
+    const perPage = normalizePerPage(perPageInput, 100);
     try {
-      if (!this.client) {
-        throw new Error("LanceDB client not initialized. Call LanceStorage.create() first.");
-      }
-      if (!tableName) {
-        throw new Error("tableName is required for insert.");
-      }
-      if (!record || Object.keys(record).length === 0) {
-        throw new Error("record is required and cannot be empty for insert.");
-      }
-    } catch (validationError) {
+      this.validateMetadataKeys(filter?.metadata);
+    } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_LANCE_STORAGE_INSERT_INVALID_ARGS",
+          id: createStorageErrorId("LANCE", "LIST_THREADS", "INVALID_METADATA_KEY"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.USER,
-          text: validationError.message,
-          details: { tableName }
+          details: { metadataKeys: filter?.metadata ? Object.keys(filter.metadata).join(", ") : "" }
         },
-        validationError
+        error instanceof Error ? error : new Error("Invalid metadata key")
       );
     }
     try {
-      const table = await this.client.openTable(tableName);
-      const primaryId = getPrimaryKeys(tableName);
-      const processedRecord = { ...record };
-      for (const key in processedRecord) {
-        if (processedRecord[key] !== null && typeof processedRecord[key] === "object" && !(processedRecord[key] instanceof Date)) {
-          this.logger.debug("Converting object to JSON string: ", processedRecord[key]);
-          processedRecord[key] = JSON.stringify(processedRecord[key]);
-        }
+      const { offset, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
+      const { field, direction } = this.parseOrderBy(orderBy);
+      const table = await this.client.openTable(TABLE_THREADS);
+      const whereClauses = [];
+      if (filter?.resourceId) {
+        whereClauses.push(`\`resourceId\` = '${this.escapeSql(filter.resourceId)}'`);
+      }
+      const whereClause = whereClauses.length > 0 ? whereClauses.join(" AND ") : "";
+      const query = whereClause ? table.query().where(whereClause) : table.query();
+      let records = await query.toArray();
+      if (filter?.metadata && Object.keys(filter.metadata).length > 0) {
+        records = records.filter((record) => {
+          if (!record.metadata) return false;
+          let recordMeta;
+          if (typeof record.metadata === "string") {
+            try {
+              recordMeta = JSON.parse(record.metadata);
+            } catch {
+              return false;
+            }
+          } else {
+            recordMeta = record.metadata;
+          }
+          return Object.entries(filter.metadata).every(([key, value]) => recordMeta[key] === value);
+        });
       }
-      console.info(await table.schema());
-      await table.mergeInsert(primaryId).whenMatchedUpdateAll().whenNotMatchedInsertAll().execute([processedRecord]);
+      const total = records.length;
+      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: TABLE_THREADS, client: this.client });
+      const threads = paginatedRecords.map(
+        (record) => processResultWithTypeConversion(record, schema)
+      );
+      return {
+        threads,
+        total,
+        page,
+        perPage: perPageForResponse,
+        hasMore: offset + perPage < total
+      };
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_LANCE_STORAGE_INSERT_FAILED",
+          id: createStorageErrorId("LANCE", "LIST_THREADS", "FAILED"),
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY,
-          details: { tableName }
+          category: ErrorCategory.THIRD_PARTY
         },
         error
       );
     }
   }
-  async batchInsert({ tableName, records }) {
-    try {
-      if (!this.client) {
-        throw new Error("LanceDB client not initialized. Call LanceStorage.create() first.");
+  /**
+   * Processes messages to include context messages based on withPreviousMessages and withNextMessages
+   * @param records - The sorted array of records to process
+   * @param include - The array of include specifications with context parameters
+   * @returns The processed array with context messages included
+   */
+  processMessagesWithContext(records, include) {
+    const messagesWithContext = include.filter((item) => item.withPreviousMessages || item.withNextMessages);
+    if (messagesWithContext.length === 0) {
+      return records;
+    }
+    const messageIndexMap = /* @__PURE__ */ new Map();
+    records.forEach((message, index) => {
+      messageIndexMap.set(message.id, index);
+    });
+    const additionalIndices = /* @__PURE__ */ new Set();
+    for (const item of messagesWithContext) {
+      const messageIndex = messageIndexMap.get(item.id);
+      if (messageIndex !== void 0) {
+        if (item.withPreviousMessages) {
+          const startIdx = Math.max(0, messageIndex - item.withPreviousMessages);
+          for (let i = startIdx; i < messageIndex; i++) {
+            additionalIndices.add(i);
+          }
+        }
+        if (item.withNextMessages) {
+          const endIdx = Math.min(records.length - 1, messageIndex + item.withNextMessages);
+          for (let i = messageIndex + 1; i <= endIdx; i++) {
+            additionalIndices.add(i);
+          }
+        }
       }
-      if (!tableName) {
-        throw new Error("tableName is required for batchInsert.");
+    }
+    if (additionalIndices.size === 0) {
+      return records;
+    }
+    const originalMatchIds = new Set(include.map((item) => item.id));
+    const allIndices = /* @__PURE__ */ new Set();
+    records.forEach((record, index) => {
+      if (originalMatchIds.has(record.id)) {
+        allIndices.add(index);
       }
-      if (!records || records.length === 0) {
-        throw new Error("records array is required and cannot be empty for batchInsert.");
+    });
+    additionalIndices.forEach((index) => {
+      allIndices.add(index);
+    });
+    return Array.from(allIndices).sort((a, b) => a - b).map((index) => records[index]);
+  }
+  /**
+   * Parse message data from LanceDB record format to MastraDBMessage format
+   */
+  parseMessageData(data) {
+    const { thread_id, ...rest } = data;
+    return {
+      ...rest,
+      threadId: thread_id,
+      content: typeof data.content === "string" ? (() => {
+        try {
+          return JSON.parse(data.content);
+        } catch {
+          return data.content;
+        }
+      })() : data.content,
+      createdAt: new Date(data.createdAt),
+      updatedAt: new Date(data.updatedAt)
+    };
+  }
+  async updateMessages(args) {
+    const { messages } = args;
+    this.logger.debug("Updating messages", { count: messages.length });
+    if (!messages.length) {
+      return [];
+    }
+    const updatedMessages = [];
+    const affectedThreadIds = /* @__PURE__ */ new Set();
+    try {
+      for (const updateData of messages) {
+        const { id, ...updates } = updateData;
+        const existingMessage = await this.#db.load({ tableName: TABLE_MESSAGES, keys: { id } });
+        if (!existingMessage) {
+          this.logger.warn("Message not found for update", { id });
+          continue;
+        }
+        const existingMsg = this.parseMessageData(existingMessage);
+        const originalThreadId = existingMsg.threadId;
+        affectedThreadIds.add(originalThreadId);
+        const updatePayload = {};
+        if ("role" in updates && updates.role !== void 0) updatePayload.role = updates.role;
+        if ("type" in updates && updates.type !== void 0) updatePayload.type = updates.type;
+        if ("resourceId" in updates && updates.resourceId !== void 0) updatePayload.resourceId = updates.resourceId;
+        if ("threadId" in updates && updates.threadId !== void 0 && updates.threadId !== null) {
+          updatePayload.thread_id = updates.threadId;
+          affectedThreadIds.add(updates.threadId);
+        }
+        if (updates.content) {
+          const existingContent = existingMsg.content;
+          let newContent = { ...existingContent };
+          if (updates.content.metadata !== void 0) {
+            newContent.metadata = {
+              ...existingContent.metadata || {},
+              ...updates.content.metadata || {}
+            };
+          }
+          if (updates.content.content !== void 0) {
+            newContent.content = updates.content.content;
+          }
+          if ("parts" in updates.content && updates.content.parts !== void 0) {
+            newContent.parts = updates.content.parts;
+          }
+          updatePayload.content = JSON.stringify(newContent);
+        }
+        await this.#db.insert({ tableName: TABLE_MESSAGES, record: { id, ...updatePayload } });
+        const updatedMessage = await this.#db.load({ tableName: TABLE_MESSAGES, keys: { id } });
+        if (updatedMessage) {
+          updatedMessages.push(this.parseMessageData(updatedMessage));
+        }
       }
-    } catch (validationError) {
+      for (const threadId of affectedThreadIds) {
+        await this.#db.insert({
+          tableName: TABLE_THREADS,
+          record: { id: threadId, updatedAt: Date.now() }
+        });
+      }
+      return updatedMessages;
+    } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_LANCE_STORAGE_BATCH_INSERT_INVALID_ARGS",
+          id: createStorageErrorId("LANCE", "UPDATE_MESSAGES", "FAILED"),
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.USER,
-          text: validationError.message,
-          details: { tableName }
+          category: ErrorCategory.THIRD_PARTY,
+          details: { count: messages.length }
         },
-        validationError
+        error
       );
     }
+  }
+  async getResourceById({ resourceId }) {
     try {
-      const table = await this.client.openTable(tableName);
-      const primaryId = getPrimaryKeys(tableName);
-      const processedRecords = records.map((record) => {
-        const processedRecord = { ...record };
-        for (const key in processedRecord) {
-          if (processedRecord[key] == null) continue;
-          if (processedRecord[key] !== null && typeof processedRecord[key] === "object" && !(processedRecord[key] instanceof Date)) {
-            processedRecord[key] = JSON.stringify(processedRecord[key]);
-          }
+      const resource = await this.#db.load({ tableName: TABLE_RESOURCES, keys: { id: resourceId } });
+      if (!resource) {
+        return null;
+      }
+      let createdAt;
+      let updatedAt;
+      try {
+        if (resource.createdAt instanceof Date) {
+          createdAt = resource.createdAt;
+        } else if (typeof resource.createdAt === "string") {
+          createdAt = new Date(resource.createdAt);
+        } else if (typeof resource.createdAt === "number") {
+          createdAt = new Date(resource.createdAt);
+        } else {
+          createdAt = /* @__PURE__ */ new Date();
         }
-        return processedRecord;
-      });
-      await table.mergeInsert(primaryId).whenMatchedUpdateAll().whenNotMatchedInsertAll().execute(processedRecords);
+        if (isNaN(createdAt.getTime())) {
+          createdAt = /* @__PURE__ */ new Date();
+        }
+      } catch {
+        createdAt = /* @__PURE__ */ new Date();
+      }
+      try {
+        if (resource.updatedAt instanceof Date) {
+          updatedAt = resource.updatedAt;
+        } else if (typeof resource.updatedAt === "string") {
+          updatedAt = new Date(resource.updatedAt);
+        } else if (typeof resource.updatedAt === "number") {
+          updatedAt = new Date(resource.updatedAt);
+        } else {
+          updatedAt = /* @__PURE__ */ new Date();
+        }
+        if (isNaN(updatedAt.getTime())) {
+          updatedAt = /* @__PURE__ */ new Date();
+        }
+      } catch {
+        updatedAt = /* @__PURE__ */ new Date();
+      }
+      let workingMemory = resource.workingMemory;
+      if (workingMemory === null || workingMemory === void 0) {
+        workingMemory = void 0;
+      } else if (workingMemory === "") {
+        workingMemory = "";
+      } else if (typeof workingMemory === "object") {
+        workingMemory = JSON.stringify(workingMemory);
+      }
+      let metadata = resource.metadata;
+      if (metadata === "" || metadata === null || metadata === void 0) {
+        metadata = void 0;
+      } else if (typeof metadata === "string") {
+        try {
+          metadata = JSON.parse(metadata);
+        } catch {
+          metadata = metadata;
+        }
+      }
+      return {
+        ...resource,
+        createdAt,
+        updatedAt,
+        workingMemory,
+        metadata
+      };
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_LANCE_STORAGE_BATCH_INSERT_FAILED",
+          id: createStorageErrorId("LANCE", "GET_RESOURCE_BY_ID", "FAILED"),
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY,
-          details: { tableName }
+          category: ErrorCategory.THIRD_PARTY
         },
         error
       );
     }
   }
-  async load({ tableName, keys }) {
-    try {
-      if (!this.client) {
-        throw new Error("LanceDB client not initialized. Call LanceStorage.create() first.");
-      }
-      if (!tableName) {
-        throw new Error("tableName is required for load.");
-      }
-      if (!keys || Object.keys(keys).length === 0) {
-        throw new Error("keys are required and cannot be empty for load.");
-      }
-    } catch (validationError) {
-      throw new MastraError(
-        {
-          id: "STORAGE_LANCE_STORAGE_LOAD_INVALID_ARGS",
-          domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.USER,
-          text: validationError.message,
-          details: { tableName }
-        },
-        validationError
-      );
-    }
+  async saveResource({ resource }) {
     try {
-      const table = await this.client.openTable(tableName);
-      const tableSchema = await getTableSchema({ tableName, client: this.client });
-      const query = table.query();
-      if (Object.keys(keys).length > 0) {
-        validateKeyTypes(keys, tableSchema);
-        const filterConditions = Object.entries(keys).map(([key, value]) => {
-          const isCamelCase = /^[a-z][a-zA-Z]*$/.test(key) && /[A-Z]/.test(key);
-          const quotedKey = isCamelCase ? `\`${key}\`` : key;
-          if (typeof value === "string") {
-            return `${quotedKey} = '${value}'`;
-          } else if (value === null) {
-            return `${quotedKey} IS NULL`;
-          } else {
-            return `${quotedKey} = ${value}`;
-          }
-        }).join(" AND ");
-        this.logger.debug("where clause generated: " + filterConditions);
-        query.where(filterConditions);
-      }
-      const result = await query.limit(1).toArray();
-      if (result.length === 0) {
-        this.logger.debug("No record found");
-        return null;
-      }
-      return processResultWithTypeConversion(result[0], tableSchema);
+      const record = {
+        ...resource,
+        metadata: resource.metadata ? JSON.stringify(resource.metadata) : "",
+        createdAt: resource.createdAt.getTime(),
+        // Store as timestamp (milliseconds)
+        updatedAt: resource.updatedAt.getTime()
+        // Store as timestamp (milliseconds)
+      };
+      const table = await this.client.openTable(TABLE_RESOURCES);
+      await table.add([record], { mode: "append" });
+      return resource;
     } catch (error) {
-      if (error instanceof MastraError) throw error;
       throw new MastraError(
         {
-          id: "STORAGE_LANCE_STORAGE_LOAD_FAILED",
+          id: createStorageErrorId("LANCE", "SAVE_RESOURCE", "FAILED"),
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY,
-          details: { tableName, keyCount: Object.keys(keys).length, firstKey: Object.keys(keys)[0] ?? "" }
+          category: ErrorCategory.THIRD_PARTY
         },
         error
       );
     }
   }
+  async updateResource({
+    resourceId,
+    workingMemory,
+    metadata
+  }) {
+    const maxRetries = 3;
+    for (let attempt = 0; attempt < maxRetries; attempt++) {
+      try {
+        const existingResource = await this.getResourceById({ resourceId });
+        if (!existingResource) {
+          const newResource = {
+            id: resourceId,
+            workingMemory,
+            metadata: metadata || {},
+            createdAt: /* @__PURE__ */ new Date(),
+            updatedAt: /* @__PURE__ */ new Date()
+          };
+          return this.saveResource({ resource: newResource });
+        }
+        const updatedResource = {
+          ...existingResource,
+          workingMemory: workingMemory !== void 0 ? workingMemory : existingResource.workingMemory,
+          metadata: {
+            ...existingResource.metadata,
+            ...metadata
+          },
+          updatedAt: /* @__PURE__ */ new Date()
+        };
+        const record = {
+          id: resourceId,
+          workingMemory: updatedResource.workingMemory || "",
+          metadata: updatedResource.metadata ? JSON.stringify(updatedResource.metadata) : "",
+          updatedAt: updatedResource.updatedAt.getTime()
+          // Store as timestamp (milliseconds)
+        };
+        const table = await this.client.openTable(TABLE_RESOURCES);
+        await table.mergeInsert("id").whenMatchedUpdateAll().whenNotMatchedInsertAll().execute([record]);
+        return updatedResource;
+      } catch (error) {
+        if (error.message?.includes("Commit conflict") && attempt < maxRetries - 1) {
+          const delay = Math.pow(2, attempt) * 10;
+          await new Promise((resolve) => setTimeout(resolve, delay));
+          continue;
+        }
+        throw new MastraError(
+          {
+            id: createStorageErrorId("LANCE", "UPDATE_RESOURCE", "FAILED"),
+            domain: ErrorDomain.STORAGE,
+            category: ErrorCategory.THIRD_PARTY
+          },
+          error
+        );
+      }
+    }
+    throw new Error("Unexpected end of retry loop");
+  }
 };
 var StoreScoresLance = class extends ScoresStorage {
   client;
-  constructor({ client }) {
+  #db;
+  constructor(config) {
     super();
+    const client = resolveLanceConfig(config);
     this.client = client;
+    this.#db = new LanceDB({ client });
+  }
+  async init() {
+    await this.#db.createTable({ tableName: TABLE_SCORERS, schema: SCORERS_SCHEMA });
+    await this.#db.alterTable({
+      tableName: TABLE_SCORERS,
+      schema: SCORERS_SCHEMA,
+      ifNotExists: ["spanId", "requestContext"]
+    });
+  }
+  async dangerouslyClearAll() {
+    await this.#db.clearTable({ tableName: TABLE_SCORERS });
   }
   async saveScore(score) {
     let validatedScore;
@@ -1403,37 +1361,47 @@ var StoreScoresLance = class extends ScoresStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "LANCE_STORAGE_SAVE_SCORE_FAILED",
+          id: createStorageErrorId("LANCE", "SAVE_SCORE", "VALIDATION_FAILED"),
           text: "Failed to save score in LanceStorage",
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY
+          category: ErrorCategory.USER,
+          details: {
+            scorer: typeof score.scorer?.id === "string" ? score.scorer.id : String(score.scorer?.id ?? "unknown"),
+            entityId: score.entityId ?? "unknown",
+            entityType: score.entityType ?? "unknown",
+            traceId: score.traceId ?? "",
+            spanId: score.spanId ?? ""
+          }
         },
         error
       );
     }
+    const id = crypto.randomUUID();
+    const now = /* @__PURE__ */ new Date();
     try {
-      const id = crypto.randomUUID();
       const table = await this.client.openTable(TABLE_SCORERS);
       const schema = await getTableSchema({ tableName: 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.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) {
       throw new MastraError(
         {
-          id: "LANCE_STORAGE_SAVE_SCORE_FAILED",
+          id: createStorageErrorId("LANCE", "SAVE_SCORE", "FAILED"),
           text: "Failed to save score in LanceStorage",
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
@@ -1449,12 +1417,11 @@ var StoreScoresLance = class extends 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: TABLE_SCORERS, client: this.client });
-      return processResultWithTypeConversion(records[0], schema);
+      return await this.transformScoreRow(records[0]);
     } catch (error) {
       throw new MastraError(
         {
-          id: "LANCE_STORAGE_GET_SCORE_BY_ID_FAILED",
+          id: createStorageErrorId("LANCE", "GET_SCORE_BY_ID", "FAILED"),
           text: "Failed to get score by id in LanceStorage",
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
@@ -1464,7 +1431,23 @@ var StoreScoresLance = class extends 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: TABLE_SCORERS, client: this.client });
+    const transformed = processResultWithTypeConversion(row, schema);
+    return {
+      ...transformed,
+      createdAt: row.createdAt,
+      updatedAt: row.updatedAt
+    };
+  }
+  async listScoresByScorerId({
     scorerId,
     pagination,
     entityId,
@@ -1472,9 +1455,10 @@ var StoreScoresLance = class extends ScoresStorage {
     source
   }) {
     try {
+      const { page, perPage: perPageInput } = pagination;
+      const perPage = normalizePerPage(perPageInput, 100);
+      const { offset: start, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
       const table = await this.client.openTable(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}'`);
@@ -1485,30 +1469,38 @@ var StoreScoresLance = class extends 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: 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) {
       throw new MastraError(
         {
-          id: "LANCE_STORAGE_GET_SCORES_BY_SCORER_ID_FAILED",
+          id: createStorageErrorId("LANCE", "LIST_SCORES_BY_SCORER_ID", "FAILED"),
           text: "Failed to get scores by scorerId in LanceStorage",
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
@@ -1518,34 +1510,38 @@ var StoreScoresLance = class extends ScoresStorage {
       );
     }
   }
-  async getScoresByRunId({
+  async listScoresByRunId({
     runId,
     pagination
   }) {
     try {
+      const { page, perPage: perPageInput } = pagination;
+      const perPage = normalizePerPage(perPageInput, 100);
+      const { offset: start, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
       const table = await this.client.openTable(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: 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) {
       throw new MastraError(
         {
-          id: "LANCE_STORAGE_GET_SCORES_BY_RUN_ID_FAILED",
+          id: createStorageErrorId("LANCE", "LIST_SCORES_BY_RUN_ID", "FAILED"),
           text: "Failed to get scores by runId in LanceStorage",
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
@@ -1555,35 +1551,39 @@ var StoreScoresLance = class extends ScoresStorage {
       );
     }
   }
-  async getScoresByEntityId({
+  async listScoresByEntityId({
     entityId,
     entityType,
     pagination
   }) {
     try {
+      const { page, perPage: perPageInput } = pagination;
+      const perPage = normalizePerPage(perPageInput, 100);
+      const { offset: start, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
       const table = await this.client.openTable(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: 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) {
       throw new MastraError(
         {
-          id: "LANCE_STORAGE_GET_SCORES_BY_ENTITY_ID_FAILED",
+          id: createStorageErrorId("LANCE", "LIST_SCORES_BY_ENTITY_ID", "FAILED"),
           text: "Failed to get scores by entityId and entityType in LanceStorage",
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
@@ -1593,307 +1593,138 @@ var StoreScoresLance = class extends ScoresStorage {
       );
     }
   }
-  async getScoresBySpan({
+  async listScoresBySpan({
     traceId,
     spanId,
     pagination
   }) {
     try {
+      const { page, perPage: perPageInput } = pagination;
+      const perPage = normalizePerPage(perPageInput, 100);
+      const { offset: start, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
       const table = await this.client.openTable(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: 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;
-      return {
-        pagination: {
-          page,
-          perPage,
-          total,
-          hasMore: offset + scores.length < total
-        },
-        scores
-      };
-    } catch (error) {
-      throw new MastraError(
-        {
-          id: "LANCE_STORAGE_GET_SCORES_BY_SPAN_FAILED",
-          text: "Failed to get scores by traceId and spanId in LanceStorage",
-          domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY,
-          details: { error: error?.message }
-        },
-        error
-      );
-    }
-  }
-};
-var StoreTracesLance = class extends TracesStorage {
-  client;
-  operations;
-  constructor({ client, operations }) {
-    super();
-    this.client = client;
-    this.operations = operations;
-  }
-  async saveTrace({ trace }) {
-    try {
-      const table = await this.client.openTable(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) {
-      throw new MastraError(
-        {
-          id: "LANCE_STORE_SAVE_TRACE_FAILED",
-          domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY
-        },
-        error
-      );
-    }
-  }
-  async getTraceById({ traceId }) {
-    try {
-      const table = await this.client.openTable(TABLE_TRACES);
-      const query = table.query().where(`id = '${traceId}'`);
-      const records = await query.toArray();
-      return records[0];
-    } catch (error) {
-      throw new MastraError(
-        {
-          id: "LANCE_STORE_GET_TRACE_BY_ID_FAILED",
-          domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY
-        },
-        error
-      );
-    }
-  }
-  async getTraces({
-    name,
-    scope,
-    page = 1,
-    perPage = 10,
-    attributes
-  }) {
-    try {
-      const table = await this.client.openTable(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) {
-      throw new MastraError(
-        {
-          id: "LANCE_STORE_GET_TRACES_FAILED",
-          domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY,
-          details: { name: name ?? "", scope: scope ?? "" }
-        },
-        error
-      );
-    }
-  }
-  async getTracesPaginated(args) {
-    try {
-      const table = await this.client.openTable(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 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 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;
-      });
+      const scores = await Promise.all(records.map(async (record) => await this.transformScoreRow(record)));
       return {
-        traces,
-        total,
-        page,
-        perPage,
-        hasMore: total > (page + 1) * perPage
+        pagination: {
+          page,
+          perPage: perPageForResponse,
+          total,
+          hasMore: end < total
+        },
+        scores
       };
     } catch (error) {
       throw new MastraError(
         {
-          id: "LANCE_STORE_GET_TRACES_PAGINATED_FAILED",
+          id: createStorageErrorId("LANCE", "LIST_SCORES_BY_SPAN", "FAILED"),
+          text: "Failed to get scores by traceId and spanId in LanceStorage",
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          details: { name: args.name ?? "", scope: args.scope ?? "" }
+          details: { error: error?.message }
         },
         error
       );
     }
   }
-  async batchTraceInsert({ records }) {
-    this.logger.debug("Batch inserting traces", { count: records.length });
-    await this.operations.batchInsert({
-      tableName: TABLE_TRACES,
-      records
-    });
-  }
 };
-function parseWorkflowRun(row) {
-  let parsedSnapshot = row.snapshot;
-  if (typeof parsedSnapshot === "string") {
-    try {
-      parsedSnapshot = JSON.parse(row.snapshot);
-    } catch (e) {
-      console.warn(`Failed to parse snapshot for workflow ${row.workflow_name}: ${e}`);
-    }
-  }
-  return {
-    workflowName: row.workflow_name,
-    runId: row.run_id,
-    snapshot: parsedSnapshot,
-    createdAt: ensureDate(row.createdAt),
-    updatedAt: ensureDate(row.updatedAt),
-    resourceId: row.resourceId
-  };
+function escapeSql(str) {
+  return str.replace(/'/g, "''");
 }
 var StoreWorkflowsLance = class extends WorkflowsStorage {
   client;
-  constructor({ client }) {
+  #db;
+  constructor(config) {
     super();
+    const client = resolveLanceConfig(config);
     this.client = client;
+    this.#db = new LanceDB({ client });
   }
-  updateWorkflowResults({
-    // workflowName,
-    // runId,
-    // stepId,
-    // result,
-    // runtimeContext,
-  }) {
-    throw new Error("Method not implemented.");
+  supportsConcurrentUpdates() {
+    return false;
   }
-  updateWorkflowState({
-    // workflowName,
-    // runId,
-    // opts,
-  }) {
-    throw new Error("Method not implemented.");
+  parseWorkflowRun(row) {
+    let parsedSnapshot = row.snapshot;
+    if (typeof parsedSnapshot === "string") {
+      try {
+        parsedSnapshot = JSON.parse(row.snapshot);
+      } catch (e) {
+        this.logger.warn(`Failed to parse snapshot for workflow ${row.workflow_name}: ${e}`);
+      }
+    }
+    return {
+      workflowName: row.workflow_name,
+      runId: row.run_id,
+      snapshot: parsedSnapshot,
+      createdAt: ensureDate(row.createdAt),
+      updatedAt: ensureDate(row.updatedAt),
+      resourceId: row.resourceId
+    };
+  }
+  async init() {
+    const schema = TABLE_SCHEMAS[TABLE_WORKFLOW_SNAPSHOT];
+    await this.#db.createTable({ tableName: TABLE_WORKFLOW_SNAPSHOT, schema });
+    await this.#db.alterTable({
+      tableName: TABLE_WORKFLOW_SNAPSHOT,
+      schema,
+      ifNotExists: ["resourceId"]
+    });
+  }
+  async dangerouslyClearAll() {
+    await this.#db.clearTable({ tableName: TABLE_WORKFLOW_SNAPSHOT });
+  }
+  async updateWorkflowResults(_args) {
+    throw new Error(
+      "updateWorkflowResults is not implemented for LanceDB storage. LanceDB does not support atomic read-modify-write operations needed for concurrent workflow updates."
+    );
+  }
+  async updateWorkflowState(_args) {
+    throw new Error(
+      "updateWorkflowState is not implemented for LanceDB storage. LanceDB does not support atomic read-modify-write operations needed for concurrent workflow updates."
+    );
   }
   async persistWorkflowSnapshot({
     workflowName,
     runId,
     resourceId,
-    snapshot
+    snapshot,
+    createdAt,
+    updatedAt
   }) {
     try {
       const table = await this.client.openTable(TABLE_WORKFLOW_SNAPSHOT);
-      const query = table.query().where(`workflow_name = '${workflowName}' AND run_id = '${runId}'`);
+      const query = table.query().where(`workflow_name = '${escapeSql(workflowName)}' AND run_id = '${escapeSql(runId)}'`);
       const records = await query.toArray();
-      let createdAt;
-      const now = Date.now();
+      let createdAtValue;
+      const now = createdAt?.getTime() ?? Date.now();
       if (records.length > 0) {
-        createdAt = records[0].createdAt ?? now;
+        createdAtValue = records[0].createdAt ?? now;
       } else {
-        createdAt = now;
+        createdAtValue = now;
       }
+      const { status, value, ...rest } = snapshot;
       const record = {
         workflow_name: workflowName,
         run_id: runId,
         resourceId,
-        snapshot: JSON.stringify(snapshot),
-        createdAt,
-        updatedAt: now
+        snapshot: JSON.stringify({ status, value, ...rest }),
+        // this is to ensure status is always just before value, for when querying the db by status
+        createdAt: createdAtValue,
+        updatedAt: updatedAt ?? now
       };
       await table.mergeInsert(["workflow_name", "run_id"]).whenMatchedUpdateAll().whenNotMatchedInsertAll().execute([record]);
     } catch (error) {
       throw new MastraError(
         {
-          id: "LANCE_STORE_PERSIST_WORKFLOW_SNAPSHOT_FAILED",
+          id: createStorageErrorId("LANCE", "PERSIST_WORKFLOW_SNAPSHOT", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { workflowName, runId }
@@ -1908,13 +1739,13 @@ var StoreWorkflowsLance = class extends WorkflowsStorage {
   }) {
     try {
       const table = await this.client.openTable(TABLE_WORKFLOW_SNAPSHOT);
-      const query = table.query().where(`workflow_name = '${workflowName}' AND run_id = '${runId}'`);
+      const query = table.query().where(`workflow_name = '${escapeSql(workflowName)}' AND run_id = '${escapeSql(runId)}'`);
       const records = await query.toArray();
       return records.length > 0 ? JSON.parse(records[0].snapshot) : null;
     } catch (error) {
       throw new MastraError(
         {
-          id: "LANCE_STORE_LOAD_WORKFLOW_SNAPSHOT_FAILED",
+          id: createStorageErrorId("LANCE", "LOAD_WORKFLOW_SNAPSHOT", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { workflowName, runId }
@@ -1926,19 +1757,19 @@ var StoreWorkflowsLance = class extends WorkflowsStorage {
   async getWorkflowRunById(args) {
     try {
       const table = await this.client.openTable(TABLE_WORKFLOW_SNAPSHOT);
-      let whereClause = `run_id = '${args.runId}'`;
+      let whereClause = `run_id = '${escapeSql(args.runId)}'`;
       if (args.workflowName) {
-        whereClause += ` AND workflow_name = '${args.workflowName}'`;
+        whereClause += ` AND workflow_name = '${escapeSql(args.workflowName)}'`;
       }
       const query = table.query().where(whereClause);
       const records = await query.toArray();
       if (records.length === 0) return null;
       const record = records[0];
-      return parseWorkflowRun(record);
+      return this.parseWorkflowRun(record);
     } catch (error) {
       throw new MastraError(
         {
-          id: "LANCE_STORE_GET_WORKFLOW_RUN_BY_ID_FAILED",
+          id: createStorageErrorId("LANCE", "GET_WORKFLOW_RUN_BY_ID", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { runId: args.runId, workflowName: args.workflowName ?? "" }
@@ -1947,359 +1778,182 @@ var StoreWorkflowsLance = class extends WorkflowsStorage {
       );
     }
   }
-  async getWorkflowRuns(args) {
+  async deleteWorkflowRunById({ runId, workflowName }) {
     try {
       const table = await this.client.openTable(TABLE_WORKFLOW_SNAPSHOT);
-      let query = table.query();
-      const conditions = [];
-      if (args?.workflowName) {
-        conditions.push(`workflow_name = '${args.workflowName.replace(/'/g, "''")}'`);
-      }
-      if (args?.resourceId) {
-        conditions.push(`\`resourceId\` = '${args.resourceId}'`);
-      }
-      if (args?.fromDate instanceof Date) {
-        conditions.push(`\`createdAt\` >= ${args.fromDate.getTime()}`);
-      }
-      if (args?.toDate instanceof Date) {
-        conditions.push(`\`createdAt\` <= ${args.toDate.getTime()}`);
-      }
-      let total = 0;
-      if (conditions.length > 0) {
-        query = query.where(conditions.join(" AND "));
-        total = await table.countRows(conditions.join(" AND "));
-      } else {
-        total = await table.countRows();
-      }
-      if (args?.limit) {
-        query.limit(args.limit);
-      }
-      if (args?.offset) {
-        query.offset(args.offset);
-      }
-      const records = await query.toArray();
-      return {
-        runs: records.map((record) => parseWorkflowRun(record)),
-        total: total || records.length
-      };
+      const whereClause = `run_id = '${escapeSql(runId)}' AND workflow_name = '${escapeSql(workflowName)}'`;
+      await table.delete(whereClause);
     } catch (error) {
       throw new MastraError(
         {
-          id: "LANCE_STORE_GET_WORKFLOW_RUNS_FAILED",
+          id: createStorageErrorId("LANCE", "DELETE_WORKFLOW_RUN_BY_ID", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          details: { namespace: args?.namespace ?? "", workflowName: args?.workflowName ?? "" }
+          details: { runId, workflowName }
         },
         error
       );
     }
   }
-};
-
-// src/storage/index.ts
-var LanceStorage = class _LanceStorage extends MastraStorage {
-  stores;
-  lanceClient;
-  /**
-   * Creates a new instance of LanceStorage
-   * @param uri The URI to connect to LanceDB
-   * @param options connection options
-   *
-   * Usage:
-   *
-   * Connect to a local database
-   * ```ts
-   * const store = await LanceStorage.create('/path/to/db');
-   * ```
-   *
-   * Connect to a LanceDB cloud database
-   * ```ts
-   * const store = await LanceStorage.create('db://host:port');
-   * ```
-   *
-   * Connect to a cloud database
-   * ```ts
-   * const store = await LanceStorage.create('s3://bucket/db', { storageOptions: { timeout: '60s' } });
-   * ```
-   */
-  static async create(name, uri, options) {
-    const instance = new _LanceStorage(name);
+  async listWorkflowRuns(args) {
     try {
-      instance.lanceClient = await connect(uri, options);
-      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 })
-      };
-      return instance;
-    } catch (e) {
-      throw new MastraError(
-        {
-          id: "STORAGE_LANCE_STORAGE_CONNECT_FAILED",
-          domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY,
-          text: `Failed to connect to LanceDB: ${e.message || e}`,
-          details: { uri, optionsProvided: !!options }
-        },
-        e
-      );
-    }
-  }
-  /**
-   * @internal
-   * Private constructor to enforce using the create factory method
-   */
-  constructor(name) {
-    super({ name });
-    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 })
-    };
-  }
-  async createTable({
-    tableName,
-    schema
-  }) {
-    return this.stores.operations.createTable({ tableName, schema });
-  }
-  async dropTable({ tableName }) {
-    return this.stores.operations.dropTable({ tableName });
-  }
-  async alterTable({
-    tableName,
-    schema,
-    ifNotExists
-  }) {
-    return this.stores.operations.alterTable({ tableName, schema, ifNotExists });
-  }
-  async clearTable({ tableName }) {
-    return this.stores.operations.clearTable({ tableName });
-  }
-  async insert({ tableName, record }) {
-    return this.stores.operations.insert({ tableName, record });
-  }
-  async batchInsert({ tableName, records }) {
-    return this.stores.operations.batchInsert({ tableName, records });
-  }
-  async load({ tableName, keys }) {
-    return this.stores.operations.load({ tableName, keys });
-  }
-  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
-   * @returns The saved thread
-   */
-  async saveThread({ thread }) {
-    return this.stores.memory.saveThread({ thread });
-  }
-  async updateThread({
-    id,
-    title,
-    metadata
-  }) {
-    return this.stores.memory.updateThread({ id, title, metadata });
-  }
-  async deleteThread({ threadId }) {
-    return this.stores.memory.deleteThread({ threadId });
-  }
-  get supports() {
-    return {
-      selectByIncludeResourceScope: true,
-      resourceWorkingMemory: true,
-      hasColumn: true,
-      createTable: true,
-      deleteMessages: false,
-      getScoresBySpan: true
-    };
-  }
-  async getResourceById({ resourceId }) {
-    return this.stores.memory.getResourceById({ resourceId });
-  }
-  async saveResource({ resource }) {
-    return this.stores.memory.saveResource({ resource });
-  }
-  async updateResource({
-    resourceId,
-    workingMemory,
-    metadata
-  }) {
-    return this.stores.memory.updateResource({ resourceId, workingMemory, metadata });
-  }
-  /**
-   * Processes messages to include context messages based on withPreviousMessages and withNextMessages
-   * @param records - The sorted array of records to process
-   * @param include - The array of include specifications with context parameters
-   * @returns The processed array with context messages included
-   */
-  processMessagesWithContext(records, include) {
-    const messagesWithContext = include.filter((item) => item.withPreviousMessages || item.withNextMessages);
-    if (messagesWithContext.length === 0) {
-      return records;
-    }
-    const messageIndexMap = /* @__PURE__ */ new Map();
-    records.forEach((message, index) => {
-      messageIndexMap.set(message.id, index);
-    });
-    const additionalIndices = /* @__PURE__ */ new Set();
-    for (const item of messagesWithContext) {
-      const messageIndex = messageIndexMap.get(item.id);
-      if (messageIndex !== void 0) {
-        if (item.withPreviousMessages) {
-          const startIdx = Math.max(0, messageIndex - item.withPreviousMessages);
-          for (let i = startIdx; i < messageIndex; i++) {
-            additionalIndices.add(i);
-          }
-        }
-        if (item.withNextMessages) {
-          const endIdx = Math.min(records.length - 1, messageIndex + item.withNextMessages);
-          for (let i = messageIndex + 1; i <= endIdx; i++) {
-            additionalIndices.add(i);
-          }
-        }
+      const table = await this.client.openTable(TABLE_WORKFLOW_SNAPSHOT);
+      let query = table.query();
+      const conditions = [];
+      if (args?.workflowName) {
+        conditions.push(`workflow_name = '${escapeSql(args.workflowName)}'`);
       }
-    }
-    if (additionalIndices.size === 0) {
-      return records;
-    }
-    const originalMatchIds = new Set(include.map((item) => item.id));
-    const allIndices = /* @__PURE__ */ new Set();
-    records.forEach((record, index) => {
-      if (originalMatchIds.has(record.id)) {
-        allIndices.add(index);
+      if (args?.status) {
+        const escapedStatus = args.status.replace(/\\/g, "\\\\").replace(/'/g, "''").replace(/%/g, "\\%").replace(/_/g, "\\_");
+        conditions.push(`\`snapshot\` LIKE '%"status":"${escapedStatus}","value"%'`);
       }
-    });
-    additionalIndices.forEach((index) => {
-      allIndices.add(index);
-    });
-    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 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 getWorkflowRunById(args) {
-    return this.stores.workflows.getWorkflowRunById(args);
-  }
-  async updateWorkflowResults({
-    workflowName,
-    runId,
-    stepId,
-    result,
-    runtimeContext
-  }) {
-    return this.stores.workflows.updateWorkflowResults({ workflowName, runId, stepId, result, runtimeContext });
-  }
-  async updateWorkflowState({
-    workflowName,
-    runId,
-    opts
-  }) {
-    return this.stores.workflows.updateWorkflowState({ workflowName, runId, opts });
-  }
-  async persistWorkflowSnapshot({
-    workflowName,
-    runId,
-    resourceId,
-    snapshot
-  }) {
-    return this.stores.workflows.persistWorkflowSnapshot({ workflowName, runId, resourceId, snapshot });
-  }
-  async loadWorkflowSnapshot({
-    workflowName,
-    runId
-  }) {
-    return this.stores.workflows.loadWorkflowSnapshot({ workflowName, runId });
-  }
-  async getScoreById({ id: _id }) {
-    return this.stores.scores.getScoreById({ id: _id });
-  }
-  async getScoresByScorerId({
-    scorerId,
-    source,
-    entityId,
-    entityType,
-    pagination
-  }) {
-    return this.stores.scores.getScoresByScorerId({ scorerId, source, pagination, entityId, entityType });
-  }
-  async saveScore(_score) {
-    return this.stores.scores.saveScore(_score);
+      if (args?.resourceId) {
+        conditions.push(`\`resourceId\` = '${escapeSql(args.resourceId)}'`);
+      }
+      if (args?.fromDate instanceof Date) {
+        conditions.push(`\`createdAt\` >= ${args.fromDate.getTime()}`);
+      }
+      if (args?.toDate instanceof Date) {
+        conditions.push(`\`createdAt\` <= ${args.toDate.getTime()}`);
+      }
+      let total = 0;
+      if (conditions.length > 0) {
+        query = query.where(conditions.join(" AND "));
+        total = await table.countRows(conditions.join(" AND "));
+      } else {
+        total = await table.countRows();
+      }
+      if (args?.perPage !== void 0 && args?.page !== void 0) {
+        const normalizedPerPage = normalizePerPage(args.perPage, Number.MAX_SAFE_INTEGER);
+        if (args.page < 0 || !Number.isInteger(args.page)) {
+          throw new MastraError(
+            {
+              id: createStorageErrorId("LANCE", "LIST_WORKFLOW_RUNS", "INVALID_PAGINATION"),
+              domain: ErrorDomain.STORAGE,
+              category: 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 {
+        runs: records.map((record) => this.parseWorkflowRun(record)),
+        total: total || records.length
+      };
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("LANCE", "LIST_WORKFLOW_RUNS", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { resourceId: args?.resourceId ?? "", workflowName: args?.workflowName ?? "" }
+        },
+        error
+      );
+    }
   }
-  async getScoresByRunId({
-    runId,
-    pagination
-  }) {
-    return this.stores.scores.getScoresByRunId({ runId, pagination });
+};
+
+// src/storage/index.ts
+var LanceStorage = class _LanceStorage extends MastraCompositeStore {
+  stores;
+  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 connectionOptions connection options for LanceDB
+   * @param storageOptions storage options including disableInit
+   *
+   * Usage:
+   *
+   * Connect to a local database
+   * ```ts
+   * const store = await LanceStorage.create('my-storage-id', 'MyStorage', '/path/to/db');
+   * ```
+   *
+   * Connect to a LanceDB cloud database
+   * ```ts
+   * const store = await LanceStorage.create('my-storage-id', 'MyStorage', 'db://host:port');
+   * ```
+   *
+   * Connect to a cloud database
+   * ```ts
+   * 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(id, name, uri, connectionOptions, storageOptions) {
+    const instance = new _LanceStorage(id, name, storageOptions?.disableInit);
+    try {
+      instance.lanceClient = await connect(uri, connectionOptions);
+      instance.stores = {
+        workflows: new StoreWorkflowsLance({ client: instance.lanceClient }),
+        scores: new StoreScoresLance({ client: instance.lanceClient }),
+        memory: new StoreMemoryLance({ client: instance.lanceClient })
+      };
+      return instance;
+    } catch (e) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("LANCE", "CONNECT", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Failed to connect to LanceDB: ${e.message || e}`,
+          details: { uri, optionsProvided: !!connectionOptions }
+        },
+        e
+      );
+    }
   }
-  async getScoresByEntityId({
-    entityId,
-    entityType,
-    pagination
-  }) {
-    return this.stores.scores.getScoresByEntityId({ entityId, entityType, pagination });
+  /**
+   * Creates a new instance of LanceStorage from a pre-configured LanceDB connection.
+   * Use this when you need to configure the connection before initialization.
+   *
+   * @param id The unique identifier for this storage instance
+   * @param name The name for this storage instance
+   * @param client Pre-configured LanceDB connection
+   * @param options Storage options including disableInit
+   *
+   * @example
+   * ```typescript
+   * import { connect } from '@lancedb/lancedb';
+   *
+   * const client = await connect('/path/to/db', {
+   *   // Custom connection options
+   * });
+   *
+   * const store = LanceStorage.fromClient('my-id', 'MyStorage', client);
+   * ```
+   */
+  static fromClient(id, name, client, options) {
+    const instance = new _LanceStorage(id, name, options?.disableInit);
+    instance.lanceClient = client;
+    instance.stores = {
+      workflows: new StoreWorkflowsLance({ client }),
+      scores: new StoreScoresLance({ client }),
+      memory: new StoreMemoryLance({ client })
+    };
+    return instance;
   }
-  async getScoresBySpan({
-    traceId,
-    spanId,
-    pagination
-  }) {
-    return this.stores.scores.getScoresBySpan({ traceId, spanId, pagination });
+  /**
+   * @internal
+   * Private constructor to enforce using the create factory method.
+   * Note: stores is initialized in create() after the lanceClient is connected.
+   */
+  constructor(id, name, disableInit) {
+    super({ id, name, disableInit });
+    this.stores = {};
   }
 };
 var LanceFilterTranslator = class extends BaseFilterTranslator {
@@ -2648,14 +2302,14 @@ var LanceVectorStore = class _LanceVectorStore extends MastraVector {
    * ```
    */
   static async create(uri, options) {
-    const instance = new _LanceVectorStore();
+    const instance = new _LanceVectorStore(options?.id || crypto.randomUUID());
     try {
       instance.lanceClient = await connect(uri, options);
       return instance;
     } catch (e) {
       throw new MastraError(
         {
-          id: "STORAGE_LANCE_VECTOR_CONNECT_FAILED",
+          id: createVectorErrorId("LANCE", "CONNECT", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { uri }
@@ -2668,8 +2322,8 @@ var LanceVectorStore = class _LanceVectorStore extends MastraVector {
    * @internal
    * Private constructor to enforce using the create factory method
    */
-  constructor() {
-    super();
+  constructor(id) {
+    super({ id });
   }
   close() {
     if (this.lanceClient) {
@@ -2678,6 +2332,7 @@ var LanceVectorStore = class _LanceVectorStore extends MastraVector {
   }
   async query({
     tableName,
+    indexName,
     queryVector,
     filter,
     includeVector = false,
@@ -2685,56 +2340,78 @@ var LanceVectorStore = class _LanceVectorStore extends MastraVector {
     columns = [],
     includeAllColumns = false
   }) {
+    const resolvedTableName = tableName ?? indexName;
+    if (!queryVector) {
+      throw new MastraError({
+        id: createVectorErrorId("LANCE", "QUERY", "MISSING_VECTOR"),
+        text: "queryVector is required for Lance queries. Metadata-only queries are not supported by this vector store.",
+        domain: ErrorDomain.STORAGE,
+        category: ErrorCategory.USER,
+        details: { indexName: resolvedTableName }
+      });
+    }
     try {
       if (!this.lanceClient) {
         throw new Error("LanceDB client not initialized. Use LanceVectorStore.create() to create an instance");
       }
-      if (!tableName) {
-        throw new Error("tableName is required");
-      }
-      if (!queryVector) {
-        throw new Error("queryVector is required");
+      if (!resolvedTableName) {
+        throw new Error("tableName or indexName is required");
       }
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_LANCE_VECTOR_QUERY_FAILED_INVALID_ARGS",
+          id: createVectorErrorId("LANCE", "QUERY", "INVALID_ARGS"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.USER,
-          text: "LanceDB client not initialized. Use LanceVectorStore.create() to create an instance",
-          details: { tableName }
+          text: error instanceof Error ? error.message : "Invalid query arguments",
+          details: { tableName: resolvedTableName }
         },
         error
       );
     }
     try {
-      const table = await this.lanceClient.openTable(tableName);
-      const selectColumns = [...columns];
-      if (!selectColumns.includes("id")) {
-        selectColumns.push("id");
+      const tables = await this.lanceClient.tableNames();
+      if (!tables.includes(resolvedTableName)) {
+        this.logger.debug(`Table ${resolvedTableName} does not exist. Returning empty results.`);
+        return [];
       }
+      const table = await this.lanceClient.openTable(resolvedTableName);
       let query = table.search(queryVector);
       if (filter && Object.keys(filter).length > 0) {
         const whereClause = this.filterTranslator(filter);
         this.logger.debug(`Where clause generated: ${whereClause}`);
+        const schema = await table.schema();
+        const schemaColumns = new Set(schema.fields.map((f) => f.name));
+        const filterColumns = this.extractFilterColumns(whereClause);
+        const missingColumns = filterColumns.filter((col) => !schemaColumns.has(col));
+        if (missingColumns.length > 0) {
+          this.logger.debug(
+            `Filter references columns not in schema: ${missingColumns.join(", ")}. Returning empty results.`
+          );
+          return [];
+        }
         query = query.where(whereClause);
       }
-      if (!includeAllColumns && selectColumns.length > 0) {
+      if (!includeAllColumns && columns.length > 0) {
+        const selectColumns = [...columns];
+        if (!selectColumns.includes("id")) {
+          selectColumns.push("id");
+        }
         query = query.select(selectColumns);
       }
       query = query.limit(topK);
       const results = await query.toArray();
       return results.map((result) => {
-        const flatMetadata = {};
-        Object.keys(result).forEach((key) => {
-          if (key !== "id" && key !== "score" && key !== "vector" && key !== "_distance") {
-            if (key.startsWith("metadata_")) {
-              const metadataKey = key.substring("metadata_".length);
-              flatMetadata[metadataKey] = result[key];
-            }
+        let metadata = {};
+        if (result._metadata_json) {
+          try {
+            metadata = JSON.parse(result._metadata_json);
+          } catch {
+            metadata = this.extractFlatMetadata(result);
           }
-        });
-        const metadata = this.unflattenObject(flatMetadata);
+        } else {
+          metadata = this.extractFlatMetadata(result);
+        }
         return {
           id: String(result.id || ""),
           metadata,
@@ -2746,10 +2423,10 @@ var LanceVectorStore = class _LanceVectorStore extends MastraVector {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_LANCE_VECTOR_QUERY_FAILED",
+          id: createVectorErrorId("LANCE", "QUERY", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          details: { tableName, includeVector, columnsCount: columns?.length, includeAllColumns }
+          details: { tableName: resolvedTableName, includeVector, columnsCount: columns?.length, includeAllColumns }
         },
         error
       );
@@ -2784,13 +2461,14 @@ var LanceVectorStore = class _LanceVectorStore extends MastraVector {
     const translator = new LanceFilterTranslator();
     return translator.translate(prefixedFilter);
   }
-  async upsert({ tableName, vectors, metadata = [], ids = [] }) {
+  async upsert({ tableName, indexName, vectors, metadata = [], ids = [] }) {
+    const resolvedTableName = tableName ?? indexName;
     try {
       if (!this.lanceClient) {
         throw new Error("LanceDB client not initialized. Use LanceVectorStore.create() to create an instance");
       }
-      if (!tableName) {
-        throw new Error("tableName is required");
+      if (!resolvedTableName) {
+        throw new Error("tableName or indexName is required");
       }
       if (!vectors || !Array.isArray(vectors) || vectors.length === 0) {
         throw new Error("vectors array is required and must not be empty");
@@ -2798,21 +2476,24 @@ var LanceVectorStore = class _LanceVectorStore extends MastraVector {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_LANCE_VECTOR_UPSERT_FAILED_INVALID_ARGS",
+          id: createVectorErrorId("LANCE", "UPSERT", "INVALID_ARGS"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.USER,
-          text: "LanceDB client not initialized. Use LanceVectorStore.create() to create an instance",
-          details: { tableName }
+          text: error instanceof Error ? error.message : "Invalid upsert arguments",
+          details: { tableName: resolvedTableName }
         },
         error
       );
     }
     try {
       const tables = await this.lanceClient.tableNames();
-      if (!tables.includes(tableName)) {
-        throw new Error(`Table ${tableName} does not exist`);
+      const tableExists = tables.includes(resolvedTableName);
+      let table = null;
+      if (!tableExists) {
+        this.logger.debug(`Table ${resolvedTableName} does not exist. Creating it with the first upsert data.`);
+      } else {
+        table = await this.lanceClient.openTable(resolvedTableName);
       }
-      const table = await this.lanceClient.openTable(tableName);
       const vectorIds = ids.length === vectors.length ? ids : vectors.map((_, i) => ids[i] || crypto.randomUUID());
       const data = vectors.map((vector, i) => {
         const id = String(vectorIds[i]);
@@ -2826,18 +2507,61 @@ var LanceVectorStore = class _LanceVectorStore extends MastraVector {
           Object.entries(flattenedMetadata).forEach(([key, value]) => {
             rowData[key] = value;
           });
+          rowData["_metadata_json"] = JSON.stringify(metadataItem);
+        } else {
+          rowData["_metadata_json"] = "";
         }
         return rowData;
       });
-      await table.add(data, { mode: "overwrite" });
+      if (table !== null) {
+        const rowCount = await table.countRows();
+        const schema = await table.schema();
+        const existingColumns = new Set(schema.fields.map((f) => f.name));
+        const dataColumns = new Set(Object.keys(data[0] || {}));
+        const extraColumns = [...dataColumns].filter((col) => !existingColumns.has(col));
+        const missingSchemaColumns = [...existingColumns].filter((col) => !dataColumns.has(col));
+        const hasSchemaMismatch = extraColumns.length > 0 || missingSchemaColumns.length > 0;
+        if (rowCount === 0 && extraColumns.length > 0) {
+          this.logger.warn(
+            `Table ${resolvedTableName} is empty and data has extra columns ${extraColumns.join(", ")}. Recreating with new schema.`
+          );
+          await this.lanceClient.dropTable(resolvedTableName);
+          await this.lanceClient.createTable(resolvedTableName, data);
+        } else if (hasSchemaMismatch) {
+          if (extraColumns.length > 0) {
+            this.logger.warn(
+              `Table ${resolvedTableName} has ${rowCount} rows. Columns ${extraColumns.join(", ")} will be dropped from upsert.`
+            );
+          }
+          const schemaFieldNames = schema.fields.map((f) => f.name);
+          const normalizedData = data.map((row) => {
+            const normalized = {};
+            for (const col of schemaFieldNames) {
+              normalized[col] = col in row ? row[col] : null;
+            }
+            return normalized;
+          });
+          await table.mergeInsert("id").whenMatchedUpdateAll().whenNotMatchedInsertAll().execute(normalizedData);
+        } else {
+          await table.mergeInsert("id").whenMatchedUpdateAll().whenNotMatchedInsertAll().execute(data);
+        }
+      } else {
+        this.logger.debug(`Creating table ${resolvedTableName} with initial data`);
+        await this.lanceClient.createTable(resolvedTableName, data);
+      }
       return vectorIds;
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_LANCE_VECTOR_UPSERT_FAILED",
+          id: createVectorErrorId("LANCE", "UPSERT", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          details: { tableName, vectorCount: vectors.length, metadataCount: metadata.length, idsCount: ids.length }
+          details: {
+            tableName: resolvedTableName,
+            vectorCount: vectors.length,
+            metadataCount: metadata.length,
+            idsCount: ids.length
+          }
         },
         error
       );
@@ -2861,7 +2585,7 @@ var LanceVectorStore = class _LanceVectorStore extends MastraVector {
   async createTable(tableName, data, options) {
     if (!this.lanceClient) {
       throw new MastraError({
-        id: "STORAGE_LANCE_VECTOR_CREATE_TABLE_FAILED_INVALID_ARGS",
+        id: createVectorErrorId("LANCE", "CREATE_TABLE", "INVALID_ARGS"),
         domain: ErrorDomain.STORAGE,
         category: ErrorCategory.USER,
         text: "LanceDB client not initialized. Use LanceVectorStore.create() to create an instance",
@@ -2876,7 +2600,7 @@ var LanceVectorStore = class _LanceVectorStore extends MastraVector {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_LANCE_VECTOR_CREATE_TABLE_FAILED",
+          id: createVectorErrorId("LANCE", "CREATE_TABLE", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { tableName }
@@ -2888,7 +2612,7 @@ var LanceVectorStore = class _LanceVectorStore extends MastraVector {
   async listTables() {
     if (!this.lanceClient) {
       throw new MastraError({
-        id: "STORAGE_LANCE_VECTOR_LIST_TABLES_FAILED_INVALID_ARGS",
+        id: createVectorErrorId("LANCE", "LIST_TABLES", "INVALID_ARGS"),
         domain: ErrorDomain.STORAGE,
         category: ErrorCategory.USER,
         text: "LanceDB client not initialized. Use LanceVectorStore.create() to create an instance",
@@ -2900,7 +2624,7 @@ var LanceVectorStore = class _LanceVectorStore extends MastraVector {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_LANCE_VECTOR_LIST_TABLES_FAILED",
+          id: createVectorErrorId("LANCE", "LIST_TABLES", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY
         },
@@ -2911,7 +2635,7 @@ var LanceVectorStore = class _LanceVectorStore extends MastraVector {
   async getTableSchema(tableName) {
     if (!this.lanceClient) {
       throw new MastraError({
-        id: "STORAGE_LANCE_VECTOR_GET_TABLE_SCHEMA_FAILED_INVALID_ARGS",
+        id: createVectorErrorId("LANCE", "GET_TABLE_SCHEMA", "INVALID_ARGS"),
         domain: ErrorDomain.STORAGE,
         category: ErrorCategory.USER,
         text: "LanceDB client not initialized. Use LanceVectorStore.create() to create an instance",
@@ -2924,7 +2648,7 @@ var LanceVectorStore = class _LanceVectorStore extends MastraVector {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_LANCE_VECTOR_GET_TABLE_SCHEMA_FAILED",
+          id: createVectorErrorId("LANCE", "GET_TABLE_SCHEMA", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { tableName }
@@ -2934,7 +2658,17 @@ var LanceVectorStore = class _LanceVectorStore extends MastraVector {
     }
   }
   /**
-   * indexName is actually a column name in a table in lanceDB
+   * Creates a vector index on a table.
+   *
+   * The behavior of `indexName` depends on whether `tableName` is provided:
+   * - With `tableName`: `indexName` is the column to index (advanced use case)
+   * - Without `tableName`: `indexName` becomes the table name, and 'vector' is used as the column (Memory compatibility)
+   *
+   * @param tableName - Optional table name. If not provided, defaults to indexName.
+   * @param indexName - The index/column name, or table name if tableName is not provided.
+   * @param dimension - Vector dimension size.
+   * @param metric - Distance metric: 'cosine', 'euclidean', or 'dotproduct'.
+   * @param indexConfig - Optional index configuration.
    */
   async createIndex({
     tableName,
@@ -2943,13 +2677,12 @@ var LanceVectorStore = class _LanceVectorStore extends MastraVector {
     metric = "cosine",
     indexConfig = {}
   }) {
+    const resolvedTableName = tableName ?? indexName;
+    const columnToIndex = tableName ? indexName : "vector";
     try {
       if (!this.lanceClient) {
         throw new Error("LanceDB client not initialized. Use LanceVectorStore.create() to create an instance");
       }
-      if (!tableName) {
-        throw new Error("tableName is required");
-      }
       if (!indexName) {
         throw new Error("indexName is required");
       }
@@ -2959,22 +2692,38 @@ var LanceVectorStore = class _LanceVectorStore extends MastraVector {
     } catch (err) {
       throw new MastraError(
         {
-          id: "STORAGE_LANCE_VECTOR_CREATE_INDEX_FAILED_INVALID_ARGS",
+          id: createVectorErrorId("LANCE", "CREATE_INDEX", "INVALID_ARGS"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.USER,
-          details: { tableName: tableName || "", indexName, dimension, metric }
+          details: { tableName: resolvedTableName, indexName, dimension, metric }
         },
         err
       );
     }
     try {
       const tables = await this.lanceClient.tableNames();
-      if (!tables.includes(tableName)) {
-        throw new Error(
-          `Table ${tableName} does not exist. Please create the table first by calling createTable() method.`
+      let table;
+      if (!tables.includes(resolvedTableName)) {
+        this.logger.debug(
+          `Table ${resolvedTableName} does not exist. Creating empty table with dimension ${dimension}.`
         );
+        const initVector = new Array(dimension).fill(0);
+        table = await this.lanceClient.createTable(resolvedTableName, [
+          { id: "__init__", vector: initVector, _metadata_json: "" }
+        ]);
+        try {
+          await table.delete("id = '__init__'");
+        } catch (deleteError) {
+          this.logger.warn(
+            `Failed to delete initialization row from ${resolvedTableName}. Subsequent queries may include '__init__' row.`,
+            deleteError
+          );
+        }
+        this.logger.debug(`Table ${resolvedTableName} created. Index creation deferred until data is available.`);
+        return;
+      } else {
+        table = await this.lanceClient.openTable(resolvedTableName);
       }
-      const table = await this.lanceClient.openTable(tableName);
       let metricType;
       if (metric === "euclidean") {
         metricType = "l2";
@@ -2983,8 +2732,15 @@ var LanceVectorStore = class _LanceVectorStore extends MastraVector {
       } else if (metric === "cosine") {
         metricType = "cosine";
       }
+      const rowCount = await table.countRows();
+      if (rowCount < 256) {
+        this.logger.warn(
+          `Table ${resolvedTableName} has ${rowCount} rows, which is below the 256 row minimum for index creation. Skipping index creation.`
+        );
+        return;
+      }
       if (indexConfig.type === "ivfflat") {
-        await table.createIndex(indexName, {
+        await table.createIndex(columnToIndex, {
           config: Index.ivfPq({
             numPartitions: indexConfig.numPartitions || 128,
             numSubVectors: indexConfig.numSubVectors || 16,
@@ -2993,7 +2749,7 @@ var LanceVectorStore = class _LanceVectorStore extends MastraVector {
         });
       } else {
         this.logger.debug("Creating HNSW PQ index with config:", indexConfig);
-        await table.createIndex(indexName, {
+        await table.createIndex(columnToIndex, {
           config: Index.hnswPq({
             m: indexConfig?.hnsw?.m || 16,
             efConstruction: indexConfig?.hnsw?.efConstruction || 100,
@@ -3004,10 +2760,10 @@ var LanceVectorStore = class _LanceVectorStore extends MastraVector {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_LANCE_VECTOR_CREATE_INDEX_FAILED",
+          id: createVectorErrorId("LANCE", "CREATE_INDEX", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          details: { tableName: tableName || "", indexName, dimension }
+          details: { tableName: resolvedTableName, indexName, dimension }
         },
         error
       );
@@ -3016,7 +2772,7 @@ var LanceVectorStore = class _LanceVectorStore extends MastraVector {
   async listIndexes() {
     if (!this.lanceClient) {
       throw new MastraError({
-        id: "STORAGE_LANCE_VECTOR_LIST_INDEXES_FAILED_INVALID_ARGS",
+        id: createVectorErrorId("LANCE", "LIST_INDEXES", "INVALID_ARGS"),
         domain: ErrorDomain.STORAGE,
         category: ErrorCategory.USER,
         text: "LanceDB client not initialized. Use LanceVectorStore.create() to create an instance",
@@ -3035,7 +2791,7 @@ var LanceVectorStore = class _LanceVectorStore extends MastraVector {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_LANCE_VECTOR_LIST_INDEXES_FAILED",
+          id: createVectorErrorId("LANCE", "LIST_INDEXES", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY
         },
@@ -3054,7 +2810,7 @@ var LanceVectorStore = class _LanceVectorStore extends MastraVector {
     } catch (err) {
       throw new MastraError(
         {
-          id: "STORAGE_LANCE_VECTOR_DESCRIBE_INDEX_FAILED_INVALID_ARGS",
+          id: createVectorErrorId("LANCE", "DESCRIBE_INDEX", "INVALID_ARGS"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.USER,
           details: { indexName }
@@ -3089,7 +2845,7 @@ var LanceVectorStore = class _LanceVectorStore extends MastraVector {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_LANCE_VECTOR_DESCRIBE_INDEX_FAILED",
+          id: createVectorErrorId("LANCE", "DESCRIBE_INDEX", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { indexName }
@@ -3109,7 +2865,7 @@ var LanceVectorStore = class _LanceVectorStore extends MastraVector {
     } catch (err) {
       throw new MastraError(
         {
-          id: "STORAGE_LANCE_VECTOR_DELETE_INDEX_FAILED_INVALID_ARGS",
+          id: createVectorErrorId("LANCE", "DELETE_INDEX", "INVALID_ARGS"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.USER,
           details: { indexName }
@@ -3132,7 +2888,7 @@ var LanceVectorStore = class _LanceVectorStore extends MastraVector {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_LANCE_VECTOR_DELETE_INDEX_FAILED",
+          id: createVectorErrorId("LANCE", "DELETE_INDEX", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { indexName }
@@ -3147,7 +2903,7 @@ var LanceVectorStore = class _LanceVectorStore extends MastraVector {
   async deleteAllTables() {
     if (!this.lanceClient) {
       throw new MastraError({
-        id: "STORAGE_LANCE_VECTOR_DELETE_ALL_TABLES_FAILED_INVALID_ARGS",
+        id: createVectorErrorId("LANCE", "DELETE_ALL_TABLES", "INVALID_ARGS"),
         domain: ErrorDomain.STORAGE,
         category: ErrorCategory.USER,
         details: { methodName: "deleteAllTables" },
@@ -3159,7 +2915,7 @@ var LanceVectorStore = class _LanceVectorStore extends MastraVector {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_LANCE_VECTOR_DELETE_ALL_TABLES_FAILED",
+          id: createVectorErrorId("LANCE", "DELETE_ALL_TABLES", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { methodName: "deleteAllTables" }
@@ -3171,7 +2927,7 @@ var LanceVectorStore = class _LanceVectorStore extends MastraVector {
   async deleteTable(tableName) {
     if (!this.lanceClient) {
       throw new MastraError({
-        id: "STORAGE_LANCE_VECTOR_DELETE_TABLE_FAILED_INVALID_ARGS",
+        id: createVectorErrorId("LANCE", "DELETE_TABLE", "INVALID_ARGS"),
         domain: ErrorDomain.STORAGE,
         category: ErrorCategory.USER,
         details: { tableName },
@@ -3183,7 +2939,7 @@ var LanceVectorStore = class _LanceVectorStore extends MastraVector {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_LANCE_VECTOR_DELETE_TABLE_FAILED",
+          id: createVectorErrorId("LANCE", "DELETE_TABLE", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { tableName }
@@ -3192,7 +2948,44 @@ var LanceVectorStore = class _LanceVectorStore extends MastraVector {
       );
     }
   }
-  async updateVector({ indexName, id, update }) {
+  async updateVector(params) {
+    const { indexName, update } = params;
+    if ("id" in params && "filter" in params && params.id && params.filter) {
+      throw new MastraError({
+        id: createVectorErrorId("LANCE", "UPDATE_VECTOR", "MUTUALLY_EXCLUSIVE"),
+        domain: ErrorDomain.STORAGE,
+        category: ErrorCategory.USER,
+        text: "id and filter are mutually exclusive",
+        details: { indexName }
+      });
+    }
+    if (!("id" in params || "filter" in params) || !params.id && !params.filter) {
+      throw new MastraError({
+        id: createVectorErrorId("LANCE", "UPDATE_VECTOR", "NO_TARGET"),
+        domain: ErrorDomain.STORAGE,
+        category: ErrorCategory.USER,
+        text: "Either id or filter must be provided",
+        details: { indexName }
+      });
+    }
+    if ("filter" in params && params.filter && Object.keys(params.filter).length === 0) {
+      throw new MastraError({
+        id: createVectorErrorId("LANCE", "UPDATE_VECTOR", "EMPTY_FILTER"),
+        domain: ErrorDomain.STORAGE,
+        category: ErrorCategory.USER,
+        text: "Cannot update with empty filter",
+        details: { indexName }
+      });
+    }
+    if (!update.vector && !update.metadata) {
+      throw new MastraError({
+        id: createVectorErrorId("LANCE", "UPDATE_VECTOR", "NO_PAYLOAD"),
+        domain: ErrorDomain.STORAGE,
+        category: ErrorCategory.USER,
+        text: "No updates provided",
+        details: { indexName }
+      });
+    }
     try {
       if (!this.lanceClient) {
         throw new Error("LanceDB client not initialized. Use LanceVectorStore.create() to create an instance");
@@ -3200,21 +2993,6 @@ var LanceVectorStore = class _LanceVectorStore extends MastraVector {
       if (!indexName) {
         throw new Error("indexName is required");
       }
-      if (!id) {
-        throw new Error("id is required");
-      }
-    } catch (err) {
-      throw new MastraError(
-        {
-          id: "STORAGE_LANCE_VECTOR_UPDATE_VECTOR_FAILED_INVALID_ARGS",
-          domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.USER,
-          details: { indexName, id }
-        },
-        err
-      );
-    }
-    try {
       const tables = await this.lanceClient.tableNames();
       for (const tableName of tables) {
         this.logger.debug("Checking table:" + tableName);
@@ -3224,39 +3002,77 @@ var LanceVectorStore = class _LanceVectorStore extends MastraVector {
           const hasColumn = schema.fields.some((field) => field.name === indexName);
           if (hasColumn) {
             this.logger.debug(`Found column ${indexName} in table ${tableName}`);
-            const existingRecord = await table.query().where(`id = '${id}'`).select(schema.fields.map((field) => field.name)).limit(1).toArray();
-            if (existingRecord.length === 0) {
-              throw new Error(`Record with id '${id}' not found in table ${tableName}`);
+            let whereClause;
+            if ("id" in params && params.id) {
+              whereClause = `id = '${params.id}'`;
+            } else if ("filter" in params && params.filter) {
+              const translator = new LanceFilterTranslator();
+              const processFilterKeys = (filter) => {
+                const processedFilter = {};
+                Object.entries(filter).forEach(([key, value]) => {
+                  if (typeof value === "object" && value !== null && !Array.isArray(value)) {
+                    Object.entries(value).forEach(([nestedKey, nestedValue]) => {
+                      processedFilter[`metadata_${key}_${nestedKey}`] = nestedValue;
+                    });
+                  } else {
+                    processedFilter[`metadata_${key}`] = value;
+                  }
+                });
+                return processedFilter;
+              };
+              const prefixedFilter = processFilterKeys(params.filter);
+              whereClause = translator.translate(prefixedFilter) || "";
+              if (!whereClause) {
+                throw new Error("Failed to translate filter to SQL");
+              }
+            } else {
+              throw new Error("Either id or filter must be provided");
             }
-            const rowData = {
-              id
-            };
-            Object.entries(existingRecord[0]).forEach(([key, value]) => {
-              if (key !== "id" && key !== "_distance") {
-                if (key === indexName) {
-                  if (!update.vector) {
-                    if (Array.isArray(value)) {
-                      rowData[key] = [...value];
-                    } else if (typeof value === "object" && value !== null) {
-                      rowData[key] = Array.from(value);
+            const existingRecords = await table.query().where(whereClause).select(schema.fields.map((field) => field.name)).toArray();
+            if (existingRecords.length === 0) {
+              this.logger.info(`No records found matching criteria in table ${tableName}`);
+              return;
+            }
+            const updatedRecords = existingRecords.map((record) => {
+              const rowData = {};
+              Object.entries(record).forEach(([key, value]) => {
+                if (key !== "_distance") {
+                  if (key === indexName) {
+                    if (update.vector) {
+                      rowData[key] = update.vector;
                     } else {
-                      rowData[key] = value;
+                      if (Array.isArray(value)) {
+                        rowData[key] = [...value];
+                      } else if (typeof value === "object" && value !== null) {
+                        rowData[key] = Array.from(value);
+                      } else {
+                        rowData[key] = value;
+                      }
+                    }
+                  } else {
+                    rowData[key] = value;
+                  }
+                }
+              });
+              if (update.metadata) {
+                Object.entries(update.metadata).forEach(([key, value]) => {
+                  rowData[`metadata_${key}`] = value;
+                });
+                const hasMetadataJson = schema.fields.some((f) => f.name === "_metadata_json");
+                if (hasMetadataJson) {
+                  let existingMetadata = {};
+                  if (record._metadata_json) {
+                    try {
+                      existingMetadata = JSON.parse(record._metadata_json);
+                    } catch {
                     }
                   }
-                } else {
-                  rowData[key] = value;
+                  rowData["_metadata_json"] = JSON.stringify({ ...existingMetadata, ...update.metadata });
                 }
               }
+              return rowData;
             });
-            if (update.vector) {
-              rowData[indexName] = update.vector;
-            }
-            if (update.metadata) {
-              Object.entries(update.metadata).forEach(([key, value]) => {
-                rowData[`metadata_${key}`] = value;
-              });
-            }
-            await table.add([rowData], { mode: "overwrite" });
+            await table.mergeInsert("id").whenMatchedUpdateAll().whenNotMatchedInsertAll().execute(updatedRecords);
             return;
           }
         } catch (err) {
@@ -3266,12 +3082,19 @@ var LanceVectorStore = class _LanceVectorStore extends MastraVector {
       }
       throw new Error(`No table found with column/index '${indexName}'`);
     } catch (error) {
+      if (error instanceof MastraError) throw error;
       throw new MastraError(
         {
-          id: "STORAGE_LANCE_VECTOR_UPDATE_VECTOR_FAILED",
+          id: createVectorErrorId("LANCE", "UPDATE_VECTOR", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          details: { indexName, id, hasVector: !!update.vector, hasMetadata: !!update.metadata }
+          details: {
+            indexName,
+            ..."id" in params && params.id && { id: params.id },
+            ..."filter" in params && params.filter && { filter: JSON.stringify(params.filter) },
+            hasVector: !!update.vector,
+            hasMetadata: !!update.metadata
+          }
         },
         error
       );
@@ -3291,10 +3114,13 @@ var LanceVectorStore = class _LanceVectorStore extends MastraVector {
     } catch (err) {
       throw new MastraError(
         {
-          id: "STORAGE_LANCE_VECTOR_DELETE_VECTOR_FAILED_INVALID_ARGS",
+          id: createVectorErrorId("LANCE", "DELETE_VECTOR", "INVALID_ARGS"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.USER,
-          details: { indexName, id }
+          details: {
+            indexName,
+            ...id && { id }
+          }
         },
         err
       );
@@ -3321,42 +3147,146 @@ var LanceVectorStore = class _LanceVectorStore extends MastraVector {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_LANCE_VECTOR_DELETE_VECTOR_FAILED",
+          id: createVectorErrorId("LANCE", "DELETE_VECTOR", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          details: { indexName, id }
+          details: {
+            indexName,
+            ...id && { id }
+          }
         },
         error
       );
     }
   }
   /**
-   * Converts a flattened object with keys using underscore notation back to a nested object.
-   * Example: { name: 'test', details_text: 'test' } → { name: 'test', details: { text: 'test' } }
+   * Extracts column names referenced in a SQL WHERE clause.
+   * Identifies metadata_* prefixed identifiers used in filter conditions.
    */
-  unflattenObject(obj) {
-    const result = {};
-    Object.keys(obj).forEach((key) => {
-      const value = obj[key];
-      const parts = key.split("_");
-      let current = result;
-      for (let i = 0; i < parts.length - 1; i++) {
-        const part = parts[i];
-        if (!part) continue;
-        if (!current[part] || typeof current[part] !== "object") {
-          current[part] = {};
+  extractFilterColumns(whereClause) {
+    const matches = whereClause.match(/metadata_\w+/g);
+    return matches ? [...new Set(matches)] : [];
+  }
+  /**
+   * Extracts metadata from flattened column names (legacy data without _metadata_json).
+   * Returns keys as-is after stripping the 'metadata_' prefix, without any unflattening.
+   */
+  extractFlatMetadata(result) {
+    const metadata = {};
+    Object.keys(result).forEach((key) => {
+      if (key !== "id" && key !== "score" && key !== "vector" && key !== "_distance" && key !== "_metadata_json") {
+        if (key.startsWith("metadata_")) {
+          metadata[key.substring("metadata_".length)] = result[key];
         }
-        current = current[part];
-      }
-      const lastPart = parts[parts.length - 1];
-      if (lastPart) {
-        current[lastPart] = value;
       }
     });
-    return result;
+    return metadata;
+  }
+  async deleteVectors({ indexName, filter, ids }) {
+    if (ids && filter) {
+      throw new MastraError({
+        id: createVectorErrorId("LANCE", "DELETE_VECTORS", "MUTUALLY_EXCLUSIVE"),
+        domain: ErrorDomain.STORAGE,
+        category: ErrorCategory.USER,
+        text: "ids and filter are mutually exclusive",
+        details: { indexName }
+      });
+    }
+    if (!ids && !filter) {
+      throw new MastraError({
+        id: createVectorErrorId("LANCE", "DELETE_VECTORS", "NO_TARGET"),
+        domain: ErrorDomain.STORAGE,
+        category: ErrorCategory.USER,
+        text: "Either filter or ids must be provided",
+        details: { indexName }
+      });
+    }
+    if (ids && ids.length === 0) {
+      throw new MastraError({
+        id: createVectorErrorId("LANCE", "DELETE_VECTORS", "EMPTY_IDS"),
+        domain: ErrorDomain.STORAGE,
+        category: ErrorCategory.USER,
+        text: "Cannot delete with empty ids array",
+        details: { indexName }
+      });
+    }
+    if (filter && Object.keys(filter).length === 0) {
+      throw new MastraError({
+        id: createVectorErrorId("LANCE", "DELETE_VECTORS", "EMPTY_FILTER"),
+        domain: ErrorDomain.STORAGE,
+        category: ErrorCategory.USER,
+        text: "Cannot delete with empty filter",
+        details: { indexName }
+      });
+    }
+    try {
+      if (!this.lanceClient) {
+        throw new Error("LanceDB client not initialized. Use LanceVectorStore.create() to create an instance");
+      }
+      if (!indexName) {
+        throw new Error("indexName is required");
+      }
+      const tables = await this.lanceClient.tableNames();
+      for (const tableName of tables) {
+        this.logger.debug("Checking table:" + tableName);
+        const table = await this.lanceClient.openTable(tableName);
+        try {
+          const schema = await table.schema();
+          const hasColumn = schema.fields.some((field) => field.name === indexName);
+          if (hasColumn) {
+            this.logger.debug(`Found column ${indexName} in table ${tableName}`);
+            if (ids) {
+              const idsConditions = ids.map((id) => `id = '${id}'`).join(" OR ");
+              await table.delete(idsConditions);
+            } else if (filter) {
+              const translator = new LanceFilterTranslator();
+              const processFilterKeys = (filter2) => {
+                const processedFilter = {};
+                Object.entries(filter2).forEach(([key, value]) => {
+                  if (typeof value === "object" && value !== null && !Array.isArray(value)) {
+                    Object.entries(value).forEach(([nestedKey, nestedValue]) => {
+                      processedFilter[`metadata_${key}_${nestedKey}`] = nestedValue;
+                    });
+                  } else {
+                    processedFilter[`metadata_${key}`] = value;
+                  }
+                });
+                return processedFilter;
+              };
+              const prefixedFilter = processFilterKeys(filter);
+              const whereClause = translator.translate(prefixedFilter);
+              if (!whereClause) {
+                throw new Error("Failed to translate filter to SQL");
+              }
+              await table.delete(whereClause);
+            }
+            return;
+          }
+        } catch (err) {
+          this.logger.error(`Error checking schema for table ${tableName}:` + err);
+          continue;
+        }
+      }
+      throw new Error(`No table found with column/index '${indexName}'`);
+    } catch (error) {
+      if (error instanceof MastraError) throw error;
+      throw new MastraError(
+        {
+          id: createVectorErrorId("LANCE", "DELETE_VECTORS", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            indexName,
+            ...filter && { filter: JSON.stringify(filter) },
+            ...ids && { idsCount: ids.length }
+          }
+        },
+        error
+      );
+    }
   }
 };
 
-export { LanceStorage, LanceVectorStore };
+export { LanceStorage, LanceVectorStore, StoreMemoryLance, StoreScoresLance, StoreWorkflowsLance };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map