@mastra/dynamodb 0.10.0 → 0.10.1-alpha.1

package/dist/index.cjs

@@ -2,6 +2,7 @@
 
 var clientDynamodb = require('@aws-sdk/client-dynamodb');
 var libDynamodb = require('@aws-sdk/lib-dynamodb');
+var agent = require('@mastra/core/agent');
 var storage = require('@mastra/core/storage');
 var electrodb = require('electrodb');
 
@@ -890,24 +891,38 @@ var DynamoDBStore = class extends storage.MastraStorage {
       throw error;
     }
   }
-  // Message operations
-  async getMessages(args) {
-    const { threadId, selectBy } = args;
+  async getMessages({
+    threadId,
+    resourceId,
+    selectBy,
+    format
+  }) {
     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, reverse: true });
-        return results2.data.map((data) => this.parseMessageData(data));
+        const list2 = new agent.MessageList({ threadId, resourceId }).add(
+          results2.data.map((data) => this.parseMessageData(data)),
+          "memory"
+        );
+        if (format === `v2`) return list2.get.all.mastra();
+        return list2.get.all.v1();
       }
       const results = await query.go();
-      return results.data.map((data) => this.parseMessageData(data));
+      const list = new agent.MessageList({ threadId, resourceId }).add(
+        results.data.map((data) => this.parseMessageData(data)),
+        "memory"
+      );
+      if (format === `v2`) return list.get.all.mastra();
+      return list.get.all.v1();
     } catch (error) {
       this.logger.error("Failed to get messages", { threadId, error });
       throw error;
     }
   }
-  async saveMessages({ messages }) {
+  async saveMessages(args) {
+    const { messages, format = "v1" } = args;
     this.logger.debug("Saving messages", { count: messages.length });
     if (!messages.length) {
       return [];
@@ -924,10 +939,10 @@ var DynamoDBStore = class extends storage.MastraStorage {
         resourceId: msg.resourceId,
         // Ensure complex fields are stringified if not handled by attribute setters
         content: typeof msg.content === "string" ? msg.content : JSON.stringify(msg.content),
-        toolCallArgs: msg.toolCallArgs ? JSON.stringify(msg.toolCallArgs) : void 0,
-        toolCallIds: msg.toolCallIds ? JSON.stringify(msg.toolCallIds) : void 0,
-        toolNames: msg.toolNames ? JSON.stringify(msg.toolNames) : void 0,
-        createdAt: msg.createdAt?.toISOString() || now,
+        toolCallArgs: `toolCallArgs` in msg && msg.toolCallArgs ? JSON.stringify(msg.toolCallArgs) : void 0,
+        toolCallIds: `toolCallIds` in msg && msg.toolCallIds ? JSON.stringify(msg.toolCallIds) : void 0,
+        toolNames: `toolNames` in msg && msg.toolNames ? JSON.stringify(msg.toolNames) : void 0,
+        createdAt: msg.createdAt instanceof Date ? msg.createdAt.toISOString() : msg.createdAt || now,
         updatedAt: now
         // Add updatedAt
       };
@@ -948,7 +963,9 @@ var DynamoDBStore = class extends storage.MastraStorage {
           await this.service.entities.message.create(messageData).go();
         }
       }
-      return messages;
+      const list = new agent.MessageList().add(messages, "memory");
+      if (format === `v1`) return list.get.all.v1();
+      return list.get.all.mastra();
     } catch (error) {
       this.logger.error("Failed to save messages", { error });
       throw error;

package/dist/index.js

@@ -1,5 +1,6 @@
 import { DynamoDBClient, DescribeTableCommand } from '@aws-sdk/client-dynamodb';
 import { DynamoDBDocumentClient } from '@aws-sdk/lib-dynamodb';
+import { MessageList } from '@mastra/core/agent';
 import { MastraStorage, TABLE_TRACES, TABLE_EVALS, TABLE_WORKFLOW_SNAPSHOT, TABLE_MESSAGES, TABLE_THREADS } from '@mastra/core/storage';
 import { Entity, Service } from 'electrodb';
 
@@ -888,24 +889,38 @@ var DynamoDBStore = class extends MastraStorage {
       throw error;
     }
   }
-  // Message operations
-  async getMessages(args) {
-    const { threadId, selectBy } = args;
+  async getMessages({
+    threadId,
+    resourceId,
+    selectBy,
+    format
+  }) {
     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, reverse: true });
-        return results2.data.map((data) => this.parseMessageData(data));
+        const list2 = new MessageList({ threadId, resourceId }).add(
+          results2.data.map((data) => this.parseMessageData(data)),
+          "memory"
+        );
+        if (format === `v2`) return list2.get.all.mastra();
+        return list2.get.all.v1();
       }
       const results = await query.go();
-      return results.data.map((data) => this.parseMessageData(data));
+      const list = new MessageList({ threadId, resourceId }).add(
+        results.data.map((data) => this.parseMessageData(data)),
+        "memory"
+      );
+      if (format === `v2`) return list.get.all.mastra();
+      return list.get.all.v1();
     } catch (error) {
       this.logger.error("Failed to get messages", { threadId, error });
       throw error;
     }
   }
-  async saveMessages({ messages }) {
+  async saveMessages(args) {
+    const { messages, format = "v1" } = args;
     this.logger.debug("Saving messages", { count: messages.length });
     if (!messages.length) {
       return [];
@@ -922,10 +937,10 @@ var DynamoDBStore = class extends MastraStorage {
         resourceId: msg.resourceId,
         // Ensure complex fields are stringified if not handled by attribute setters
         content: typeof msg.content === "string" ? msg.content : JSON.stringify(msg.content),
-        toolCallArgs: msg.toolCallArgs ? JSON.stringify(msg.toolCallArgs) : void 0,
-        toolCallIds: msg.toolCallIds ? JSON.stringify(msg.toolCallIds) : void 0,
-        toolNames: msg.toolNames ? JSON.stringify(msg.toolNames) : void 0,
-        createdAt: msg.createdAt?.toISOString() || now,
+        toolCallArgs: `toolCallArgs` in msg && msg.toolCallArgs ? JSON.stringify(msg.toolCallArgs) : void 0,
+        toolCallIds: `toolCallIds` in msg && msg.toolCallIds ? JSON.stringify(msg.toolCallIds) : void 0,
+        toolNames: `toolNames` in msg && msg.toolNames ? JSON.stringify(msg.toolNames) : void 0,
+        createdAt: msg.createdAt instanceof Date ? msg.createdAt.toISOString() : msg.createdAt || now,
         updatedAt: now
         // Add updatedAt
       };
@@ -946,7 +961,9 @@ var DynamoDBStore = class extends MastraStorage {
           await this.service.entities.message.create(messageData).go();
         }
       }
-      return messages;
+      const list = new MessageList().add(messages, "memory");
+      if (format === `v1`) return list.get.all.v1();
+      return list.get.all.mastra();
     } catch (error) {
       this.logger.error("Failed to save messages", { error });
       throw error;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/dynamodb",
-  "version": "0.10.0",
+  "version": "0.10.1-alpha.1",
   "description": "DynamoDB storage adapter for Mastra",
   "type": "module",
   "main": "dist/index.js",
@@ -15,7 +15,7 @@
     "electrodb": "^3.4.1"
   },
   "peerDependencies": {
-    "@mastra/core": "^0.10.0"
+    "@mastra/core": "^0.10.0-alpha.0"
   },
   "devDependencies": {
     "@microsoft/api-extractor": "^7.52.1",
@@ -27,8 +27,8 @@
     "tsup": "^8.4.0",
     "typescript": "^5.8.2",
     "vitest": "^3.0.9",
-    "@internal/lint": "0.0.6",
-    "@mastra/core": "0.10.0"
+    "@internal/lint": "0.0.7",
+    "@mastra/core": "0.10.2-alpha.2"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --clean --treeshake=smallest --splitting",

package/src/storage/index.test.ts

@@ -11,7 +11,8 @@ import {
   waitUntilTableExists,
   waitUntilTableNotExists,
 } from '@aws-sdk/client-dynamodb';
-import type { MessageType, StorageThreadType, WorkflowRun, WorkflowRunState } from '@mastra/core';
+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';
 import { afterAll, beforeAll, beforeEach, describe, expect, test } from 'vitest';
 import { DynamoDBStore } from '..';
@@ -388,17 +389,17 @@ describe('DynamoDBStore Integration Tests', () => {
     });
 
     describe('Batch Operations', () => {
-      test('should handle batch message inserts efficiently (up to 25 items)', async () => {
+      test('should handle batch message inserts efficiently (up to 25 items) [v1 storage]', async () => {
         const startTime = Date.now(); // Get a base time
         const threadId = 'batch-thread';
-        const messages: MessageType[] = Array.from({ length: 25 }, (_, i) => ({
+        const messages: MastraMessageV1[] = Array.from({ length: 25 }, (_, i) => ({
           id: `msg-${i}`,
           threadId,
           resourceId: 'test-resource',
           content: `Message ${i}`,
           // Increment timestamp slightly for each message to ensure order
           createdAt: new Date(startTime + i),
-          role: 'user',
+          role: i % 2 === 0 ? 'user' : 'assistant',
           type: 'text',
         }));
 
@@ -412,10 +413,36 @@ describe('DynamoDBStore Integration Tests', () => {
         expect(retrieved[24]?.content).toBe('Message 24');
       });
 
+      test('should handle batch message inserts efficiently (up to 25 items) [v2 storage]', async () => {
+        const startTime = Date.now(); // Get a base time
+        const threadId = 'batch-thread';
+        const messages: MastraMessageV2[] = Array.from({ length: 25 }, (_, i) => ({
+          id: `msg-${i}`,
+          threadId,
+          resourceId: 'test-resource',
+          content: { format: 2, parts: [{ type: 'text', text: `Message ${i}` }] },
+          // Increment timestamp slightly for each message to ensure order
+          createdAt: new Date(startTime + i),
+          role: i % 2 === 0 ? 'user' : 'assistant',
+          type: 'text',
+        }));
+
+        // Assuming saveMessages uses BatchWriteItem internally
+        await expect(store.saveMessages({ messages, format: 'v2' })).resolves.not.toThrow();
+
+        const retrieved = await store.getMessages({ threadId, format: 'v2' });
+        expect(retrieved).toHaveLength(25);
+        // Now the order should be guaranteed by the ascending createdAt timestamp
+        if (retrieved[0]?.content?.parts[0]?.type !== `text`) throw new Error(`Expected text part`);
+        expect(retrieved[0].content.parts[0].text).toBe('Message 0');
+        if (retrieved[24]?.content?.parts?.[0]?.type !== `text`) throw new Error(`Expected text part`);
+        expect(retrieved[24].content.parts[0].text).toBe('Message 24');
+      });
+
       test('should handle batch inserts exceeding 25 items (if saveMessages chunks)', async () => {
         const startTime = Date.now(); // Get a base time
         const threadId = 'batch-thread-large';
-        const messages: MessageType[] = Array.from({ length: 30 }, (_, i) => ({
+        const messages: MastraMessageV1[] = Array.from({ length: 30 }, (_, i) => ({
           id: `msg-large-${i}`,
           threadId,
           resourceId: 'test-resource-large',

package/src/storage/index.ts

@@ -1,6 +1,8 @@
 import { DynamoDBClient, DescribeTableCommand } from '@aws-sdk/client-dynamodb';
 import { DynamoDBDocumentClient } from '@aws-sdk/lib-dynamodb';
-import type { StorageThreadType, MessageType, WorkflowRunState } from '@mastra/core';
+import type { StorageThreadType, WorkflowRunState, MastraMessageV1 } from '@mastra/core';
+import type { MastraMessageV2 } from '@mastra/core/agent';
+import { MessageList } from '@mastra/core/agent';
 import {
   MastraStorage,
   TABLE_THREADS,
@@ -514,8 +516,14 @@ export class DynamoDBStore extends MastraStorage {
   }
 
   // Message operations
-  async getMessages(args: StorageGetMessagesArg): Promise<MessageType[]> {
-    const { threadId, selectBy } = args;
+  public async getMessages(args: StorageGetMessagesArg & { format?: 'v1' }): Promise<MastraMessageV1[]>;
+  public async getMessages(args: StorageGetMessagesArg & { format: 'v2' }): Promise<MastraMessageV2[]>;
+  public async getMessages({
+    threadId,
+    resourceId,
+    selectBy,
+    format,
+  }: StorageGetMessagesArg & { format?: 'v1' | 'v2' }): Promise<MastraMessageV1[] | MastraMessageV2[]> {
     this.logger.debug('Getting messages', { threadId, selectBy });
 
     try {
@@ -530,21 +538,34 @@ export class DynamoDBStore extends MastraStorage {
         // Assuming default sort is ascending on SK, use reverse: true for descending
         const results = await query.go({ limit: selectBy.last, reverse: true });
         // Use arrow function in map to preserve 'this' context for parseMessageData
-        return results.data.map((data: any) => this.parseMessageData(data)) as MessageType[];
+        const list = new MessageList({ threadId, resourceId }).add(
+          results.data.map((data: any) => this.parseMessageData(data)),
+          'memory',
+        );
+        if (format === `v2`) return list.get.all.mastra();
+        return list.get.all.v1();
       }
 
       // If no limit specified, get all messages (potentially paginated by ElectroDB)
       // Consider adding default limit or handling pagination if needed
       const results = await query.go();
-      // Use arrow function in map to preserve 'this' context for parseMessageData
-      return results.data.map((data: any) => this.parseMessageData(data)) as MessageType[];
+      const list = new MessageList({ threadId, resourceId }).add(
+        results.data.map((data: any) => this.parseMessageData(data)),
+        'memory',
+      );
+      if (format === `v2`) return list.get.all.mastra();
+      return list.get.all.v1();
     } catch (error) {
       this.logger.error('Failed to get messages', { threadId, error });
       throw error;
     }
   }
-
-  async saveMessages({ messages }: { messages: MessageType[] }): Promise<MessageType[]> {
+  async saveMessages(args: { messages: MastraMessageV1[]; format?: undefined | 'v1' }): Promise<MastraMessageV1[]>;
+  async saveMessages(args: { messages: MastraMessageV2[]; format: 'v2' }): Promise<MastraMessageV2[]>;
+  async saveMessages(
+    args: { messages: MastraMessageV1[]; format?: undefined | 'v1' } | { messages: MastraMessageV2[]; format: 'v2' },
+  ): Promise<MastraMessageV2[] | MastraMessageV1[]> {
+    const { messages, format = 'v1' } = args;
     this.logger.debug('Saving messages', { count: messages.length });
 
     if (!messages.length) {
@@ -563,10 +584,10 @@ export class DynamoDBStore extends MastraStorage {
         resourceId: msg.resourceId,
         // Ensure complex fields are stringified if not handled by attribute setters
         content: typeof msg.content === 'string' ? msg.content : JSON.stringify(msg.content),
-        toolCallArgs: msg.toolCallArgs ? JSON.stringify(msg.toolCallArgs) : undefined,
-        toolCallIds: msg.toolCallIds ? JSON.stringify(msg.toolCallIds) : undefined,
-        toolNames: msg.toolNames ? JSON.stringify(msg.toolNames) : undefined,
-        createdAt: msg.createdAt?.toISOString() || now,
+        toolCallArgs: `toolCallArgs` in msg && msg.toolCallArgs ? JSON.stringify(msg.toolCallArgs) : undefined,
+        toolCallIds: `toolCallIds` in msg && msg.toolCallIds ? JSON.stringify(msg.toolCallIds) : undefined,
+        toolNames: `toolNames` in msg && msg.toolNames ? JSON.stringify(msg.toolNames) : undefined,
+        createdAt: msg.createdAt instanceof Date ? msg.createdAt.toISOString() : msg.createdAt || now,
         updatedAt: now, // Add updatedAt
       };
     });
@@ -595,7 +616,9 @@ export class DynamoDBStore extends MastraStorage {
         // Original batch call: await this.service.entities.message.create(batch).go();
       }
 
-      return messages; // Return original message objects
+      const list = new MessageList().add(messages, 'memory');
+      if (format === `v1`) return list.get.all.v1();
+      return list.get.all.mastra();
     } catch (error) {
       this.logger.error('Failed to save messages', { error });
       throw error;
@@ -603,7 +626,7 @@ export class DynamoDBStore extends MastraStorage {
   }
 
   // Helper function to parse message data (handle JSON fields)
-  private parseMessageData(data: any): MessageType {
+  private parseMessageData(data: any): MastraMessageV2 | MastraMessageV1 {
     // Removed try/catch and JSON.parse logic - now handled by entity 'get' attributes
     // This function now primarily ensures correct typing and Date conversion.
     return {
@@ -613,7 +636,7 @@ export class DynamoDBStore extends MastraStorage {
       updatedAt: data.updatedAt ? new Date(data.updatedAt) : undefined,
       // Other fields like content, toolCallArgs etc. are assumed to be correctly
       // transformed by the ElectroDB entity getters.
-    } as MessageType; // Add explicit type assertion
+    };
   }
 
   // Trace operations