@mastra/dynamodb 0.0.0-toolOptionTypes-20250917085558 → 0.0.0-top-level-fix-20251211103030

package/dist/index.js

@@ -1,9 +1,10 @@
 import { DynamoDBClient, DescribeTableCommand } from '@aws-sdk/client-dynamodb';
 import { DynamoDBDocumentClient } from '@aws-sdk/lib-dynamodb';
 import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
-import { MastraStorage, StoreOperations, TracesStorage, TABLE_TRACES, WorkflowsStorage, MemoryStorage, resolveMessageLimit, ScoresStorage, LegacyEvalsStorage, TABLE_AI_SPANS, TABLE_RESOURCES, TABLE_SCORERS, TABLE_EVALS, TABLE_WORKFLOW_SNAPSHOT, TABLE_MESSAGES, TABLE_THREADS } from '@mastra/core/storage';
+import { MastraStorage, createStorageErrorId, StoreOperations, WorkflowsStorage, normalizePerPage, MemoryStorage, calculatePagination, ScoresStorage, SCORERS_SCHEMA, 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
 
@@ -370,6 +371,10 @@ var scoreEntity = new Entity({
       type: "string",
       required: false
     },
+    spanId: {
+      type: "string",
+      required: false
+    },
     runId: {
       type: "string",
       required: true
@@ -418,6 +423,10 @@ var scoreEntity = new Entity({
         return value;
       }
     },
+    preprocessPrompt: {
+      type: "string",
+      required: false
+    },
     preprocessStepResult: {
       type: "string",
       required: false,
@@ -557,7 +566,7 @@ var scoreEntity = new Entity({
         return value;
       }
     },
-    runtimeContext: {
+    requestContext: {
       type: "string",
       required: false,
       set: (value) => {
@@ -656,6 +665,11 @@ var scoreEntity = new Entity({
       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"] }
     }
   }
 });
@@ -923,187 +937,6 @@ function getElectroDbService(client, tableName) {
     }
   );
 }
-var LegacyEvalsDynamoDB = class extends LegacyEvalsStorage {
-  service;
-  tableName;
-  constructor({ service, tableName }) {
-    super();
-    this.service = service;
-    this.tableName = tableName;
-  }
-  // Eval operations
-  async getEvalsByAgentName(agentName, type) {
-    this.logger.debug("Getting evals for agent", { agentName, type });
-    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
-          };
-        }
-      });
-    } catch (error) {
-      throw new MastraError(
-        {
-          id: "STORAGE_DYNAMODB_STORE_GET_EVALS_BY_AGENT_NAME_FAILED",
-          domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY,
-          details: { agentName }
-        },
-        error
-      );
-    }
-  }
-  async getEvals(options = {}) {
-    const { agentName, type, page = 0, perPage = 100, dateRange } = options;
-    this.logger.debug("Getting evals with pagination", { agentName, type, page, perPage, dateRange });
-    try {
-      let query;
-      if (agentName) {
-        query = this.service.entities.eval.query.byAgent({ entity: "eval", agent_name: agentName });
-      } else {
-        query = this.service.entities.eval.query.byEntity({ entity: "eval" });
-      }
-      const results = await query.go({
-        order: "desc",
-        pages: "all"
-        // Get all pages to apply filtering and pagination
-      });
-      if (!results.data.length) {
-        return {
-          evals: [],
-          total: 0,
-          page,
-          perPage,
-          hasMore: false
-        };
-      }
-      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;
-        });
-      }
-      if (dateRange) {
-        const fromDate = dateRange.start;
-        const toDate = dateRange.end;
-        filteredData = filteredData.filter((evalRecord) => {
-          const recordDate = new Date(evalRecord.created_at);
-          if (fromDate && recordDate < fromDate) {
-            return false;
-          }
-          if (toDate && recordDate > toDate) {
-            return false;
-          }
-          return true;
-        });
-      }
-      const total = filteredData.length;
-      const start = page * perPage;
-      const end = start + perPage;
-      const paginatedData = filteredData.slice(start, end);
-      const evals = paginatedData.map((evalRecord) => {
-        try {
-          return {
-            input: evalRecord.input,
-            output: evalRecord.output,
-            result: evalRecord.result && typeof evalRecord.result === "string" ? JSON.parse(evalRecord.result) : void 0,
-            agentName: evalRecord.agent_name,
-            createdAt: evalRecord.created_at,
-            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 hasMore = end < total;
-      return {
-        evals,
-        total,
-        page,
-        perPage,
-        hasMore
-      };
-    } catch (error) {
-      throw new MastraError(
-        {
-          id: "STORAGE_DYNAMODB_STORE_GET_EVALS_FAILED",
-          domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY,
-          details: {
-            agentName: agentName || "all",
-            type: type || "all",
-            page,
-            perPage
-          }
-        },
-        error
-      );
-    }
-  }
-};
 var MemoryStorageDynamoDB = class extends MemoryStorage {
   service;
   constructor({ service }) {
@@ -1122,17 +955,17 @@ var MemoryStorageDynamoDB = class extends MemoryStorage {
     };
   }
   // Helper function to transform and sort threads
-  transformAndSortThreads(rawThreads, orderBy, sortDirection) {
+  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 = orderBy === "createdAt" ? a.createdAt : a.updatedAt;
-      const fieldB = orderBy === "createdAt" ? b.createdAt : b.updatedAt;
+      const fieldA = field === "createdAt" ? a.createdAt : a.updatedAt;
+      const fieldB = field === "createdAt" ? b.createdAt : b.updatedAt;
       const comparison = fieldA.getTime() - fieldB.getTime();
-      return sortDirection === "DESC" ? -comparison : comparison;
+      return direction === "DESC" ? -comparison : comparison;
     });
   }
   async getThreadById({ threadId }) {
@@ -1154,7 +987,7 @@ var MemoryStorageDynamoDB = class extends MemoryStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_GET_THREAD_BY_ID_FAILED",
+          id: createStorageErrorId("DYNAMODB", "GET_THREAD_BY_ID", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { threadId }
@@ -1163,32 +996,6 @@ var MemoryStorageDynamoDB = class extends MemoryStorage {
       );
     }
   }
-  /**
-   * @deprecated use getThreadsByResourceIdPaginated instead for paginated results.
-   */
-  async getThreadsByResourceId(args) {
-    const resourceId = args.resourceId;
-    const orderBy = this.castThreadOrderBy(args.orderBy);
-    const sortDirection = this.castThreadSortDirection(args.sortDirection);
-    this.logger.debug("Getting threads by resource ID", { resourceId, orderBy, sortDirection });
-    try {
-      const result = await this.service.entities.thread.query.byResource({ entity: "thread", resourceId }).go();
-      if (!result.data.length) {
-        return [];
-      }
-      return this.transformAndSortThreads(result.data, orderBy, sortDirection);
-    } catch (error) {
-      throw new MastraError(
-        {
-          id: "STORAGE_DYNAMODB_STORE_GET_THREADS_BY_RESOURCE_ID_FAILED",
-          domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY,
-          details: { resourceId }
-        },
-        error
-      );
-    }
-  }
   async saveThread({ thread }) {
     this.logger.debug("Saving thread", { threadId: thread.id });
     const now = /* @__PURE__ */ new Date();
@@ -1208,13 +1015,13 @@ var MemoryStorageDynamoDB = class extends MemoryStorage {
         resourceId: thread.resourceId,
         title: threadData.title,
         createdAt: thread.createdAt || now,
-        updatedAt: now,
+        updatedAt: thread.updatedAt || now,
         metadata: thread.metadata
       };
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_SAVE_THREAD_FAILED",
+          id: createStorageErrorId("DYNAMODB", "SAVE_THREAD", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { threadId: thread.id }
@@ -1256,7 +1063,7 @@ var MemoryStorageDynamoDB = class extends MemoryStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_UPDATE_THREAD_FAILED",
+          id: createStorageErrorId("DYNAMODB", "UPDATE_THREAD", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { threadId: id }
@@ -1268,7 +1075,7 @@ var MemoryStorageDynamoDB = class extends MemoryStorage {
   async deleteThread({ threadId }) {
     this.logger.debug("Deleting thread", { threadId });
     try {
-      const messages = await this.getMessages({ threadId });
+      const { messages } = await this.listMessages({ threadId, perPage: false });
       if (messages.length > 0) {
         const batchSize = 25;
         for (let i = 0; i < messages.length; i += batchSize) {
@@ -1288,7 +1095,7 @@ var MemoryStorageDynamoDB = class extends MemoryStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_DELETE_THREAD_FAILED",
+          id: createStorageErrorId("DYNAMODB", "DELETE_THREAD", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { threadId }
@@ -1297,104 +1104,176 @@ var MemoryStorageDynamoDB = class extends MemoryStorage {
       );
     }
   }
-  async getMessages({
-    threadId,
-    resourceId,
-    selectBy,
-    format
-  }) {
-    this.logger.debug("Getting messages", { threadId, selectBy });
+  async listMessagesById({ messageIds }) {
+    this.logger.debug("Getting messages by ID", { messageIds });
+    if (messageIds.length === 0) return { messages: [] };
     try {
-      if (!threadId.trim()) throw new Error("threadId must be a non-empty string");
-      const messages = [];
-      const limit = resolveMessageLimit({ last: selectBy?.last, defaultLimit: Number.MAX_SAFE_INTEGER });
-      if (selectBy?.include?.length) {
-        const includeMessages = await this._getIncludedMessages(threadId, selectBy);
-        if (includeMessages) {
-          messages.push(...includeMessages);
-        }
-      }
-      if (limit !== 0) {
-        const query = this.service.entities.message.query.byThread({ entity: "message", threadId });
-        let results;
-        if (limit !== Number.MAX_SAFE_INTEGER && limit > 0) {
-          results = await query.go({ limit, order: "desc" });
-          results.data = results.data.reverse();
-        } else {
-          results = await query.go();
-        }
-        let allThreadMessages = results.data.map((data) => this.parseMessageData(data)).filter((msg) => "content" in msg);
-        allThreadMessages.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;
-        });
-        messages.push(...allThreadMessages);
-      }
-      messages.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 uniqueMessages = messages.filter(
+      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({ threadId, resourceId }).add(uniqueMessages, "memory");
-      if (format === `v2`) return list.get.all.v2();
-      return list.get.all.v1();
+      const list = new MessageList().add(uniqueMessages, "memory");
+      return { messages: list.get.all.db() };
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_GET_MESSAGES_FAILED",
+          id: createStorageErrorId("DYNAMODB", "LIST_MESSAGES_BY_ID", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          details: { threadId, resourceId: resourceId ?? "" }
+          details: { messageIds: JSON.stringify(messageIds) }
         },
         error
       );
     }
   }
-  async getMessagesById({
-    messageIds,
-    format
-  }) {
-    this.logger.debug("Getting messages by ID", { messageIds });
-    if (messageIds.length === 0) return [];
-    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)
+  async listMessages(args) {
+    const { threadId, resourceId, include, filter, perPage: perPageInput, page = 0, orderBy } = args;
+    const threadIds = Array.isArray(threadId) ? threadId : [threadId];
+    if (threadIds.length === 0 || threadIds.some((id) => !id.trim())) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("DYNAMODB", "LIST_MESSAGES", "INVALID_THREAD_ID"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { threadId: Array.isArray(threadId) ? threadId.join(",") : threadId }
+        },
+        new Error("threadId must be a non-empty string or array of non-empty strings")
       );
-      const list = new MessageList().add(uniqueMessages, "memory");
-      if (format === `v1`) return list.get.all.v1();
-      return list.get.all.v2();
+    }
+    const perPage = normalizePerPage(perPageInput, 40);
+    const { offset, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
+    try {
+      if (page < 0) {
+        throw new MastraError(
+          {
+            id: createStorageErrorId("DYNAMODB", "LIST_MESSAGES", "INVALID_PAGE"),
+            domain: ErrorDomain.STORAGE,
+            category: ErrorCategory.USER,
+            details: { page }
+          },
+          new Error("page must be >= 0")
+        );
+      }
+      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(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) {
-      throw new MastraError(
+      const mastraError = new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_GET_MESSAGES_BY_ID_FAILED",
+          id: createStorageErrorId("DYNAMODB", "LIST_MESSAGES", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          details: { messageIds: JSON.stringify(messageIds) }
+          details: {
+            threadId: Array.isArray(threadId) ? threadId.join(",") : 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, format = "v1" } = args;
+    const { messages } = args;
     this.logger.debug("Saving messages", { count: messages.length });
     if (!messages.length) {
-      return [];
+      return { messages: [] };
     }
     const threadId = messages[0]?.threadId;
     if (!threadId) {
@@ -1448,12 +1327,11 @@ var MemoryStorageDynamoDB = class extends MemoryStorage {
         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();
+      return { messages: list.get.all.db() };
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_SAVE_MESSAGES_FAILED",
+          id: createStorageErrorId("DYNAMODB", "SAVE_MESSAGES", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { count: messages.length }
@@ -1462,37 +1340,48 @@ var MemoryStorageDynamoDB = class extends MemoryStorage {
       );
     }
   }
-  async getThreadsByResourceIdPaginated(args) {
-    const { resourceId, page = 0, perPage = 100 } = args;
-    const orderBy = this.castThreadOrderBy(args.orderBy);
-    const sortDirection = this.castThreadSortDirection(args.sortDirection);
+  async listThreadsByResourceId(args) {
+    const { resourceId, page = 0, perPage: perPageInput, orderBy } = args;
+    const perPage = normalizePerPage(perPageInput, 100);
+    if (page < 0) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("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,
-      orderBy,
-      sortDirection
+      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, orderBy, sortDirection);
-      const startIndex = page * perPage;
-      const endIndex = startIndex + perPage;
-      const paginatedThreads = allThreads.slice(startIndex, endIndex);
+      const allThreads = this.transformAndSortThreads(results.data, field, direction);
+      const endIndex = offset + perPage;
+      const paginatedThreads = allThreads.slice(offset, endIndex);
       const total = allThreads.length;
-      const hasMore = endIndex < total;
+      const hasMore = offset + perPage < total;
       return {
         threads: paginatedThreads,
         total,
         page,
-        perPage,
+        perPage: perPageForResponse,
         hasMore
       };
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_GET_THREADS_BY_RESOURCE_ID_PAGINATED_FAILED",
+          id: createStorageErrorId("DYNAMODB", "LIST_THREADS_BY_RESOURCE_ID", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { resourceId, page, perPage }
@@ -1501,98 +1390,24 @@ var MemoryStorageDynamoDB = class extends MemoryStorage {
       );
     }
   }
-  async getMessagesPaginated(args) {
-    const { threadId, resourceId, selectBy, format = "v1" } = args;
-    const { page = 0, perPage = 40, dateRange } = selectBy?.pagination || {};
-    const fromDate = dateRange?.start;
-    const toDate = dateRange?.end;
-    const limit = resolveMessageLimit({ last: selectBy?.last, defaultLimit: Number.MAX_SAFE_INTEGER });
-    this.logger.debug("Getting messages with pagination", { threadId, page, perPage, fromDate, toDate, limit });
-    try {
-      if (!threadId.trim()) throw new Error("threadId must be a non-empty string");
-      let messages = [];
-      if (selectBy?.include?.length) {
-        const includeMessages = await this._getIncludedMessages(threadId, selectBy);
-        if (includeMessages) {
-          messages.push(...includeMessages);
-        }
-      }
-      if (limit !== 0) {
-        const query = this.service.entities.message.query.byThread({ entity: "message", threadId });
-        let results;
-        if (limit !== Number.MAX_SAFE_INTEGER && limit > 0) {
-          results = await query.go({ limit, order: "desc" });
-          results.data = results.data.reverse();
-        } else {
-          results = await query.go();
-        }
-        let allThreadMessages = results.data.map((data) => this.parseMessageData(data)).filter((msg) => "content" in msg);
-        allThreadMessages.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 excludeIds = messages.map((m) => m.id);
-        if (excludeIds.length > 0) {
-          allThreadMessages = allThreadMessages.filter((msg) => !excludeIds.includes(msg.id));
-        }
-        messages.push(...allThreadMessages);
-      }
-      messages.sort((a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime());
-      if (fromDate || toDate) {
-        messages = messages.filter((msg) => {
-          const createdAt = new Date(msg.createdAt).getTime();
-          if (fromDate && createdAt < new Date(fromDate).getTime()) return false;
-          if (toDate && createdAt > new Date(toDate).getTime()) return false;
-          return true;
-        });
-      }
-      const total = messages.length;
-      const start = page * perPage;
-      const end = start + perPage;
-      const paginatedMessages = messages.slice(start, end);
-      const hasMore = end < total;
-      const list = new MessageList({ threadId, resourceId }).add(paginatedMessages, "memory");
-      const finalMessages = format === "v2" ? list.get.all.v2() : list.get.all.v1();
-      return {
-        messages: finalMessages,
-        total,
-        page,
-        perPage,
-        hasMore
-      };
-    } catch (error) {
-      const mastraError = new MastraError(
-        {
-          id: "STORAGE_DYNAMODB_STORE_GET_MESSAGES_PAGINATED_FAILED",
-          domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY,
-          details: { threadId, resourceId: resourceId ?? "" }
-        },
-        error
-      );
-      this.logger?.trackException?.(mastraError);
-      this.logger?.error?.(mastraError.toString());
-      return { messages: [], total: 0, page, perPage, hasMore: false };
-    }
-  }
   // 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");
+  async _getIncludedMessages(selectBy) {
     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;
+        const { id, withPreviousMessages = 0, withNextMessages = 0 } = includeItem;
+        const targetResult = await this.service.entities.message.get({ entity: "message", id }).go();
+        if (!targetResult.data) {
+          this.logger.warn("Target message not found", { id });
+          continue;
+        }
+        const targetMessageData = targetResult.data;
+        const searchThreadId = targetMessageData.threadId;
         this.logger.debug("Getting included messages for", {
           id,
-          targetThreadId,
           searchThreadId,
           withPreviousMessages,
           withNextMessages
@@ -1615,7 +1430,7 @@ var MemoryStorageDynamoDB = class extends MemoryStorage {
         });
         const targetIndex = allMessages.findIndex((msg) => msg.id === id);
         if (targetIndex === -1) {
-          this.logger.warn("Target message not found", { id, threadId: searchThreadId });
+          this.logger.warn("Target message not found in thread", { id, threadId: searchThreadId });
           continue;
         }
         this.logger.debug("Found target message at index", { id, targetIndex, totalMessages: allMessages.length });
@@ -1700,7 +1515,7 @@ var MemoryStorageDynamoDB = class extends MemoryStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_UPDATE_MESSAGES_FAILED",
+          id: createStorageErrorId("DYNAMODB", "UPDATE_MESSAGES", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { count: messages.length }
@@ -1729,7 +1544,7 @@ var MemoryStorageDynamoDB = class extends MemoryStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_GET_RESOURCE_BY_ID_FAILED",
+          id: createStorageErrorId("DYNAMODB", "GET_RESOURCE_BY_ID", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { resourceId }
@@ -1761,7 +1576,7 @@ var MemoryStorageDynamoDB = class extends MemoryStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_SAVE_RESOURCE_FAILED",
+          id: createStorageErrorId("DYNAMODB", "SAVE_RESOURCE", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { resourceId: resource.id }
@@ -1810,7 +1625,7 @@ var MemoryStorageDynamoDB = class extends MemoryStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_UPDATE_RESOURCE_FAILED",
+          id: createStorageErrorId("DYNAMODB", "UPDATE_RESOURCE", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { resourceId }
@@ -1845,11 +1660,11 @@ var StoreOperationsDynamoDB = class extends StoreOperations {
       [TABLE_THREADS]: "thread",
       [TABLE_MESSAGES]: "message",
       [TABLE_WORKFLOW_SNAPSHOT]: "workflow_snapshot",
-      [TABLE_EVALS]: "eval",
       [TABLE_SCORERS]: "score",
       [TABLE_TRACES]: "trace",
       [TABLE_RESOURCES]: "resource",
-      [TABLE_AI_SPANS]: "ai_span"
+      [TABLE_SPANS]: "ai_span",
+      mastra_agents: "agent"
     };
     return mapping[tableName] || null;
   }
@@ -1911,7 +1726,7 @@ var StoreOperationsDynamoDB = class extends StoreOperations {
       }
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_VALIDATE_TABLE_EXISTS_FAILED",
+          id: createStorageErrorId("DYNAMODB", "VALIDATE_TABLE_EXISTS", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { tableName: this.tableName }
@@ -1944,7 +1759,7 @@ var StoreOperationsDynamoDB = class extends StoreOperations {
       this.logger.error("Error validating table access", { tableName: this.tableName, error });
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_VALIDATE_TABLE_ACCESS_FAILED",
+          id: createStorageErrorId("DYNAMODB", "VALIDATE_TABLE_ACCESS", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { tableName: this.tableName }
@@ -1958,7 +1773,7 @@ var StoreOperationsDynamoDB = class extends StoreOperations {
     const entityName = this.getEntityNameForTable(tableName);
     if (!entityName || !this.service.entities[entityName]) {
       throw new MastraError({
-        id: "STORAGE_DYNAMODB_STORE_INSERT_INVALID_ARGS",
+        id: createStorageErrorId("DYNAMODB", "INSERT", "INVALID_ARGS"),
         domain: ErrorDomain.STORAGE,
         category: ErrorCategory.USER,
         text: "No entity defined for tableName",
@@ -1971,7 +1786,7 @@ var StoreOperationsDynamoDB = class extends StoreOperations {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_INSERT_FAILED",
+          id: createStorageErrorId("DYNAMODB", "INSERT", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { tableName }
@@ -1990,7 +1805,7 @@ var StoreOperationsDynamoDB = class extends StoreOperations {
     const entityName = this.getEntityNameForTable(tableName);
     if (!entityName || !this.service.entities[entityName]) {
       throw new MastraError({
-        id: "STORAGE_DYNAMODB_STORE_CLEAR_TABLE_INVALID_ARGS",
+        id: createStorageErrorId("DYNAMODB", "CLEAR_TABLE", "INVALID_ARGS"),
         domain: ErrorDomain.STORAGE,
         category: ErrorCategory.USER,
         text: "No entity defined for tableName",
@@ -2034,6 +1849,10 @@ var StoreOperationsDynamoDB = class extends StoreOperations {
             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}`);
@@ -2049,7 +1868,7 @@ var StoreOperationsDynamoDB = class extends StoreOperations {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_CLEAR_TABLE_FAILED",
+          id: createStorageErrorId("DYNAMODB", "CLEAR_TABLE", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { tableName }
@@ -2066,7 +1885,7 @@ var StoreOperationsDynamoDB = class extends StoreOperations {
     const entityName = this.getEntityNameForTable(tableName);
     if (!entityName || !this.service.entities[entityName]) {
       throw new MastraError({
-        id: "STORAGE_DYNAMODB_STORE_BATCH_INSERT_INVALID_ARGS",
+        id: createStorageErrorId("DYNAMODB", "BATCH_INSERT", "INVALID_ARGS"),
         domain: ErrorDomain.STORAGE,
         category: ErrorCategory.USER,
         text: "No entity defined for tableName",
@@ -2094,7 +1913,7 @@ var StoreOperationsDynamoDB = class extends StoreOperations {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_BATCH_INSERT_FAILED",
+          id: createStorageErrorId("DYNAMODB", "BATCH_INSERT", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { tableName }
@@ -2111,7 +1930,7 @@ var StoreOperationsDynamoDB = class extends StoreOperations {
     const entityName = this.getEntityNameForTable(tableName);
     if (!entityName || !this.service.entities[entityName]) {
       throw new MastraError({
-        id: "STORAGE_DYNAMODB_STORE_LOAD_INVALID_ARGS",
+        id: createStorageErrorId("DYNAMODB", "LOAD", "INVALID_ARGS"),
         domain: ErrorDomain.STORAGE,
         category: ErrorCategory.USER,
         text: "No entity defined for tableName",
@@ -2129,7 +1948,7 @@ var StoreOperationsDynamoDB = class extends StoreOperations {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_LOAD_FAILED",
+          id: createStorageErrorId("DYNAMODB", "LOAD", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { tableName }
@@ -2145,14 +1964,28 @@ var ScoresStorageDynamoDB = class extends ScoresStorage {
     super();
     this.service = service;
   }
-  // Helper function to parse score data (handle JSON fields)
+  /**
+   * DynamoDB-specific score row transformation.
+   *
+   * Note: This implementation does NOT use coreTransformScoreRow because:
+   * 1. ElectroDB already parses JSON fields via its entity getters
+   * 2. DynamoDB stores empty strings for null values (which need special handling)
+   * 3. 'entity' is a reserved ElectroDB key, so we use 'entityData' column
+   */
   parseScoreData(data) {
+    const result = {};
+    for (const key of Object.keys(SCORERS_SCHEMA)) {
+      if (["traceId", "resourceId", "threadId", "spanId"].includes(key)) {
+        result[key] = data[key] === "" ? null : data[key];
+        continue;
+      }
+      result[key] = data[key];
+    }
+    result.entity = data.entityData ?? null;
     return {
-      ...data,
-      // Convert date strings back to Date objects for consistency
+      ...result,
       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 }) {
@@ -2166,7 +1999,7 @@ var ScoresStorageDynamoDB = class extends ScoresStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_GET_SCORE_BY_ID_FAILED",
+          id: createStorageErrorId("DYNAMODB", "GET_SCORE_BY_ID", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { id }
@@ -2176,50 +2009,69 @@ var ScoresStorageDynamoDB = class extends ScoresStorage {
     }
   }
   async saveScore(score) {
-    this.logger.debug("Saving score", { scorerId: score.scorerId, runId: score.runId });
+    let validatedScore;
+    try {
+      validatedScore = saveScorePayloadSchema.parse(score);
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("DYNAMODB", "SAVE_SCORE", "VALIDATION_FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER,
+          details: {
+            scorer: score.scorer?.id ?? "unknown",
+            entityId: score.entityId ?? "unknown",
+            entityType: score.entityType ?? "unknown",
+            traceId: score.traceId ?? "",
+            spanId: score.spanId ?? ""
+          }
+        },
+        error
+      );
+    }
     const now = /* @__PURE__ */ new Date();
-    const scoreId = `score-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
-    const scoreData = {
-      entity: "score",
-      id: scoreId,
-      scorerId: score.scorerId,
-      traceId: score.traceId || "",
-      runId: score.runId,
-      scorer: typeof score.scorer === "string" ? score.scorer : JSON.stringify(score.scorer),
-      preprocessStepResult: typeof score.preprocessStepResult === "string" ? score.preprocessStepResult : JSON.stringify(score.preprocessStepResult),
-      analyzeStepResult: typeof score.analyzeStepResult === "string" ? score.analyzeStepResult : JSON.stringify(score.analyzeStepResult),
-      score: score.score,
-      reason: score.reason,
-      preprocessPrompt: score.preprocessPrompt,
-      generateScorePrompt: score.generateScorePrompt,
-      analyzePrompt: score.analyzePrompt,
-      reasonPrompt: score.reasonPrompt,
-      input: typeof score.input === "string" ? score.input : JSON.stringify(score.input),
-      output: typeof score.output === "string" ? score.output : JSON.stringify(score.output),
-      additionalContext: typeof score.additionalContext === "string" ? score.additionalContext : JSON.stringify(score.additionalContext),
-      runtimeContext: typeof score.runtimeContext === "string" ? score.runtimeContext : JSON.stringify(score.runtimeContext),
-      entityType: score.entityType,
-      entityData: typeof score.entity === "string" ? score.entity : JSON.stringify(score.entity),
-      entityId: score.entityId,
-      source: score.source,
-      resourceId: score.resourceId || "",
-      threadId: score.threadId || "",
-      createdAt: now.toISOString(),
-      updatedAt: now.toISOString()
-    };
+    const scoreId = crypto.randomUUID();
+    const scorer = typeof validatedScore.scorer === "string" ? validatedScore.scorer : JSON.stringify(validatedScore.scorer);
+    const preprocessStepResult = typeof validatedScore.preprocessStepResult === "string" ? validatedScore.preprocessStepResult : JSON.stringify(validatedScore.preprocessStepResult);
+    const analyzeStepResult = typeof validatedScore.analyzeStepResult === "string" ? validatedScore.analyzeStepResult : JSON.stringify(validatedScore.analyzeStepResult);
+    const input = typeof validatedScore.input === "string" ? validatedScore.input : JSON.stringify(validatedScore.input);
+    const output = typeof validatedScore.output === "string" ? validatedScore.output : JSON.stringify(validatedScore.output);
+    const requestContext = typeof validatedScore.requestContext === "string" ? validatedScore.requestContext : JSON.stringify(validatedScore.requestContext);
+    const entity = typeof validatedScore.entity === "string" ? validatedScore.entity : JSON.stringify(validatedScore.entity);
+    const scoreData = Object.fromEntries(
+      Object.entries({
+        ...validatedScore,
+        entity: "score",
+        id: scoreId,
+        scorer,
+        preprocessStepResult,
+        analyzeStepResult,
+        input,
+        output,
+        requestContext,
+        entityData: entity,
+        traceId: validatedScore.traceId || "",
+        resourceId: validatedScore.resourceId || "",
+        threadId: validatedScore.threadId || "",
+        spanId: validatedScore.spanId || "",
+        createdAt: now.toISOString(),
+        updatedAt: now.toISOString()
+      }).filter(([_, value]) => value !== void 0 && value !== null)
+    );
     try {
       await this.service.entities.score.upsert(scoreData).go();
-      const savedScore = {
-        ...score,
-        id: scoreId,
-        createdAt: now,
-        updatedAt: now
+      return {
+        score: {
+          ...validatedScore,
+          id: scoreId,
+          createdAt: now,
+          updatedAt: now
+        }
       };
-      return { score: savedScore };
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_SAVE_SCORE_FAILED",
+          id: createStorageErrorId("DYNAMODB", "SAVE_SCORE", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { scorerId: score.scorerId, runId: score.runId }
@@ -2228,7 +2080,7 @@ var ScoresStorageDynamoDB = class extends ScoresStorage {
       );
     }
   }
-  async getScoresByScorerId({
+  async listScoresByScorerId({
     scorerId,
     pagination,
     entityId,
@@ -2249,24 +2101,25 @@ var ScoresStorageDynamoDB = class extends ScoresStorage {
         allScores = allScores.filter((score) => score.source === source);
       }
       allScores.sort((a, b) => b.createdAt.getTime() - a.createdAt.getTime());
-      const startIndex = pagination.page * pagination.perPage;
-      const endIndex = startIndex + pagination.perPage;
-      const paginatedScores = allScores.slice(startIndex, endIndex);
+      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 hasMore = endIndex < total;
+      const end = perPageInput === false ? allScores.length : start + perPage;
+      const paginatedScores = allScores.slice(start, end);
       return {
         scores: paginatedScores,
         pagination: {
           total,
-          page: pagination.page,
-          perPage: pagination.perPage,
-          hasMore
+          page,
+          perPage: perPageForResponse,
+          hasMore: end < total
         }
       };
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_GET_SCORES_BY_SCORER_ID_FAILED",
+          id: createStorageErrorId("DYNAMODB", "LIST_SCORES_BY_SCORER_ID", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -2282,7 +2135,7 @@ var ScoresStorageDynamoDB = class extends ScoresStorage {
       );
     }
   }
-  async getScoresByRunId({
+  async listScoresByRunId({
     runId,
     pagination
   }) {
@@ -2292,24 +2145,25 @@ var ScoresStorageDynamoDB = class extends ScoresStorage {
       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 startIndex = pagination.page * pagination.perPage;
-      const endIndex = startIndex + pagination.perPage;
-      const paginatedScores = allScores.slice(startIndex, endIndex);
+      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 hasMore = endIndex < total;
+      const end = perPageInput === false ? allScores.length : start + perPage;
+      const paginatedScores = allScores.slice(start, end);
       return {
         scores: paginatedScores,
         pagination: {
           total,
-          page: pagination.page,
-          perPage: pagination.perPage,
-          hasMore
+          page,
+          perPage: perPageForResponse,
+          hasMore: end < total
         }
       };
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_GET_SCORES_BY_RUN_ID_FAILED",
+          id: createStorageErrorId("DYNAMODB", "LIST_SCORES_BY_RUN_ID", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { runId, page: pagination.page, perPage: pagination.perPage }
@@ -2318,7 +2172,7 @@ var ScoresStorageDynamoDB = class extends ScoresStorage {
       );
     }
   }
-  async getScoresByEntityId({
+  async listScoresByEntityId({
     entityId,
     entityType,
     pagination
@@ -2330,24 +2184,25 @@ var ScoresStorageDynamoDB = class extends ScoresStorage {
       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 startIndex = pagination.page * pagination.perPage;
-      const endIndex = startIndex + pagination.perPage;
-      const paginatedScores = allScores.slice(startIndex, endIndex);
+      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 hasMore = endIndex < total;
+      const end = perPageInput === false ? allScores.length : start + perPage;
+      const paginatedScores = allScores.slice(start, end);
       return {
         scores: paginatedScores,
         pagination: {
           total,
-          page: pagination.page,
-          perPage: pagination.perPage,
-          hasMore
+          page,
+          perPage: perPageForResponse,
+          hasMore: end < total
         }
       };
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_GET_SCORES_BY_ENTITY_ID_FAILED",
+          id: createStorageErrorId("DYNAMODB", "LIST_SCORES_BY_ENTITY_ID", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { entityId, entityType, page: pagination.page, perPage: pagination.perPage }
@@ -2356,234 +2211,39 @@ var ScoresStorageDynamoDB = class extends ScoresStorage {
       );
     }
   }
-};
-var TracesStorageDynamoDB = class extends TracesStorage {
-  service;
-  operations;
-  constructor({ service, operations }) {
-    super();
-    this.service = service;
-    this.operations = operations;
-  }
-  // Trace operations
-  async getTraces(args) {
-    const { name, scope, page, perPage } = args;
-    this.logger.debug("Getting traces", { name, scope, page, perPage });
-    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;
-        }
-      } while (cursor && pagesFetched < startPage);
-      return items;
-    } catch (error) {
-      throw new MastraError(
-        {
-          id: "STORAGE_DYNAMODB_STORE_GET_TRACES_FAILED",
-          domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY
-        },
-        error
-      );
-    }
-  }
-  async batchTraceInsert({ records }) {
-    this.logger.debug("Batch inserting traces", { count: records.length });
-    if (!records.length) {
-      return;
-    }
-    try {
-      const recordsToSave = records.map((rec) => ({ entity: "trace", ...rec }));
-      await this.operations.batchInsert({
-        tableName: TABLE_TRACES,
-        records: recordsToSave
-        // Pass records with 'entity' included
-      });
-    } catch (error) {
-      throw new MastraError(
-        {
-          id: "STORAGE_DYNAMODB_STORE_BATCH_TRACE_INSERT_FAILED",
-          domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY,
-          details: { count: records.length }
-        },
-        error
-      );
-    }
-  }
-  async getTracesPaginated(args) {
-    const { name, scope, page = 0, perPage = 100, attributes, filters, dateRange } = args;
-    this.logger.debug("Getting traces with pagination", { name, scope, page, perPage, attributes, filters, dateRange });
+  async listScoresBySpan({
+    traceId,
+    spanId,
+    pagination
+  }) {
+    this.logger.debug("Getting scores by span", { traceId, spanId, 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;
-      }
-      const results = await query.go({
-        order: "desc",
-        pages: "all"
-        // Get all pages to apply filtering and pagination
-      });
-      if (!results.data.length) {
-        return {
-          traces: [],
-          total: 0,
+      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,
-          hasMore: false
-        };
-      }
-      let filteredData = results.data;
-      if (attributes) {
-        filteredData = filteredData.filter((item) => {
-          try {
-            let itemAttributes = {};
-            if (item.attributes) {
-              if (typeof item.attributes === "string") {
-                if (item.attributes === "[object Object]") {
-                  itemAttributes = {};
-                } else {
-                  try {
-                    itemAttributes = JSON.parse(item.attributes);
-                  } catch {
-                    itemAttributes = {};
-                  }
-                }
-              } else if (typeof item.attributes === "object") {
-                itemAttributes = item.attributes;
-              }
-            }
-            return Object.entries(attributes).every(([key, value]) => itemAttributes[key] === value);
-          } catch (e) {
-            this.logger.warn("Failed to parse attributes during filtering", { item, error: e });
-            return false;
-          }
-        });
-      }
-      if (dateRange?.start) {
-        filteredData = filteredData.filter((item) => {
-          const itemDate = new Date(item.createdAt);
-          return itemDate >= dateRange.start;
-        });
-      }
-      if (dateRange?.end) {
-        filteredData = filteredData.filter((item) => {
-          const itemDate = new Date(item.createdAt);
-          return itemDate <= dateRange.end;
-        });
-      }
-      const total = filteredData.length;
-      const start = page * perPage;
-      const end = start + perPage;
-      const paginatedData = filteredData.slice(start, end);
-      const traces = paginatedData.map((item) => {
-        let attributes2;
-        if (item.attributes) {
-          if (typeof item.attributes === "string") {
-            if (item.attributes === "[object Object]") {
-              attributes2 = void 0;
-            } else {
-              try {
-                attributes2 = JSON.parse(item.attributes);
-              } catch {
-                attributes2 = void 0;
-              }
-            }
-          } else if (typeof item.attributes === "object") {
-            attributes2 = item.attributes;
-          }
-        }
-        let status;
-        if (item.status) {
-          if (typeof item.status === "string") {
-            try {
-              status = JSON.parse(item.status);
-            } catch {
-              status = void 0;
-            }
-          } else if (typeof item.status === "object") {
-            status = item.status;
-          }
+          perPage: perPageForResponse,
+          hasMore: end < total
         }
-        let events;
-        if (item.events) {
-          if (typeof item.events === "string") {
-            try {
-              events = JSON.parse(item.events);
-            } catch {
-              events = void 0;
-            }
-          } else if (Array.isArray(item.events)) {
-            events = item.events;
-          }
-        }
-        let links;
-        if (item.links) {
-          if (typeof item.links === "string") {
-            try {
-              links = JSON.parse(item.links);
-            } catch {
-              links = void 0;
-            }
-          } else if (Array.isArray(item.links)) {
-            links = item.links;
-          }
-        }
-        return {
-          id: item.id,
-          parentSpanId: item.parentSpanId,
-          name: item.name,
-          traceId: item.traceId,
-          scope: item.scope,
-          kind: item.kind,
-          attributes: attributes2,
-          status,
-          events,
-          links,
-          other: item.other,
-          startTime: item.startTime,
-          endTime: item.endTime,
-          createdAt: item.createdAt
-        };
-      });
-      return {
-        traces,
-        total,
-        page,
-        perPage,
-        hasMore: end < total
       };
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_GET_TRACES_PAGINATED_FAILED",
+          id: createStorageErrorId("DYNAMODB", "LIST_SCORES_BY_SPAN", "FAILED"),
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY
+          category: ErrorCategory.THIRD_PARTY,
+          details: { traceId, spanId, page: pagination.page, perPage: pagination.perPage }
         },
         error
       );
@@ -2611,7 +2271,7 @@ var WorkflowStorageDynamoDB = class extends WorkflowsStorage {
     // runId,
     // stepId,
     // result,
-    // runtimeContext,
+    // requestContext,
   }) {
     throw new Error("Method not implemented.");
   }
@@ -2638,7 +2298,6 @@ var WorkflowStorageDynamoDB = class extends WorkflowsStorage {
         workflow_name: workflowName,
         run_id: runId,
         snapshot: JSON.stringify(snapshot),
-        // Stringify the snapshot object
         createdAt: now,
         updatedAt: now,
         resourceId
@@ -2647,7 +2306,7 @@ var WorkflowStorageDynamoDB = class extends WorkflowsStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_PERSIST_WORKFLOW_SNAPSHOT_FAILED",
+          id: createStorageErrorId("DYNAMODB", "PERSIST_WORKFLOW_SNAPSHOT", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { workflowName, runId }
@@ -2675,7 +2334,7 @@ var WorkflowStorageDynamoDB = class extends WorkflowsStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_LOAD_WORKFLOW_SNAPSHOT_FAILED",
+          id: createStorageErrorId("DYNAMODB", "LOAD_WORKFLOW_SNAPSHOT", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { workflowName, runId }
@@ -2684,11 +2343,24 @@ var WorkflowStorageDynamoDB = class extends WorkflowsStorage {
       );
     }
   }
-  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: createStorageErrorId("DYNAMODB", "LIST_WORKFLOW_RUNS", "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.workflow_snapshot.query.primary({
@@ -2710,6 +2382,11 @@ var WorkflowStorageDynamoDB = class extends WorkflowsStorage {
         });
         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);
@@ -2735,7 +2412,7 @@ var WorkflowStorageDynamoDB = class extends WorkflowsStorage {
         return { runs: [], total: 0 };
       }
       const total = allMatchingSnapshots.length;
-      const paginatedData = allMatchingSnapshots.slice(offset, offset + limit);
+      const paginatedData = allMatchingSnapshots.slice(offset, offset + normalizedPerPage);
       const runs = paginatedData.map((snapshot) => formatWorkflowRun(snapshot));
       return {
         runs,
@@ -2744,7 +2421,7 @@ var WorkflowStorageDynamoDB = class extends WorkflowsStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_GET_WORKFLOW_RUNS_FAILED",
+          id: createStorageErrorId("DYNAMODB", "LIST_WORKFLOW_RUNS", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { workflowName: args?.workflowName || "", resourceId: args?.resourceId || "" }
@@ -2756,8 +2433,6 @@ var WorkflowStorageDynamoDB = class extends WorkflowsStorage {
   async getWorkflowRunById(args) {
     const { runId, workflowName } = args;
     this.logger.debug("Getting workflow run by ID", { runId, workflowName });
-    console.log("workflowName", workflowName);
-    console.log("runId", runId);
     try {
       if (workflowName) {
         this.logger.debug("WorkflowName provided, using direct GET operation.");
@@ -2767,7 +2442,6 @@ var WorkflowStorageDynamoDB = class extends WorkflowsStorage {
           workflow_name: workflowName,
           run_id: runId
         }).go();
-        console.log("result", result2);
         if (!result2.data) {
           return null;
         }
@@ -2801,7 +2475,7 @@ var WorkflowStorageDynamoDB = class extends WorkflowsStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_GET_WORKFLOW_RUN_BY_ID_FAILED",
+          id: createStorageErrorId("DYNAMODB", "GET_WORKFLOW_RUN_BY_ID", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { runId, workflowName: args?.workflowName || "" }
@@ -2810,6 +2484,26 @@ var WorkflowStorageDynamoDB = class extends WorkflowsStorage {
       );
     }
   }
+  async deleteWorkflowRunById({ runId, workflowName }) {
+    this.logger.debug("Deleting workflow run by ID", { runId, workflowName });
+    try {
+      await this.service.entities.workflow_snapshot.delete({
+        entity: "workflow_snapshot",
+        workflow_name: workflowName,
+        run_id: runId
+      }).go();
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("DYNAMODB", "DELETE_WORKFLOW_RUN_BY_ID", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { runId, workflowName }
+        },
+        error
+      );
+    }
+  }
 };
 
 // src/storage/index.ts
@@ -2820,7 +2514,7 @@ var DynamoDBStore = class extends MastraStorage {
   hasInitialized = null;
   stores;
   constructor({ name, config }) {
-    super({ name });
+    super({ id: config.id, name, disableInit: config.disableInit });
     try {
       if (!config.tableName || typeof config.tableName !== "string" || config.tableName.trim() === "") {
         throw new Error("DynamoDBStore: config.tableName must be provided and cannot be empty.");
@@ -2843,14 +2537,11 @@ var DynamoDBStore = class extends MastraStorage {
         tableName: this.tableName,
         client: this.client
       });
-      const traces = new TracesStorageDynamoDB({ service: this.service, operations });
       const workflows = new WorkflowStorageDynamoDB({ service: this.service });
       const memory = new MemoryStorageDynamoDB({ service: this.service });
       const scores = new ScoresStorageDynamoDB({ service: this.service });
       this.stores = {
         operations,
-        legacyEvals: new LegacyEvalsDynamoDB({ service: this.service, tableName: this.tableName }),
-        traces,
         workflows,
         memory,
         scores
@@ -2858,7 +2549,7 @@ var DynamoDBStore = class extends MastraStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_CONSTRUCTOR_FAILED",
+          id: createStorageErrorId("DYNAMODB", "CONSTRUCTOR", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.USER
         },
@@ -2872,7 +2563,8 @@ var DynamoDBStore = class extends MastraStorage {
       resourceWorkingMemory: true,
       hasColumn: false,
       createTable: false,
-      deleteMessages: false
+      deleteMessages: false,
+      listScoresBySpan: true
     };
   }
   /**
@@ -2893,7 +2585,7 @@ var DynamoDBStore = class extends MastraStorage {
       }
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_VALIDATE_TABLE_EXISTS_FAILED",
+          id: createStorageErrorId("DYNAMODB", "VALIDATE_TABLE_EXISTS", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { tableName: this.tableName }
@@ -2916,7 +2608,7 @@ var DynamoDBStore = class extends MastraStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_INIT_FAILED",
+          id: createStorageErrorId("DYNAMODB", "INIT", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { tableName: this.tableName }
@@ -2967,9 +2659,6 @@ var DynamoDBStore = class extends MastraStorage {
   async getThreadById({ threadId }) {
     return this.stores.memory.getThreadById({ threadId });
   }
-  async getThreadsByResourceId(args) {
-    return this.stores.memory.getThreadsByResourceId(args);
-  }
   async saveThread({ thread }) {
     return this.stores.memory.saveThread({ thread });
   }
@@ -2983,51 +2672,24 @@ var DynamoDBStore = class extends MastraStorage {
   async deleteThread({ threadId }) {
     return this.stores.memory.deleteThread({ threadId });
   }
-  async getMessages({
-    threadId,
-    resourceId,
-    selectBy,
-    format
-  }) {
-    return this.stores.memory.getMessages({ threadId, resourceId, selectBy, format });
-  }
-  async getMessagesById({
-    messageIds,
-    format
-  }) {
-    return this.stores.memory.getMessagesById({ messageIds, format });
+  async listMessagesById(args) {
+    return this.stores.memory.listMessagesById(args);
   }
   async saveMessages(args) {
     return this.stores.memory.saveMessages(args);
   }
-  async getThreadsByResourceIdPaginated(args) {
-    return this.stores.memory.getThreadsByResourceIdPaginated(args);
-  }
-  async getMessagesPaginated(args) {
-    return this.stores.memory.getMessagesPaginated(args);
-  }
   async updateMessages(_args) {
     return this.stores.memory.updateMessages(_args);
   }
-  // Trace operations
-  async getTraces(args) {
-    return this.stores.traces.getTraces(args);
-  }
-  async batchTraceInsert({ records }) {
-    return this.stores.traces.batchTraceInsert({ records });
-  }
-  async getTracesPaginated(_args) {
-    return this.stores.traces.getTracesPaginated(_args);
-  }
   // Workflow operations
   async updateWorkflowResults({
     workflowName,
     runId,
     stepId,
     result,
-    runtimeContext
+    requestContext
   }) {
-    return this.stores.workflows.updateWorkflowResults({ workflowName, runId, stepId, result, runtimeContext });
+    return this.stores.workflows.updateWorkflowResults({ workflowName, runId, stepId, result, requestContext });
   }
   async updateWorkflowState({
     workflowName,
@@ -3050,12 +2712,15 @@ var DynamoDBStore = class extends MastraStorage {
   }) {
     return this.stores.workflows.loadWorkflowSnapshot({ workflowName, runId });
   }
-  async getWorkflowRuns(args) {
-    return this.stores.workflows.getWorkflowRuns(args);
+  async listWorkflowRuns(args) {
+    return this.stores.workflows.listWorkflowRuns(args);
   }
   async getWorkflowRunById(args) {
     return this.stores.workflows.getWorkflowRunById(args);
   }
+  async deleteWorkflowRunById({ runId, workflowName }) {
+    return this.stores.workflows.deleteWorkflowRunById({ runId, workflowName });
+  }
   async getResourceById({ resourceId }) {
     return this.stores.memory.getResourceById({ resourceId });
   }
@@ -3069,13 +2734,6 @@ var DynamoDBStore = class extends MastraStorage {
   }) {
     return this.stores.memory.updateResource({ resourceId, workingMemory, metadata });
   }
-  // Eval operations
-  async getEvalsByAgentName(agentName, type) {
-    return this.stores.legacyEvals.getEvalsByAgentName(agentName, type);
-  }
-  async getEvals(options) {
-    return this.stores.legacyEvals.getEvals(options);
-  }
   /**
    * Closes the DynamoDB client connection and cleans up resources.
    * Should be called when the store is no longer needed, e.g., at the end of tests or application shutdown.
@@ -3088,7 +2746,7 @@ var DynamoDBStore = class extends MastraStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "STORAGE_DYNAMODB_STORE_CLOSE_FAILED",
+          id: createStorageErrorId("DYNAMODB", "CLOSE", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY
         },
@@ -3102,34 +2760,41 @@ var DynamoDBStore = class extends MastraStorage {
   async getScoreById({ id: _id }) {
     return this.stores.scores.getScoreById({ id: _id });
   }
-  async saveScore(_score) {
-    return this.stores.scores.saveScore(_score);
+  async saveScore(score) {
+    return this.stores.scores.saveScore(score);
   }
-  async getScoresByRunId({
+  async listScoresByRunId({
     runId: _runId,
     pagination: _pagination
   }) {
-    return this.stores.scores.getScoresByRunId({ runId: _runId, pagination: _pagination });
+    return this.stores.scores.listScoresByRunId({ runId: _runId, pagination: _pagination });
   }
-  async getScoresByEntityId({
+  async listScoresByEntityId({
     entityId: _entityId,
     entityType: _entityType,
     pagination: _pagination
   }) {
-    return this.stores.scores.getScoresByEntityId({
+    return this.stores.scores.listScoresByEntityId({
       entityId: _entityId,
       entityType: _entityType,
       pagination: _pagination
     });
   }
-  async getScoresByScorerId({
+  async listScoresByScorerId({
     scorerId,
     source,
     entityId,
     entityType,
     pagination
   }) {
-    return this.stores.scores.getScoresByScorerId({ 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 });
   }
 };