@mastra/dynamodb 0.0.0-share-agent-metadata-with-cloud-20250718123411 → 0.0.0-span-scorring-test-20251124132129

package/dist/index.js

@@ -1,9 +1,10 @@
 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 { MastraStorage, StoreOperations, WorkflowsStorage, normalizePerPage, MemoryStorage, calculatePagination, ScoresStorage, TABLE_SPANS, TABLE_RESOURCES, TABLE_TRACES, TABLE_SCORERS, TABLE_WORKFLOW_SNAPSHOT, TABLE_MESSAGES, TABLE_THREADS } from '@mastra/core/storage';
 import { Entity, Service } from 'electrodb';
+import { MessageList } from '@mastra/core/agent';
+import { saveScorePayloadSchema } from '@mastra/core/evals';
 
 // src/storage/index.ts
 
@@ -294,9 +295,9 @@ var messageEntity = new Entity({
     }
   }
 });
-var threadEntity = new Entity({
+var resourceEntity = new Entity({
   model: {
-    entity: "thread",
+    entity: "resource",
     version: "1",
     service: "mastra"
   },
@@ -310,25 +311,21 @@ var threadEntity = new Entity({
       type: "string",
       required: true
     },
-    resourceId: {
-      type: "string",
-      required: true
-    },
-    title: {
+    workingMemory: {
       type: "string",
-      required: true
+      required: false
     },
     metadata: {
       type: "string",
       required: false,
-      // Stringify metadata object on set if it's not already a string
+      // Stringify content object on set if it's not already a string
       set: (value) => {
         if (value && typeof value !== "string") {
           return JSON.stringify(value);
         }
         return value;
       },
-      // Parse JSON string to object on get
+      // Parse JSON string to object on get ONLY if it looks like JSON
       get: (value) => {
         if (value && typeof value === "string") {
           try {
@@ -346,18 +343,13 @@ var threadEntity = new Entity({
   indexes: {
     primary: {
       pk: { field: "pk", composite: ["entity", "id"] },
-      sk: { field: "sk", composite: ["id"] }
-    },
-    byResource: {
-      index: "gsi1",
-      pk: { field: "gsi1pk", composite: ["entity", "resourceId"] },
-      sk: { field: "gsi1sk", composite: ["createdAt"] }
+      sk: { field: "sk", composite: ["entity"] }
     }
   }
 });
-var traceEntity = new Entity({
+var scoreEntity = new Entity({
   model: {
-    entity: "trace",
+    entity: "score",
     version: "1",
     service: "mastra"
   },
@@ -371,123 +363,315 @@ var traceEntity = new Entity({
       type: "string",
       required: true
     },
-    parentSpanId: {
+    scorerId: {
+      type: "string",
+      required: true
+    },
+    traceId: {
       type: "string",
       required: false
     },
-    name: {
+    spanId: {
       type: "string",
-      required: true
+      required: false
     },
-    traceId: {
+    runId: {
       type: "string",
       required: true
     },
-    scope: {
+    scorer: {
       type: "string",
-      required: true
+      required: true,
+      set: (value) => {
+        if (value && typeof value !== "string") {
+          return JSON.stringify(value);
+        }
+        return value;
+      },
+      get: (value) => {
+        if (value && typeof value === "string") {
+          try {
+            if (value.startsWith("{") || value.startsWith("[")) {
+              return JSON.parse(value);
+            }
+          } catch {
+            return value;
+          }
+        }
+        return value;
+      }
     },
-    kind: {
+    extractStepResult: {
+      type: "string",
+      required: false,
+      set: (value) => {
+        if (value && typeof value !== "string") {
+          return JSON.stringify(value);
+        }
+        return value;
+      },
+      get: (value) => {
+        if (value && typeof value === "string") {
+          try {
+            if (value.startsWith("{") || value.startsWith("[")) {
+              return JSON.parse(value);
+            }
+          } catch {
+            return value;
+          }
+        }
+        return value;
+      }
+    },
+    preprocessStepResult: {
+      type: "string",
+      required: false,
+      set: (value) => {
+        if (value && typeof value !== "string") {
+          return JSON.stringify(value);
+        }
+        return value;
+      },
+      get: (value) => {
+        if (value && typeof value === "string") {
+          try {
+            if (value.startsWith("{") || value.startsWith("[")) {
+              return JSON.parse(value);
+            }
+          } catch {
+            return value;
+          }
+        }
+        return value;
+      }
+    },
+    analyzeStepResult: {
+      type: "string",
+      required: false,
+      set: (value) => {
+        if (value && typeof value !== "string") {
+          return JSON.stringify(value);
+        }
+        return value;
+      },
+      get: (value) => {
+        if (value && typeof value === "string") {
+          try {
+            if (value.startsWith("{") || value.startsWith("[")) {
+              return JSON.parse(value);
+            }
+          } catch {
+            return value;
+          }
+        }
+        return value;
+      }
+    },
+    score: {
       type: "number",
       required: true
     },
-    attributes: {
+    reason: {
       type: "string",
-      // JSON stringified
-      required: false,
-      // Stringify object on set
+      required: false
+    },
+    extractPrompt: {
+      type: "string",
+      required: false
+    },
+    analyzePrompt: {
+      type: "string",
+      required: false
+    },
+    // Deprecated in favor of generateReasonPrompt
+    reasonPrompt: {
+      type: "string",
+      required: false
+    },
+    generateScorePrompt: {
+      type: "string",
+      required: false
+    },
+    generateReasonPrompt: {
+      type: "string",
+      required: false
+    },
+    input: {
+      type: "string",
+      required: true,
       set: (value) => {
         if (value && typeof value !== "string") {
           return JSON.stringify(value);
         }
         return value;
       },
-      // Parse JSON string to object on get
       get: (value) => {
-        return value ? JSON.parse(value) : value;
+        if (value && typeof value === "string") {
+          try {
+            if (value.startsWith("{") || value.startsWith("[")) {
+              return JSON.parse(value);
+            }
+          } catch {
+            return value;
+          }
+        }
+        return value;
       }
     },
-    status: {
+    output: {
+      type: "string",
+      required: true,
+      set: (value) => {
+        if (value && typeof value !== "string") {
+          return JSON.stringify(value);
+        }
+        return value;
+      },
+      get: (value) => {
+        if (value && typeof value === "string") {
+          try {
+            if (value.startsWith("{") || value.startsWith("[")) {
+              return JSON.parse(value);
+            }
+          } catch {
+            return value;
+          }
+        }
+        return value;
+      }
+    },
+    additionalContext: {
       type: "string",
-      // JSON stringified
       required: false,
-      // Stringify object on set
       set: (value) => {
         if (value && typeof value !== "string") {
           return JSON.stringify(value);
         }
         return value;
       },
-      // Parse JSON string to object on get
       get: (value) => {
+        if (value && typeof value === "string") {
+          try {
+            if (value.startsWith("{") || value.startsWith("[")) {
+              return JSON.parse(value);
+            }
+          } catch {
+            return value;
+          }
+        }
         return value;
       }
     },
-    events: {
+    requestContext: {
       type: "string",
-      // JSON stringified
       required: false,
-      // Stringify object on set
       set: (value) => {
         if (value && typeof value !== "string") {
           return JSON.stringify(value);
         }
         return value;
       },
-      // Parse JSON string to object on get
       get: (value) => {
+        if (value && typeof value === "string") {
+          try {
+            if (value.startsWith("{") || value.startsWith("[")) {
+              return JSON.parse(value);
+            }
+          } catch {
+            return value;
+          }
+        }
         return value;
       }
     },
-    links: {
+    entityType: {
+      type: "string",
+      required: false
+    },
+    entityData: {
       type: "string",
-      // JSON stringified
       required: false,
-      // Stringify object on set
       set: (value) => {
         if (value && typeof value !== "string") {
           return JSON.stringify(value);
         }
         return value;
       },
-      // Parse JSON string to object on get
       get: (value) => {
+        if (value && typeof value === "string") {
+          try {
+            if (value.startsWith("{") || value.startsWith("[")) {
+              return JSON.parse(value);
+            }
+          } catch {
+            return value;
+          }
+        }
         return value;
       }
     },
-    other: {
+    entityId: {
       type: "string",
       required: false
     },
-    startTime: {
-      type: "number",
+    source: {
+      type: "string",
       required: true
     },
-    endTime: {
-      type: "number",
-      required: true
+    resourceId: {
+      type: "string",
+      required: false
+    },
+    threadId: {
+      type: "string",
+      required: false
     }
   },
   indexes: {
     primary: {
       pk: { field: "pk", composite: ["entity", "id"] },
-      sk: { field: "sk", composite: [] }
+      sk: { field: "sk", composite: ["entity"] }
     },
-    byName: {
+    byScorer: {
       index: "gsi1",
-      pk: { field: "gsi1pk", composite: ["entity", "name"] },
-      sk: { field: "gsi1sk", composite: ["startTime"] }
+      pk: { field: "gsi1pk", composite: ["entity", "scorerId"] },
+      sk: { field: "gsi1sk", composite: ["createdAt"] }
     },
-    byScope: {
+    byRun: {
       index: "gsi2",
-      pk: { field: "gsi2pk", composite: ["entity", "scope"] },
-      sk: { field: "gsi2sk", composite: ["startTime"] }
+      pk: { field: "gsi2pk", composite: ["entity", "runId"] },
+      sk: { field: "gsi2sk", composite: ["createdAt"] }
+    },
+    byTrace: {
+      index: "gsi3",
+      pk: { field: "gsi3pk", composite: ["entity", "traceId"] },
+      sk: { field: "gsi3sk", composite: ["createdAt"] }
+    },
+    byEntityData: {
+      index: "gsi4",
+      pk: { field: "gsi4pk", composite: ["entity", "entityId"] },
+      sk: { field: "gsi4sk", composite: ["createdAt"] }
+    },
+    byResource: {
+      index: "gsi5",
+      pk: { field: "gsi5pk", composite: ["entity", "resourceId"] },
+      sk: { field: "gsi5sk", composite: ["createdAt"] }
+    },
+    byThread: {
+      index: "gsi6",
+      pk: { field: "gsi6pk", composite: ["entity", "threadId"] },
+      sk: { field: "gsi6sk", composite: ["createdAt"] }
+    },
+    bySpan: {
+      index: "gsi7",
+      pk: { field: "gsi7pk", composite: ["entity", "traceId", "spanId"] },
+      sk: { field: "gsi7sk", composite: ["createdAt"] }
     }
   }
 });
-var workflowSnapshotEntity = new Entity({
+var threadEntity = new Entity({
   model: {
-    entity: "workflow_snapshot",
+    entity: "thread",
     version: "1",
     service: "mastra"
   },
@@ -497,11 +681,202 @@ var workflowSnapshotEntity = new Entity({
       required: true
     },
     ...baseAttributes,
-    workflow_name: {
+    id: {
       type: "string",
       required: true
     },
-    run_id: {
+    resourceId: {
+      type: "string",
+      required: true
+    },
+    title: {
+      type: "string",
+      required: true
+    },
+    metadata: {
+      type: "string",
+      required: false,
+      // Stringify metadata object on set if it's not already a string
+      set: (value) => {
+        if (value && typeof value !== "string") {
+          return JSON.stringify(value);
+        }
+        return value;
+      },
+      // Parse JSON string to object on get
+      get: (value) => {
+        if (value && typeof value === "string") {
+          try {
+            if (value.startsWith("{") || value.startsWith("[")) {
+              return JSON.parse(value);
+            }
+          } catch {
+            return value;
+          }
+        }
+        return value;
+      }
+    }
+  },
+  indexes: {
+    primary: {
+      pk: { field: "pk", composite: ["entity", "id"] },
+      sk: { field: "sk", composite: ["id"] }
+    },
+    byResource: {
+      index: "gsi1",
+      pk: { field: "gsi1pk", composite: ["entity", "resourceId"] },
+      sk: { field: "gsi1sk", composite: ["createdAt"] }
+    }
+  }
+});
+var traceEntity = new Entity({
+  model: {
+    entity: "trace",
+    version: "1",
+    service: "mastra"
+  },
+  attributes: {
+    entity: {
+      type: "string",
+      required: true
+    },
+    ...baseAttributes,
+    id: {
+      type: "string",
+      required: true
+    },
+    parentSpanId: {
+      type: "string",
+      required: false
+    },
+    name: {
+      type: "string",
+      required: true
+    },
+    traceId: {
+      type: "string",
+      required: true
+    },
+    scope: {
+      type: "string",
+      required: true
+    },
+    kind: {
+      type: "number",
+      required: true
+    },
+    attributes: {
+      type: "string",
+      // JSON stringified
+      required: false,
+      // Stringify object on set
+      set: (value) => {
+        if (value && typeof value !== "string") {
+          return JSON.stringify(value);
+        }
+        return value;
+      },
+      // Parse JSON string to object on get
+      get: (value) => {
+        return value ? JSON.parse(value) : value;
+      }
+    },
+    status: {
+      type: "string",
+      // JSON stringified
+      required: false,
+      // Stringify object on set
+      set: (value) => {
+        if (value && typeof value !== "string") {
+          return JSON.stringify(value);
+        }
+        return value;
+      },
+      // Parse JSON string to object on get
+      get: (value) => {
+        return value;
+      }
+    },
+    events: {
+      type: "string",
+      // JSON stringified
+      required: false,
+      // Stringify object on set
+      set: (value) => {
+        if (value && typeof value !== "string") {
+          return JSON.stringify(value);
+        }
+        return value;
+      },
+      // Parse JSON string to object on get
+      get: (value) => {
+        return value;
+      }
+    },
+    links: {
+      type: "string",
+      // JSON stringified
+      required: false,
+      // Stringify object on set
+      set: (value) => {
+        if (value && typeof value !== "string") {
+          return JSON.stringify(value);
+        }
+        return value;
+      },
+      // Parse JSON string to object on get
+      get: (value) => {
+        return value;
+      }
+    },
+    other: {
+      type: "string",
+      required: false
+    },
+    startTime: {
+      type: "number",
+      required: true
+    },
+    endTime: {
+      type: "number",
+      required: true
+    }
+  },
+  indexes: {
+    primary: {
+      pk: { field: "pk", composite: ["entity", "id"] },
+      sk: { field: "sk", composite: [] }
+    },
+    byName: {
+      index: "gsi1",
+      pk: { field: "gsi1pk", composite: ["entity", "name"] },
+      sk: { field: "gsi1sk", composite: ["startTime"] }
+    },
+    byScope: {
+      index: "gsi2",
+      pk: { field: "gsi2pk", composite: ["entity", "scope"] },
+      sk: { field: "gsi2sk", composite: ["startTime"] }
+    }
+  }
+});
+var workflowSnapshotEntity = new Entity({
+  model: {
+    entity: "workflow_snapshot",
+    version: "1",
+    service: "mastra"
+  },
+  attributes: {
+    entity: {
+      type: "string",
+      required: true
+    },
+    ...baseAttributes,
+    workflow_name: {
+      type: "string",
+      required: true
+    },
+    run_id: {
       type: "string",
       required: true
     },
@@ -548,7 +923,9 @@ function getElectroDbService(client, tableName) {
       message: messageEntity,
       eval: evalEntity,
       trace: traceEntity,
-      workflowSnapshot: workflowSnapshotEntity
+      workflow_snapshot: workflowSnapshotEntity,
+      resource: resourceEntity,
+      score: scoreEntity
     },
     {
       client,
@@ -556,76 +933,771 @@ function getElectroDbService(client, tableName) {
     }
   );
 }
-
-// src/storage/index.ts
-var DynamoDBStore = class extends MastraStorage {
-  tableName;
-  client;
+var MemoryStorageDynamoDB = class extends MemoryStorage {
   service;
-  hasInitialized = null;
-  constructor({ name, config }) {
-    super({ name });
+  constructor({ service }) {
+    super();
+    this.service = service;
+  }
+  // Helper function to parse message data (handle JSON fields)
+  parseMessageData(data) {
+    return {
+      ...data,
+      // Ensure dates are Date objects if needed (ElectroDB might return strings)
+      createdAt: data.createdAt ? new Date(data.createdAt) : void 0,
+      updatedAt: data.updatedAt ? new Date(data.updatedAt) : void 0
+      // Other fields like content, toolCallArgs etc. are assumed to be correctly
+      // transformed by the ElectroDB entity getters.
+    };
+  }
+  // Helper function to transform and sort threads
+  transformAndSortThreads(rawThreads, field, direction) {
+    return rawThreads.map((data) => ({
+      ...data,
+      // Convert date strings back to Date objects for consistency
+      createdAt: typeof data.createdAt === "string" ? new Date(data.createdAt) : data.createdAt,
+      updatedAt: typeof data.updatedAt === "string" ? new Date(data.updatedAt) : data.updatedAt
+    })).sort((a, b) => {
+      const fieldA = field === "createdAt" ? a.createdAt : a.updatedAt;
+      const fieldB = field === "createdAt" ? b.createdAt : b.updatedAt;
+      const comparison = fieldA.getTime() - fieldB.getTime();
+      return direction === "DESC" ? -comparison : comparison;
+    });
+  }
+  async getThreadById({ threadId }) {
+    this.logger.debug("Getting thread by ID", { threadId });
     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 result = await this.service.entities.thread.get({ entity: "thread", id: threadId }).go();
+      if (!result.data) {
+        return null;
       }
-      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);
+      const data = result.data;
+      return {
+        ...data,
+        // Convert date strings back to Date objects for consistency
+        createdAt: typeof data.createdAt === "string" ? new Date(data.createdAt) : data.createdAt,
+        updatedAt: typeof data.updatedAt === "string" ? new Date(data.updatedAt) : data.updatedAt
+        // metadata: data.metadata ? JSON.parse(data.metadata) : undefined, // REMOVED by AI
+        // metadata is already transformed by the entity's getter
+      };
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_CONSTRUCTOR_FAILED",
+          id: "STORAGE_DYNAMODB_STORE_GET_THREAD_BY_ID_FAILED",
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.USER
+          category: ErrorCategory.THIRD_PARTY,
+          details: { threadId }
         },
         error
       );
     }
   }
-  /**
-   * This method is modified for DynamoDB with ElectroDB single-table design.
-   * It assumes the table is created and managed externally via CDK/CloudFormation.
-   *
-   * This implementation only validates that the required table exists and is accessible.
-   * No table creation is attempted - we simply check if we can access the table.
-   */
-  async createTable({ tableName }) {
-    this.logger.debug("Validating access to externally managed table", { tableName, physicalTable: this.tableName });
+  async saveThread({ thread }) {
+    this.logger.debug("Saving thread", { threadId: thread.id });
+    const now = /* @__PURE__ */ new Date();
+    const threadData = {
+      entity: "thread",
+      id: thread.id,
+      resourceId: thread.resourceId,
+      title: thread.title || `Thread ${thread.id}`,
+      createdAt: thread.createdAt?.toISOString() || now.toISOString(),
+      updatedAt: thread.updatedAt?.toISOString() || now.toISOString(),
+      metadata: thread.metadata ? JSON.stringify(thread.metadata) : void 0
+    };
     try {
-      const tableExists = await this.validateTableExists();
-      if (!tableExists) {
-        this.logger.error(
-          `Table ${this.tableName} does not exist or is not accessible. It should be created via CDK/CloudFormation.`
-        );
-        throw new Error(
-          `Table ${this.tableName} does not exist or is not accessible. Ensure it's created via CDK/CloudFormation before using this store.`
+      await this.service.entities.thread.upsert(threadData).go();
+      return {
+        id: thread.id,
+        resourceId: thread.resourceId,
+        title: threadData.title,
+        createdAt: thread.createdAt || now,
+        updatedAt: thread.updatedAt || now,
+        metadata: thread.metadata
+      };
+    } catch (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({
+    id,
+    title,
+    metadata
+  }) {
+    this.logger.debug("Updating thread", { threadId: id });
+    try {
+      const existingThread = await this.getThreadById({ threadId: id });
+      if (!existingThread) {
+        throw new Error(`Thread not found: ${id}`);
+      }
+      const now = /* @__PURE__ */ new Date();
+      const updateData = {
+        updatedAt: now.toISOString()
+      };
+      if (title) {
+        updateData.title = title;
+      }
+      if (metadata) {
+        const existingMetadata = existingThread.metadata ? typeof existingThread.metadata === "string" ? JSON.parse(existingThread.metadata) : existingThread.metadata : {};
+        const mergedMetadata = { ...existingMetadata, ...metadata };
+        updateData.metadata = JSON.stringify(mergedMetadata);
+      }
+      await this.service.entities.thread.update({ entity: "thread", id }).set(updateData).go();
+      return {
+        ...existingThread,
+        title: title || existingThread.title,
+        metadata: metadata ? { ...existingThread.metadata, ...metadata } : existingThread.metadata,
+        updatedAt: now
+      };
+    } catch (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 }) {
+    this.logger.debug("Deleting thread", { threadId });
+    try {
+      const { messages } = await this.listMessages({ threadId, perPage: false });
+      if (messages.length > 0) {
+        const batchSize = 25;
+        for (let i = 0; i < messages.length; i += batchSize) {
+          const batch = messages.slice(i, i + batchSize);
+          await Promise.all(
+            batch.map(
+              (message) => this.service.entities.message.delete({
+                entity: "message",
+                id: message.id,
+                threadId: message.threadId
+              }).go()
+            )
+          );
+        }
+      }
+      await this.service.entities.thread.delete({ entity: "thread", id: threadId }).go();
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "STORAGE_DYNAMODB_STORE_DELETE_THREAD_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { threadId }
+        },
+        error
+      );
+    }
+  }
+  async listMessagesById({ messageIds }) {
+    this.logger.debug("Getting messages by ID", { messageIds });
+    if (messageIds.length === 0) return { messages: [] };
+    try {
+      const results = await Promise.all(
+        messageIds.map((id) => this.service.entities.message.query.primary({ entity: "message", id }).go())
+      );
+      const data = results.map((result) => result.data).flat(1);
+      let parsedMessages = data.map((data2) => this.parseMessageData(data2)).filter((msg) => "content" in msg);
+      const uniqueMessages = parsedMessages.filter(
+        (message, index, self) => index === self.findIndex((m) => m.id === message.id)
+      );
+      const list = new MessageList().add(uniqueMessages, "memory");
+      return { messages: list.get.all.db() };
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "STORAGE_DYNAMODB_STORE_LIST_MESSAGES_BY_ID_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { messageIds: JSON.stringify(messageIds) }
+        },
+        error
+      );
+    }
+  }
+  async listMessages(args) {
+    const { threadId, resourceId, include, filter, perPage: perPageInput, page = 0, orderBy } = args;
+    if (!threadId.trim()) {
+      throw new MastraError(
+        {
+          id: "STORAGE_DYNAMODB_LIST_MESSAGES_INVALID_THREAD_ID",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { threadId }
+        },
+        new Error("threadId must be a non-empty string")
+      );
+    }
+    const perPage = normalizePerPage(perPageInput, 40);
+    const { offset, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
+    try {
+      if (page < 0) {
+        throw new MastraError(
+          {
+            id: "STORAGE_DYNAMODB_LIST_MESSAGES_INVALID_PAGE",
+            domain: ErrorDomain.STORAGE,
+            category: ErrorCategory.USER,
+            details: { page }
+          },
+          new Error("page must be >= 0")
         );
       }
-      this.logger.debug(`Table ${this.tableName} exists and is accessible`);
+      const { field, direction } = this.parseOrderBy(orderBy, "ASC");
+      this.logger.debug("Getting messages with listMessages", {
+        threadId,
+        resourceId,
+        perPageInput,
+        offset,
+        perPage,
+        page,
+        field,
+        direction
+      });
+      const query = this.service.entities.message.query.byThread({ entity: "message", threadId });
+      const results = await query.go();
+      let allThreadMessages = results.data.map((data) => this.parseMessageData(data)).filter((msg) => "content" in msg && typeof msg.content === "object");
+      if (resourceId) {
+        allThreadMessages = allThreadMessages.filter((msg) => msg.resourceId === resourceId);
+      }
+      if (filter?.dateRange) {
+        const dateRange = filter.dateRange;
+        allThreadMessages = allThreadMessages.filter((msg) => {
+          const createdAt = new Date(msg.createdAt).getTime();
+          if (dateRange.start) {
+            const startTime = dateRange.start instanceof Date ? dateRange.start.getTime() : new Date(dateRange.start).getTime();
+            if (createdAt < startTime) return false;
+          }
+          if (dateRange.end) {
+            const endTime = dateRange.end instanceof Date ? dateRange.end.getTime() : new Date(dateRange.end).getTime();
+            if (createdAt > endTime) return false;
+          }
+          return true;
+        });
+      }
+      allThreadMessages.sort((a, b) => {
+        const aValue = field === "createdAt" ? new Date(a.createdAt).getTime() : a[field];
+        const bValue = field === "createdAt" ? new Date(b.createdAt).getTime() : b[field];
+        if (aValue === bValue) {
+          return a.id.localeCompare(b.id);
+        }
+        return direction === "ASC" ? aValue - bValue : bValue - aValue;
+      });
+      const total = allThreadMessages.length;
+      const paginatedMessages = allThreadMessages.slice(offset, offset + perPage);
+      const paginatedCount = paginatedMessages.length;
+      if (total === 0 && paginatedCount === 0 && (!include || include.length === 0)) {
+        return {
+          messages: [],
+          total: 0,
+          page,
+          perPage: perPageForResponse,
+          hasMore: false
+        };
+      }
+      const messageIds = new Set(paginatedMessages.map((m) => m.id));
+      let includeMessages = [];
+      if (include && include.length > 0) {
+        const selectBy = { include };
+        includeMessages = await this._getIncludedMessages(threadId, selectBy);
+        for (const includeMsg of includeMessages) {
+          if (!messageIds.has(includeMsg.id)) {
+            paginatedMessages.push(includeMsg);
+            messageIds.add(includeMsg.id);
+          }
+        }
+      }
+      const list = new MessageList().add(paginatedMessages, "memory");
+      let finalMessages = list.get.all.db();
+      finalMessages = finalMessages.sort((a, b) => {
+        const aValue = field === "createdAt" ? new Date(a.createdAt).getTime() : a[field];
+        const bValue = field === "createdAt" ? new Date(b.createdAt).getTime() : b[field];
+        if (aValue === bValue) {
+          return a.id.localeCompare(b.id);
+        }
+        return direction === "ASC" ? aValue - bValue : bValue - aValue;
+      });
+      const returnedThreadMessageIds = new Set(finalMessages.filter((m) => m.threadId === threadId).map((m) => m.id));
+      const allThreadMessagesReturned = returnedThreadMessageIds.size >= total;
+      let hasMore = false;
+      if (perPageInput !== false && !allThreadMessagesReturned) {
+        hasMore = offset + paginatedCount < total;
+      }
+      return {
+        messages: finalMessages,
+        total,
+        page,
+        perPage: perPageForResponse,
+        hasMore
+      };
+    } catch (error) {
+      const mastraError = new MastraError(
+        {
+          id: "STORAGE_DYNAMODB_STORE_LIST_MESSAGES_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            threadId,
+            resourceId: resourceId ?? ""
+          }
+        },
+        error
+      );
+      this.logger?.error?.(mastraError.toString());
+      this.logger?.trackException?.(mastraError);
+      return {
+        messages: [],
+        total: 0,
+        page,
+        perPage: perPageForResponse,
+        hasMore: false
+      };
+    }
+  }
+  async saveMessages(args) {
+    const { messages } = args;
+    this.logger.debug("Saving messages", { count: messages.length });
+    if (!messages.length) {
+      return { messages: [] };
+    }
+    const threadId = messages[0]?.threadId;
+    if (!threadId) {
+      throw new Error("Thread ID is required");
+    }
+    const messagesToSave = messages.map((msg) => {
+      const now = (/* @__PURE__ */ new Date()).toISOString();
+      return {
+        entity: "message",
+        // Add entity type
+        id: msg.id,
+        threadId: msg.threadId,
+        role: msg.role,
+        type: msg.type,
+        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: `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
+      };
+    });
+    try {
+      const savedMessageIds = [];
+      for (const messageData of messagesToSave) {
+        if (!messageData.entity) {
+          this.logger.error("Missing entity property in message data for create", { messageData });
+          throw new Error("Internal error: Missing entity property during saveMessages");
+        }
+        try {
+          await this.service.entities.message.put(messageData).go();
+          savedMessageIds.push(messageData.id);
+        } catch (error) {
+          for (const savedId of savedMessageIds) {
+            try {
+              await this.service.entities.message.delete({ entity: "message", id: savedId }).go();
+            } catch (rollbackError) {
+              this.logger.error("Failed to rollback message during save error", {
+                messageId: savedId,
+                error: rollbackError
+              });
+            }
+          }
+          throw error;
+        }
+      }
+      await this.service.entities.thread.update({ entity: "thread", id: threadId }).set({
+        updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+      }).go();
+      const list = new MessageList().add(messages, "memory");
+      return { messages: list.get.all.db() };
     } catch (error) {
-      this.logger.error("Error validating table access", { tableName: this.tableName, error });
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_VALIDATE_TABLE_ACCESS_FAILED",
+          id: "STORAGE_DYNAMODB_STORE_SAVE_MESSAGES_FAILED",
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          details: { tableName: this.tableName }
+          details: { count: messages.length }
+        },
+        error
+      );
+    }
+  }
+  async listThreadsByResourceId(args) {
+    const { resourceId, page = 0, perPage: perPageInput, orderBy } = args;
+    const perPage = normalizePerPage(perPageInput, 100);
+    if (page < 0) {
+      throw new MastraError(
+        {
+          id: "STORAGE_DYNAMODB_LIST_THREADS_BY_RESOURCE_ID_INVALID_PAGE",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER,
+          details: { page }
+        },
+        new Error("page must be >= 0")
+      );
+    }
+    const { offset, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
+    const { field, direction } = this.parseOrderBy(orderBy);
+    this.logger.debug("Getting threads by resource ID with pagination", {
+      resourceId,
+      page,
+      perPage,
+      field,
+      direction
+    });
+    try {
+      const query = this.service.entities.thread.query.byResource({ entity: "thread", resourceId });
+      const results = await query.go();
+      const allThreads = this.transformAndSortThreads(results.data, field, direction);
+      const endIndex = offset + perPage;
+      const paginatedThreads = allThreads.slice(offset, endIndex);
+      const total = allThreads.length;
+      const hasMore = offset + perPage < total;
+      return {
+        threads: paginatedThreads,
+        total,
+        page,
+        perPage: perPageForResponse,
+        hasMore
+      };
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "DYNAMODB_STORAGE_LIST_THREADS_BY_RESOURCE_ID_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { resourceId, page, perPage }
+        },
+        error
+      );
+    }
+  }
+  // Helper method to get included messages with context
+  async _getIncludedMessages(threadId, selectBy) {
+    if (!threadId.trim()) throw new Error("threadId must be a non-empty string");
+    if (!selectBy?.include?.length) {
+      return [];
+    }
+    const includeMessages = [];
+    for (const includeItem of selectBy.include) {
+      try {
+        const { id, threadId: targetThreadId, withPreviousMessages = 0, withNextMessages = 0 } = includeItem;
+        const searchThreadId = targetThreadId || threadId;
+        this.logger.debug("Getting included messages for", {
+          id,
+          targetThreadId,
+          searchThreadId,
+          withPreviousMessages,
+          withNextMessages
+        });
+        const query = this.service.entities.message.query.byThread({ entity: "message", threadId: searchThreadId });
+        const results = await query.go();
+        const allMessages = results.data.map((data) => this.parseMessageData(data)).filter((msg) => "content" in msg && typeof msg.content === "object");
+        this.logger.debug("Found messages in thread", {
+          threadId: searchThreadId,
+          messageCount: allMessages.length,
+          messageIds: allMessages.map((m) => m.id)
+        });
+        allMessages.sort((a, b) => {
+          const timeA = a.createdAt.getTime();
+          const timeB = b.createdAt.getTime();
+          if (timeA === timeB) {
+            return a.id.localeCompare(b.id);
+          }
+          return timeA - timeB;
+        });
+        const targetIndex = allMessages.findIndex((msg) => msg.id === id);
+        if (targetIndex === -1) {
+          this.logger.warn("Target message not found", { id, threadId: searchThreadId });
+          continue;
+        }
+        this.logger.debug("Found target message at index", { id, targetIndex, totalMessages: allMessages.length });
+        const startIndex = Math.max(0, targetIndex - withPreviousMessages);
+        const endIndex = Math.min(allMessages.length, targetIndex + withNextMessages + 1);
+        const contextMessages = allMessages.slice(startIndex, endIndex);
+        this.logger.debug("Context messages", {
+          startIndex,
+          endIndex,
+          contextCount: contextMessages.length,
+          contextIds: contextMessages.map((m) => m.id)
+        });
+        includeMessages.push(...contextMessages);
+      } catch (error) {
+        this.logger.warn("Failed to get included message", { messageId: includeItem.id, error });
+      }
+    }
+    this.logger.debug("Total included messages", {
+      count: includeMessages.length,
+      ids: includeMessages.map((m) => m.id)
+    });
+    return includeMessages;
+  }
+  async updateMessages(args) {
+    const { messages } = args;
+    this.logger.debug("Updating messages", { count: messages.length });
+    if (!messages.length) {
+      return [];
+    }
+    const updatedMessages = [];
+    const affectedThreadIds = /* @__PURE__ */ new Set();
+    try {
+      for (const updateData of messages) {
+        const { id, ...updates } = updateData;
+        const existingMessage = await this.service.entities.message.get({ entity: "message", id }).go();
+        if (!existingMessage.data) {
+          this.logger.warn("Message not found for update", { id });
+          continue;
+        }
+        const existingMsg = this.parseMessageData(existingMessage.data);
+        const originalThreadId = existingMsg.threadId;
+        affectedThreadIds.add(originalThreadId);
+        const updatePayload = {
+          updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+        };
+        if ("role" in updates && updates.role !== void 0) updatePayload.role = updates.role;
+        if ("type" in updates && updates.type !== void 0) updatePayload.type = updates.type;
+        if ("resourceId" in updates && updates.resourceId !== void 0) updatePayload.resourceId = updates.resourceId;
+        if ("threadId" in updates && updates.threadId !== void 0 && updates.threadId !== null) {
+          updatePayload.threadId = updates.threadId;
+          affectedThreadIds.add(updates.threadId);
+        }
+        if (updates.content) {
+          const existingContent = existingMsg.content;
+          let newContent = { ...existingContent };
+          if (updates.content.metadata !== void 0) {
+            newContent.metadata = {
+              ...existingContent.metadata || {},
+              ...updates.content.metadata || {}
+            };
+          }
+          if (updates.content.content !== void 0) {
+            newContent.content = updates.content.content;
+          }
+          if ("parts" in updates.content && updates.content.parts !== void 0) {
+            newContent.parts = updates.content.parts;
+          }
+          updatePayload.content = JSON.stringify(newContent);
+        }
+        await this.service.entities.message.update({ entity: "message", id }).set(updatePayload).go();
+        const updatedMessage = await this.service.entities.message.get({ entity: "message", id }).go();
+        if (updatedMessage.data) {
+          updatedMessages.push(this.parseMessageData(updatedMessage.data));
+        }
+      }
+      for (const threadId of affectedThreadIds) {
+        await this.service.entities.thread.update({ entity: "thread", id: threadId }).set({
+          updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+        }).go();
+      }
+      return updatedMessages;
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "STORAGE_DYNAMODB_STORE_UPDATE_MESSAGES_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { count: messages.length }
+        },
+        error
+      );
+    }
+  }
+  async getResourceById({ resourceId }) {
+    this.logger.debug("Getting resource by ID", { resourceId });
+    try {
+      const result = await this.service.entities.resource.get({ entity: "resource", id: resourceId }).go();
+      if (!result.data) {
+        return null;
+      }
+      const data = result.data;
+      return {
+        ...data,
+        // Convert date strings back to Date objects for consistency
+        createdAt: typeof data.createdAt === "string" ? new Date(data.createdAt) : data.createdAt,
+        updatedAt: typeof data.updatedAt === "string" ? new Date(data.updatedAt) : data.updatedAt,
+        // Ensure workingMemory is always returned as a string, regardless of automatic parsing
+        workingMemory: typeof data.workingMemory === "object" ? JSON.stringify(data.workingMemory) : data.workingMemory
+        // metadata is already transformed by the entity's getter
+      };
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "STORAGE_DYNAMODB_STORE_GET_RESOURCE_BY_ID_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { resourceId }
+        },
+        error
+      );
+    }
+  }
+  async saveResource({ resource }) {
+    this.logger.debug("Saving resource", { resourceId: resource.id });
+    const now = /* @__PURE__ */ new Date();
+    const resourceData = {
+      entity: "resource",
+      id: resource.id,
+      workingMemory: resource.workingMemory,
+      metadata: resource.metadata ? JSON.stringify(resource.metadata) : void 0,
+      createdAt: resource.createdAt?.toISOString() || now.toISOString(),
+      updatedAt: now.toISOString()
+    };
+    try {
+      await this.service.entities.resource.upsert(resourceData).go();
+      return {
+        id: resource.id,
+        workingMemory: resource.workingMemory,
+        metadata: resource.metadata,
+        createdAt: resource.createdAt || now,
+        updatedAt: now
+      };
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "STORAGE_DYNAMODB_STORE_SAVE_RESOURCE_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { resourceId: resource.id }
         },
         error
       );
     }
   }
+  async updateResource({
+    resourceId,
+    workingMemory,
+    metadata
+  }) {
+    this.logger.debug("Updating resource", { resourceId });
+    try {
+      const existingResource = await this.getResourceById({ resourceId });
+      if (!existingResource) {
+        const newResource = {
+          id: resourceId,
+          workingMemory,
+          metadata: metadata || {},
+          createdAt: /* @__PURE__ */ new Date(),
+          updatedAt: /* @__PURE__ */ new Date()
+        };
+        return this.saveResource({ resource: newResource });
+      }
+      const now = /* @__PURE__ */ new Date();
+      const updateData = {
+        updatedAt: now.toISOString()
+      };
+      if (workingMemory !== void 0) {
+        updateData.workingMemory = workingMemory;
+      }
+      if (metadata) {
+        const existingMetadata = existingResource.metadata || {};
+        const mergedMetadata = { ...existingMetadata, ...metadata };
+        updateData.metadata = JSON.stringify(mergedMetadata);
+      }
+      await this.service.entities.resource.update({ entity: "resource", id: resourceId }).set(updateData).go();
+      return {
+        ...existingResource,
+        workingMemory: workingMemory !== void 0 ? workingMemory : existingResource.workingMemory,
+        metadata: metadata ? { ...existingResource.metadata, ...metadata } : existingResource.metadata,
+        updatedAt: now
+      };
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "STORAGE_DYNAMODB_STORE_UPDATE_RESOURCE_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { resourceId }
+        },
+        error
+      );
+    }
+  }
+};
+var StoreOperationsDynamoDB = class extends StoreOperations {
+  client;
+  tableName;
+  service;
+  constructor({
+    service,
+    tableName,
+    client
+  }) {
+    super();
+    this.service = service;
+    this.client = client;
+    this.tableName = tableName;
+  }
+  async hasColumn() {
+    return true;
+  }
+  async dropTable() {
+  }
+  // Helper methods for entity/table mapping
+  getEntityNameForTable(tableName) {
+    const mapping = {
+      [TABLE_THREADS]: "thread",
+      [TABLE_MESSAGES]: "message",
+      [TABLE_WORKFLOW_SNAPSHOT]: "workflow_snapshot",
+      [TABLE_SCORERS]: "score",
+      [TABLE_TRACES]: "trace",
+      [TABLE_RESOURCES]: "resource",
+      [TABLE_SPANS]: "ai_span"
+    };
+    return mapping[tableName] || null;
+  }
+  /**
+   * Pre-processes a record to ensure Date objects are converted to ISO strings
+   * This is necessary because ElectroDB validation happens before setters are applied
+   */
+  preprocessRecord(record) {
+    const processed = { ...record };
+    if (processed.createdAt instanceof Date) {
+      processed.createdAt = processed.createdAt.toISOString();
+    }
+    if (processed.updatedAt instanceof Date) {
+      processed.updatedAt = processed.updatedAt.toISOString();
+    }
+    if (processed.created_at instanceof Date) {
+      processed.created_at = processed.created_at.toISOString();
+    }
+    if (processed.result && typeof processed.result === "object") {
+      processed.result = JSON.stringify(processed.result);
+    }
+    if (processed.test_info && typeof processed.test_info === "object") {
+      processed.test_info = JSON.stringify(processed.test_info);
+    } else if (processed.test_info === void 0 || processed.test_info === null) {
+      delete processed.test_info;
+    }
+    if (processed.snapshot && typeof processed.snapshot === "object") {
+      processed.snapshot = JSON.stringify(processed.snapshot);
+    }
+    if (processed.attributes && typeof processed.attributes === "object") {
+      processed.attributes = JSON.stringify(processed.attributes);
+    }
+    if (processed.status && typeof processed.status === "object") {
+      processed.status = JSON.stringify(processed.status);
+    }
+    if (processed.events && typeof processed.events === "object") {
+      processed.events = JSON.stringify(processed.events);
+    }
+    if (processed.links && typeof processed.links === "object") {
+      processed.links = JSON.stringify(processed.links);
+    }
+    return processed;
+  }
   /**
    * Validates that the required DynamoDB table exists and is accessible.
    * This does not check the table structure - it assumes the table
@@ -644,7 +1716,40 @@ var DynamoDBStore = class extends MastraStorage {
       }
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_VALIDATE_TABLE_EXISTS_FAILED",
+          id: "STORAGE_DYNAMODB_STORE_VALIDATE_TABLE_EXISTS_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { tableName: this.tableName }
+        },
+        error
+      );
+    }
+  }
+  /**
+   * This method is modified for DynamoDB with ElectroDB single-table design.
+   * It assumes the table is created and managed externally via CDK/CloudFormation.
+   *
+   * This implementation only validates that the required table exists and is accessible.
+   * No table creation is attempted - we simply check if we can access the table.
+   */
+  async createTable({ tableName }) {
+    this.logger.debug("Validating access to externally managed table", { tableName, physicalTable: this.tableName });
+    try {
+      const tableExists = await this.validateTableExists();
+      if (!tableExists) {
+        this.logger.error(
+          `Table ${this.tableName} does not exist or is not accessible. It should be created via CDK/CloudFormation.`
+        );
+        throw new Error(
+          `Table ${this.tableName} does not exist or is not accessible. Ensure it's created via CDK/CloudFormation before using this store.`
+        );
+      }
+      this.logger.debug(`Table ${this.tableName} exists and is accessible`);
+    } catch (error) {
+      this.logger.error("Error validating table access", { tableName: this.tableName, error });
+      throw new MastraError(
+        {
+          id: "STORAGE_DYNAMODB_STORE_VALIDATE_TABLE_ACCESS_FAILED",
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { tableName: this.tableName }
@@ -653,63 +1758,33 @@ var DynamoDBStore = class extends MastraStorage {
       );
     }
   }
-  /**
-   * Initialize storage, validating the externally managed table is accessible.
-   * For the single-table design, we only validate once that we can access
-   * the table that was created via CDK/CloudFormation.
-   */
-  async init() {
-    if (this.hasInitialized === null) {
-      this.hasInitialized = this._performInitializationAndStore();
+  async insert({ tableName, record }) {
+    this.logger.debug("DynamoDB insert called", { tableName });
+    const entityName = this.getEntityNameForTable(tableName);
+    if (!entityName || !this.service.entities[entityName]) {
+      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 {
-      await this.hasInitialized;
+      const dataToSave = { entity: entityName, ...this.preprocessRecord(record) };
+      await this.service.entities[entityName].create(dataToSave).go();
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_INIT_FAILED",
+          id: "STORAGE_DYNAMODB_STORE_INSERT_FAILED",
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          details: { tableName: this.tableName }
+          details: { tableName }
         },
         error
       );
     }
   }
-  /**
-   * Performs the actual table validation and stores the promise.
-   * Handles resetting the stored promise on failure to allow retries.
-   */
-  _performInitializationAndStore() {
-    return this.validateTableExists().then((exists) => {
-      if (!exists) {
-        throw new Error(
-          `Table ${this.tableName} does not exist or is not accessible. Ensure it's created via CDK/CloudFormation before using this store.`
-        );
-      }
-      return true;
-    }).catch((err) => {
-      this.hasInitialized = null;
-      throw err;
-    });
-  }
-  /**
-   * Pre-processes a record to ensure Date objects are converted to ISO strings
-   * This is necessary because ElectroDB validation happens before setters are applied
-   */
-  preprocessRecord(record) {
-    const processed = { ...record };
-    if (processed.createdAt instanceof Date) {
-      processed.createdAt = processed.createdAt.toISOString();
-    }
-    if (processed.updatedAt instanceof Date) {
-      processed.updatedAt = processed.updatedAt.toISOString();
-    }
-    if (processed.created_at instanceof Date) {
-      processed.created_at = processed.created_at.toISOString();
-    }
-    return processed;
-  }
   async alterTable(_args) {
   }
   /**
@@ -745,10 +1820,10 @@ var DynamoDBStore = class extends MastraStorage {
             if (!item.id) throw new Error(`Missing required key 'id' for entity 'message'`);
             key.id = item.id;
             break;
-          case "workflowSnapshot":
+          case "workflow_snapshot":
             if (!item.workflow_name)
-              throw new Error(`Missing required key 'workflow_name' for entity 'workflowSnapshot'`);
-            if (!item.run_id) throw new Error(`Missing required key 'run_id' for entity 'workflowSnapshot'`);
+              throw new Error(`Missing required key 'workflow_name' for entity 'workflow_snapshot'`);
+            if (!item.run_id) throw new Error(`Missing required key 'run_id' for entity 'workflow_snapshot'`);
             key.workflow_name = item.workflow_name;
             key.run_id = item.run_id;
             break;
@@ -760,6 +1835,14 @@ var DynamoDBStore = class extends MastraStorage {
             if (!item.id) throw new Error(`Missing required key 'id' for entity 'trace'`);
             key.id = item.id;
             break;
+          case "score":
+            if (!item.id) throw new Error(`Missing required key 'id' for entity 'score'`);
+            key.id = item.id;
+            break;
+          case "resource":
+            if (!item.id) throw new Error(`Missing required key 'id' for entity 'resource'`);
+            key.id = item.id;
+            break;
           default:
             this.logger.warn(`Unknown entity type encountered during clearTable: ${entityName}`);
             throw new Error(`Cannot construct delete key for unknown entity type: ${entityName}`);
@@ -784,46 +1867,10 @@ var DynamoDBStore = class extends MastraStorage {
       );
     }
   }
-  /**
-   * Insert a record into the specified "table" (entity)
-   */
-  async insert({
-    tableName,
-    record
-  }) {
-    this.logger.debug("DynamoDB insert called", { tableName });
-    const entityName = this.getEntityNameForTable(tableName);
-    if (!entityName || !this.service.entities[entityName]) {
-      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) {
-      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]) {
@@ -868,10 +1915,7 @@ 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]) {
@@ -903,344 +1947,320 @@ var DynamoDBStore = class extends MastraStorage {
       );
     }
   }
-  // Thread operations
-  async getThreadById({ threadId }) {
-    this.logger.debug("Getting thread by ID", { threadId });
+};
+var ScoresStorageDynamoDB = class extends ScoresStorage {
+  service;
+  constructor({ service }) {
+    super();
+    this.service = service;
+  }
+  // Helper function to parse score data (handle JSON fields)
+  parseScoreData(data) {
+    return {
+      ...data,
+      // Convert date strings back to Date objects for consistency
+      createdAt: data.createdAt ? new Date(data.createdAt) : /* @__PURE__ */ new Date(),
+      updatedAt: data.updatedAt ? new Date(data.updatedAt) : /* @__PURE__ */ new Date()
+      // JSON fields are already transformed by the entity's getters
+    };
+  }
+  async getScoreById({ id }) {
+    this.logger.debug("Getting score by ID", { id });
     try {
-      const result = await this.service.entities.thread.get({ entity: "thread", id: threadId }).go();
+      const result = await this.service.entities.score.get({ entity: "score", id }).go();
       if (!result.data) {
         return null;
       }
-      const data = result.data;
-      return {
-        ...data,
-        // Convert date strings back to Date objects for consistency
-        createdAt: typeof data.createdAt === "string" ? new Date(data.createdAt) : data.createdAt,
-        updatedAt: typeof data.updatedAt === "string" ? new Date(data.updatedAt) : data.updatedAt
-        // metadata: data.metadata ? JSON.parse(data.metadata) : undefined, // REMOVED by AI
-        // metadata is already transformed by the entity's getter
-      };
+      return this.parseScoreData(result.data);
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_GET_THREAD_BY_ID_FAILED",
+          id: "STORAGE_DYNAMODB_STORE_GET_SCORE_BY_ID_FAILED",
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          details: { threadId }
+          details: { id }
         },
         error
       );
     }
   }
-  async getThreadsByResourceId({ resourceId }) {
-    this.logger.debug("Getting threads by resource ID", { resourceId });
+  async saveScore(score) {
+    let validatedScore;
     try {
-      const result = await this.service.entities.thread.query.byResource({ entity: "thread", resourceId }).go();
-      if (!result.data.length) {
-        return [];
-      }
-      return result.data.map((data) => ({
-        ...data,
-        // Convert date strings back to Date objects for consistency
-        createdAt: typeof data.createdAt === "string" ? new Date(data.createdAt) : data.createdAt,
-        updatedAt: typeof data.updatedAt === "string" ? new Date(data.updatedAt) : data.updatedAt
-        // metadata: data.metadata ? JSON.parse(data.metadata) : undefined, // REMOVED by AI
-        // metadata is already transformed by the entity's getter
-      }));
+      validatedScore = saveScorePayloadSchema.parse(score);
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_GET_THREADS_BY_RESOURCE_ID_FAILED",
+          id: "STORAGE_DYNAMODB_STORE_SAVE_SCORE_FAILED",
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY,
-          details: { resourceId }
+          category: ErrorCategory.THIRD_PARTY
         },
         error
       );
     }
-  }
-  async saveThread({ thread }) {
-    this.logger.debug("Saving thread", { threadId: thread.id });
     const now = /* @__PURE__ */ new Date();
-    const threadData = {
-      entity: "thread",
-      id: thread.id,
-      resourceId: thread.resourceId,
-      title: thread.title || `Thread ${thread.id}`,
-      createdAt: thread.createdAt?.toISOString() || now.toISOString(),
-      updatedAt: now.toISOString(),
-      metadata: thread.metadata ? JSON.stringify(thread.metadata) : void 0
+    const scoreId = `score-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
+    const scoreData = {
+      entity: "score",
+      id: scoreId,
+      scorerId: validatedScore.scorerId,
+      traceId: validatedScore.traceId || "",
+      spanId: validatedScore.spanId || "",
+      runId: validatedScore.runId,
+      scorer: typeof validatedScore.scorer === "string" ? validatedScore.scorer : JSON.stringify(validatedScore.scorer),
+      preprocessStepResult: typeof validatedScore.preprocessStepResult === "string" ? validatedScore.preprocessStepResult : JSON.stringify(validatedScore.preprocessStepResult),
+      analyzeStepResult: typeof validatedScore.analyzeStepResult === "string" ? validatedScore.analyzeStepResult : JSON.stringify(validatedScore.analyzeStepResult),
+      score: validatedScore.score,
+      reason: validatedScore.reason,
+      preprocessPrompt: validatedScore.preprocessPrompt,
+      generateScorePrompt: validatedScore.generateScorePrompt,
+      generateReasonPrompt: validatedScore.generateReasonPrompt,
+      analyzePrompt: validatedScore.analyzePrompt,
+      input: typeof validatedScore.input === "string" ? validatedScore.input : JSON.stringify(validatedScore.input),
+      output: typeof validatedScore.output === "string" ? validatedScore.output : JSON.stringify(validatedScore.output),
+      additionalContext: typeof validatedScore.additionalContext === "string" ? validatedScore.additionalContext : JSON.stringify(validatedScore.additionalContext),
+      requestContext: typeof validatedScore.requestContext === "string" ? validatedScore.requestContext : JSON.stringify(validatedScore.requestContext),
+      entityType: validatedScore.entityType,
+      entityData: typeof validatedScore.entity === "string" ? validatedScore.entity : JSON.stringify(validatedScore.entity),
+      entityId: validatedScore.entityId,
+      source: validatedScore.source,
+      resourceId: validatedScore.resourceId || "",
+      threadId: validatedScore.threadId || "",
+      createdAt: now.toISOString(),
+      updatedAt: now.toISOString()
     };
     try {
-      await this.service.entities.thread.upsert(threadData).go();
-      return {
-        id: thread.id,
-        resourceId: thread.resourceId,
-        title: threadData.title,
-        createdAt: thread.createdAt || now,
-        updatedAt: now,
-        metadata: thread.metadata
-      };
-    } catch (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({
-    id,
-    title,
-    metadata
-  }) {
-    this.logger.debug("Updating thread", { threadId: id });
-    try {
-      const existingThread = await this.getThreadById({ threadId: id });
-      if (!existingThread) {
-        throw new Error(`Thread not found: ${id}`);
-      }
-      const now = /* @__PURE__ */ new Date();
-      const updateData = {
-        updatedAt: now.toISOString()
-      };
-      if (title) {
-        updateData.title = title;
-      }
-      if (metadata) {
-        updateData.metadata = JSON.stringify(metadata);
-      }
-      await this.service.entities.thread.update({ entity: "thread", id }).set(updateData).go();
-      return {
-        ...existingThread,
-        title: title || existingThread.title,
-        metadata: metadata || existingThread.metadata,
+      await this.service.entities.score.upsert(scoreData).go();
+      const savedScore = {
+        ...score,
+        id: scoreId,
+        createdAt: now,
         updatedAt: now
       };
+      return { score: savedScore };
     } catch (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 }) {
-    this.logger.debug("Deleting thread", { threadId });
-    try {
-      await this.service.entities.thread.delete({ entity: "thread", id: threadId }).go();
-    } catch (error) {
-      throw new MastraError(
-        {
-          id: "STORAGE_DYNAMODB_STORE_DELETE_THREAD_FAILED",
+          id: "STORAGE_DYNAMODB_STORE_SAVE_SCORE_FAILED",
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          details: { threadId }
+          details: { scorerId: score.scorerId, runId: score.runId }
         },
         error
       );
     }
   }
-  async getMessages({
-    threadId,
-    resourceId,
-    selectBy,
-    format
+  async listScoresByScorerId({
+    scorerId,
+    pagination,
+    entityId,
+    entityType,
+    source
   }) {
-    this.logger.debug("Getting messages", { threadId, selectBy });
     try {
-      const query = this.service.entities.message.query.byThread({ entity: "message", threadId });
-      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"
-        );
-        if (format === `v2`) return list2.get.all.v2();
-        return list2.get.all.v1();
-      }
+      const query = this.service.entities.score.query.byScorer({ entity: "score", scorerId });
       const results = await query.go();
-      const list = new MessageList({ threadId, resourceId }).add(
-        results.data.map((data) => this.parseMessageData(data)),
-        "memory"
-      );
-      if (format === `v2`) return list.get.all.v2();
-      return list.get.all.v1();
-    } catch (error) {
-      throw new MastraError(
-        {
-          id: "STORAGE_DYNAMODB_STORE_GET_MESSAGES_FAILED",
-          domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY,
-          details: { threadId }
-        },
-        error
-      );
-    }
-  }
-  async saveMessages(args) {
-    const { messages, format = "v1" } = args;
-    this.logger.debug("Saving messages", { count: messages.length });
-    if (!messages.length) {
-      return [];
-    }
-    const threadId = messages[0]?.threadId;
-    if (!threadId) {
-      throw new Error("Thread ID is required");
-    }
-    const messagesToSave = messages.map((msg) => {
-      const now = (/* @__PURE__ */ new Date()).toISOString();
-      return {
-        entity: "message",
-        // Add entity type
-        id: msg.id,
-        threadId: msg.threadId,
-        role: msg.role,
-        type: msg.type,
-        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: `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
+      let allScores = results.data.map((data) => this.parseScoreData(data));
+      if (entityId) {
+        allScores = allScores.filter((score) => score.entityId === entityId);
+      }
+      if (entityType) {
+        allScores = allScores.filter((score) => score.entityType === entityType);
+      }
+      if (source) {
+        allScores = allScores.filter((score) => score.source === source);
+      }
+      allScores.sort((a, b) => b.createdAt.getTime() - a.createdAt.getTime());
+      const { page, perPage: perPageInput } = pagination;
+      const perPage = normalizePerPage(perPageInput, Number.MAX_SAFE_INTEGER);
+      const { offset: start, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
+      const total = allScores.length;
+      const end = perPageInput === false ? allScores.length : start + perPage;
+      const paginatedScores = allScores.slice(start, end);
+      return {
+        scores: paginatedScores,
+        pagination: {
+          total,
+          page,
+          perPage: perPageForResponse,
+          hasMore: end < total
+        }
       };
-    });
-    try {
-      const batchSize = 25;
-      const batches = [];
-      for (let i = 0; i < messagesToSave.length; i += batchSize) {
-        const batch = messagesToSave.slice(i, i + batchSize);
-        batches.push(batch);
-      }
-      await Promise.all([
-        // Process message batches
-        ...batches.map(async (batch) => {
-          for (const messageData of batch) {
-            if (!messageData.entity) {
-              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.put(messageData).go();
-          }
-        }),
-        // Update thread's updatedAt timestamp
-        this.service.entities.thread.update({ entity: "thread", id: threadId }).set({
-          updatedAt: (/* @__PURE__ */ new Date()).toISOString()
-        }).go()
-      ]);
-      const list = new MessageList().add(messages, "memory");
-      if (format === `v1`) return list.get.all.v1();
-      return list.get.all.v2();
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_SAVE_MESSAGES_FAILED",
+          id: "STORAGE_DYNAMODB_STORE_GET_SCORES_BY_SCORER_ID_FAILED",
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          details: { count: messages.length }
+          details: {
+            scorerId: scorerId || "",
+            entityId: entityId || "",
+            entityType: entityType || "",
+            source: source || "",
+            page: pagination.page,
+            perPage: pagination.perPage
+          }
         },
         error
       );
     }
   }
-  // Helper function to parse message data (handle JSON fields)
-  parseMessageData(data) {
-    return {
-      ...data,
-      // Ensure dates are Date objects if needed (ElectroDB might return strings)
-      createdAt: data.createdAt ? new Date(data.createdAt) : void 0,
-      updatedAt: data.updatedAt ? new Date(data.updatedAt) : void 0
-      // Other fields like content, toolCallArgs etc. are assumed to be correctly
-      // transformed by the ElectroDB entity getters.
-    };
-  }
-  // Trace operations
-  async getTraces(args) {
-    const { name, scope, page, perPage } = args;
-    this.logger.debug("Getting traces", { name, scope, page, perPage });
+  async listScoresByRunId({
+    runId,
+    pagination
+  }) {
+    this.logger.debug("Getting scores by run ID", { runId, pagination });
     try {
-      let query;
-      if (name) {
-        query = this.service.entities.trace.query.byName({ entity: "trace", name });
-      } else if (scope) {
-        query = this.service.entities.trace.query.byScope({ entity: "trace", scope });
-      } else {
-        this.logger.warn("Performing a scan operation on traces - consider using a more specific query");
-        query = this.service.entities.trace.scan;
-      }
-      let items = [];
-      let cursor = null;
-      let pagesFetched = 0;
-      const startPage = page > 0 ? page : 1;
-      do {
-        const results = await query.go({ cursor, limit: perPage });
-        pagesFetched++;
-        if (pagesFetched === startPage) {
-          items = results.data;
-          break;
-        }
-        cursor = results.cursor;
-        if (!cursor && results.data.length > 0 && pagesFetched < startPage) {
-          break;
+      const query = this.service.entities.score.query.byRun({ entity: "score", runId });
+      const results = await query.go();
+      const allScores = results.data.map((data) => this.parseScoreData(data));
+      allScores.sort((a, b) => b.createdAt.getTime() - a.createdAt.getTime());
+      const { page, perPage: perPageInput } = pagination;
+      const perPage = normalizePerPage(perPageInput, Number.MAX_SAFE_INTEGER);
+      const { offset: start, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
+      const total = allScores.length;
+      const end = perPageInput === false ? allScores.length : start + perPage;
+      const paginatedScores = allScores.slice(start, end);
+      return {
+        scores: paginatedScores,
+        pagination: {
+          total,
+          page,
+          perPage: perPageForResponse,
+          hasMore: end < total
         }
-      } while (cursor && pagesFetched < startPage);
-      return items;
+      };
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_GET_TRACES_FAILED",
+          id: "STORAGE_DYNAMODB_STORE_GET_SCORES_BY_RUN_ID_FAILED",
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY
+          category: ErrorCategory.THIRD_PARTY,
+          details: { runId, page: pagination.page, perPage: pagination.perPage }
         },
         error
       );
     }
   }
-  async batchTraceInsert({ records }) {
-    this.logger.debug("Batch inserting traces", { count: records.length });
-    if (!records.length) {
-      return;
+  async listScoresByEntityId({
+    entityId,
+    entityType,
+    pagination
+  }) {
+    this.logger.debug("Getting scores by entity ID", { entityId, entityType, pagination });
+    try {
+      const query = this.service.entities.score.query.byEntityData({ entity: "score", entityId });
+      const results = await query.go();
+      let allScores = results.data.map((data) => this.parseScoreData(data));
+      allScores = allScores.filter((score) => score.entityType === entityType);
+      allScores.sort((a, b) => b.createdAt.getTime() - a.createdAt.getTime());
+      const { page, perPage: perPageInput } = pagination;
+      const perPage = normalizePerPage(perPageInput, Number.MAX_SAFE_INTEGER);
+      const { offset: start, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
+      const total = allScores.length;
+      const end = perPageInput === false ? allScores.length : start + perPage;
+      const paginatedScores = allScores.slice(start, end);
+      return {
+        scores: paginatedScores,
+        pagination: {
+          total,
+          page,
+          perPage: perPageForResponse,
+          hasMore: end < total
+        }
+      };
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "STORAGE_DYNAMODB_STORE_GET_SCORES_BY_ENTITY_ID_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { entityId, entityType, page: pagination.page, perPage: pagination.perPage }
+        },
+        error
+      );
     }
+  }
+  async listScoresBySpan({
+    traceId,
+    spanId,
+    pagination
+  }) {
+    this.logger.debug("Getting scores by span", { traceId, spanId, pagination });
     try {
-      const recordsToSave = records.map((rec) => ({ entity: "trace", ...rec }));
-      await this.batchInsert({
-        tableName: TABLE_TRACES,
-        records: recordsToSave
-        // Pass records with 'entity' included
-      });
+      const query = this.service.entities.score.query.bySpan({ entity: "score", traceId, spanId });
+      const results = await query.go();
+      const allScores = results.data.map((data) => this.parseScoreData(data));
+      allScores.sort((a, b) => b.createdAt.getTime() - a.createdAt.getTime());
+      const { page, perPage: perPageInput } = pagination;
+      const perPage = normalizePerPage(perPageInput, Number.MAX_SAFE_INTEGER);
+      const { offset: start, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
+      const total = allScores.length;
+      const end = perPageInput === false ? allScores.length : start + perPage;
+      const paginatedScores = allScores.slice(start, end);
+      return {
+        scores: paginatedScores,
+        pagination: {
+          total,
+          page,
+          perPage: perPageForResponse,
+          hasMore: end < total
+        }
+      };
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_BATCH_TRACE_INSERT_FAILED",
+          id: "STORAGE_DYNAMODB_STORE_GET_SCORES_BY_SPAN_FAILED",
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          details: { count: records.length }
+          details: { traceId, spanId, page: pagination.page, perPage: pagination.perPage }
         },
         error
       );
     }
   }
+};
+function formatWorkflowRun(snapshotData) {
+  return {
+    workflowName: snapshotData.workflow_name,
+    runId: snapshotData.run_id,
+    snapshot: snapshotData.snapshot,
+    createdAt: new Date(snapshotData.createdAt),
+    updatedAt: new Date(snapshotData.updatedAt),
+    resourceId: snapshotData.resourceId
+  };
+}
+var WorkflowStorageDynamoDB = class extends WorkflowsStorage {
+  service;
+  constructor({ service }) {
+    super();
+    this.service = service;
+  }
+  updateWorkflowResults({
+    // workflowName,
+    // runId,
+    // stepId,
+    // result,
+    // requestContext,
+  }) {
+    throw new Error("Method not implemented.");
+  }
+  updateWorkflowState({
+    // workflowName,
+    // runId,
+    // opts,
+  }) {
+    throw new Error("Method not implemented.");
+  }
   // Workflow operations
   async persistWorkflowSnapshot({
     workflowName,
     runId,
+    resourceId,
     snapshot
   }) {
     this.logger.debug("Persisting workflow snapshot", { workflowName, runId });
     try {
-      const resourceId = "resourceId" in snapshot ? snapshot.resourceId : void 0;
       const now = (/* @__PURE__ */ new Date()).toISOString();
       const data = {
         entity: "workflow_snapshot",
@@ -1248,12 +2268,11 @@ var DynamoDBStore = class extends MastraStorage {
         workflow_name: workflowName,
         run_id: runId,
         snapshot: JSON.stringify(snapshot),
-        // Stringify the snapshot object
         createdAt: now,
         updatedAt: now,
         resourceId
       };
-      await this.service.entities.workflowSnapshot.upsert(data).go();
+      await this.service.entities.workflow_snapshot.upsert(data).go();
     } catch (error) {
       throw new MastraError(
         {
@@ -1272,7 +2291,7 @@ var DynamoDBStore = class extends MastraStorage {
   }) {
     this.logger.debug("Loading workflow snapshot", { workflowName, runId });
     try {
-      const result = await this.service.entities.workflowSnapshot.get({
+      const result = await this.service.entities.workflow_snapshot.get({
         entity: "workflow_snapshot",
         // Add entity type
         workflow_name: workflowName,
@@ -1294,21 +2313,34 @@ var DynamoDBStore = class extends MastraStorage {
       );
     }
   }
-  async getWorkflowRuns(args) {
+  async listWorkflowRuns(args) {
     this.logger.debug("Getting workflow runs", { args });
     try {
-      const limit = args?.limit || 10;
-      const offset = args?.offset || 0;
+      const perPage = args?.perPage !== void 0 ? args.perPage : 10;
+      const page = args?.page !== void 0 ? args.page : 0;
+      if (page < 0) {
+        throw new MastraError(
+          {
+            id: "DYNAMODB_STORE_INVALID_PAGE",
+            domain: ErrorDomain.STORAGE,
+            category: ErrorCategory.USER,
+            details: { page }
+          },
+          new Error("page must be >= 0")
+        );
+      }
+      const normalizedPerPage = normalizePerPage(perPage, 10);
+      const offset = page * normalizedPerPage;
       let query;
       if (args?.workflowName) {
-        query = this.service.entities.workflowSnapshot.query.primary({
+        query = this.service.entities.workflow_snapshot.query.primary({
           entity: "workflow_snapshot",
           // Add entity type
           workflow_name: args.workflowName
         });
       } else {
         this.logger.warn("Performing a scan operation on workflow snapshots - consider using a more specific query");
-        query = this.service.entities.workflowSnapshot.scan;
+        query = this.service.entities.workflow_snapshot.scan;
       }
       const allMatchingSnapshots = [];
       let cursor = null;
@@ -1320,6 +2352,11 @@ var DynamoDBStore = class extends MastraStorage {
         });
         if (pageResults.data && pageResults.data.length > 0) {
           let pageFilteredData = pageResults.data;
+          if (args?.status) {
+            pageFilteredData = pageFilteredData.filter((snapshot) => {
+              return snapshot.snapshot.status === args.status;
+            });
+          }
           if (args?.fromDate || args?.toDate) {
             pageFilteredData = pageFilteredData.filter((snapshot) => {
               const createdAt = new Date(snapshot.createdAt);
@@ -1345,8 +2382,8 @@ var DynamoDBStore = class extends MastraStorage {
         return { runs: [], total: 0 };
       }
       const total = allMatchingSnapshots.length;
-      const paginatedData = allMatchingSnapshots.slice(offset, offset + limit);
-      const runs = paginatedData.map((snapshot) => this.formatWorkflowRun(snapshot));
+      const paginatedData = allMatchingSnapshots.slice(offset, offset + normalizedPerPage);
+      const runs = paginatedData.map((snapshot) => formatWorkflowRun(snapshot));
       return {
         runs,
         total
@@ -1354,7 +2391,7 @@ var DynamoDBStore = class extends MastraStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_GET_WORKFLOW_RUNS_FAILED",
+          id: "STORAGE_DYNAMODB_STORE_LIST_WORKFLOW_RUNS_FAILED",
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { workflowName: args?.workflowName || "", resourceId: args?.resourceId || "" }
@@ -1369,7 +2406,7 @@ var DynamoDBStore = class extends MastraStorage {
     try {
       if (workflowName) {
         this.logger.debug("WorkflowName provided, using direct GET operation.");
-        const result2 = await this.service.entities.workflowSnapshot.get({
+        const result2 = await this.service.entities.workflow_snapshot.get({
           entity: "workflow_snapshot",
           // Entity type for PK
           workflow_name: workflowName,
@@ -1391,7 +2428,7 @@ var DynamoDBStore = class extends MastraStorage {
       this.logger.debug(
         'WorkflowName not provided. Attempting to find workflow run by runId using GSI. Ensure GSI (e.g., "byRunId") is defined on the workflowSnapshot entity with run_id as its key and provisioned in DynamoDB.'
       );
-      const result = await this.service.entities.workflowSnapshot.query.gsi2({ entity: "workflow_snapshot", run_id: runId }).go();
+      const result = await this.service.entities.workflow_snapshot.query.gsi2({ entity: "workflow_snapshot", run_id: runId }).go();
       const matchingRunDbItem = result.data && result.data.length > 0 ? result.data[0] : null;
       if (!matchingRunDbItem) {
         return null;
@@ -1417,121 +2454,232 @@ var DynamoDBStore = class extends MastraStorage {
       );
     }
   }
-  // Helper function to format workflow run
-  formatWorkflowRun(snapshotData) {
-    return {
-      workflowName: snapshotData.workflow_name,
-      runId: snapshotData.run_id,
-      snapshot: snapshotData.snapshot,
-      createdAt: new Date(snapshotData.createdAt),
-      updatedAt: new Date(snapshotData.updatedAt),
-      resourceId: snapshotData.resourceId
-    };
+};
+
+// src/storage/index.ts
+var DynamoDBStore = class extends MastraStorage {
+  tableName;
+  client;
+  service;
+  hasInitialized = null;
+  stores;
+  constructor({ name, config }) {
+    super({ id: config.id, name });
+    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);
+      const operations = new StoreOperationsDynamoDB({
+        service: this.service,
+        tableName: this.tableName,
+        client: this.client
+      });
+      const workflows = new WorkflowStorageDynamoDB({ service: this.service });
+      const memory = new MemoryStorageDynamoDB({ service: this.service });
+      const scores = new ScoresStorageDynamoDB({ service: this.service });
+      this.stores = {
+        operations,
+        workflows,
+        memory,
+        scores
+      };
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "STORAGE_DYNAMODB_STORE_CONSTRUCTOR_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER
+        },
+        error
+      );
+    }
   }
-  // Helper methods for entity/table mapping
-  getEntityNameForTable(tableName) {
-    const mapping = {
-      [TABLE_THREADS]: "thread",
-      [TABLE_MESSAGES]: "message",
-      [TABLE_WORKFLOW_SNAPSHOT]: "workflowSnapshot",
-      [TABLE_EVALS]: "eval",
-      [TABLE_TRACES]: "trace"
+  get supports() {
+    return {
+      selectByIncludeResourceScope: true,
+      resourceWorkingMemory: true,
+      hasColumn: false,
+      createTable: false,
+      deleteMessages: false,
+      listScoresBySpan: true
     };
-    return mapping[tableName] || null;
   }
-  // Eval operations
-  async getEvalsByAgentName(agentName, type) {
-    this.logger.debug("Getting evals for agent", { agentName, type });
+  /**
+   * Validates that the required DynamoDB table exists and is accessible.
+   * This does not check the table structure - it assumes the table
+   * was created with the correct structure via CDK/CloudFormation.
+   */
+  async validateTableExists() {
     try {
-      const query = this.service.entities.eval.query.byAgent({ entity: "eval", agent_name: agentName });
-      const results = await query.go({ order: "desc", limit: 100 });
-      if (!results.data.length) {
-        return [];
-      }
-      let filteredData = results.data;
-      if (type) {
-        filteredData = filteredData.filter((evalRecord) => {
-          try {
-            const testInfo = evalRecord.test_info && typeof evalRecord.test_info === "string" ? JSON.parse(evalRecord.test_info) : void 0;
-            if (type === "test" && !testInfo) {
-              return false;
-            }
-            if (type === "live" && testInfo) {
-              return false;
-            }
-          } catch (e) {
-            this.logger.warn("Failed to parse test_info during filtering", { record: evalRecord, error: e });
-          }
-          return true;
-        });
-      }
-      return filteredData.map((evalRecord) => {
-        try {
-          return {
-            input: evalRecord.input,
-            output: evalRecord.output,
-            // Safely parse result and test_info
-            result: evalRecord.result && typeof evalRecord.result === "string" ? JSON.parse(evalRecord.result) : void 0,
-            agentName: evalRecord.agent_name,
-            createdAt: evalRecord.created_at,
-            // Keep as string from DDB?
-            metricName: evalRecord.metric_name,
-            instructions: evalRecord.instructions,
-            runId: evalRecord.run_id,
-            globalRunId: evalRecord.global_run_id,
-            testInfo: evalRecord.test_info && typeof evalRecord.test_info === "string" ? JSON.parse(evalRecord.test_info) : void 0
-          };
-        } catch (parseError) {
-          this.logger.error("Failed to parse eval record", { record: evalRecord, error: parseError });
-          return {
-            agentName: evalRecord.agent_name,
-            createdAt: evalRecord.created_at,
-            runId: evalRecord.run_id,
-            globalRunId: evalRecord.global_run_id
-          };
-        }
+      const command = new DescribeTableCommand({
+        TableName: this.tableName
       });
+      await this.client.send(command);
+      return true;
     } catch (error) {
+      if (error.name === "ResourceNotFoundException") {
+        return false;
+      }
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_GET_EVALS_BY_AGENT_NAME_FAILED",
+          id: "STORAGE_DYNAMODB_STORE_VALIDATE_TABLE_EXISTS_FAILED",
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          details: { agentName }
+          details: { tableName: this.tableName }
         },
         error
       );
     }
   }
-  async getTracesPaginated(_args) {
-    throw new MastraError(
-      {
-        id: "STORAGE_DYNAMODB_STORE_GET_TRACES_PAGINATED_FAILED",
-        domain: ErrorDomain.STORAGE,
-        category: ErrorCategory.THIRD_PARTY
-      },
-      new Error("Method not implemented.")
-    );
+  /**
+   * Initialize storage, validating the externally managed table is accessible.
+   * For the single-table design, we only validate once that we can access
+   * the table that was created via CDK/CloudFormation.
+   */
+  async init() {
+    if (this.hasInitialized === null) {
+      this.hasInitialized = this._performInitializationAndStore();
+    }
+    try {
+      await this.hasInitialized;
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "STORAGE_DYNAMODB_STORE_INIT_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { tableName: this.tableName }
+        },
+        error
+      );
+    }
   }
-  async getThreadsByResourceIdPaginated(_args) {
-    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.")
-    );
+  /**
+   * Performs the actual table validation and stores the promise.
+   * Handles resetting the stored promise on failure to allow retries.
+   */
+  _performInitializationAndStore() {
+    return this.validateTableExists().then((exists) => {
+      if (!exists) {
+        throw new Error(
+          `Table ${this.tableName} does not exist or is not accessible. Ensure it's created via CDK/CloudFormation before using this store.`
+        );
+      }
+      return true;
+    }).catch((err) => {
+      this.hasInitialized = null;
+      throw err;
+    });
   }
-  async getMessagesPaginated(_args) {
-    throw new MastraError(
-      {
-        id: "STORAGE_DYNAMODB_STORE_GET_MESSAGES_PAGINATED_FAILED",
-        domain: ErrorDomain.STORAGE,
-        category: ErrorCategory.THIRD_PARTY
-      },
-      new Error("Method not implemented.")
-    );
+  async createTable({ tableName, schema }) {
+    return this.stores.operations.createTable({ tableName, schema });
+  }
+  async alterTable(_args) {
+    return this.stores.operations.alterTable(_args);
+  }
+  async clearTable({ tableName }) {
+    return this.stores.operations.clearTable({ tableName });
+  }
+  async dropTable({ tableName }) {
+    return this.stores.operations.dropTable({ tableName });
+  }
+  async insert({ tableName, record }) {
+    return this.stores.operations.insert({ tableName, record });
+  }
+  async batchInsert({ tableName, records }) {
+    return this.stores.operations.batchInsert({ tableName, records });
+  }
+  async load({ tableName, keys }) {
+    return this.stores.operations.load({ tableName, keys });
+  }
+  // Thread operations
+  async getThreadById({ threadId }) {
+    return this.stores.memory.getThreadById({ threadId });
+  }
+  async saveThread({ thread }) {
+    return this.stores.memory.saveThread({ thread });
+  }
+  async updateThread({
+    id,
+    title,
+    metadata
+  }) {
+    return this.stores.memory.updateThread({ id, title, metadata });
+  }
+  async deleteThread({ threadId }) {
+    return this.stores.memory.deleteThread({ threadId });
+  }
+  async listMessagesById(args) {
+    return this.stores.memory.listMessagesById(args);
+  }
+  async saveMessages(args) {
+    return this.stores.memory.saveMessages(args);
+  }
+  async updateMessages(_args) {
+    return this.stores.memory.updateMessages(_args);
+  }
+  // Workflow operations
+  async updateWorkflowResults({
+    workflowName,
+    runId,
+    stepId,
+    result,
+    requestContext
+  }) {
+    return this.stores.workflows.updateWorkflowResults({ workflowName, runId, stepId, result, requestContext });
+  }
+  async updateWorkflowState({
+    workflowName,
+    runId,
+    opts
+  }) {
+    return this.stores.workflows.updateWorkflowState({ workflowName, runId, opts });
+  }
+  async persistWorkflowSnapshot({
+    workflowName,
+    runId,
+    resourceId,
+    snapshot
+  }) {
+    return this.stores.workflows.persistWorkflowSnapshot({ workflowName, runId, resourceId, snapshot });
+  }
+  async loadWorkflowSnapshot({
+    workflowName,
+    runId
+  }) {
+    return this.stores.workflows.loadWorkflowSnapshot({ workflowName, runId });
+  }
+  async listWorkflowRuns(args) {
+    return this.stores.workflows.listWorkflowRuns(args);
+  }
+  async getWorkflowRunById(args) {
+    return this.stores.workflows.getWorkflowRunById(args);
+  }
+  async getResourceById({ resourceId }) {
+    return this.stores.memory.getResourceById({ resourceId });
+  }
+  async saveResource({ resource }) {
+    return this.stores.memory.saveResource({ resource });
+  }
+  async updateResource({
+    resourceId,
+    workingMemory,
+    metadata
+  }) {
+    return this.stores.memory.updateResource({ resourceId, workingMemory, metadata });
   }
   /**
    * Closes the DynamoDB client connection and cleans up resources.
@@ -1553,10 +2701,50 @@ var DynamoDBStore = class extends MastraStorage {
       );
     }
   }
-  async updateMessages(_args) {
-    this.logger.error("updateMessages is not yet implemented in DynamoDBStore");
-    throw new Error("Method not implemented");
+  /**
+   * SCORERS - Not implemented
+   */
+  async getScoreById({ id: _id }) {
+    return this.stores.scores.getScoreById({ id: _id });
+  }
+  async saveScore(_score) {
+    return this.stores.scores.saveScore(_score);
+  }
+  async listScoresByRunId({
+    runId: _runId,
+    pagination: _pagination
+  }) {
+    return this.stores.scores.listScoresByRunId({ runId: _runId, pagination: _pagination });
+  }
+  async listScoresByEntityId({
+    entityId: _entityId,
+    entityType: _entityType,
+    pagination: _pagination
+  }) {
+    return this.stores.scores.listScoresByEntityId({
+      entityId: _entityId,
+      entityType: _entityType,
+      pagination: _pagination
+    });
+  }
+  async listScoresByScorerId({
+    scorerId,
+    source,
+    entityId,
+    entityType,
+    pagination
+  }) {
+    return this.stores.scores.listScoresByScorerId({ scorerId, source, entityId, entityType, pagination });
+  }
+  async listScoresBySpan({
+    traceId,
+    spanId,
+    pagination
+  }) {
+    return this.stores.scores.listScoresBySpan({ traceId, spanId, pagination });
   }
 };
 
 export { DynamoDBStore };
+//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.js.map