@mastra/convex 1.0.5 → 1.0.6

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @mastra/convex
 
+## 1.0.6
+
+### Patch Changes
+
+- 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), [`866cc2c`](https://github.com/mastra-ai/mastra/commit/866cc2cb1f0e3b314afab5194f69477fada745d1), [`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), [`1d0a8a8`](https://github.com/mastra-ai/mastra/commit/1d0a8a8acf33203d5744fc429b090ad8598aa8ed), [`631ffd8`](https://github.com/mastra-ai/mastra/commit/631ffd82fed108648b448b28e6a90e38c5f53bf5), [`6bcbf8a`](https://github.com/mastra-ai/mastra/commit/6bcbf8a6774d5a53b21d61db8a45ce2593ca1616), [`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), [`18c3a90`](https://github.com/mastra-ai/mastra/commit/18c3a90c9e48cf69500e308affeb8eba5860b2af), [`41d79a1`](https://github.com/mastra-ai/mastra/commit/41d79a14bd8cb6de1e2565fd0a04786bae2f211b), [`f35487b`](https://github.com/mastra-ai/mastra/commit/f35487bb2d46c636e22aa71d90025613ae38235a), [`6dc2192`](https://github.com/mastra-ai/mastra/commit/6dc21921aef0f0efab15cd0805fa3d18f277a76f), [`eeb3a3f`](https://github.com/mastra-ai/mastra/commit/eeb3a3f43aca10cf49479eed2a84b7d9ecea02ba), [`e673376`](https://github.com/mastra-ai/mastra/commit/e6733763ad1321aa7e5ae15096b9c2104f93b1f3), [`05f8d90`](https://github.com/mastra-ai/mastra/commit/05f8d9009290ce6aa03428b3add635268615db85), [`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), [`4b8da97`](https://github.com/mastra-ai/mastra/commit/4b8da97a5ce306e97869df6c39535d9069e563db), [`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), [`256df35`](https://github.com/mastra-ai/mastra/commit/256df3571d62beb3ad4971faa432927cc140e603), [`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
+
+## 1.0.6-alpha.0
+
+### Patch Changes
+
+- 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.5
 
 ### Patch Changes

package/dist/docs/SKILL.md

@@ -3,7 +3,7 @@ name: mastra-convex
 description: Documentation for @mastra/convex. Use when working with @mastra/convex APIs, configuration, or implementation.
 metadata:
   package: "@mastra/convex"
-  version: "1.0.5"
+  version: "1.0.6"
 ---
 
 ## When to use
@@ -16,8 +16,8 @@ Read the individual reference documents for detailed explanations and code examp
 
 ### Reference
 
-- [Reference: Convex Storage](references/reference-storage-convex.md) - Documentation for the Convex storage implementation in Mastra.
-- [Reference: Convex Vector Store](references/reference-vectors-convex.md) - Documentation for the ConvexVector class in Mastra, which provides vector search using Convex.
+- [Reference: Convex storage](references/reference-storage-convex.md) - Documentation for the Convex storage implementation in Mastra.
+- [Reference: Convex vector store](references/reference-vectors-convex.md) - Documentation for the ConvexVector class in Mastra, which provides vector search using Convex.
 
 
 Read [assets/SOURCE_MAP.json](assets/SOURCE_MAP.json) for source code references.

package/dist/docs/assets/SOURCE_MAP.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.5",
+  "version": "1.0.6",
   "package": "@mastra/convex",
   "exports": {
     "mastraStorage": {

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

@@ -1,8 +1,8 @@
-# Convex Storage
+# Convex storage
 
 The Convex storage implementation provides a serverless storage solution using [Convex](https://convex.dev), a full-stack TypeScript development platform with real-time sync and automatic caching.
 
-> **Observability Not Supported:** Convex storage **does not support the observability domain**. Traces from the `DefaultExporter` cannot be persisted to Convex, and Mastra Studio's observability features won't work with Convex 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:** Convex storage **doesn't support the observability domain**. Traces from the `DefaultExporter` can't be persisted to Convex, and Mastra Studio's observability features won't work with Convex 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.
 
 > **Record Size Limit:** Convex enforces a **1 MiB maximum record size**. This limit can be exceeded when storing messages with base64-encoded attachments such as images. See [Handling large attachments](https://mastra.ai/docs/memory/storage) for workarounds including uploading attachments to external storage like S3, Cloudflare R2, or [Convex file storage](https://docs.convex.dev/file-storage).
 
@@ -32,7 +32,7 @@ yarn add @mastra/convex@latest
 bun add @mastra/convex@latest
 ```
 
-## Convex Setup
+## Convex setup
 
 Before using `ConvexStore`, you need to set up the Convex schema and storage handler in your Convex project.
 
@@ -97,13 +97,13 @@ const storage = new ConvexStore({
 
 ## Parameters
 
-**deploymentUrl:** (`string`): Convex deployment URL (e.g., https\://your-project.convex.cloud)
+**deploymentUrl** (`string`): Convex deployment URL (e.g., https\://your-project.convex.cloud)
 
-**adminAuthToken:** (`string`): Convex admin authentication token for backend access
+**adminAuthToken** (`string`): Convex admin authentication token for backend access
 
-**storageFunction?:** (`string`): Path to the storage mutation function (default: 'mastra/storage:handle') (Default: `mastra/storage:handle`)
+**storageFunction** (`string`): Path to the storage mutation function (default: 'mastra/storage:handle') (Default: `mastra/storage:handle`)
 
-## Constructor Examples
+## Constructor examples
 
 ```ts
 import { ConvexStore } from '@mastra/convex'
@@ -124,7 +124,7 @@ const storeCustom = new ConvexStore({
 })
 ```
 
-## Additional Notes
+## Additional notes
 
 ### Schema Management
 
@@ -148,7 +148,7 @@ All typed tables include:
 
 This design ensures compatibility with Mastra's storage contract while leveraging Convex's automatic indexing and real-time capabilities.
 
-### Environment Variables
+### Environment variables
 
 Set these environment variables for your deployment:
 

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

@@ -1,4 +1,4 @@
-# Convex Vector Store
+# Convex vector store
 
 The ConvexVector class provides vector storage and similarity search using [Convex](https://convex.dev). It stores embeddings inside Convex and performs cosine similarity search.
 
@@ -28,19 +28,19 @@ yarn add @mastra/convex@latest
 bun add @mastra/convex@latest
 ```
 
-## Convex Setup
+## Convex setup
 
 Before using `ConvexVector`, you need to set up the Convex schema and storage handler. See [Convex Storage Setup](https://mastra.ai/reference/storage/convex) for setup instructions.
 
-## Constructor Options
+## Constructor options
 
-**deploymentUrl:** (`string`): Convex deployment URL (e.g., https\://your-project.convex.cloud)
+**deploymentUrl** (`string`): Convex deployment URL (e.g., https\://your-project.convex.cloud)
 
-**adminAuthToken:** (`string`): Convex admin authentication token
+**adminAuthToken** (`string`): Convex admin authentication token
 
-**storageFunction?:** (`string`): Path to the storage mutation function (Default: `mastra/storage:handle`)
+**storageFunction** (`string`): Path to the storage mutation function (Default: `mastra/storage:handle`)
 
-## Constructor Examples
+## Constructor examples
 
 ### Basic Configuration
 
@@ -67,13 +67,13 @@ const vectorStore = new ConvexVector({
 
 ## Methods
 
-### createIndex()
+### `createIndex()`
 
-**indexName:** (`string`): Name of the index to create
+**indexName** (`string`): Name of the index 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 (only cosine is currently supported) (Default: `cosine`)
+**metric** (`'cosine' | 'euclidean' | 'dotproduct'`): Distance metric for similarity search (only cosine is currently supported) (Default: `cosine`)
 
 ```typescript
 await vectorStore.createIndex({
@@ -82,15 +82,15 @@ await vectorStore.createIndex({
 })
 ```
 
-### upsert()
+### `upsert()`
 
-**indexName:** (`string`): Name of the index to upsert vectors into
+**indexName** (`string`): Name of the index 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)
 
 ```typescript
 await vectorStore.upsert({
@@ -101,17 +101,17 @@ await vectorStore.upsert({
 });
 ```
 
-### query()
+### `query()`
 
-**indexName:** (`string`): Name of the index to query
+**indexName** (`string`): Name of the index 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`)
 
 ```typescript
 const results = await vectorStore.query({
@@ -122,7 +122,7 @@ const results = await vectorStore.query({
 });
 ```
 
-### listIndexes()
+### `listIndexes()`
 
 Returns an array of index names as strings.
 
@@ -131,9 +131,9 @@ const indexes = await vectorStore.listIndexes()
 // ["my_vectors", "embeddings", ...]
 ```
 
-### describeIndex()
+### `describeIndex()`
 
-**indexName:** (`string`): Name of the index to describe
+**indexName** (`string`): Name of the index to describe
 
 Returns:
 
@@ -145,9 +145,9 @@ interface IndexStats {
 }
 ```
 
-### deleteIndex()
+### `deleteIndex()`
 
-**indexName:** (`string`): Name of the index to delete
+**indexName** (`string`): Name of the index to delete
 
 Deletes the index and all its vectors.
 
@@ -155,17 +155,17 @@ Deletes the index and all its vectors.
 await vectorStore.deleteIndex({ indexName: 'my_vectors' })
 ```
 
-### updateVector()
+### `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
 
 ```typescript
 // Update by ID
@@ -188,25 +188,25 @@ await vectorStore.updateVector({
 })
 ```
 
-### deleteVector()
+### `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
 
 ```typescript
 await vectorStore.deleteVector({ indexName: 'my_vectors', id: 'vector123' })
 ```
 
-### deleteVectors()
+### `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)
 
 ```typescript
 // Delete by IDs
@@ -222,7 +222,7 @@ await vectorStore.deleteVectors({
 })
 ```
 
-## Response Types
+## Response types
 
 Query results are returned in this format:
 
@@ -235,7 +235,7 @@ interface QueryResult {
 }
 ```
 
-## Metadata Filtering
+## Metadata filtering
 
 ConvexVector supports metadata filtering with various operators:
 

package/dist/index.cjs

@@ -324,6 +324,20 @@ var MemoryConvex = class extends storage.MemoryStorage {
     const perPage = storage.normalizePerPage(perPageInput, 40);
     const { offset, perPage: perPageForResponse } = storage.calculatePagination(page, perPageInput, perPage);
     const { field, direction } = this.parseOrderBy(orderBy, "ASC");
+    if (perPage === 0 && (!include || include.length === 0)) {
+      return { messages: [], total: 0, page, perPage: perPageForResponse, hasMore: false };
+    }
+    if (perPage === 0 && include && include.length > 0) {
+      const messages2 = await this._getIncludedMessages(include);
+      const list = new agent.MessageList().add(messages2, "memory");
+      return {
+        messages: this._sortMessages(list.get.all.db(), field, direction),
+        total: 0,
+        page,
+        perPage: perPageForResponse,
+        hasMore: false
+      };
+    }
     let rows = [];
     for (const tid of threadIds) {
       const threadRows = await this.#db.queryTable(storage.TABLE_MESSAGES, [{ field: "thread_id", value: tid }]);
@@ -343,62 +357,27 @@ var MemoryConvex = class extends storage.MemoryStorage {
     });
     const totalThreadMessages = rows.length;
     const paginatedRows = perPageInput === false ? rows : rows.slice(offset, offset + perPage);
-    const messages = paginatedRows.map((row) => this.parseStoredMessage(row));
+    let messages = paginatedRows.map((row) => this.parseStoredMessage(row));
     const messageIds = new Set(messages.map((msg) => msg.id));
     if (include && include.length > 0) {
-      const threadMessagesCache = /* @__PURE__ */ new Map();
-      for (const tid of threadIds) {
-        const tidRows = rows.filter((r) => r.thread_id === tid);
-        threadMessagesCache.set(tid, tidRows);
-      }
-      for (const includeItem of include) {
-        let targetThreadId;
-        let target;
-        for (const [tid, cachedRows] of threadMessagesCache) {
-          target = cachedRows.find((row) => row.id === includeItem.id);
-          if (target) {
-            targetThreadId = tid;
-            break;
-          }
-        }
-        if (!target) {
-          const messageRows = await this.#db.queryTable(storage.TABLE_MESSAGES, [
-            { field: "id", value: includeItem.id }
-          ]);
-          if (messageRows.length > 0) {
-            target = messageRows[0];
-            targetThreadId = target.thread_id;
-            if (targetThreadId && !threadMessagesCache.has(targetThreadId)) {
-              const otherThreadRows = await this.#db.queryTable(storage.TABLE_MESSAGES, [
-                { field: "thread_id", value: targetThreadId }
-              ]);
-              threadMessagesCache.set(targetThreadId, otherThreadRows);
-            }
-          }
+      const preloadedThreads = /* @__PURE__ */ new Map();
+      if (!resourceId && !filter?.dateRange) {
+        for (const tid of threadIds) {
+          preloadedThreads.set(
+            tid,
+            rows.filter((r) => r.thread_id === tid)
+          );
         }
-        if (!target || !targetThreadId) continue;
-        if (!messageIds.has(target.id)) {
-          messages.push(this.parseStoredMessage(target));
-          messageIds.add(target.id);
+      }
+      const includedMessages = await this._getIncludedMessages(include, preloadedThreads);
+      for (const msg of includedMessages) {
+        if (!messageIds.has(msg.id)) {
+          messages.push(msg);
+          messageIds.add(msg.id);
         }
-        const targetThreadRows = threadMessagesCache.get(targetThreadId) || [];
-        await this.addContextMessages({
-          includeItem,
-          allMessages: targetThreadRows,
-          targetThreadId,
-          messageIds,
-          messages
-        });
       }
     }
-    messages.sort((a, b) => {
-      const aValue = field === "createdAt" || field === "updatedAt" ? new Date(a[field]).getTime() : a[field];
-      const bValue = field === "createdAt" || field === "updatedAt" ? new Date(b[field]).getTime() : b[field];
-      if (typeof aValue === "number" && typeof bValue === "number") {
-        return direction === "ASC" ? aValue - bValue : bValue - aValue;
-      }
-      return direction === "ASC" ? String(aValue).localeCompare(String(bValue)) : String(bValue).localeCompare(String(aValue));
-    });
+    messages = this._sortMessages(messages, field, direction);
     const hasMore = include && include.length > 0 ? new Set(messages.filter((m) => m.threadId === threadId).map((m) => m.id)).size < totalThreadMessages : perPageInput === false ? false : offset + perPage < totalThreadMessages;
     return {
       messages,
@@ -578,6 +557,69 @@ var MemoryConvex = class extends storage.MemoryStorage {
     await this.saveResource({ resource: updated });
     return updated;
   }
+  _sortMessages(messages, field, direction) {
+    return messages.sort((a, b) => {
+      const aValue = field === "createdAt" || field === "updatedAt" ? new Date(a[field]).getTime() : a[field];
+      const bValue = field === "createdAt" || field === "updatedAt" ? new Date(b[field]).getTime() : b[field];
+      if (typeof aValue === "number" && typeof bValue === "number") {
+        return direction === "ASC" ? aValue - bValue : bValue - aValue;
+      }
+      return direction === "ASC" ? String(aValue).localeCompare(String(bValue)) : String(bValue).localeCompare(String(aValue));
+    });
+  }
+  async _getIncludedMessages(include, preloadedThreads) {
+    if (include.length === 0) return [];
+    const messages = [];
+    const messageIds = /* @__PURE__ */ new Set();
+    const threadMessagesCache = new Map(preloadedThreads ?? []);
+    const cachedTargets = /* @__PURE__ */ new Map();
+    for (const [threadId, rows] of threadMessagesCache) {
+      for (const row of rows) {
+        cachedTargets.set(row.id, { threadId, row });
+      }
+    }
+    for (const includeItem of include) {
+      let targetThreadId;
+      let target;
+      const cached = cachedTargets.get(includeItem.id);
+      if (cached) {
+        target = cached.row;
+        targetThreadId = cached.threadId;
+      }
+      if (!target) {
+        const messageRows = await this.#db.queryTable(storage.TABLE_MESSAGES, [
+          { field: "id", value: includeItem.id }
+        ]);
+        if (messageRows.length > 0) {
+          target = messageRows[0];
+          targetThreadId = target.thread_id;
+          if (targetThreadId && !threadMessagesCache.has(targetThreadId)) {
+            const otherThreadRows = await this.#db.queryTable(storage.TABLE_MESSAGES, [
+              { field: "thread_id", value: targetThreadId }
+            ]);
+            threadMessagesCache.set(targetThreadId, otherThreadRows);
+            for (const row of otherThreadRows) {
+              cachedTargets.set(row.id, { threadId: targetThreadId, row });
+            }
+          }
+        }
+      }
+      if (!target || !targetThreadId) continue;
+      if (!messageIds.has(target.id)) {
+        messages.push(this.parseStoredMessage(target));
+        messageIds.add(target.id);
+      }
+      const targetThreadRows = threadMessagesCache.get(targetThreadId) || [];
+      await this.addContextMessages({
+        includeItem,
+        allMessages: targetThreadRows,
+        targetThreadId,
+        messageIds,
+        messages
+      });
+    }
+    return messages;
+  }
   parseStoredMessage(message) {
     const content = storage.safelyParseJSON(message.content);
     return {