@mastra/clickhouse 1.2.3 → 1.3.0

package/CHANGELOG.md

@@ -1,5 +1,39 @@
 # @mastra/clickhouse
 
+## 1.3.0
+
+### Minor Changes
+
+- Added `requestContext` column to the spans table. Request context data from tracing is now persisted alongside other span data. ([#14020](https://github.com/mastra-ai/mastra/pull/14020))
+
+### 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.
+
+- Fixed slow semantic recall in the libsql, Cloudflare D1, and ClickHouse storage adapters. Recall performance no longer degrades as threads grow larger. (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.3.0-alpha.0
+
+### Minor Changes
+
+- Added `requestContext` column to the spans table. Request context data from tracing is now persisted alongside other span data. ([#14020](https://github.com/mastra-ai/mastra/pull/14020))
+
+### 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.
+
+- Fixed slow semantic recall in the libsql, Cloudflare D1, and ClickHouse storage adapters. Recall performance no longer degrades as threads grow larger. (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.2.3
 
 ### Patch Changes

package/dist/docs/SKILL.md

@@ -3,7 +3,7 @@ name: mastra-clickhouse
 description: Documentation for @mastra/clickhouse. Use when working with @mastra/clickhouse APIs, configuration, or implementation.
 metadata:
   package: "@mastra/clickhouse"
-  version: "1.2.3"
+  version: "1.3.0"
 ---
 
 ## When to use
@@ -16,7 +16,7 @@ Read the individual reference documents for detailed explanations and code examp
 
 ### Reference
 
-- [Reference: Composite Storage](references/reference-storage-composite.md) - Documentation for combining multiple storage backends in Mastra.
+- [Reference: Composite storage](references/reference-storage-composite.md) - Documentation for combining multiple storage backends in Mastra.
 
 
 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.2.3",
+  "version": "1.3.0",
   "package": "@mastra/clickhouse",
   "exports": {},
   "modules": {}

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

@@ -1,4 +1,4 @@
-# Composite Storage
+# Composite storage
 
 `MastraCompositeStore` can compose storage domains from different providers. Use it when you need different databases for different purposes. For example, use LibSQL for memory and PostgreSQL for workflows.
 
@@ -120,23 +120,23 @@ export const mastra = new Mastra({
 
 ## Options
 
-**id:** (`string`): Unique identifier for this storage instance.
+**id** (`string`): Unique identifier for this storage instance.
 
-**default?:** (`MastraCompositeStore`): Default storage adapter. Domains not explicitly specified in \`domains\` will use this storage's domains as fallbacks.
+**default** (`MastraCompositeStore`): Default storage adapter. Domains not explicitly specified in \`domains\` will use this storage's domains as fallbacks.
 
-**domains?:** (`object`): Individual domain overrides. Each domain can come from a different storage adapter. These take precedence over the default storage.
+**domains** (`object`): Individual domain overrides. Each domain can come from a different storage adapter. These take precedence over the default storage.
 
-**domains.memory?:** (`MemoryStorage`): Storage for threads, messages, and resources.
+**domains.memory** (`MemoryStorage`): Storage for threads, messages, and resources.
 
-**domains.workflows?:** (`WorkflowsStorage`): Storage for workflow snapshots.
+**domains.workflows** (`WorkflowsStorage`): Storage for workflow snapshots.
 
-**domains.scores?:** (`ScoresStorage`): Storage for evaluation scores.
+**domains.scores** (`ScoresStorage`): Storage for evaluation scores.
 
-**domains.observability?:** (`ObservabilityStorage`): Storage for traces and spans.
+**domains.observability** (`ObservabilityStorage`): Storage for traces and spans.
 
-**domains.agents?:** (`AgentsStorage`): Storage for stored agent configurations.
+**domains.agents** (`AgentsStorage`): Storage for stored agent configurations.
 
-**disableInit?:** (`boolean`): When true, automatic initialization is disabled. You must call init() explicitly.
+**disableInit** (`boolean`): When true, automatic initialization is disabled. You must call init() explicitly.
 
 ## Initialization
 

package/dist/index.cjs

@@ -105,6 +105,8 @@ function resolveClickhouseConfig(config) {
 var ClickhouseDB = class extends base.MastraBase {
   ttl;
   client;
+  /** Cache of actual table columns: tableName -> Promise<Set<columnName>> (stores in-flight promise to coalesce concurrent calls) */
+  tableColumnsCache = /* @__PURE__ */ new Map();
   constructor({ client, ttl }) {
     super({
       name: "CLICKHOUSE_DB"
@@ -112,6 +114,48 @@ var ClickhouseDB = class extends base.MastraBase {
     this.ttl = ttl;
     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 result = await this.client.query({
+          query: `DESCRIBE TABLE ${tableName}`,
+          format: "JSONEachRow"
+        });
+        const rows = await result.json();
+        const columns = new Set(rows.map((r) => r.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;
+  }
   async hasColumn(table, column) {
     const result = await this.client.query({
       query: `DESCRIBE TABLE ${table}`,
@@ -423,6 +467,8 @@ var ClickhouseDB = class extends base.MastraBase {
         },
         error$1
       );
+    } finally {
+      this.tableColumnsCache.delete(tableName);
     }
   }
   async alterTable({
@@ -462,6 +508,8 @@ var ClickhouseDB = class extends base.MastraBase {
         },
         error$1
       );
+    } finally {
+      this.tableColumnsCache.delete(tableName);
     }
   }
   async clearTable({ tableName }) {
@@ -489,25 +537,39 @@ var ClickhouseDB = class extends base.MastraBase {
     }
   }
   async dropTable({ tableName }) {
-    await this.client.query({
-      query: `DROP TABLE IF EXISTS ${tableName}`
-    });
+    try {
+      await this.client.query({
+        query: `DROP TABLE IF EXISTS ${tableName}`
+      });
+    } catch (error$1) {
+      throw new error.MastraError(
+        {
+          id: storage.createStorageErrorId("CLICKHOUSE", "DROP_TABLE", "FAILED"),
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          details: { tableName }
+        },
+        error$1
+      );
+    } finally {
+      this.tableColumnsCache.delete(tableName);
+    }
   }
   async insert({ tableName, record }) {
-    const rawCreatedAt = record.createdAt || record.created_at || /* @__PURE__ */ new Date();
-    const rawUpdatedAt = record.updatedAt || /* @__PURE__ */ new Date();
-    const createdAt = rawCreatedAt instanceof Date ? rawCreatedAt.toISOString() : rawCreatedAt;
-    const updatedAt = rawUpdatedAt instanceof Date ? rawUpdatedAt.toISOString() : rawUpdatedAt;
     try {
+      const filteredRecord = await this.filterRecordToKnownColumns(tableName, record);
+      if (Object.keys(filteredRecord).length === 0) return;
+      const rawCreatedAt = filteredRecord.createdAt || filteredRecord.created_at || /* @__PURE__ */ new Date();
+      const rawUpdatedAt = filteredRecord.updatedAt || /* @__PURE__ */ new Date();
+      if ("createdAt" in filteredRecord || (await this.getTableColumns(tableName)).has("createdAt")) {
+        filteredRecord.createdAt = rawCreatedAt instanceof Date ? rawCreatedAt.toISOString() : rawCreatedAt;
+      }
+      if ("updatedAt" in filteredRecord || (await this.getTableColumns(tableName)).has("updatedAt")) {
+        filteredRecord.updatedAt = rawUpdatedAt instanceof Date ? rawUpdatedAt.toISOString() : rawUpdatedAt;
+      }
       await this.client.insert({
         table: tableName,
-        values: [
-          {
-            ...record,
-            createdAt,
-            updatedAt
-          }
-        ],
+        values: [filteredRecord],
         format: "JSONEachRow",
         clickhouse_settings: {
           // Allows to insert serialized JS Dates (such as '2023-12-06T10:54:48.000Z')
@@ -529,7 +591,7 @@ var ClickhouseDB = class extends base.MastraBase {
     }
   }
   async batchInsert({ tableName, records }) {
-    const recordsToBeInserted = records.map((record) => ({
+    const processedRecords = records.map((record) => ({
       ...Object.fromEntries(
         Object.entries(record).map(([key, value]) => [
           key,
@@ -539,10 +601,15 @@ var ClickhouseDB = class extends base.MastraBase {
         ])
       )
     }));
+    const recordsToBeInserted = await Promise.all(
+      processedRecords.map((r) => this.filterRecordToKnownColumns(tableName, r))
+    );
+    const nonEmptyRecords = recordsToBeInserted.filter((r) => Object.keys(r).length > 0);
+    if (nonEmptyRecords.length === 0) return;
     try {
       await this.client.insert({
         table: tableName,
-        values: recordsToBeInserted,
+        values: nonEmptyRecords,
         format: "JSONEachRow",
         clickhouse_settings: {
           // Allows to insert serialized JS Dates (such as '2023-12-06T10:54:48.000Z')
@@ -808,6 +875,20 @@ var MemoryStorageClickhouse = class extends storage.MemoryStorage {
       }
       const { field, direction } = this.parseOrderBy(orderBy, "ASC");
       dataQuery += ` ORDER BY "${field}" ${direction}`;
+      if (perPageForQuery === 0 && (!include || include.length === 0)) {
+        return { messages: [], total: 0, page, perPage: perPageForResponse, hasMore: false };
+      }
+      if (perPageForQuery === 0 && include && include.length > 0) {
+        const includeResult = await this._getIncludedMessages({ include });
+        const list2 = new agent.MessageList().add(includeResult, "memory");
+        return {
+          messages: this._sortMessages(list2.get.all.db(), field, direction),
+          total: 0,
+          page,
+          perPage: perPageForResponse,
+          hasMore: false
+        };
+      }
       if (perPageForResponse === false) ; else {
         dataQuery += ` LIMIT {limit:Int64} OFFSET {offset:Int64}`;
         dataParams.limit = perPageForQuery;
@@ -869,92 +950,17 @@ var MemoryStorageClickhouse = class extends storage.MemoryStorage {
         };
       }
       const messageIds = new Set(paginatedMessages.map((m) => m.id));
-      let includeMessages = [];
       if (include && include.length > 0) {
-        const includesNeedingThread = include.filter((inc) => !inc.threadId);
-        const threadByMessageId = /* @__PURE__ */ new Map();
-        if (includesNeedingThread.length > 0) {
-          const { messages: includeLookup } = await this.listMessagesById({
-            messageIds: includesNeedingThread.map((inc) => inc.id)
-          });
-          for (const msg of includeLookup) {
-            if (msg.threadId) {
-              threadByMessageId.set(msg.id, msg.threadId);
-            }
-          }
-        }
-        const unionQueries = [];
-        const params = [];
-        let paramIdx = 1;
-        for (const inc of include) {
-          const { id, withPreviousMessages = 0, withNextMessages = 0 } = inc;
-          const searchThreadId = inc.threadId ?? threadByMessageId.get(id);
-          if (!searchThreadId) continue;
-          unionQueries.push(`
-            SELECT * FROM (
-              WITH numbered_messages AS (
-                SELECT
-                  id, content, role, type, "createdAt", thread_id, "resourceId",
-                  ROW_NUMBER() OVER (ORDER BY "createdAt" ASC) as row_num
-                FROM "${storage.TABLE_MESSAGES}"
-                WHERE thread_id = {var_thread_id_${paramIdx}:String}
-              ),
-              target_positions AS (
-                SELECT row_num as target_pos
-                FROM numbered_messages
-                WHERE id = {var_include_id_${paramIdx}:String}
-              )
-              SELECT DISTINCT m.id, m.content, m.role, m.type, m."createdAt", m.thread_id AS "threadId", m."resourceId"
-              FROM numbered_messages m
-              CROSS JOIN target_positions t
-              WHERE m.row_num BETWEEN (t.target_pos - {var_withPreviousMessages_${paramIdx}:Int64}) AND (t.target_pos + {var_withNextMessages_${paramIdx}:Int64})
-            ) AS query_${paramIdx}
-          `);
-          params.push(
-            { [`var_thread_id_${paramIdx}`]: searchThreadId },
-            { [`var_include_id_${paramIdx}`]: id },
-            { [`var_withPreviousMessages_${paramIdx}`]: withPreviousMessages },
-            { [`var_withNextMessages_${paramIdx}`]: withNextMessages }
-          );
-          paramIdx++;
-        }
-        if (unionQueries.length > 0) {
-          const finalQuery = unionQueries.join(" UNION ALL ") + ' ORDER BY "createdAt" ASC';
-          const mergedParams = params.reduce((acc, paramObj) => ({ ...acc, ...paramObj }), {});
-          const includeResult = await this.client.query({
-            query: finalQuery,
-            query_params: mergedParams,
-            clickhouse_settings: {
-              date_time_input_format: "best_effort",
-              date_time_output_format: "iso",
-              use_client_time_zone: 1,
-              output_format_json_quote_64bit_integers: 0
-            }
-          });
-          const includeRows = await includeResult.json();
-          includeMessages = transformRows(includeRows.data);
-          for (const includeMsg of includeMessages) {
-            if (!messageIds.has(includeMsg.id)) {
-              paginatedMessages.push(includeMsg);
-              messageIds.add(includeMsg.id);
-            }
+        const includeMessages = await this._getIncludedMessages({ include });
+        for (const includeMsg of includeMessages) {
+          if (!messageIds.has(includeMsg.id)) {
+            paginatedMessages.push(includeMsg);
+            messageIds.add(includeMsg.id);
           }
         }
       }
       const list = new agent.MessageList().add(paginatedMessages, "memory");
-      let finalMessages = list.get.all.db();
-      finalMessages = finalMessages.sort((a, b) => {
-        const isDateField = field === "createdAt" || field === "updatedAt";
-        const aValue = isDateField ? new Date(a[field]).getTime() : a[field];
-        const bValue = isDateField ? new Date(b[field]).getTime() : b[field];
-        if (aValue === bValue) {
-          return a.id.localeCompare(b.id);
-        }
-        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));
-      });
+      const finalMessages = this._sortMessages(list.get.all.db(), field, direction);
       const threadIdSet = new Set(threadIds);
       const returnedThreadMessageIds = new Set(
         finalMessages.filter((m) => m.threadId && threadIdSet.has(m.threadId)).map((m) => m.id)
@@ -992,6 +998,95 @@ var MemoryStorageClickhouse = class extends storage.MemoryStorage {
       };
     }
   }
+  _sortMessages(messages, field, direction) {
+    return messages.sort((a, b) => {
+      const isDateField = field === "createdAt" || field === "updatedAt";
+      const aValue = isDateField ? new Date(a[field]).getTime() : a[field];
+      const bValue = isDateField ? new Date(b[field]).getTime() : b[field];
+      if (aValue === bValue) {
+        return a.id.localeCompare(b.id);
+      }
+      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
+  }) {
+    if (!include || include.length === 0) return [];
+    const targetIds = include.map((inc) => inc.id).filter(Boolean);
+    if (targetIds.length === 0) return [];
+    const { messages: targetDocs } = await this.listMessagesById({ messageIds: targetIds });
+    const targetMap = new Map(
+      targetDocs.map((msg) => [msg.id, { threadId: msg.threadId, createdAt: msg.createdAt }])
+    );
+    const unionQueries = [];
+    const params = {};
+    let paramIdx = 1;
+    for (const inc of include) {
+      const { id, withPreviousMessages = 0, withNextMessages = 0 } = inc;
+      const target = targetMap.get(id);
+      if (!target) continue;
+      const threadParam = `var_thread_${paramIdx}`;
+      const createdAtParam = `var_createdAt_${paramIdx}`;
+      const limitParam = `var_limit_${paramIdx}`;
+      unionQueries.push(`
+        SELECT id, content, role, type, "createdAt", thread_id AS "threadId", "resourceId"
+        FROM "${storage.TABLE_MESSAGES}"
+        WHERE thread_id = {${threadParam}:String}
+          AND createdAt <= parseDateTime64BestEffort({${createdAtParam}:String}, 3)
+        ORDER BY createdAt DESC, id DESC
+        LIMIT {${limitParam}:Int64}
+      `);
+      params[threadParam] = target.threadId;
+      params[createdAtParam] = target.createdAt;
+      params[limitParam] = withPreviousMessages + 1;
+      paramIdx++;
+      if (withNextMessages > 0) {
+        const threadParam2 = `var_thread_${paramIdx}`;
+        const createdAtParam2 = `var_createdAt_${paramIdx}`;
+        const limitParam2 = `var_limit_${paramIdx}`;
+        unionQueries.push(`
+          SELECT id, content, role, type, "createdAt", thread_id AS "threadId", "resourceId"
+          FROM "${storage.TABLE_MESSAGES}"
+          WHERE thread_id = {${threadParam2}:String}
+            AND createdAt > parseDateTime64BestEffort({${createdAtParam2}:String}, 3)
+          ORDER BY createdAt ASC, id ASC
+          LIMIT {${limitParam2}:Int64}
+        `);
+        params[threadParam2] = target.threadId;
+        params[createdAtParam2] = target.createdAt;
+        params[limitParam2] = withNextMessages;
+        paramIdx++;
+      }
+    }
+    if (unionQueries.length === 0) return [];
+    let finalQuery;
+    if (unionQueries.length === 1) {
+      finalQuery = unionQueries[0];
+    } else {
+      finalQuery = `SELECT * FROM (${unionQueries.join(" UNION ALL ")}) ORDER BY "createdAt" ASC, id ASC`;
+    }
+    const includeResult = await this.client.query({
+      query: finalQuery,
+      query_params: params,
+      clickhouse_settings: {
+        date_time_input_format: "best_effort",
+        date_time_output_format: "iso",
+        use_client_time_zone: 1,
+        output_format_json_quote_64bit_integers: 0
+      }
+    });
+    const includeRows = await includeResult.json();
+    const seen = /* @__PURE__ */ new Set();
+    return transformRows(includeRows.data).filter((row) => {
+      if (seen.has(row.id)) return false;
+      seen.add(row.id);
+      return true;
+    });
+  }
   async saveMessages(args) {
     const { messages } = args;
     if (messages.length === 0) return { messages };
@@ -1912,6 +2007,11 @@ time for large tables. Please ensure you have a backup before proceeding.
       });
     }
     await this.#db.createTable({ tableName: storage.TABLE_SPANS, schema: storage.SPAN_SCHEMA });
+    await this.#db.alterTable({
+      tableName: storage.TABLE_SPANS,
+      schema: storage.SPAN_SCHEMA,
+      ifNotExists: ["requestContext"]
+    });
   }
   async dangerouslyClearAll() {
     await this.#db.clearTable({ tableName: storage.TABLE_SPANS });
@@ -2184,7 +2284,8 @@ time for large tables. Please ensure you have a backup before proceeding.
   }
   async listTraces(args) {
     const { filters, pagination, orderBy } = storage.listTracesArgsSchema.parse(args);
-    const { page, perPage } = pagination;
+    const page = pagination?.page ?? 0;
+    const perPage = pagination?.perPage ?? 10;
     try {
       const conditions = [`(parentSpanId IS NULL OR parentSpanId = '')`];
       const values = {};
@@ -2331,8 +2432,8 @@ time for large tables. Please ensure you have a backup before proceeding.
       const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
       const engine = TABLE_ENGINES[storage.TABLE_SPANS] ?? "MergeTree()";
       const finalClause = engine.startsWith("ReplacingMergeTree") ? "FINAL" : "";
-      const sortField = orderBy.field;
-      const sortDirection = orderBy.direction;
+      const sortField = orderBy?.field ?? "startedAt";
+      const sortDirection = orderBy?.direction ?? "DESC";
       let orderClause;
       if (sortField === "endedAt") {
         const nullSortValue = sortDirection === "DESC" ? 0 : 1;