@mastra/lance 1.0.3 → 1.0.4-alpha.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @mastra/lance
 
+## 1.0.4-alpha.0
+
+### Patch Changes
+
+- Added resilient column handling to insert and update operations. Unknown columns in records are now silently dropped instead of causing SQL errors, ensuring forward compatibility when newer domain packages add fields that haven't been migrated yet. ([#14021](https://github.com/mastra-ai/mastra/pull/14021))
+
+  For example, calling `db.insert({ tableName, record: { id: '1', title: 'Hello', futureField: 'value' } })` will silently ignore `futureField` if it doesn't exist in the database table, rather than throwing. The same applies to `update` — unknown fields in the data payload are dropped before building the SQL statement.
+
+- Improved semantic recall performance for large message histories. Semantic recall no longer loads entire threads when only the recalled messages are needed, eliminating delays that previously scaled with total message count. (Fixes #11702) ([#14022](https://github.com/mastra-ai/mastra/pull/14022))
+
+- Updated dependencies [[`4f71b43`](https://github.com/mastra-ai/mastra/commit/4f71b436a4a6b8839842d8da47b57b84509af56c), [`a070277`](https://github.com/mastra-ai/mastra/commit/a07027766ce195ba74d0783116d894cbab25d44c), [`b628b91`](https://github.com/mastra-ai/mastra/commit/b628b9128b372c0f54214d902b07279f03443900), [`332c014`](https://github.com/mastra-ai/mastra/commit/332c014e076b81edf7fe45b58205882726415e90), [`6b63153`](https://github.com/mastra-ai/mastra/commit/6b63153878ea841c0f4ce632ba66bb33e57e9c1b), [`4246e34`](https://github.com/mastra-ai/mastra/commit/4246e34cec9c26636d0965942268e6d07c346671), [`b8837ee`](https://github.com/mastra-ai/mastra/commit/b8837ee77e2e84197609762bfabd8b3da326d30c), [`5d950f7`](https://github.com/mastra-ai/mastra/commit/5d950f7bf426a215a1808f0abef7de5c8336ba1c), [`28c85b1`](https://github.com/mastra-ai/mastra/commit/28c85b184fc32b40f7f160483c982da6d388ecbd), [`e9a08fb`](https://github.com/mastra-ai/mastra/commit/e9a08fbef1ada7e50e961e2f54f55e8c10b4a45c), [`631ffd8`](https://github.com/mastra-ai/mastra/commit/631ffd82fed108648b448b28e6a90e38c5f53bf5), [`aae2295`](https://github.com/mastra-ai/mastra/commit/aae2295838a2d329ad6640829e87934790ffe5b8), [`aa61f29`](https://github.com/mastra-ai/mastra/commit/aa61f29ff8095ce46a4ae16e46c4d8c79b2b685b), [`7ff3714`](https://github.com/mastra-ai/mastra/commit/7ff37148515439bb3be009a60e02c3e363299760), [`41d79a1`](https://github.com/mastra-ai/mastra/commit/41d79a14bd8cb6de1e2565fd0a04786bae2f211b), [`e673376`](https://github.com/mastra-ai/mastra/commit/e6733763ad1321aa7e5ae15096b9c2104f93b1f3), [`b2204c9`](https://github.com/mastra-ai/mastra/commit/b2204c98a42848bbfb6f0440f005dc2b6354f1cd), [`a1bf1e3`](https://github.com/mastra-ai/mastra/commit/a1bf1e385ed4c0ef6f11b56c5887442970d127f2), [`b6f647a`](https://github.com/mastra-ai/mastra/commit/b6f647ae2388e091f366581595feb957e37d5b40), [`0c57b8b`](https://github.com/mastra-ai/mastra/commit/0c57b8b0a69a97b5a4ae3f79be6c610f29f3cf7b), [`b081f27`](https://github.com/mastra-ai/mastra/commit/b081f272cf411716e1d6bd72ceac4bcee2657b19), [`0c09eac`](https://github.com/mastra-ai/mastra/commit/0c09eacb1926f64cfdc9ae5c6d63385cf8c9f72c), [`6b9b93d`](https://github.com/mastra-ai/mastra/commit/6b9b93d6f459d1ba6e36f163abf62a085ddb3d64), [`31b6067`](https://github.com/mastra-ai/mastra/commit/31b6067d0cc3ab10e1b29c36147f3b5266bc714a), [`797ac42`](https://github.com/mastra-ai/mastra/commit/797ac4276de231ad2d694d9aeca75980f6cd0419), [`0bc289e`](https://github.com/mastra-ai/mastra/commit/0bc289e2d476bf46c5b91c21969e8d0c6864691c), [`9b75a06`](https://github.com/mastra-ai/mastra/commit/9b75a06e53ebb0b950ba7c1e83a0142047185f46), [`4c3a1b1`](https://github.com/mastra-ai/mastra/commit/4c3a1b122ea083e003d71092f30f3b31680b01c0), [`85cc3b3`](https://github.com/mastra-ai/mastra/commit/85cc3b3b6f32ae4b083c26498f50d5b250ba944b), [`97ea28c`](https://github.com/mastra-ai/mastra/commit/97ea28c746e9e4147d56047bbb1c4a92417a3fec), [`d567299`](https://github.com/mastra-ai/mastra/commit/d567299cf81e02bd9d5221d4bc05967d6c224161), [`716ffe6`](https://github.com/mastra-ai/mastra/commit/716ffe68bed81f7c2690bc8581b9e140f7bf1c3d), [`8296332`](https://github.com/mastra-ai/mastra/commit/8296332de21c16e3dfc3d0b2d615720a6dc88f2f), [`4df2116`](https://github.com/mastra-ai/mastra/commit/4df211619dd922c047d396ca41cd7027c8c4c8e7), [`2219c1a`](https://github.com/mastra-ai/mastra/commit/2219c1acbd21da116da877f0036ffb985a9dd5a3), [`17c4145`](https://github.com/mastra-ai/mastra/commit/17c4145166099354545582335b5252bdfdfd908b)]:
+  - @mastra/core@1.11.0-alpha.0
+
 ## 1.0.3
 
 ### Patch Changes

package/dist/docs/SKILL.md

@@ -3,7 +3,7 @@ name: mastra-lance
 description: Documentation for @mastra/lance. Use when working with @mastra/lance APIs, configuration, or implementation.
 metadata:
   package: "@mastra/lance"
-  version: "1.0.3"
+  version: "1.0.4-alpha.0"
 ---
 
 ## When to use

package/dist/docs/assets/SOURCE_MAP.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.3",
+  "version": "1.0.4-alpha.0",
   "package": "@mastra/lance",
   "exports": {},
   "modules": {}

package/dist/docs/references/docs-rag-vector-databases.md

@@ -359,7 +359,7 @@ The dimension size must match the output dimension of your chosen embedding mode
 - Cohere embed-multilingual-v3: 1024 dimensions
 - Google gemini-embedding-001: 768 dimensions (or custom)
 
-> **Warning:** Index dimensions cannot be changed after creation. To use a different model, delete and recreate the index with the new dimension size.
+> **Warning:** Index dimensions can't be changed after creation. To use a different model, delete and recreate the index with the new dimension size.
 
 ### Naming Rules for Databases
 
@@ -583,7 +583,7 @@ Key metadata considerations:
 
 ## Deleting Vectors
 
-When building RAG applications, you often need to clean up stale vectors when documents are deleted or updated. Mastra provides the `deleteVectors` method that supports deleting vectors by metadata filters, making it easy to remove all embeddings associated with a specific document.
+When building RAG applications, you often need to clean up stale vectors when documents are deleted or updated. Mastra provides the `deleteVectors` method that supports deleting vectors by metadata filters, making it straightforward to remove all embeddings associated with a specific document.
 
 ### Delete by Metadata Filter
 

package/dist/docs/references/reference-storage-lance.md

@@ -2,7 +2,7 @@
 
 The LanceDB storage implementation provides a high-performance storage solution using the LanceDB database system, which excels at handling both traditional data storage and vector operations.
 
-> **Observability Not Supported:** LanceDB storage **does not support the observability domain**. Traces from the `DefaultExporter` cannot be persisted to LanceDB, and Mastra Studio's observability features won't work with LanceDB as your only storage provider. To enable observability, use [composite storage](https://mastra.ai/reference/storage/composite) to route observability data to a supported provider like ClickHouse or PostgreSQL.
+> **Observability Not Supported:** LanceDB storage **doesn't support the observability domain**. Traces from the `DefaultExporter` can't be persisted to LanceDB, and Mastra Studio's observability features won't work with LanceDB as your only storage provider. To enable observability, use [composite storage](https://mastra.ai/reference/storage/composite) to route observability data to a supported provider like ClickHouse or PostgreSQL.
 
 ## Installation
 
@@ -53,11 +53,11 @@ const storage = await LanceStorage.create('my-storage', 's3://bucket/db', {
 
 ### LanceStorage.create()
 
-**name:** (`string`): Name identifier for the storage instance
+**name** (`string`): Name identifier for the storage instance
 
-**uri:** (`string`): URI to connect to the LanceDB database. Can be a local path, cloud DB URL, or S3 bucket URL
+**uri** (`string`): URI to connect to the LanceDB database. Can be a local path, cloud DB URL, or S3 bucket URL
 
-**options?:** (`ConnectionOptions`): Connection options for LanceDB, such as timeout settings, authentication, etc.
+**options** (`ConnectionOptions`): Connection options for LanceDB, such as timeout settings, authentication, etc.
 
 ## Additional Notes
 
@@ -101,7 +101,7 @@ const memoryStore = await storage.getStore('memory')
 const thread = await memoryStore?.getThreadById({ threadId: '...' })
 ```
 
-> **Warning:** If `init()` is not called, tables won't be created and storage operations will fail silently or throw errors.
+> **Warning:** If `init()` isn't called, tables won't be created and storage operations will fail silently or throw errors.
 
 ### Deployment Options
 

package/dist/docs/references/reference-vectors-lance.md

@@ -6,9 +6,9 @@ The LanceVectorStore class provides vector search using [LanceDB](https://lanced
 
 The LanceVectorStore uses a factory pattern for creation. You should use the static `create()` method rather than the constructor directly.
 
-**uri:** (`string`): Path to LanceDB database or URI for cloud deployments
+**uri** (`string`): Path to LanceDB database or URI for cloud deployments
 
-**options?:** (`ConnectionOptions`): Additional connection options for LanceDB
+**options** (`ConnectionOptions`): Additional connection options for LanceDB
 
 ## Constructor Examples
 
@@ -33,59 +33,67 @@ const s3Store = await LanceVectorStore.create('s3://bucket/db', {
 
 ### createIndex()
 
-**tableName:** (`string`): Name of the table to create index in
+**tableName** (`string`): Name of the table to create index in
 
-**indexName:** (`string`): Name of the index (column name) to create
+**indexName** (`string`): Name of the index (column name) to create
 
-**dimension:** (`number`): Vector dimension (must match your embedding model)
+**dimension** (`number`): Vector dimension (must match your embedding model)
 
-**metric?:** (`'cosine' | 'euclidean' | 'dotproduct'`): Distance metric for similarity search (Default: `cosine`)
+**metric** (`'cosine' | 'euclidean' | 'dotproduct'`): Distance metric for similarity search (Default: `cosine`)
 
-**indexConfig?:** (`LanceIndexConfig`): Index configuration (Default: `{ type: 'hnsw' }`)
+**indexConfig** (`LanceIndexConfig`): Index configuration (Default: `{ type: 'hnsw' }`)
 
 #### LanceIndexConfig
 
-**type:** (`'ivfflat' | 'hnsw'`): stringivfflat:ivfflatClusters vectors into lists for approximate search.hnsw:hnswGraph-based index offering fast search times and high recall. (Default: `hnsw`)
+**type** (`'ivfflat' | 'hnsw'`): Index type (Default: `hnsw`)
 
-**numPartitions?:** (`number`): Number of partitions for IVF indexes (Default: `128`)
+**type.ivfflat** (`ivfflat`): Clusters vectors into lists for approximate search.
 
-**numSubVectors?:** (`number`): Number of sub-vectors for product quantization (Default: `16`)
+**type.hnsw** (`hnsw`): Graph-based index offering fast search times and high recall.
 
-**hnsw?:** (`HNSWConfig`): objectm?:numberMaximum number of connections per node (default: 16)efConstruction?:numberBuild-time complexity (default: 100)
+**numPartitions** (`number`): Number of partitions for IVF indexes (Default: `128`)
+
+**numSubVectors** (`number`): Number of sub-vectors for product quantization (Default: `16`)
+
+**hnsw** (`HNSWConfig`): HNSW configuration
+
+**hnsw\.m** (`number`): Maximum number of connections per node (default: 16)
+
+**hnsw\.efConstruction** (`number`): Build-time complexity (default: 100)
 
 ### createTable()
 
-**tableName:** (`string`): Name of the table to create
+**tableName** (`string`): Name of the table to create
 
-**data:** (`Record<string, unknown>[] | TableLike`): Initial data for the table
+**data** (`Record<string, unknown>[] | TableLike`): Initial data for the table
 
-**options?:** (`Partial<CreateTableOptions>`): Additional table creation options
+**options** (`Partial<CreateTableOptions>`): Additional table creation options
 
 ### upsert()
 
-**tableName:** (`string`): Name of the table to upsert vectors into
+**tableName** (`string`): Name of the table to upsert vectors into
 
-**vectors:** (`number[][]`): Array of embedding vectors
+**vectors** (`number[][]`): Array of embedding vectors
 
-**metadata?:** (`Record<string, any>[]`): Metadata for each vector
+**metadata** (`Record<string, any>[]`): Metadata for each vector
 
-**ids?:** (`string[]`): Optional vector IDs (auto-generated if not provided)
+**ids** (`string[]`): Optional vector IDs (auto-generated if not provided)
 
 ### query()
 
-**tableName:** (`string`): Name of the table to query
+**tableName** (`string`): Name of the table to query
 
-**queryVector:** (`number[]`): Query vector
+**queryVector** (`number[]`): Query vector
 
-**topK?:** (`number`): Number of results to return (Default: `10`)
+**topK** (`number`): Number of results to return (Default: `10`)
 
-**filter?:** (`Record<string, any>`): Metadata filters
+**filter** (`Record<string, any>`): Metadata filters
 
-**includeVector?:** (`boolean`): Whether to include the vector in the result (Default: `false`)
+**includeVector** (`boolean`): Whether to include the vector in the result (Default: `false`)
 
-**columns?:** (`string[]`): Specific columns to include in the result (Default: `[]`)
+**columns** (`string[]`): Specific columns to include in the result (Default: `[]`)
 
-**includeAllColumns?:** (`boolean`): Whether to include all columns in the result (Default: `false`)
+**includeAllColumns** (`boolean`): Whether to include all columns in the result (Default: `false`)
 
 ### listTables()
 
@@ -98,13 +106,13 @@ const tables = await vectorStore.listTables()
 
 ### getTableSchema()
 
-**tableName:** (`string`): Name of the table to describe
+**tableName** (`string`): Name of the table to describe
 
 Returns the schema of the specified table.
 
 ### deleteTable()
 
-**tableName:** (`string`): Name of the table to delete
+**tableName** (`string`): Name of the table to delete
 
 ### deleteAllTables()
 
@@ -116,7 +124,7 @@ Returns an array of index names as strings.
 
 ### describeIndex()
 
-**indexName:** (`string`): Name of the index to describe
+**indexName** (`string`): Name of the index to describe
 
 Returns information about the index:
 
@@ -137,35 +145,35 @@ interface IndexStats {
 
 ### deleteIndex()
 
-**indexName:** (`string`): Name of the index to delete
+**indexName** (`string`): Name of the index to delete
 
 ### updateVector()
 
 Update a single vector by ID or by metadata filter. Either `id` or `filter` must be provided, but not both.
 
-**indexName:** (`string`): Name of the index containing the vector
+**indexName** (`string`): Name of the index containing the vector
 
-**id?:** (`string`): ID of the vector to update (mutually exclusive with filter)
+**id** (`string`): ID of the vector to update (mutually exclusive with filter)
 
-**filter?:** (`Record<string, any>`): Metadata filter to identify vector(s) to update (mutually exclusive with id)
+**filter** (`Record<string, any>`): Metadata filter to identify vector(s) to update (mutually exclusive with id)
 
-**update:** (`{ vector?: number[]; metadata?: Record<string, any>; }`): Object containing the vector and/or metadata to update
+**update** (`{ vector?: number[]; metadata?: Record<string, any>; }`): Object containing the vector and/or metadata to update
 
 ### deleteVector()
 
-**indexName:** (`string`): Name of the index containing the vector
+**indexName** (`string`): Name of the index containing the vector
 
-**id:** (`string`): ID of the vector to delete
+**id** (`string`): ID of the vector to delete
 
 ### deleteVectors()
 
 Delete multiple vectors by IDs or by metadata filter. Either `ids` or `filter` must be provided, but not both.
 
-**indexName:** (`string`): Name of the index containing the vectors to delete
+**indexName** (`string`): Name of the index containing the vectors to delete
 
-**ids?:** (`string[]`): Array of vector IDs to delete (mutually exclusive with filter)
+**ids** (`string[]`): Array of vector IDs to delete (mutually exclusive with filter)
 
-**filter?:** (`Record<string, any>`): Metadata filter to identify vectors to delete (mutually exclusive with ids)
+**filter** (`Record<string, any>`): Metadata filter to identify vectors to delete (mutually exclusive with ids)
 
 ### close()
 

package/dist/index.cjs

@@ -131,10 +131,52 @@ function resolveLanceConfig(config) {
 }
 var LanceDB = class extends base.MastraBase {
   client;
+  /** Cache of actual table columns: tableName -> Set<columnName> */
+  /** Cache of actual table columns: tableName -> Promise<Set<columnName>> (stores in-flight promise to coalesce concurrent calls) */
+  tableColumnsCache = /* @__PURE__ */ new Map();
   constructor({ client }) {
     super({ name: "lance-db" });
     this.client = client;
   }
+  /**
+   * Gets the set of column names that actually exist in the database table.
+   * Results are cached; the cache is invalidated when alterTable() adds new columns.
+   */
+  async getTableColumns(tableName) {
+    const cached = this.tableColumnsCache.get(tableName);
+    if (cached) return cached;
+    const promise = (async () => {
+      try {
+        const table = await this.client.openTable(tableName);
+        const schema = await table.schema();
+        const columns = new Set(schema.fields.map((f) => f.name));
+        if (columns.size === 0) {
+          this.tableColumnsCache.delete(tableName);
+        }
+        return columns;
+      } catch {
+        this.tableColumnsCache.delete(tableName);
+        return /* @__PURE__ */ new Set();
+      }
+    })();
+    this.tableColumnsCache.set(tableName, promise);
+    return promise;
+  }
+  /**
+   * Filters a record to only include columns that exist in the actual database table.
+   * Unknown columns are silently dropped to ensure forward compatibility.
+   */
+  async filterRecordToKnownColumns(tableName, record) {
+    const knownColumns = await this.getTableColumns(tableName);
+    if (knownColumns.size === 0) return record;
+    const filtered = {};
+    for (const [key, value] of Object.entries(record)) {
+      if (knownColumns.has(key)) {
+        filtered[key] = value;
+      }
+    }
+    return filtered;
+  }
   getDefaultValue(type) {
     switch (type) {
       case "text":
@@ -234,6 +276,8 @@ var LanceDB = class extends base.MastraBase {
         },
         error$1
       );
+    } finally {
+      this.tableColumnsCache.delete(tableName);
     }
   }
   async dropTable({ tableName }) {
@@ -272,6 +316,8 @@ var LanceDB = class extends base.MastraBase {
         },
         error$1
       );
+    } finally {
+      this.tableColumnsCache.delete(tableName);
     }
   }
   async alterTable({
@@ -338,6 +384,8 @@ var LanceDB = class extends base.MastraBase {
         },
         error$1
       );
+    } finally {
+      this.tableColumnsCache.delete(tableName);
     }
   }
   async clearTable({ tableName }) {
@@ -408,7 +456,9 @@ var LanceDB = class extends base.MastraBase {
           processedRecord[key] = JSON.stringify(processedRecord[key]);
         }
       }
-      await table.mergeInsert(primaryId).whenMatchedUpdateAll().whenNotMatchedInsertAll().execute([processedRecord]);
+      const filteredRecord = await this.filterRecordToKnownColumns(tableName, processedRecord);
+      if (Object.keys(filteredRecord).length === 0) return;
+      await table.mergeInsert(primaryId).whenMatchedUpdateAll().whenNotMatchedInsertAll().execute([filteredRecord]);
     } catch (error$1) {
       throw new error.MastraError(
         {
@@ -457,7 +507,12 @@ var LanceDB = class extends base.MastraBase {
         }
         return processedRecord;
       });
-      await table.mergeInsert(primaryId).whenMatchedUpdateAll().whenNotMatchedInsertAll().execute(processedRecords);
+      const filteredRecords = await Promise.all(
+        processedRecords.map((r) => this.filterRecordToKnownColumns(tableName, r))
+      );
+      const nonEmptyRecords = filteredRecords.filter((r) => Object.keys(r).length > 0);
+      if (nonEmptyRecords.length === 0) return;
+      await table.mergeInsert(primaryId).whenMatchedUpdateAll().whenNotMatchedInsertAll().execute(nonEmptyRecords);
     } catch (error$1) {
       throw new error.MastraError(
         {
@@ -808,6 +863,20 @@ var StoreMemoryLance = class extends storage.MemoryStorage {
         conditions.push(`\`createdAt\` ${endOp} ${endTime}`);
       }
       const whereClause = conditions.join(" AND ");
+      if (perPage === 0 && (!include || include.length === 0)) {
+        return { messages: [], total: 0, page, perPage: perPageForResponse, hasMore: false };
+      }
+      if (perPage === 0 && include && include.length > 0) {
+        const includedMessages = await this._getIncludedMessages(table, include);
+        const list2 = new agent.MessageList().add(includedMessages, "memory");
+        return {
+          messages: this._sortMessages(list2.get.all.db(), field, direction),
+          total: 0,
+          page,
+          perPage: perPageForResponse,
+          hasMore: false
+        };
+      }
       const total = await table.countRows(whereClause);
       const query = table.query().where(whereClause);
       let allRecords = await query.toArray();
@@ -835,16 +904,7 @@ var StoreMemoryLance = class extends storage.MemoryStorage {
       }
       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));
+        const includedMessages = await this._getIncludedMessages(table, include);
         for (const includeMsg of includedMessages) {
           if (!messageIds.has(includeMsg.id)) {
             messages.push(includeMsg);
@@ -854,17 +914,7 @@ var StoreMemoryLance = class extends storage.MemoryStorage {
       }
       const list = new agent.MessageList().add(messages, "memory");
       let finalMessages = list.get.all.db();
-      finalMessages = finalMessages.sort((a, b) => {
-        const aValue = field === "createdAt" ? new Date(a.createdAt).getTime() : a[field];
-        const bValue = field === "createdAt" ? new Date(b.createdAt).getTime() : b[field];
-        if (aValue == null && bValue == null) return 0;
-        if (aValue == null) return direction === "ASC" ? -1 : 1;
-        if (bValue == null) return direction === "ASC" ? 1 : -1;
-        if (typeof aValue === "string" && typeof bValue === "string") {
-          return direction === "ASC" ? aValue.localeCompare(bValue) : bValue.localeCompare(aValue);
-        }
-        return direction === "ASC" ? aValue - bValue : bValue - aValue;
-      });
+      finalMessages = this._sortMessages(finalMessages, field, direction);
       const returnedThreadMessageIds = new Set(finalMessages.filter((m) => m.threadId === threadId).map((m) => m.id));
       const allThreadMessagesReturned = returnedThreadMessageIds.size >= total;
       const fetchedAll = perPageInput === false || allThreadMessagesReturned;
@@ -1043,6 +1093,62 @@ var StoreMemoryLance = class extends storage.MemoryStorage {
       );
     }
   }
+  _sortMessages(messages, field, direction) {
+    return messages.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;
+    });
+  }
+  async _getIncludedMessages(table, include) {
+    if (include.length === 0) return [];
+    const targetIds = include.map((item) => item.id);
+    const idCondition = targetIds.length === 1 ? `id = '${this.escapeSql(targetIds[0])}'` : `id IN (${targetIds.map((id) => `'${this.escapeSql(id)}'`).join(", ")})`;
+    const targetRecords = await table.query().where(idCondition).toArray();
+    const needsContext = include.some((item) => item.withPreviousMessages || item.withNextMessages);
+    if (!needsContext) {
+      return targetRecords.map((row) => this.normalizeMessage(row));
+    }
+    const threadIdsToFetch = [...new Set(targetRecords.map((r) => r.thread_id))];
+    const threadCache = /* @__PURE__ */ new Map();
+    for (const tid of threadIdsToFetch) {
+      const threadRecords = await table.query().where(`thread_id = '${this.escapeSql(tid)}'`).toArray();
+      threadRecords.sort((a, b) => a.createdAt - b.createdAt);
+      threadCache.set(tid, threadRecords);
+    }
+    const targetThreadMap = /* @__PURE__ */ new Map();
+    for (const r of targetRecords) {
+      targetThreadMap.set(r.id, r.thread_id);
+    }
+    const includeByThread = /* @__PURE__ */ new Map();
+    for (const item of include) {
+      const tid = targetThreadMap.get(item.id);
+      if (!tid) continue;
+      const items = includeByThread.get(tid) ?? [];
+      items.push(item);
+      includeByThread.set(tid, items);
+    }
+    const seen = /* @__PURE__ */ new Set();
+    const allContextMessages = [];
+    for (const [tid, threadInclude] of includeByThread) {
+      const threadMessages = threadCache.get(tid) ?? [];
+      const contextMessages = this.processMessagesWithContext(threadMessages, threadInclude);
+      for (const msg of contextMessages) {
+        if (!seen.has(msg.id)) {
+          seen.add(msg.id);
+          allContextMessages.push(msg);
+        }
+      }
+    }
+    allContextMessages.sort((a, b) => a.createdAt - b.createdAt);
+    return allContextMessages.map((row) => this.normalizeMessage(row));
+  }
   /**
    * Processes messages to include context messages based on withPreviousMessages and withNextMessages
    * @param records - The sorted array of records to process
@@ -1052,7 +1158,8 @@ var StoreMemoryLance = class extends storage.MemoryStorage {
   processMessagesWithContext(records, include) {
     const messagesWithContext = include.filter((item) => item.withPreviousMessages || item.withNextMessages);
     if (messagesWithContext.length === 0) {
-      return records;
+      const targetIds = new Set(include.map((item) => item.id));
+      return records.filter((record) => targetIds.has(record.id));
     }
     const messageIndexMap = /* @__PURE__ */ new Map();
     records.forEach((message, index) => {
@@ -1077,7 +1184,8 @@ var StoreMemoryLance = class extends storage.MemoryStorage {
       }
     }
     if (additionalIndices.size === 0) {
-      return records;
+      const targetIds = new Set(include.map((item) => item.id));
+      return records.filter((record) => targetIds.has(record.id));
     }
     const originalMatchIds = new Set(include.map((item) => item.id));
     const allIndices = /* @__PURE__ */ new Set();