@mastra/clickhouse 0.11.1-alpha.1 → 0.12.0-alpha.3

package/.turbo/turbo-build.log

@@ -1,23 +1,23 @@
 
-> @mastra/clickhouse@0.11.1-alpha.1 build /home/runner/work/mastra/mastra/stores/clickhouse
+> @mastra/clickhouse@0.12.0-alpha.3 build /home/runner/work/mastra/mastra/stores/clickhouse
 > tsup src/index.ts --format esm,cjs --experimental-dts --clean --treeshake=smallest --splitting
 
 CLI Building entry: src/index.ts
 CLI Using tsconfig: tsconfig.json
 CLI tsup v8.5.0
 TSC Build start
-TSC ⚡️ Build success in 8767ms
+TSC ⚡️ Build success in 11027ms
 DTS Build start
 CLI Target: es2022
 Analysis will use the bundled TypeScript version 5.8.3
 Writing package typings: /home/runner/work/mastra/mastra/stores/clickhouse/dist/_tsup-dts-rollup.d.ts
 Analysis will use the bundled TypeScript version 5.8.3
 Writing package typings: /home/runner/work/mastra/mastra/stores/clickhouse/dist/_tsup-dts-rollup.d.cts
-DTS ⚡️ Build success in 11882ms
+DTS ⚡️ Build success in 12403ms
 CLI Cleaning output folder
 ESM Build start
 CJS Build start
-ESM dist/index.js 36.43 KB
-ESM ⚡️ Build success in 1044ms
-CJS dist/index.cjs 37.19 KB
-CJS ⚡️ Build success in 1046ms
+ESM dist/index.js 38.52 KB
+ESM ⚡️ Build success in 986ms
+CJS dist/index.cjs 39.29 KB
+CJS ⚡️ Build success in 988ms

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @mastra/clickhouse
 
+## 0.12.0-alpha.3
+
+### Minor Changes
+
+- 8a3bfd2: Update peerdeps to latest core
+
+### Patch Changes
+
+- Updated dependencies [792c4c0]
+- Updated dependencies [502fe05]
+- Updated dependencies [4efcfa0]
+  - @mastra/core@0.10.7-alpha.3
+
+## 0.11.1-alpha.2
+
+### Patch Changes
+
+- 15e9d26: Added per-resource working memory for LibSQL, Upstash, and PG
+- 0fb9d64: [MASTRA-4018] Update saveMessages in storage adapters to upsert messages
+- Updated dependencies [15e9d26]
+- Updated dependencies [07d6d88]
+- Updated dependencies [5d74aab]
+- Updated dependencies [144eb0b]
+  - @mastra/core@0.10.7-alpha.2
+
 ## 0.11.1-alpha.1
 
 ### Patch Changes

package/dist/_tsup-dts-rollup.d.cts

@@ -10,6 +10,7 @@ import type { StorageGetMessagesArg } from '@mastra/core/storage';
 import type { StorageGetTracesArg } from '@mastra/core/storage';
 import type { StorageThreadType } from '@mastra/core/memory';
 import type { TABLE_NAMES } from '@mastra/core/storage';
+import type { TABLE_RESOURCES } from '@mastra/core/storage';
 import { TABLE_SCHEMAS } from '@mastra/core/storage';
 import type { Trace } from '@mastra/core/telemetry';
 import type { WorkflowRun } from '@mastra/core/storage';
@@ -45,6 +46,7 @@ declare class ClickhouseStore extends MastraStorage {
     protected ttl: ClickhouseConfig['ttl'];
     constructor(config: ClickhouseConfig);
     private transformEvalRow;
+    private escape;
     getEvalsByAgentName(agentName: string, type?: 'test' | 'live'): Promise<EvalRow[]>;
     batchInsert({ tableName, records }: {
         tableName: TABLE_NAMES;
@@ -67,7 +69,7 @@ declare class ClickhouseStore extends MastraStorage {
         tableName: TABLE_NAMES;
     }): Promise<void>;
     createTable({ tableName, schema, }: {
-        tableName: TABLE_NAMES;
+        tableName: SUPPORTED_TABLE_NAMES;
         schema: Record<string, StorageColumn>;
     }): Promise<void>;
     protected getSqlType(type: StorageColumn['type']): string;
@@ -89,8 +91,8 @@ declare class ClickhouseStore extends MastraStorage {
         tableName: TABLE_NAMES;
         record: Record<string, any>;
     }): Promise<void>;
-    load<R>({ tableName, keys }: {
-        tableName: TABLE_NAMES;
+    load<R>({ tableName, keys, }: {
+        tableName: SUPPORTED_TABLE_NAMES;
         keys: Record<string, string>;
     }): Promise<R | null>;
     getThreadById({ threadId }: {
@@ -180,7 +182,9 @@ export { COLUMN_TYPES as COLUMN_TYPES_alias_1 }
 
 declare type IntervalUnit = 'NANOSECOND' | 'MICROSECOND' | 'MILLISECOND' | 'SECOND' | 'MINUTE' | 'HOUR' | 'DAY' | 'WEEK' | 'MONTH' | 'QUARTER' | 'YEAR';
 
-declare const TABLE_ENGINES: Record<TABLE_NAMES, string>;
+declare type SUPPORTED_TABLE_NAMES = Exclude<TABLE_NAMES, typeof TABLE_RESOURCES>;
+
+declare const TABLE_ENGINES: Record<SUPPORTED_TABLE_NAMES, string>;
 export { TABLE_ENGINES }
 export { TABLE_ENGINES as TABLE_ENGINES_alias_1 }
 

package/dist/_tsup-dts-rollup.d.ts

@@ -10,6 +10,7 @@ import type { StorageGetMessagesArg } from '@mastra/core/storage';
 import type { StorageGetTracesArg } from '@mastra/core/storage';
 import type { StorageThreadType } from '@mastra/core/memory';
 import type { TABLE_NAMES } from '@mastra/core/storage';
+import type { TABLE_RESOURCES } from '@mastra/core/storage';
 import { TABLE_SCHEMAS } from '@mastra/core/storage';
 import type { Trace } from '@mastra/core/telemetry';
 import type { WorkflowRun } from '@mastra/core/storage';
@@ -45,6 +46,7 @@ declare class ClickhouseStore extends MastraStorage {
     protected ttl: ClickhouseConfig['ttl'];
     constructor(config: ClickhouseConfig);
     private transformEvalRow;
+    private escape;
     getEvalsByAgentName(agentName: string, type?: 'test' | 'live'): Promise<EvalRow[]>;
     batchInsert({ tableName, records }: {
         tableName: TABLE_NAMES;
@@ -67,7 +69,7 @@ declare class ClickhouseStore extends MastraStorage {
         tableName: TABLE_NAMES;
     }): Promise<void>;
     createTable({ tableName, schema, }: {
-        tableName: TABLE_NAMES;
+        tableName: SUPPORTED_TABLE_NAMES;
         schema: Record<string, StorageColumn>;
     }): Promise<void>;
     protected getSqlType(type: StorageColumn['type']): string;
@@ -89,8 +91,8 @@ declare class ClickhouseStore extends MastraStorage {
         tableName: TABLE_NAMES;
         record: Record<string, any>;
     }): Promise<void>;
-    load<R>({ tableName, keys }: {
-        tableName: TABLE_NAMES;
+    load<R>({ tableName, keys, }: {
+        tableName: SUPPORTED_TABLE_NAMES;
         keys: Record<string, string>;
     }): Promise<R | null>;
     getThreadById({ threadId }: {
@@ -180,7 +182,9 @@ export { COLUMN_TYPES as COLUMN_TYPES_alias_1 }
 
 declare type IntervalUnit = 'NANOSECOND' | 'MICROSECOND' | 'MILLISECOND' | 'SECOND' | 'MINUTE' | 'HOUR' | 'DAY' | 'WEEK' | 'MONTH' | 'QUARTER' | 'YEAR';
 
-declare const TABLE_ENGINES: Record<TABLE_NAMES, string>;
+declare type SUPPORTED_TABLE_NAMES = Exclude<TABLE_NAMES, typeof TABLE_RESOURCES>;
+
+declare const TABLE_ENGINES: Record<SUPPORTED_TABLE_NAMES, string>;
 export { TABLE_ENGINES }
 export { TABLE_ENGINES as TABLE_ENGINES_alias_1 }
 

package/dist/index.cjs

@@ -87,6 +87,18 @@ var ClickhouseStore = class extends storage.MastraStorage {
       createdAt: row.created_at
     };
   }
+  escape(value) {
+    if (typeof value === "string") {
+      return `'${value.replace(/'/g, "''")}'`;
+    }
+    if (value instanceof Date) {
+      return `'${value.toISOString()}'`;
+    }
+    if (value === null || value === void 0) {
+      return "NULL";
+    }
+    return value.toString();
+  }
   async getEvalsByAgentName(agentName, type) {
     try {
       const baseQuery = `SELECT *, toDateTime64(createdAt, 3) as createdAt FROM ${storage.TABLE_EVALS} WHERE agent_name = {var_agent_name:String}`;
@@ -457,7 +469,10 @@ var ClickhouseStore = class extends storage.MastraStorage {
       );
     }
   }
-  async load({ tableName, keys }) {
+  async load({
+    tableName,
+    keys
+  }) {
     try {
       const keyEntries = Object.entries(keys);
       const conditions = keyEntries.map(
@@ -832,12 +847,52 @@ var ClickhouseStore = class extends storage.MastraStorage {
       if (!thread) {
         throw new Error(`Thread ${threadId} not found`);
       }
+      const existingResult = await this.db.query({
+        query: `SELECT id, thread_id FROM ${storage.TABLE_MESSAGES} WHERE id IN ({ids:Array(String)})`,
+        query_params: {
+          ids: messages.map((m) => m.id)
+        },
+        clickhouse_settings: {
+          // Allows to insert serialized JS Dates (such as '2023-12-06T10:54:48.000Z')
+          date_time_input_format: "best_effort",
+          date_time_output_format: "iso",
+          use_client_time_zone: 1,
+          output_format_json_quote_64bit_integers: 0
+        },
+        format: "JSONEachRow"
+      });
+      const existingRows = await existingResult.json();
+      const existingSet = new Set(existingRows.map((row) => `${row.id}::${row.thread_id}`));
+      const toInsert = messages.filter((m) => !existingSet.has(`${m.id}::${threadId}`));
+      const toUpdate = messages.filter((m) => existingSet.has(`${m.id}::${threadId}`));
+      const updatePromises = toUpdate.map(
+        (message) => this.db.command({
+          query: `
+      ALTER TABLE ${storage.TABLE_MESSAGES}
+      UPDATE content = {var_content:String}, role = {var_role:String}, type = {var_type:String}
+      WHERE id = {var_id:String} AND thread_id = {var_thread_id:String}
+    `,
+          query_params: {
+            var_content: typeof message.content === "string" ? message.content : JSON.stringify(message.content),
+            var_role: message.role,
+            var_type: message.type || "v2",
+            var_id: message.id,
+            var_thread_id: threadId
+          },
+          clickhouse_settings: {
+            // Allows to insert serialized JS Dates (such as '2023-12-06T10:54:48.000Z')
+            date_time_input_format: "best_effort",
+            use_client_time_zone: 1,
+            output_format_json_quote_64bit_integers: 0
+          }
+        })
+      );
       await Promise.all([
         // Insert messages
         this.db.insert({
           table: storage.TABLE_MESSAGES,
           format: "JSONEachRow",
-          values: messages.map((message) => ({
+          values: toInsert.map((message) => ({
             id: message.id,
             thread_id: threadId,
             content: typeof message.content === "string" ? message.content : JSON.stringify(message.content),
@@ -852,6 +907,7 @@ var ClickhouseStore = class extends storage.MastraStorage {
             output_format_json_quote_64bit_integers: 0
           }
         }),
+        ...updatePromises,
         // Update thread's updatedAt timestamp
         this.db.insert({
           table: storage.TABLE_THREADS,

package/dist/index.js

@@ -85,6 +85,18 @@ var ClickhouseStore = class extends MastraStorage {
       createdAt: row.created_at
     };
   }
+  escape(value) {
+    if (typeof value === "string") {
+      return `'${value.replace(/'/g, "''")}'`;
+    }
+    if (value instanceof Date) {
+      return `'${value.toISOString()}'`;
+    }
+    if (value === null || value === void 0) {
+      return "NULL";
+    }
+    return value.toString();
+  }
   async getEvalsByAgentName(agentName, type) {
     try {
       const baseQuery = `SELECT *, toDateTime64(createdAt, 3) as createdAt FROM ${TABLE_EVALS} WHERE agent_name = {var_agent_name:String}`;
@@ -455,7 +467,10 @@ var ClickhouseStore = class extends MastraStorage {
       );
     }
   }
-  async load({ tableName, keys }) {
+  async load({
+    tableName,
+    keys
+  }) {
     try {
       const keyEntries = Object.entries(keys);
       const conditions = keyEntries.map(
@@ -830,12 +845,52 @@ var ClickhouseStore = class extends MastraStorage {
       if (!thread) {
         throw new Error(`Thread ${threadId} not found`);
       }
+      const existingResult = await this.db.query({
+        query: `SELECT id, thread_id FROM ${TABLE_MESSAGES} WHERE id IN ({ids:Array(String)})`,
+        query_params: {
+          ids: messages.map((m) => m.id)
+        },
+        clickhouse_settings: {
+          // Allows to insert serialized JS Dates (such as '2023-12-06T10:54:48.000Z')
+          date_time_input_format: "best_effort",
+          date_time_output_format: "iso",
+          use_client_time_zone: 1,
+          output_format_json_quote_64bit_integers: 0
+        },
+        format: "JSONEachRow"
+      });
+      const existingRows = await existingResult.json();
+      const existingSet = new Set(existingRows.map((row) => `${row.id}::${row.thread_id}`));
+      const toInsert = messages.filter((m) => !existingSet.has(`${m.id}::${threadId}`));
+      const toUpdate = messages.filter((m) => existingSet.has(`${m.id}::${threadId}`));
+      const updatePromises = toUpdate.map(
+        (message) => this.db.command({
+          query: `
+      ALTER TABLE ${TABLE_MESSAGES}
+      UPDATE content = {var_content:String}, role = {var_role:String}, type = {var_type:String}
+      WHERE id = {var_id:String} AND thread_id = {var_thread_id:String}
+    `,
+          query_params: {
+            var_content: typeof message.content === "string" ? message.content : JSON.stringify(message.content),
+            var_role: message.role,
+            var_type: message.type || "v2",
+            var_id: message.id,
+            var_thread_id: threadId
+          },
+          clickhouse_settings: {
+            // Allows to insert serialized JS Dates (such as '2023-12-06T10:54:48.000Z')
+            date_time_input_format: "best_effort",
+            use_client_time_zone: 1,
+            output_format_json_quote_64bit_integers: 0
+          }
+        })
+      );
       await Promise.all([
         // Insert messages
         this.db.insert({
           table: TABLE_MESSAGES,
           format: "JSONEachRow",
-          values: messages.map((message) => ({
+          values: toInsert.map((message) => ({
             id: message.id,
             thread_id: threadId,
             content: typeof message.content === "string" ? message.content : JSON.stringify(message.content),
@@ -850,6 +905,7 @@ var ClickhouseStore = class extends MastraStorage {
             output_format_json_quote_64bit_integers: 0
           }
         }),
+        ...updatePromises,
         // Update thread's updatedAt timestamp
         this.db.insert({
           table: TABLE_THREADS,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/clickhouse",
-  "version": "0.11.1-alpha.1",
+  "version": "0.12.0-alpha.3",
   "description": "Clickhouse provider for Mastra - includes db storage capabilities",
   "type": "module",
   "main": "dist/index.js",
@@ -25,16 +25,16 @@
   "devDependencies": {
     "@microsoft/api-extractor": "^7.52.8",
     "@types/node": "^20.19.0",
-    "eslint": "^9.28.0",
+    "eslint": "^9.29.0",
     "tsup": "^8.5.0",
     "typescript": "^5.8.3",
     "vitest": "^3.2.3",
     "@internal/lint": "0.0.13",
     "@internal/storage-test-utils": "0.0.9",
-    "@mastra/core": "0.10.7-alpha.1"
+    "@mastra/core": "0.10.7-alpha.3"
   },
   "peerDependencies": {
-    "@mastra/core": ">=0.10.4-0 <0.11.0"
+    "@mastra/core": ">=0.10.7-0 <0.11.0-0"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --experimental-dts --clean --treeshake=smallest --splitting",

package/src/storage/index.test.ts

@@ -4,6 +4,7 @@ import {
   createSampleThread,
   createSampleWorkflowSnapshot,
   checkWorkflowSnapshot,
+  createSampleMessageV2,
 } from '@internal/storage-test-utils';
 import type { MastraMessageV1, StorageColumn, WorkflowRunState } from '@mastra/core';
 import type { TABLE_NAMES } from '@mastra/core/storage';
@@ -236,6 +237,83 @@ describe('ClickhouseStore', () => {
       });
     }, 10e3);
 
+    it('should upsert messages: duplicate id+threadId results in update, not duplicate row', async () => {
+      const thread = await createSampleThread({ resourceId: 'clickhouse-test' });
+      await store.saveThread({ thread });
+      const baseMessage = createSampleMessageV2({
+        threadId: thread.id,
+        createdAt: new Date(),
+        content: { content: 'Original' },
+        resourceId: 'clickhouse-test',
+      });
+
+      // Insert the message for the first time
+      await store.saveMessages({ messages: [baseMessage], format: 'v2' });
+
+      // Insert again with the same id and threadId but different content
+      const updatedMessage = {
+        ...createSampleMessageV2({
+          threadId: thread.id,
+          createdAt: new Date(),
+          content: { content: 'Updated' },
+          resourceId: 'clickhouse-test',
+        }),
+        id: baseMessage.id,
+      };
+      await store.saveMessages({ messages: [updatedMessage], format: 'v2' });
+      await new Promise(resolve => setTimeout(resolve, 500));
+
+      // Retrieve messages for the thread
+      const retrievedMessages = await store.getMessages({ threadId: thread.id, format: 'v2' });
+
+      // Only one message should exist for that id+threadId
+      expect(retrievedMessages.filter(m => m.id === baseMessage.id)).toHaveLength(1);
+
+      // The content should be the updated one
+      expect(retrievedMessages.find(m => m.id === baseMessage.id)?.content.content).toBe('Updated');
+    }, 10e3);
+
+    it('should upsert messages: duplicate id and different threadid', async () => {
+      const thread1 = await createSampleThread();
+      const thread2 = await createSampleThread();
+      await store.saveThread({ thread: thread1 });
+      await store.saveThread({ thread: thread2 });
+
+      const message = createSampleMessageV2({
+        threadId: thread1.id,
+        createdAt: new Date(),
+        content: { content: 'Thread1 Content' },
+        resourceId: thread1.resourceId,
+      });
+
+      // Insert message into thread1
+      await store.saveMessages({ messages: [message], format: 'v2' });
+
+      // Attempt to insert a message with the same id but different threadId
+      const conflictingMessage = {
+        ...createSampleMessageV2({
+          threadId: thread2.id,
+          createdAt: new Date(),
+          content: { content: 'Thread2 Content' },
+          resourceId: thread2.resourceId,
+        }),
+        id: message.id,
+      };
+
+      // Save should also save the message to the new thread
+      await store.saveMessages({ messages: [conflictingMessage], format: 'v2' });
+
+      // Retrieve messages for both threads
+      const thread1Messages = await store.getMessages({ threadId: thread1.id, format: 'v2' });
+      const thread2Messages = await store.getMessages({ threadId: thread2.id, format: 'v2' });
+
+      // Thread 1 should have the message with that id
+      expect(thread1Messages.find(m => m.id === message.id)?.content.content).toBe('Thread1 Content');
+
+      // Thread 2 should have the message with that id
+      expect(thread2Messages.find(m => m.id === message.id)?.content.content).toBe('Thread2 Content');
+    }, 10e3);
+
     // it('should retrieve messages w/ next/prev messages by message id + resource id', async () => {
     //   const messages: MastraMessageV2[] = [
     //     createSampleMessageV2({ threadId: 'thread-one', content: 'First', resourceId: 'cross-thread-resource' }),

package/src/storage/index.ts

@@ -23,10 +23,13 @@ import type {
   WorkflowRun,
   WorkflowRuns,
   StorageGetTracesArg,
+  TABLE_RESOURCES,
 } from '@mastra/core/storage';
 import type { Trace } from '@mastra/core/telemetry';
 import type { WorkflowRunState } from '@mastra/core/workflows';
 
+type SUPPORTED_TABLE_NAMES = Exclude<TABLE_NAMES, typeof TABLE_RESOURCES>;
+
 function safelyParseJSON(jsonString: string): any {
   try {
     return JSON.parse(jsonString);
@@ -66,7 +69,7 @@ export type ClickhouseConfig = {
   };
 };
 
-export const TABLE_ENGINES: Record<TABLE_NAMES, string> = {
+export const TABLE_ENGINES: Record<SUPPORTED_TABLE_NAMES, string> = {
   [TABLE_MESSAGES]: `MergeTree()`,
   [TABLE_WORKFLOW_SNAPSHOT]: `ReplacingMergeTree()`,
   [TABLE_TRACES]: `MergeTree()`,
@@ -149,6 +152,19 @@ export class ClickhouseStore extends MastraStorage {
     };
   }
 
+  private escape(value: any): string {
+    if (typeof value === 'string') {
+      return `'${value.replace(/'/g, "''")}'`;
+    }
+    if (value instanceof Date) {
+      return `'${value.toISOString()}'`;
+    }
+    if (value === null || value === undefined) {
+      return 'NULL';
+    }
+    return value.toString();
+  }
+
   async getEvalsByAgentName(agentName: string, type?: 'test' | 'live'): Promise<EvalRow[]> {
     try {
       const baseQuery = `SELECT *, toDateTime64(createdAt, 3) as createdAt FROM ${TABLE_EVALS} WHERE agent_name = {var_agent_name:String}`;
@@ -388,7 +404,7 @@ export class ClickhouseStore extends MastraStorage {
     tableName,
     schema,
   }: {
-    tableName: TABLE_NAMES;
+    tableName: SUPPORTED_TABLE_NAMES;
     schema: Record<string, StorageColumn>;
   }): Promise<void> {
     try {
@@ -577,7 +593,13 @@ export class ClickhouseStore extends MastraStorage {
     }
   }
 
-  async load<R>({ tableName, keys }: { tableName: TABLE_NAMES; keys: Record<string, string> }): Promise<R | null> {
+  async load<R>({
+    tableName,
+    keys,
+  }: {
+    tableName: SUPPORTED_TABLE_NAMES;
+    keys: Record<string, string>;
+  }): Promise<R | null> {
     try {
       const keyEntries = Object.entries(keys);
       const conditions = keyEntries
@@ -591,7 +613,7 @@ export class ClickhouseStore extends MastraStorage {
       }, {});
 
       const result = await this.db.query({
-        query: `SELECT *, toDateTime64(createdAt, 3) as createdAt, toDateTime64(updatedAt, 3) as updatedAt FROM ${tableName} ${TABLE_ENGINES[tableName as TABLE_NAMES].startsWith('ReplacingMergeTree') ? 'FINAL' : ''} WHERE ${conditions}`,
+        query: `SELECT *, toDateTime64(createdAt, 3) as createdAt, toDateTime64(updatedAt, 3) as updatedAt FROM ${tableName} ${TABLE_ENGINES[tableName as SUPPORTED_TABLE_NAMES].startsWith('ReplacingMergeTree') ? 'FINAL' : ''} WHERE ${conditions}`,
         query_params: values,
         clickhouse_settings: {
           // Allows to insert serialized JS Dates (such as '2023-12-06T10:54:48.000Z')
@@ -1007,13 +1029,62 @@ export class ClickhouseStore extends MastraStorage {
         throw new Error(`Thread ${threadId} not found`);
       }
 
+      // Clickhouse's MergeTree engine does not support native upserts or unique constraints on (id, thread_id).
+      // Note: We cannot switch to ReplacingMergeTree without a schema migration,
+      // as it would require altering the table engine.
+      // To ensure correct upsert behavior, we first fetch existing (id, thread_id) pairs for the incoming messages.
+      const existingResult = await this.db.query({
+        query: `SELECT id, thread_id FROM ${TABLE_MESSAGES} WHERE id IN ({ids:Array(String)})`,
+        query_params: {
+          ids: messages.map(m => m.id),
+        },
+        clickhouse_settings: {
+          // Allows to insert serialized JS Dates (such as '2023-12-06T10:54:48.000Z')
+          date_time_input_format: 'best_effort',
+          date_time_output_format: 'iso',
+          use_client_time_zone: 1,
+          output_format_json_quote_64bit_integers: 0,
+        },
+        format: 'JSONEachRow',
+      });
+      const existingRows: Array<{ id: string; thread_id: string }> = await existingResult.json();
+
+      const existingSet = new Set(existingRows.map(row => `${row.id}::${row.thread_id}`));
+      // Partition the batch into new inserts and updates:
+      // New messages are inserted in bulk.
+      const toInsert = messages.filter(m => !existingSet.has(`${m.id}::${threadId}`));
+      // Existing messages are updated via ALTER TABLE ... UPDATE.
+      const toUpdate = messages.filter(m => existingSet.has(`${m.id}::${threadId}`));
+      const updatePromises = toUpdate.map(message =>
+        this.db.command({
+          query: `
+      ALTER TABLE ${TABLE_MESSAGES}
+      UPDATE content = {var_content:String}, role = {var_role:String}, type = {var_type:String}
+      WHERE id = {var_id:String} AND thread_id = {var_thread_id:String}
+    `,
+          query_params: {
+            var_content: typeof message.content === 'string' ? message.content : JSON.stringify(message.content),
+            var_role: message.role,
+            var_type: message.type || 'v2',
+            var_id: message.id,
+            var_thread_id: threadId,
+          },
+          clickhouse_settings: {
+            // Allows to insert serialized JS Dates (such as '2023-12-06T10:54:48.000Z')
+            date_time_input_format: 'best_effort',
+            use_client_time_zone: 1,
+            output_format_json_quote_64bit_integers: 0,
+          },
+        }),
+      );
+
       // Execute message inserts and thread update in parallel for better performance
       await Promise.all([
         // Insert messages
         this.db.insert({
           table: TABLE_MESSAGES,
           format: 'JSONEachRow',
-          values: messages.map(message => ({
+          values: toInsert.map(message => ({
             id: message.id,
             thread_id: threadId,
             content: typeof message.content === 'string' ? message.content : JSON.stringify(message.content),
@@ -1028,6 +1099,7 @@ export class ClickhouseStore extends MastraStorage {
             output_format_json_quote_64bit_integers: 0,
           },
         }),
+        ...updatePromises,
         // Update thread's updatedAt timestamp
         this.db.insert({
           table: TABLE_THREADS,