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

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

@@ -12,6 +12,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 type { Trace } from '@mastra/core/telemetry';
 import type { WorkflowRun } from '@mastra/core/storage';
 import type { WorkflowRuns } from '@mastra/core/storage';
@@ -89,27 +90,27 @@ declare class DynamoDBStore extends MastraStorage {
      * Clear all items from a logical "table" (entity type)
      */
     clearTable({ tableName }: {
-        tableName: TABLE_NAMES;
+        tableName: SUPPORTED_TABLE_NAMES;
     }): Promise<void>;
     /**
      * Insert a record into the specified "table" (entity)
      */
-    insert({ tableName, record }: {
-        tableName: TABLE_NAMES;
+    insert({ tableName, record, }: {
+        tableName: SUPPORTED_TABLE_NAMES;
         record: Record<string, any>;
     }): Promise<void>;
     /**
      * Insert multiple records as a batch
      */
-    batchInsert({ tableName, records }: {
-        tableName: TABLE_NAMES;
+    batchInsert({ tableName, records, }: {
+        tableName: SUPPORTED_TABLE_NAMES;
         records: Record<string, any>[];
     }): Promise<void>;
     /**
      * Load a record by its keys
      */
-    load<R>({ tableName, keys }: {
-        tableName: TABLE_NAMES;
+    load<R>({ tableName, keys, }: {
+        tableName: SUPPORTED_TABLE_NAMES;
         keys: Record<string, string>;
     }): Promise<R | null>;
     getThreadById({ threadId }: {
@@ -887,6 +888,8 @@ export declare const messageEntity: Entity<string, string, string, {
     };
 }>;
 
+declare type SUPPORTED_TABLE_NAMES = Exclude<TABLE_NAMES, typeof TABLE_RESOURCES>;
+
 export declare const threadEntity: Entity<string, string, string, {
     model: {
         entity: string;

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

@@ -12,6 +12,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 type { Trace } from '@mastra/core/telemetry';
 import type { WorkflowRun } from '@mastra/core/storage';
 import type { WorkflowRuns } from '@mastra/core/storage';
@@ -89,27 +90,27 @@ declare class DynamoDBStore extends MastraStorage {
      * Clear all items from a logical "table" (entity type)
      */
     clearTable({ tableName }: {
-        tableName: TABLE_NAMES;
+        tableName: SUPPORTED_TABLE_NAMES;
     }): Promise<void>;
     /**
      * Insert a record into the specified "table" (entity)
      */
-    insert({ tableName, record }: {
-        tableName: TABLE_NAMES;
+    insert({ tableName, record, }: {
+        tableName: SUPPORTED_TABLE_NAMES;
         record: Record<string, any>;
     }): Promise<void>;
     /**
      * Insert multiple records as a batch
      */
-    batchInsert({ tableName, records }: {
-        tableName: TABLE_NAMES;
+    batchInsert({ tableName, records, }: {
+        tableName: SUPPORTED_TABLE_NAMES;
         records: Record<string, any>[];
     }): Promise<void>;
     /**
      * Load a record by its keys
      */
-    load<R>({ tableName, keys }: {
-        tableName: TABLE_NAMES;
+    load<R>({ tableName, keys, }: {
+        tableName: SUPPORTED_TABLE_NAMES;
         keys: Record<string, string>;
     }): Promise<R | null>;
     getThreadById({ threadId }: {
@@ -887,6 +888,8 @@ export declare const messageEntity: Entity<string, string, string, {
     };
 }>;
 
+declare type SUPPORTED_TABLE_NAMES = Exclude<TABLE_NAMES, typeof TABLE_RESOURCES>;
+
 export declare const threadEntity: Entity<string, string, string, {
     model: {
         entity: string;

package/dist/index.cjs

@@ -789,7 +789,10 @@ var DynamoDBStore = class extends storage.MastraStorage {
   /**
    * 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]) {
@@ -819,7 +822,10 @@ var DynamoDBStore = class extends storage.MastraStorage {
   /**
    * 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]) {
@@ -864,7 +870,10 @@ var DynamoDBStore = class extends storage.MastraStorage {
   /**
    * 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]) {
@@ -1125,7 +1134,7 @@ var DynamoDBStore = class extends storage.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

package/dist/index.js

@@ -787,7 +787,10 @@ var DynamoDBStore = class extends MastraStorage {
   /**
    * 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]) {
@@ -817,7 +820,10 @@ var DynamoDBStore = class extends MastraStorage {
   /**
    * 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]) {
@@ -862,7 +868,10 @@ var DynamoDBStore = class extends MastraStorage {
   /**
    * 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]) {
@@ -1123,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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/dynamodb",
-  "version": "0.11.1-alpha.1",
+  "version": "0.12.0-alpha.3",
   "description": "DynamoDB storage adapter for Mastra",
   "type": "module",
   "main": "dist/index.js",
@@ -28,7 +28,7 @@
     "electrodb": "^3.4.3"
   },
   "peerDependencies": {
-    "@mastra/core": ">=0.10.4-0 <0.11.0"
+    "@mastra/core": ">=0.10.7-0 <0.11.0-0"
   },
   "devDependencies": {
     "@microsoft/api-extractor": "^7.52.8",
@@ -36,13 +36,13 @@
     "@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.1",
-    "@internal/storage-test-utils": "0.0.9"
+    "@mastra/core": "0.10.7-alpha.3",
+    "@internal/storage-test-utils": "0.0.9",
+    "@internal/lint": "0.0.13"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --experimental-dts --clean --treeshake=smallest --splitting",

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', () => {

package/src/storage/index.ts

@@ -22,6 +22,7 @@ import type {
   StorageGetTracesArg,
   PaginationInfo,
   StorageColumn,
+  TABLE_RESOURCES,
 } from '@mastra/core/storage';
 import type { Trace } from '@mastra/core/telemetry';
 import type { WorkflowRunState } from '@mastra/core/workflows';
@@ -38,6 +39,8 @@ export interface DynamoDBStoreConfig {
   };
 }
 
+type SUPPORTED_TABLE_NAMES = Exclude<TABLE_NAMES, typeof TABLE_RESOURCES>;
+
 // Define a type for our service that allows string indexing
 type MastraService = Service<Record<string, any>> & {
   [key: string]: any;
@@ -263,7 +266,7 @@ export class DynamoDBStore extends MastraStorage {
   /**
    * Clear all items from a logical "table" (entity type)
    */
-  async clearTable({ tableName }: { tableName: TABLE_NAMES }): Promise<void> {
+  async clearTable({ tableName }: { tableName: SUPPORTED_TABLE_NAMES }): Promise<void> {
     this.logger.debug('DynamoDB clearTable called', { tableName });
 
     const entityName = this.getEntityNameForTable(tableName);
@@ -359,7 +362,13 @@ export class DynamoDBStore extends MastraStorage {
   /**
    * Insert a record into the specified "table" (entity)
    */
-  async insert({ tableName, record }: { tableName: TABLE_NAMES; record: Record<string, any> }): Promise<void> {
+  async insert({
+    tableName,
+    record,
+  }: {
+    tableName: SUPPORTED_TABLE_NAMES;
+    record: Record<string, any>;
+  }): Promise<void> {
     this.logger.debug('DynamoDB insert called', { tableName });
 
     const entityName = this.getEntityNameForTable(tableName);
@@ -393,7 +402,13 @@ export class DynamoDBStore extends MastraStorage {
   /**
    * Insert multiple records as a batch
    */
-  async batchInsert({ tableName, records }: { tableName: TABLE_NAMES; records: Record<string, any>[] }): Promise<void> {
+  async batchInsert({
+    tableName,
+    records,
+  }: {
+    tableName: SUPPORTED_TABLE_NAMES;
+    records: Record<string, any>[];
+  }): Promise<void> {
     this.logger.debug('DynamoDB batchInsert called', { tableName, count: records.length });
 
     const entityName = this.getEntityNameForTable(tableName);
@@ -449,7 +464,13 @@ export class DynamoDBStore extends MastraStorage {
   /**
    * Load a record by its keys
    */
-  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> {
     this.logger.debug('DynamoDB load called', { tableName, keys });
 
     const entityName = this.getEntityNameForTable(tableName);
@@ -797,7 +818,7 @@ export class DynamoDBStore 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
@@ -1192,8 +1213,8 @@ export class DynamoDBStore extends MastraStorage {
   }
 
   // Helper methods for entity/table mapping
-  private getEntityNameForTable(tableName: TABLE_NAMES): string | null {
-    const mapping: Record<TABLE_NAMES, string> = {
+  private getEntityNameForTable(tableName: SUPPORTED_TABLE_NAMES): string | null {
+    const mapping: Record<SUPPORTED_TABLE_NAMES, string> = {
       [TABLE_THREADS]: 'thread',
       [TABLE_MESSAGES]: 'message',
       [TABLE_WORKFLOW_SNAPSHOT]: 'workflowSnapshot',