@mastra/dynamodb 0.11.1-alpha.0 → 0.11.1-alpha.2

package/dist/index.js

@@ -1,6 +1,7 @@
 import { DynamoDBClient, DescribeTableCommand } from '@aws-sdk/client-dynamodb';
 import { DynamoDBDocumentClient } from '@aws-sdk/lib-dynamodb';
 import { MessageList } from '@mastra/core/agent';
+import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
 import { MastraStorage, TABLE_TRACES, TABLE_EVALS, TABLE_WORKFLOW_SNAPSHOT, TABLE_MESSAGES, TABLE_THREADS } from '@mastra/core/storage';
 import { Entity, Service } from 'electrodb';
 
@@ -564,22 +565,33 @@ var DynamoDBStore = class extends MastraStorage {
   hasInitialized = null;
   constructor({ name, config }) {
     super({ name });
-    if (!config.tableName || typeof config.tableName !== "string" || config.tableName.trim() === "") {
-      throw new Error("DynamoDBStore: config.tableName must be provided and cannot be empty.");
-    }
-    if (!/^[a-zA-Z0-9_.-]{3,255}$/.test(config.tableName)) {
-      throw new Error(
-        `DynamoDBStore: config.tableName "${config.tableName}" contains invalid characters or is not between 3 and 255 characters long.`
+    try {
+      if (!config.tableName || typeof config.tableName !== "string" || config.tableName.trim() === "") {
+        throw new Error("DynamoDBStore: config.tableName must be provided and cannot be empty.");
+      }
+      if (!/^[a-zA-Z0-9_.-]{3,255}$/.test(config.tableName)) {
+        throw new Error(
+          `DynamoDBStore: config.tableName "${config.tableName}" contains invalid characters or is not between 3 and 255 characters long.`
+        );
+      }
+      const dynamoClient = new DynamoDBClient({
+        region: config.region || "us-east-1",
+        endpoint: config.endpoint,
+        credentials: config.credentials
+      });
+      this.tableName = config.tableName;
+      this.client = DynamoDBDocumentClient.from(dynamoClient);
+      this.service = getElectroDbService(this.client, this.tableName);
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "STORAGE_DYNAMODB_STORE_CONSTRUCTOR_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER
+        },
+        error
       );
     }
-    const dynamoClient = new DynamoDBClient({
-      region: config.region || "us-east-1",
-      endpoint: config.endpoint,
-      credentials: config.credentials
-    });
-    this.tableName = config.tableName;
-    this.client = DynamoDBDocumentClient.from(dynamoClient);
-    this.service = getElectroDbService(this.client, this.tableName);
   }
   /**
    * This method is modified for DynamoDB with ElectroDB single-table design.
@@ -603,7 +615,15 @@ var DynamoDBStore = class extends MastraStorage {
       this.logger.debug(`Table ${this.tableName} exists and is accessible`);
     } catch (error) {
       this.logger.error("Error validating table access", { tableName: this.tableName, error });
-      throw error;
+      throw new MastraError(
+        {
+          id: "STORAGE_DYNAMODB_STORE_VALIDATE_TABLE_ACCESS_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { tableName: this.tableName }
+        },
+        error
+      );
     }
   }
   /**
@@ -622,7 +642,15 @@ var DynamoDBStore = class extends MastraStorage {
       if (error.name === "ResourceNotFoundException") {
         return false;
       }
-      throw error;
+      throw new MastraError(
+        {
+          id: "STORAGE_DYNAMODB_STORE_VALIDATE_TABLE_EXISTS_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { tableName: this.tableName }
+        },
+        error
+      );
     }
   }
   /**
@@ -637,7 +665,15 @@ var DynamoDBStore = class extends MastraStorage {
     try {
       await this.hasInitialized;
     } catch (error) {
-      throw error;
+      throw new MastraError(
+        {
+          id: "STORAGE_DYNAMODB_STORE_INIT_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { tableName: this.tableName }
+        },
+        error
+      );
     }
   }
   /**
@@ -683,7 +719,13 @@ var DynamoDBStore = class extends MastraStorage {
     this.logger.debug("DynamoDB clearTable called", { tableName });
     const entityName = this.getEntityNameForTable(tableName);
     if (!entityName || !this.service.entities[entityName]) {
-      throw new Error(`No entity defined for ${tableName}`);
+      throw new MastraError({
+        id: "STORAGE_DYNAMODB_STORE_CLEAR_TABLE_INVALID_ARGS",
+        domain: ErrorDomain.STORAGE,
+        category: ErrorCategory.USER,
+        text: "No entity defined for tableName",
+        details: { tableName }
+      });
     }
     try {
       const result = await this.service.entities[entityName].scan.go({ pages: "all" });
@@ -731,35 +773,67 @@ var DynamoDBStore = class extends MastraStorage {
       }
       this.logger.debug(`Successfully cleared all records for ${tableName}`);
     } catch (error) {
-      this.logger.error("Failed to clear table", { tableName, error });
-      throw error;
+      throw new MastraError(
+        {
+          id: "STORAGE_DYNAMODB_STORE_CLEAR_TABLE_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { tableName }
+        },
+        error
+      );
     }
   }
   /**
    * Insert a record into the specified "table" (entity)
    */
-  async insert({ tableName, record }) {
+  async insert({
+    tableName,
+    record
+  }) {
     this.logger.debug("DynamoDB insert called", { tableName });
     const entityName = this.getEntityNameForTable(tableName);
     if (!entityName || !this.service.entities[entityName]) {
-      throw new Error(`No entity defined for ${tableName}`);
+      throw new MastraError({
+        id: "STORAGE_DYNAMODB_STORE_INSERT_INVALID_ARGS",
+        domain: ErrorDomain.STORAGE,
+        category: ErrorCategory.USER,
+        text: "No entity defined for tableName",
+        details: { tableName }
+      });
     }
     try {
       const dataToSave = { entity: entityName, ...this.preprocessRecord(record) };
       await this.service.entities[entityName].create(dataToSave).go();
     } catch (error) {
-      this.logger.error("Failed to insert record", { tableName, error });
-      throw error;
+      throw new MastraError(
+        {
+          id: "STORAGE_DYNAMODB_STORE_INSERT_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { tableName }
+        },
+        error
+      );
     }
   }
   /**
    * Insert multiple records as a batch
    */
-  async batchInsert({ tableName, records }) {
+  async batchInsert({
+    tableName,
+    records
+  }) {
     this.logger.debug("DynamoDB batchInsert called", { tableName, count: records.length });
     const entityName = this.getEntityNameForTable(tableName);
     if (!entityName || !this.service.entities[entityName]) {
-      throw new Error(`No entity defined for ${tableName}`);
+      throw new MastraError({
+        id: "STORAGE_DYNAMODB_STORE_BATCH_INSERT_INVALID_ARGS",
+        domain: ErrorDomain.STORAGE,
+        category: ErrorCategory.USER,
+        text: "No entity defined for tableName",
+        details: { tableName }
+      });
     }
     const recordsToSave = records.map((rec) => ({ entity: entityName, ...this.preprocessRecord(rec) }));
     const batchSize = 25;
@@ -780,18 +854,34 @@ var DynamoDBStore = class extends MastraStorage {
         }
       }
     } catch (error) {
-      this.logger.error("Failed to batch insert records", { tableName, error });
-      throw error;
+      throw new MastraError(
+        {
+          id: "STORAGE_DYNAMODB_STORE_BATCH_INSERT_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { tableName }
+        },
+        error
+      );
     }
   }
   /**
    * Load a record by its keys
    */
-  async load({ tableName, keys }) {
+  async load({
+    tableName,
+    keys
+  }) {
     this.logger.debug("DynamoDB load called", { tableName, keys });
     const entityName = this.getEntityNameForTable(tableName);
     if (!entityName || !this.service.entities[entityName]) {
-      throw new Error(`No entity defined for ${tableName}`);
+      throw new MastraError({
+        id: "STORAGE_DYNAMODB_STORE_LOAD_INVALID_ARGS",
+        domain: ErrorDomain.STORAGE,
+        category: ErrorCategory.USER,
+        text: "No entity defined for tableName",
+        details: { tableName }
+      });
     }
     try {
       const keyObject = { entity: entityName, ...keys };
@@ -802,8 +892,15 @@ var DynamoDBStore = class extends MastraStorage {
       let data = result.data;
       return data;
     } catch (error) {
-      this.logger.error("Failed to load record", { tableName, keys, error });
-      throw error;
+      throw new MastraError(
+        {
+          id: "STORAGE_DYNAMODB_STORE_LOAD_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { tableName }
+        },
+        error
+      );
     }
   }
   // Thread operations
@@ -824,8 +921,15 @@ var DynamoDBStore = class extends MastraStorage {
         // metadata is already transformed by the entity's getter
       };
     } catch (error) {
-      this.logger.error("Failed to get thread by ID", { threadId, error });
-      throw error;
+      throw new MastraError(
+        {
+          id: "STORAGE_DYNAMODB_STORE_GET_THREAD_BY_ID_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { threadId }
+        },
+        error
+      );
     }
   }
   async getThreadsByResourceId({ resourceId }) {
@@ -844,8 +948,15 @@ var DynamoDBStore = class extends MastraStorage {
         // metadata is already transformed by the entity's getter
       }));
     } catch (error) {
-      this.logger.error("Failed to get threads by resource ID", { resourceId, error });
-      throw error;
+      throw new MastraError(
+        {
+          id: "STORAGE_DYNAMODB_STORE_GET_THREADS_BY_RESOURCE_ID_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { resourceId }
+        },
+        error
+      );
     }
   }
   async saveThread({ thread }) {
@@ -871,8 +982,15 @@ var DynamoDBStore = class extends MastraStorage {
         metadata: thread.metadata
       };
     } catch (error) {
-      this.logger.error("Failed to save thread", { threadId: thread.id, error });
-      throw error;
+      throw new MastraError(
+        {
+          id: "STORAGE_DYNAMODB_STORE_SAVE_THREAD_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { threadId: thread.id }
+        },
+        error
+      );
     }
   }
   async updateThread({
@@ -904,8 +1022,15 @@ var DynamoDBStore = class extends MastraStorage {
         updatedAt: now
       };
     } catch (error) {
-      this.logger.error("Failed to update thread", { threadId: id, error });
-      throw error;
+      throw new MastraError(
+        {
+          id: "STORAGE_DYNAMODB_STORE_UPDATE_THREAD_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { threadId: id }
+        },
+        error
+      );
     }
   }
   async deleteThread({ threadId }) {
@@ -913,8 +1038,15 @@ var DynamoDBStore = class extends MastraStorage {
     try {
       await this.service.entities.thread.delete({ entity: "thread", id: threadId }).go();
     } catch (error) {
-      this.logger.error("Failed to delete thread", { threadId, error });
-      throw error;
+      throw new MastraError(
+        {
+          id: "STORAGE_DYNAMODB_STORE_DELETE_THREAD_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { threadId }
+        },
+        error
+      );
     }
   }
   async getMessages({
@@ -926,8 +1058,9 @@ var DynamoDBStore = class extends MastraStorage {
     this.logger.debug("Getting messages", { threadId, selectBy });
     try {
       const query = this.service.entities.message.query.byThread({ entity: "message", threadId });
-      if (selectBy?.last && typeof selectBy.last === "number") {
-        const results2 = await query.go({ limit: selectBy.last, order: "desc" });
+      const limit = this.resolveMessageLimit({ last: selectBy?.last, defaultLimit: Number.MAX_SAFE_INTEGER });
+      if (limit !== Number.MAX_SAFE_INTEGER) {
+        const results2 = await query.go({ limit, order: "desc" });
         const list2 = new MessageList({ threadId, resourceId }).add(
           results2.data.map((data) => this.parseMessageData(data)),
           "memory"
@@ -943,8 +1076,15 @@ var DynamoDBStore = class extends MastraStorage {
       if (format === `v2`) return list.get.all.v2();
       return list.get.all.v1();
     } catch (error) {
-      this.logger.error("Failed to get messages", { threadId, error });
-      throw error;
+      throw new MastraError(
+        {
+          id: "STORAGE_DYNAMODB_STORE_GET_MESSAGES_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { threadId }
+        },
+        error
+      );
     }
   }
   async saveMessages(args) {
@@ -992,7 +1132,7 @@ var DynamoDBStore = class extends MastraStorage {
               this.logger.error("Missing entity property in message data for create", { messageData });
               throw new Error("Internal error: Missing entity property during saveMessages");
             }
-            await this.service.entities.message.create(messageData).go();
+            await this.service.entities.message.put(messageData).go();
           }
         }),
         // Update thread's updatedAt timestamp
@@ -1004,8 +1144,15 @@ var DynamoDBStore = class extends MastraStorage {
       if (format === `v1`) return list.get.all.v1();
       return list.get.all.v2();
     } catch (error) {
-      this.logger.error("Failed to save messages", { error });
-      throw error;
+      throw new MastraError(
+        {
+          id: "STORAGE_DYNAMODB_STORE_SAVE_MESSAGES_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { count: messages.length }
+        },
+        error
+      );
     }
   }
   // Helper function to parse message data (handle JSON fields)
@@ -1051,8 +1198,14 @@ var DynamoDBStore = class extends MastraStorage {
       } while (cursor && pagesFetched < startPage);
       return items;
     } catch (error) {
-      this.logger.error("Failed to get traces", { error });
-      throw error;
+      throw new MastraError(
+        {
+          id: "STORAGE_DYNAMODB_STORE_GET_TRACES_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY
+        },
+        error
+      );
     }
   }
   async batchTraceInsert({ records }) {
@@ -1068,8 +1221,15 @@ var DynamoDBStore = class extends MastraStorage {
         // Pass records with 'entity' included
       });
     } catch (error) {
-      this.logger.error("Failed to batch insert traces", { error });
-      throw error;
+      throw new MastraError(
+        {
+          id: "STORAGE_DYNAMODB_STORE_BATCH_TRACE_INSERT_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { count: records.length }
+        },
+        error
+      );
     }
   }
   // Workflow operations
@@ -1095,8 +1255,15 @@ var DynamoDBStore = class extends MastraStorage {
       };
       await this.service.entities.workflowSnapshot.upsert(data).go();
     } catch (error) {
-      this.logger.error("Failed to persist workflow snapshot", { workflowName, runId, error });
-      throw error;
+      throw new MastraError(
+        {
+          id: "STORAGE_DYNAMODB_STORE_PERSIST_WORKFLOW_SNAPSHOT_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { workflowName, runId }
+        },
+        error
+      );
     }
   }
   async loadWorkflowSnapshot({
@@ -1116,8 +1283,15 @@ var DynamoDBStore = class extends MastraStorage {
       }
       return result.data.snapshot;
     } catch (error) {
-      this.logger.error("Failed to load workflow snapshot", { workflowName, runId, error });
-      throw error;
+      throw new MastraError(
+        {
+          id: "STORAGE_DYNAMODB_STORE_LOAD_WORKFLOW_SNAPSHOT_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { workflowName, runId }
+        },
+        error
+      );
     }
   }
   async getWorkflowRuns(args) {
@@ -1178,8 +1352,15 @@ var DynamoDBStore = class extends MastraStorage {
         total
       };
     } catch (error) {
-      this.logger.error("Failed to get workflow runs", { error });
-      throw error;
+      throw new MastraError(
+        {
+          id: "STORAGE_DYNAMODB_STORE_GET_WORKFLOW_RUNS_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { workflowName: args?.workflowName || "", resourceId: args?.resourceId || "" }
+        },
+        error
+      );
     }
   }
   async getWorkflowRunById(args) {
@@ -1225,8 +1406,15 @@ var DynamoDBStore = class extends MastraStorage {
         resourceId: matchingRunDbItem.resourceId
       };
     } catch (error) {
-      this.logger.error("Failed to get workflow run by ID", { runId, workflowName, error });
-      throw error;
+      throw new MastraError(
+        {
+          id: "STORAGE_DYNAMODB_STORE_GET_WORKFLOW_RUN_BY_ID_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { runId, workflowName: args?.workflowName || "" }
+        },
+        error
+      );
     }
   }
   // Helper function to format workflow run
@@ -1304,18 +1492,46 @@ var DynamoDBStore = class extends MastraStorage {
         }
       });
     } catch (error) {
-      this.logger.error("Failed to get evals by agent name", { agentName, type, error });
-      throw error;
+      throw new MastraError(
+        {
+          id: "STORAGE_DYNAMODB_STORE_GET_EVALS_BY_AGENT_NAME_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { agentName }
+        },
+        error
+      );
     }
   }
   async getTracesPaginated(_args) {
-    throw new Error("Method not implemented.");
+    throw new MastraError(
+      {
+        id: "STORAGE_DYNAMODB_STORE_GET_TRACES_PAGINATED_FAILED",
+        domain: ErrorDomain.STORAGE,
+        category: ErrorCategory.THIRD_PARTY
+      },
+      new Error("Method not implemented.")
+    );
   }
   async getThreadsByResourceIdPaginated(_args) {
-    throw new Error("Method not implemented.");
+    throw new MastraError(
+      {
+        id: "STORAGE_DYNAMODB_STORE_GET_THREADS_BY_RESOURCE_ID_PAGINATED_FAILED",
+        domain: ErrorDomain.STORAGE,
+        category: ErrorCategory.THIRD_PARTY
+      },
+      new Error("Method not implemented.")
+    );
   }
   async getMessagesPaginated(_args) {
-    throw new Error("Method not implemented.");
+    throw new MastraError(
+      {
+        id: "STORAGE_DYNAMODB_STORE_GET_MESSAGES_PAGINATED_FAILED",
+        domain: ErrorDomain.STORAGE,
+        category: ErrorCategory.THIRD_PARTY
+      },
+      new Error("Method not implemented.")
+    );
   }
   /**
    * Closes the DynamoDB client connection and cleans up resources.
@@ -1327,8 +1543,14 @@ var DynamoDBStore = class extends MastraStorage {
       this.client.destroy();
       this.logger.debug("DynamoDB client closed successfully for store:", { name: this.name });
     } catch (error) {
-      this.logger.error("Error closing DynamoDB client for store:", { name: this.name, error });
-      throw error;
+      throw new MastraError(
+        {
+          id: "STORAGE_DYNAMODB_STORE_CLOSE_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY
+        },
+        error
+      );
     }
   }
   async updateMessages(_args) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/dynamodb",
-  "version": "0.11.1-alpha.0",
+  "version": "0.11.1-alpha.2",
   "description": "DynamoDB storage adapter for Mastra",
   "type": "module",
   "main": "dist/index.js",
@@ -36,12 +36,12 @@
     "@vitest/coverage-v8": "3.2.3",
     "@vitest/ui": "3.2.3",
     "axios": "^1.10.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",
-    "@mastra/core": "0.10.7-alpha.0",
+    "@mastra/core": "0.10.7-alpha.2",
     "@internal/storage-test-utils": "0.0.9"
   },
   "scripts": {

package/src/storage/index.test.ts

@@ -11,6 +11,7 @@ import {
   waitUntilTableExists,
   waitUntilTableNotExists,
 } from '@aws-sdk/client-dynamodb';
+import { createSampleMessageV2, createSampleThread } from '@internal/storage-test-utils';
 import type { MastraMessageV1, StorageThreadType, WorkflowRun, WorkflowRunState } from '@mastra/core';
 import type { MastraMessageV2 } from '@mastra/core/agent';
 import { TABLE_EVALS, TABLE_THREADS, TABLE_WORKFLOW_SNAPSHOT } from '@mastra/core/storage';
@@ -555,6 +556,82 @@ describe('DynamoDBStore Integration Tests', () => {
         expect(retrieved[0]?.content).toBe('Large Message 0');
         expect(retrieved[29]?.content).toBe('Large Message 29');
       });
+
+      test('should upsert messages: duplicate id+threadId results in update, not duplicate row', async () => {
+        const thread = await createSampleThread();
+        await store.saveThread({ thread });
+        const baseMessage = createSampleMessageV2({
+          threadId: thread.id,
+          createdAt: new Date(),
+          content: { content: 'Original' },
+          resourceId: thread.resourceId,
+        });
+
+        // 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: thread.resourceId,
+          }),
+          id: baseMessage.id,
+        };
+
+        await store.saveMessages({ messages: [updatedMessage], format: 'v2' });
+
+        // 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');
+      });
+
+      test('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, // different thread
+            content: { content: 'Thread2 Content' },
+            resourceId: thread2.resourceId,
+          }),
+          id: message.id,
+        };
+
+        // Save should 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 NOT have the message with that id
+        expect(thread1Messages.find(m => m.id === message.id)).toBeUndefined();
+
+        // Thread 2 should have the message with that id
+        expect(thread2Messages.find(m => m.id === message.id)?.content.content).toBe('Thread2 Content');
+      });
     });
 
     describe('Single-Table Design', () => {