@mastra/mssql 0.0.0-netlify-no-bundle-20251127120354 → 0.0.0-partial-response-backport-20251204204441

package/dist/index.cjs

@@ -2,15 +2,15 @@
 
 var error = require('@mastra/core/error');
 var storage = require('@mastra/core/storage');
-var sql2 = require('mssql');
-var agent = require('@mastra/core/agent');
+var sql3 = require('mssql');
 var utils = require('@mastra/core/utils');
+var agent = require('@mastra/core/agent');
 var crypto = require('crypto');
-var evals = require('@mastra/core/evals');
+var scores = require('@mastra/core/scores');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
-var sql2__default = /*#__PURE__*/_interopDefault(sql2);
+var sql3__default = /*#__PURE__*/_interopDefault(sql3);
 
 // src/storage/index.ts
 function getSchemaName(schema) {
@@ -86,7 +86,153 @@ function transformFromSqlRow({
   return result;
 }
 
-// src/storage/domains/memory/index.ts
+// src/storage/domains/legacy-evals/index.ts
+function transformEvalRow(row) {
+  let testInfoValue = null, resultValue = null;
+  if (row.test_info) {
+    try {
+      testInfoValue = typeof row.test_info === "string" ? JSON.parse(row.test_info) : row.test_info;
+    } catch {
+    }
+  }
+  if (row.result) {
+    try {
+      resultValue = typeof row.result === "string" ? JSON.parse(row.result) : row.result;
+    } catch {
+    }
+  }
+  return {
+    agentName: row.agent_name,
+    input: row.input,
+    output: row.output,
+    result: resultValue,
+    metricName: row.metric_name,
+    instructions: row.instructions,
+    testInfo: testInfoValue,
+    globalRunId: row.global_run_id,
+    runId: row.run_id,
+    createdAt: row.created_at
+  };
+}
+var LegacyEvalsMSSQL = class extends storage.LegacyEvalsStorage {
+  pool;
+  schema;
+  constructor({ pool, schema }) {
+    super();
+    this.pool = pool;
+    this.schema = schema;
+  }
+  /** @deprecated use getEvals instead */
+  async getEvalsByAgentName(agentName, type) {
+    try {
+      let query = `SELECT * FROM ${getTableName({ indexName: storage.TABLE_EVALS, schemaName: getSchemaName(this.schema) })} WHERE agent_name = @p1`;
+      if (type === "test") {
+        query += " AND test_info IS NOT NULL AND JSON_VALUE(test_info, '$.testPath') IS NOT NULL";
+      } else if (type === "live") {
+        query += " AND (test_info IS NULL OR JSON_VALUE(test_info, '$.testPath') IS NULL)";
+      }
+      query += " ORDER BY created_at DESC";
+      const request = this.pool.request();
+      request.input("p1", agentName);
+      const result = await request.query(query);
+      const rows = result.recordset;
+      return typeof transformEvalRow === "function" ? rows?.map((row) => transformEvalRow(row)) ?? [] : rows ?? [];
+    } catch (error) {
+      if (error && error.number === 208 && error.message && error.message.includes("Invalid object name")) {
+        return [];
+      }
+      this.logger?.error?.("Failed to get evals for the specified agent:", error);
+      throw error;
+    }
+  }
+  async getEvals(options = {}) {
+    const { agentName, type, page = 0, perPage = 100, dateRange } = options;
+    const fromDate = dateRange?.start;
+    const toDate = dateRange?.end;
+    const where = [];
+    const params = {};
+    if (agentName) {
+      where.push("agent_name = @agentName");
+      params["agentName"] = agentName;
+    }
+    if (type === "test") {
+      where.push("test_info IS NOT NULL AND JSON_VALUE(test_info, '$.testPath') IS NOT NULL");
+    } else if (type === "live") {
+      where.push("(test_info IS NULL OR JSON_VALUE(test_info, '$.testPath') IS NULL)");
+    }
+    if (fromDate instanceof Date && !isNaN(fromDate.getTime())) {
+      where.push(`[created_at] >= @fromDate`);
+      params[`fromDate`] = fromDate.toISOString();
+    }
+    if (toDate instanceof Date && !isNaN(toDate.getTime())) {
+      where.push(`[created_at] <= @toDate`);
+      params[`toDate`] = toDate.toISOString();
+    }
+    const whereClause = where.length > 0 ? `WHERE ${where.join(" AND ")}` : "";
+    const tableName = getTableName({ indexName: storage.TABLE_EVALS, schemaName: getSchemaName(this.schema) });
+    const offset = page * perPage;
+    const countQuery = `SELECT COUNT(*) as total FROM ${tableName} ${whereClause}`;
+    const dataQuery = `SELECT * FROM ${tableName} ${whereClause} ORDER BY seq_id DESC OFFSET @offset ROWS FETCH NEXT @perPage ROWS ONLY`;
+    try {
+      const countReq = this.pool.request();
+      Object.entries(params).forEach(([key, value]) => {
+        if (value instanceof Date) {
+          countReq.input(key, sql3__default.default.DateTime, value);
+        } else {
+          countReq.input(key, value);
+        }
+      });
+      const countResult = await countReq.query(countQuery);
+      const total = countResult.recordset[0]?.total || 0;
+      if (total === 0) {
+        return {
+          evals: [],
+          total: 0,
+          page,
+          perPage,
+          hasMore: false
+        };
+      }
+      const req = this.pool.request();
+      Object.entries(params).forEach(([key, value]) => {
+        if (value instanceof Date) {
+          req.input(key, sql3__default.default.DateTime, value);
+        } else {
+          req.input(key, value);
+        }
+      });
+      req.input("offset", offset);
+      req.input("perPage", perPage);
+      const result = await req.query(dataQuery);
+      const rows = result.recordset;
+      return {
+        evals: rows?.map((row) => transformEvalRow(row)) ?? [],
+        total,
+        page,
+        perPage,
+        hasMore: offset + (rows?.length ?? 0) < total
+      };
+    } catch (error$1) {
+      const mastraError = new error.MastraError(
+        {
+          id: "MASTRA_STORAGE_MSSQL_STORE_GET_EVALS_FAILED",
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          details: {
+            agentName: agentName || "all",
+            type: type || "all",
+            page,
+            perPage
+          }
+        },
+        error$1
+      );
+      this.logger?.error?.(mastraError.toString());
+      this.logger?.trackException?.(mastraError);
+      throw mastraError;
+    }
+  }
+};
 var MemoryMSSQL = class extends storage.MemoryStorage {
   pool;
   schema;
@@ -104,7 +250,7 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
     });
     const cleanMessages = messagesWithParsedContent.map(({ seq_id, ...rest }) => rest);
     const list = new agent.MessageList().add(cleanMessages, "memory");
-    return format === "v2" ? list.get.all.db() : list.get.all.v1();
+    return format === "v2" ? list.get.all.v2() : list.get.all.v1();
   }
   constructor({
     pool,
@@ -118,7 +264,7 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
   }
   async getThreadById({ threadId }) {
     try {
-      const sql5 = `SELECT 
+      const sql7 = `SELECT 
         id,
         [resourceId],
         title,
@@ -129,7 +275,7 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
       WHERE id = @threadId`;
       const request = this.pool.request();
       request.input("threadId", threadId);
-      const resultSet = await request.query(sql5);
+      const resultSet = await request.query(sql7);
       const thread = resultSet.recordset[0] || null;
       if (!thread) {
         return null;
@@ -154,24 +300,11 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
       );
     }
   }
-  async listThreadsByResourceId(args) {
-    const { resourceId, page = 0, perPage: perPageInput, orderBy } = args;
-    if (page < 0) {
-      throw new error.MastraError({
-        id: "MASTRA_STORAGE_MSSQL_STORE_INVALID_PAGE",
-        domain: error.ErrorDomain.STORAGE,
-        category: error.ErrorCategory.USER,
-        text: "Page number must be non-negative",
-        details: {
-          resourceId,
-          page
-        }
-      });
-    }
-    const perPage = storage.normalizePerPage(perPageInput, 100);
-    const { offset, perPage: perPageForResponse } = storage.calculatePagination(page, perPageInput, perPage);
-    const { field, direction } = this.parseOrderBy(orderBy);
+  async getThreadsByResourceIdPaginated(args) {
+    const { resourceId, page = 0, perPage: perPageInput, orderBy = "createdAt", sortDirection = "DESC" } = args;
     try {
+      const perPage = perPageInput !== void 0 ? perPageInput : 100;
+      const currentOffset = page * perPage;
       const baseQuery = `FROM ${getTableName({ indexName: storage.TABLE_THREADS, schemaName: getSchemaName(this.schema) })} WHERE [resourceId] = @resourceId`;
       const countQuery = `SELECT COUNT(*) as count ${baseQuery}`;
       const countRequest = this.pool.request();
@@ -183,22 +316,17 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
           threads: [],
           total: 0,
           page,
-          perPage: perPageForResponse,
+          perPage,
           hasMore: false
         };
       }
-      const orderByField = field === "createdAt" ? "[createdAt]" : "[updatedAt]";
-      const dir = (direction || "DESC").toUpperCase() === "ASC" ? "ASC" : "DESC";
-      const limitValue = perPageInput === false ? total : perPage;
+      const orderByField = orderBy === "createdAt" ? "[createdAt]" : "[updatedAt]";
+      const dir = (sortDirection || "DESC").toUpperCase() === "ASC" ? "ASC" : "DESC";
       const dataQuery = `SELECT id, [resourceId], title, metadata, [createdAt], [updatedAt] ${baseQuery} ORDER BY ${orderByField} ${dir} OFFSET @offset ROWS FETCH NEXT @perPage ROWS ONLY`;
       const dataRequest = this.pool.request();
       dataRequest.input("resourceId", resourceId);
-      dataRequest.input("offset", offset);
-      if (limitValue > 2147483647) {
-        dataRequest.input("perPage", sql2__default.default.BigInt, limitValue);
-      } else {
-        dataRequest.input("perPage", limitValue);
-      }
+      dataRequest.input("perPage", perPage);
+      dataRequest.input("offset", currentOffset);
       const rowsResult = await dataRequest.query(dataQuery);
       const rows = rowsResult.recordset || [];
       const threads = rows.map((thread) => ({
@@ -211,13 +339,13 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
         threads,
         total,
         page,
-        perPage: perPageForResponse,
-        hasMore: perPageInput === false ? false : offset + perPage < total
+        perPage,
+        hasMore: currentOffset + threads.length < total
       };
     } catch (error$1) {
       const mastraError = new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_LIST_THREADS_BY_RESOURCE_ID_FAILED",
+          id: "MASTRA_STORAGE_MSSQL_STORE_GET_THREADS_BY_RESOURCE_ID_PAGINATED_FAILED",
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -229,13 +357,7 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
       );
       this.logger?.error?.(mastraError.toString());
       this.logger?.trackException?.(mastraError);
-      return {
-        threads: [],
-        total: 0,
-        page,
-        perPage: perPageForResponse,
-        hasMore: false
-      };
+      return { threads: [], total: 0, page, perPage: perPageInput || 100, hasMore: false };
     }
   }
   async saveThread({ thread }) {
@@ -259,12 +381,12 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
       req.input("title", thread.title);
       const metadata = thread.metadata ? JSON.stringify(thread.metadata) : null;
       if (metadata === null) {
-        req.input("metadata", sql2__default.default.NVarChar, null);
+        req.input("metadata", sql3__default.default.NVarChar, null);
       } else {
         req.input("metadata", metadata);
       }
-      req.input("createdAt", sql2__default.default.DateTime2, thread.createdAt);
-      req.input("updatedAt", sql2__default.default.DateTime2, thread.updatedAt);
+      req.input("createdAt", sql3__default.default.DateTime2, thread.createdAt);
+      req.input("updatedAt", sql3__default.default.DateTime2, thread.updatedAt);
       await req.query(mergeSql);
       return thread;
     } catch (error$1) {
@@ -281,6 +403,31 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
       );
     }
   }
+  /**
+   * @deprecated use getThreadsByResourceIdPaginated instead
+   */
+  async getThreadsByResourceId(args) {
+    const { resourceId, orderBy = "createdAt", sortDirection = "DESC" } = args;
+    try {
+      const baseQuery = `FROM ${getTableName({ indexName: storage.TABLE_THREADS, schemaName: getSchemaName(this.schema) })} WHERE [resourceId] = @resourceId`;
+      const orderByField = orderBy === "createdAt" ? "[createdAt]" : "[updatedAt]";
+      const dir = (sortDirection || "DESC").toUpperCase() === "ASC" ? "ASC" : "DESC";
+      const dataQuery = `SELECT id, [resourceId], title, metadata, [createdAt], [updatedAt] ${baseQuery} ORDER BY ${orderByField} ${dir}`;
+      const request = this.pool.request();
+      request.input("resourceId", resourceId);
+      const resultSet = await request.query(dataQuery);
+      const rows = resultSet.recordset || [];
+      return rows.map((thread) => ({
+        ...thread,
+        metadata: typeof thread.metadata === "string" ? JSON.parse(thread.metadata) : thread.metadata,
+        createdAt: thread.createdAt,
+        updatedAt: thread.updatedAt
+      }));
+    } catch (error) {
+      this.logger?.error?.(`Error getting threads for resource ${resourceId}:`, error);
+      return [];
+    }
+  }
   /**
    * Updates a thread's title and metadata, merging with existing metadata. Returns the updated thread.
    */
@@ -308,7 +455,7 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
     };
     try {
       const table = getTableName({ indexName: storage.TABLE_THREADS, schemaName: getSchemaName(this.schema) });
-      const sql5 = `UPDATE ${table}
+      const sql7 = `UPDATE ${table}
         SET title = @title,
             metadata = @metadata,
             [updatedAt] = @updatedAt
@@ -319,7 +466,7 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
       req.input("title", title);
       req.input("metadata", JSON.stringify(mergedMetadata));
       req.input("updatedAt", /* @__PURE__ */ new Date());
-      const result = await req.query(sql5);
+      const result = await req.query(sql7);
       let thread = result.recordset && result.recordset[0];
       if (thread && "seq_id" in thread) {
         const { seq_id, ...rest } = thread;
@@ -389,9 +536,11 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
   }
   async _getIncludedMessages({
     threadId,
-    include
+    selectBy,
+    orderByStatement
   }) {
     if (!threadId.trim()) throw new Error("threadId must be a non-empty string");
+    const include = selectBy?.include;
     if (!include) return null;
     const unionQueries = [];
     const paramValues = [];
@@ -416,7 +565,7 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
             m.[resourceId],
             m.seq_id
           FROM (
-            SELECT *, ROW_NUMBER() OVER (ORDER BY [createdAt] ASC) as row_num
+            SELECT *, ROW_NUMBER() OVER (${orderByStatement}) as row_num
             FROM ${getTableName({ indexName: storage.TABLE_MESSAGES, schemaName: getSchemaName(this.schema) })}
             WHERE [thread_id] = ${pThreadId}
           ) AS m
@@ -424,17 +573,15 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
           OR EXISTS (
             SELECT 1
             FROM (
-              SELECT *, ROW_NUMBER() OVER (ORDER BY [createdAt] ASC) as row_num
+              SELECT *, ROW_NUMBER() OVER (${orderByStatement}) as row_num
               FROM ${getTableName({ indexName: storage.TABLE_MESSAGES, schemaName: getSchemaName(this.schema) })}
               WHERE [thread_id] = ${pThreadId}
             ) AS target
             WHERE target.id = ${pId}
             AND (
-              -- Get previous messages (messages that come BEFORE the target)
-              (m.row_num < target.row_num AND m.row_num >= target.row_num - ${pPrev})
+              (m.row_num <= target.row_num + ${pPrev} AND m.row_num > target.row_num)
               OR
-              -- Get next messages (messages that come AFTER the target)
-              (m.row_num > target.row_num AND m.row_num <= target.row_num + ${pNext})
+              (m.row_num >= target.row_num - ${pNext} AND m.row_num < target.row_num)
             )
           )
         `
@@ -463,16 +610,34 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
     });
     return dedupedRows;
   }
-  async listMessagesById({ messageIds }) {
-    if (messageIds.length === 0) return { messages: [] };
+  async getMessages(args) {
+    const { threadId, resourceId, format, selectBy } = args;
     const selectStatement = `SELECT seq_id, id, content, role, type, [createdAt], thread_id AS threadId, resourceId`;
     const orderByStatement = `ORDER BY [seq_id] DESC`;
+    const limit = storage.resolveMessageLimit({ last: selectBy?.last, defaultLimit: 40 });
     try {
+      if (!threadId.trim()) throw new Error("threadId must be a non-empty string");
       let rows = [];
-      let query = `${selectStatement} FROM ${getTableName({ indexName: storage.TABLE_MESSAGES, schemaName: getSchemaName(this.schema) })} WHERE [id] IN (${messageIds.map((_, i) => `@id${i}`).join(", ")})`;
+      const include = selectBy?.include || [];
+      if (include?.length) {
+        const includeMessages = await this._getIncludedMessages({ threadId, selectBy, orderByStatement });
+        if (includeMessages) {
+          rows.push(...includeMessages);
+        }
+      }
+      const excludeIds = rows.map((m) => m.id).filter(Boolean);
+      let query = `${selectStatement} FROM ${getTableName({ indexName: storage.TABLE_MESSAGES, schemaName: getSchemaName(this.schema) })} WHERE [thread_id] = @threadId`;
       const request = this.pool.request();
-      messageIds.forEach((id, i) => request.input(`id${i}`, id));
-      query += ` ${orderByStatement}`;
+      request.input("threadId", threadId);
+      if (excludeIds.length > 0) {
+        const excludeParams = excludeIds.map((_, idx) => `@id${idx}`);
+        query += ` AND id NOT IN (${excludeParams.join(", ")})`;
+        excludeIds.forEach((id, idx) => {
+          request.input(`id${idx}`, id);
+        });
+      }
+      query += ` ${orderByStatement} OFFSET 0 ROWS FETCH NEXT @limit ROWS ONLY`;
+      request.input("limit", limit);
       const result = await request.query(query);
       const remainingRows = result.recordset || [];
       rows.push(...remainingRows);
@@ -480,171 +645,154 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
         const timeDiff = a.seq_id - b.seq_id;
         return timeDiff;
       });
-      const messagesWithParsedContent = rows.map((row) => {
-        if (typeof row.content === "string") {
-          try {
-            return { ...row, content: JSON.parse(row.content) };
-          } catch {
-            return row;
-          }
-        }
-        return row;
-      });
-      const cleanMessages = messagesWithParsedContent.map(({ seq_id, ...rest }) => rest);
-      const list = new agent.MessageList().add(cleanMessages, "memory");
-      return { messages: list.get.all.db() };
+      rows = rows.map(({ seq_id, ...rest }) => rest);
+      return this._parseAndFormatMessages(rows, format);
     } catch (error$1) {
       const mastraError = new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_LIST_MESSAGES_BY_ID_FAILED",
+          id: "MASTRA_STORAGE_MSSQL_STORE_GET_MESSAGES_FAILED",
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
-            messageIds: JSON.stringify(messageIds)
+            threadId,
+            resourceId: resourceId ?? ""
           }
         },
         error$1
       );
       this.logger?.error?.(mastraError.toString());
       this.logger?.trackException?.(mastraError);
-      return { messages: [] };
+      return [];
     }
   }
-  async listMessages(args) {
-    const { threadId, resourceId, include, filter, perPage: perPageInput, page = 0, orderBy } = args;
-    if (!threadId.trim()) {
-      throw new error.MastraError(
+  async getMessagesById({
+    messageIds,
+    format
+  }) {
+    if (messageIds.length === 0) return [];
+    const selectStatement = `SELECT seq_id, id, content, role, type, [createdAt], thread_id AS threadId, resourceId`;
+    const orderByStatement = `ORDER BY [seq_id] DESC`;
+    try {
+      let rows = [];
+      let query = `${selectStatement} FROM ${getTableName({ indexName: storage.TABLE_MESSAGES, schemaName: getSchemaName(this.schema) })} WHERE [id] IN (${messageIds.map((_, i) => `@id${i}`).join(", ")})`;
+      const request = this.pool.request();
+      messageIds.forEach((id, i) => request.input(`id${i}`, id));
+      query += ` ${orderByStatement}`;
+      const result = await request.query(query);
+      const remainingRows = result.recordset || [];
+      rows.push(...remainingRows);
+      rows.sort((a, b) => {
+        const timeDiff = a.seq_id - b.seq_id;
+        return timeDiff;
+      });
+      rows = rows.map(({ seq_id, ...rest }) => rest);
+      if (format === `v1`) return this._parseAndFormatMessages(rows, format);
+      return this._parseAndFormatMessages(rows, `v2`);
+    } catch (error$1) {
+      const mastraError = new error.MastraError(
         {
-          id: "STORAGE_MSSQL_LIST_MESSAGES_INVALID_THREAD_ID",
+          id: "MASTRA_STORAGE_MSSQL_STORE_GET_MESSAGES_BY_ID_FAILED",
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
-          details: { threadId }
+          details: {
+            messageIds: JSON.stringify(messageIds)
+          }
         },
-        new Error("threadId must be a non-empty string")
+        error$1
       );
+      this.logger?.error?.(mastraError.toString());
+      this.logger?.trackException?.(mastraError);
+      return [];
     }
-    if (page < 0) {
-      throw new error.MastraError({
-        id: "MASTRA_STORAGE_MSSQL_STORE_INVALID_PAGE",
-        domain: error.ErrorDomain.STORAGE,
-        category: error.ErrorCategory.USER,
-        text: "Page number must be non-negative",
-        details: {
-          threadId,
-          page
-        }
-      });
-    }
-    const perPage = storage.normalizePerPage(perPageInput, 40);
-    const { offset, perPage: perPageForResponse } = storage.calculatePagination(page, perPageInput, perPage);
+  }
+  async getMessagesPaginated(args) {
+    const { threadId, resourceId, format, selectBy } = args;
+    const { page = 0, perPage: perPageInput, dateRange } = selectBy?.pagination || {};
     try {
-      const { field, direction } = this.parseOrderBy(orderBy, "ASC");
-      const orderByStatement = `ORDER BY [${field}] ${direction}, [seq_id] ${direction}`;
-      const tableName = getTableName({ indexName: storage.TABLE_MESSAGES, schemaName: getSchemaName(this.schema) });
-      const baseQuery = `SELECT seq_id, id, content, role, type, [createdAt], thread_id AS threadId, resourceId FROM ${tableName}`;
-      const filters = {
-        thread_id: threadId,
-        ...resourceId ? { resourceId } : {},
-        ...buildDateRangeFilter(filter?.dateRange, "createdAt")
-      };
-      const { sql: actualWhereClause = "", params: whereParams } = prepareWhereClause(
-        filters);
-      const bindWhereParams = (req) => {
-        Object.entries(whereParams).forEach(([paramName, paramValue]) => req.input(paramName, paramValue));
-      };
-      const countRequest = this.pool.request();
-      bindWhereParams(countRequest);
-      const countResult = await countRequest.query(`SELECT COUNT(*) as total FROM ${tableName}${actualWhereClause}`);
+      if (!threadId.trim()) throw new Error("threadId must be a non-empty string");
+      const fromDate = dateRange?.start;
+      const toDate = dateRange?.end;
+      const selectStatement = `SELECT seq_id, id, content, role, type, [createdAt], thread_id AS threadId, resourceId`;
+      const orderByStatement = `ORDER BY [seq_id] DESC`;
+      let messages = [];
+      if (selectBy?.include?.length) {
+        const includeMessages = await this._getIncludedMessages({ threadId, selectBy, orderByStatement });
+        if (includeMessages) messages.push(...includeMessages);
+      }
+      const perPage = perPageInput !== void 0 ? perPageInput : storage.resolveMessageLimit({ last: selectBy?.last, defaultLimit: 40 });
+      const currentOffset = page * perPage;
+      const conditions = ["[thread_id] = @threadId"];
+      const request = this.pool.request();
+      request.input("threadId", threadId);
+      if (fromDate instanceof Date && !isNaN(fromDate.getTime())) {
+        conditions.push("[createdAt] >= @fromDate");
+        request.input("fromDate", fromDate.toISOString());
+      }
+      if (toDate instanceof Date && !isNaN(toDate.getTime())) {
+        conditions.push("[createdAt] <= @toDate");
+        request.input("toDate", toDate.toISOString());
+      }
+      const whereClause = `WHERE ${conditions.join(" AND ")}`;
+      const countQuery = `SELECT COUNT(*) as total FROM ${getTableName({ indexName: storage.TABLE_MESSAGES, schemaName: getSchemaName(this.schema) })} ${whereClause}`;
+      const countResult = await request.query(countQuery);
       const total = parseInt(countResult.recordset[0]?.total, 10) || 0;
-      const fetchBaseMessages = async () => {
-        const request = this.pool.request();
-        bindWhereParams(request);
-        if (perPageInput === false) {
-          const result2 = await request.query(`${baseQuery}${actualWhereClause} ${orderByStatement}`);
-          return result2.recordset || [];
-        }
-        request.input("offset", offset);
-        request.input("limit", perPage > 2147483647 ? sql2__default.default.BigInt : sql2__default.default.Int, perPage);
-        const result = await request.query(
-          `${baseQuery}${actualWhereClause} ${orderByStatement} OFFSET @offset ROWS FETCH NEXT @limit ROWS ONLY`
-        );
-        return result.recordset || [];
-      };
-      const baseRows = perPage === 0 ? [] : await fetchBaseMessages();
-      const messages = [...baseRows];
-      const seqById = /* @__PURE__ */ new Map();
-      messages.forEach((msg) => {
-        if (typeof msg.seq_id === "number") seqById.set(msg.id, msg.seq_id);
-      });
-      if (total === 0 && messages.length === 0 && (!include || include.length === 0)) {
+      if (total === 0 && messages.length > 0) {
+        const parsedIncluded = this._parseAndFormatMessages(messages, format);
         return {
-          messages: [],
-          total: 0,
+          messages: parsedIncluded,
+          total: parsedIncluded.length,
           page,
-          perPage: perPageForResponse,
+          perPage,
           hasMore: false
         };
       }
-      if (include?.length) {
-        const messageIds = new Set(messages.map((m) => m.id));
-        const includeMessages = await this._getIncludedMessages({ threadId, include });
-        includeMessages?.forEach((msg) => {
-          if (!messageIds.has(msg.id)) {
-            messages.push(msg);
-            messageIds.add(msg.id);
-            if (typeof msg.seq_id === "number") seqById.set(msg.id, msg.seq_id);
-          }
-        });
-      }
-      const parsed = this._parseAndFormatMessages(messages, "v2");
-      const mult = direction === "ASC" ? 1 : -1;
-      const finalMessages = parsed.sort((a, b) => {
-        const aVal = field === "createdAt" ? new Date(a.createdAt).getTime() : a[field];
-        const bVal = field === "createdAt" ? new Date(b.createdAt).getTime() : b[field];
-        if (aVal == null || bVal == null) {
-          return aVal == null && bVal == null ? a.id.localeCompare(b.id) : aVal == null ? 1 : -1;
-        }
-        const diff = (typeof aVal === "number" && typeof bVal === "number" ? aVal - bVal : String(aVal).localeCompare(String(bVal))) * mult;
-        if (diff !== 0) return diff;
-        const seqA = seqById.get(a.id);
-        const seqB = seqById.get(b.id);
-        return seqA != null && seqB != null ? (seqA - seqB) * mult : a.id.localeCompare(b.id);
-      });
-      const returnedThreadMessageCount = finalMessages.filter((m) => m.threadId === threadId).length;
-      const hasMore = perPageInput !== false && returnedThreadMessageCount < total && offset + perPage < total;
+      const excludeIds = messages.map((m) => m.id);
+      if (excludeIds.length > 0) {
+        const excludeParams = excludeIds.map((_, idx) => `@id${idx}`);
+        conditions.push(`id NOT IN (${excludeParams.join(", ")})`);
+        excludeIds.forEach((id, idx) => request.input(`id${idx}`, id));
+      }
+      const finalWhereClause = `WHERE ${conditions.join(" AND ")}`;
+      const dataQuery = `${selectStatement} FROM ${getTableName({ indexName: storage.TABLE_MESSAGES, schemaName: getSchemaName(this.schema) })} ${finalWhereClause} ${orderByStatement} OFFSET @offset ROWS FETCH NEXT @limit ROWS ONLY`;
+      request.input("offset", currentOffset);
+      request.input("limit", perPage);
+      const rowsResult = await request.query(dataQuery);
+      const rows = rowsResult.recordset || [];
+      rows.sort((a, b) => a.seq_id - b.seq_id);
+      messages.push(...rows);
+      let parsed = this._parseAndFormatMessages(messages, format);
+      parsed = parsed.sort((a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime());
       return {
-        messages: finalMessages,
+        messages: parsed,
         total,
         page,
-        perPage: perPageForResponse,
-        hasMore
+        perPage,
+        hasMore: currentOffset + rows.length < total
       };
     } catch (error$1) {
       const mastraError = new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_LIST_MESSAGES_FAILED",
+          id: "MASTRA_STORAGE_MSSQL_STORE_GET_MESSAGES_PAGINATED_FAILED",
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
             threadId,
-            resourceId: resourceId ?? ""
+            resourceId: resourceId ?? "",
+            page
           }
         },
         error$1
       );
       this.logger?.error?.(mastraError.toString());
       this.logger?.trackException?.(mastraError);
-      return {
-        messages: [],
-        total: 0,
-        page,
-        perPage: perPageForResponse,
-        hasMore: false
-      };
+      return { messages: [], total: 0, page, perPage: perPageInput || 40, hasMore: false };
     }
   }
-  async saveMessages({ messages }) {
-    if (messages.length === 0) return { messages: [] };
+  async saveMessages({
+    messages,
+    format
+  }) {
+    if (messages.length === 0) return messages;
     const threadId = messages[0]?.threadId;
     if (!threadId) {
       throw new error.MastraError({
@@ -688,7 +836,7 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
             "content",
             typeof message.content === "string" ? message.content : JSON.stringify(message.content)
           );
-          request.input("createdAt", sql2__default.default.DateTime2, message.createdAt);
+          request.input("createdAt", sql3__default.default.DateTime2, message.createdAt);
           request.input("role", message.role);
           request.input("type", message.type || "v2");
           request.input("resourceId", message.resourceId);
@@ -707,7 +855,7 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
           await request.query(mergeSql);
         }
         const threadReq = transaction.request();
-        threadReq.input("updatedAt", sql2__default.default.DateTime2, /* @__PURE__ */ new Date());
+        threadReq.input("updatedAt", sql3__default.default.DateTime2, /* @__PURE__ */ new Date());
         threadReq.input("id", threadId);
         await threadReq.query(`UPDATE ${tableThreads} SET [updatedAt] = @updatedAt WHERE id = @id`);
         await transaction.commit();
@@ -726,7 +874,8 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
         return message;
       });
       const list = new agent.MessageList().add(messagesWithParsedContent, "memory");
-      return { messages: list.get.all.db() };
+      if (format === "v2") return list.get.all.v2();
+      return list.get.all.v1();
     } catch (error$1) {
       throw new error.MastraError(
         {
@@ -1005,13 +1154,13 @@ var ObservabilityMSSQL = class extends storage.ObservabilityStorage {
     this.operations = operations;
     this.schema = schema;
   }
-  get tracingStrategy() {
+  get aiTracingStrategy() {
     return {
       preferred: "batch-with-updates",
       supported: ["batch-with-updates", "insert-only"]
     };
   }
-  async createSpan(span) {
+  async createAISpan(span) {
     try {
       const startedAt = span.startedAt instanceof Date ? span.startedAt.toISOString() : span.startedAt;
       const endedAt = span.endedAt instanceof Date ? span.endedAt.toISOString() : span.endedAt;
@@ -1021,11 +1170,11 @@ var ObservabilityMSSQL = class extends storage.ObservabilityStorage {
         endedAt
         // Note: createdAt/updatedAt will be set by default values
       };
-      return this.operations.insert({ tableName: storage.TABLE_SPANS, record });
+      return this.operations.insert({ tableName: storage.TABLE_AI_SPANS, record });
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MSSQL_STORE_CREATE_SPAN_FAILED",
+          id: "MSSQL_STORE_CREATE_AI_SPAN_FAILED",
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER,
           details: {
@@ -1039,10 +1188,10 @@ var ObservabilityMSSQL = class extends storage.ObservabilityStorage {
       );
     }
   }
-  async getTrace(traceId) {
+  async getAITrace(traceId) {
     try {
       const tableName = getTableName({
-        indexName: storage.TABLE_SPANS,
+        indexName: storage.TABLE_AI_SPANS,
         schemaName: getSchemaName(this.schema)
       });
       const request = this.pool.request();
@@ -1063,7 +1212,7 @@ var ObservabilityMSSQL = class extends storage.ObservabilityStorage {
         traceId,
         spans: result.recordset.map(
           (span) => transformFromSqlRow({
-            tableName: storage.TABLE_SPANS,
+            tableName: storage.TABLE_AI_SPANS,
             sqlRow: span
           })
         )
@@ -1071,7 +1220,7 @@ var ObservabilityMSSQL = class extends storage.ObservabilityStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MSSQL_STORE_GET_TRACE_FAILED",
+          id: "MSSQL_STORE_GET_AI_TRACE_FAILED",
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER,
           details: {
@@ -1082,7 +1231,7 @@ var ObservabilityMSSQL = class extends storage.ObservabilityStorage {
       );
     }
   }
-  async updateSpan({
+  async updateAISpan({
     spanId,
     traceId,
     updates
@@ -1096,14 +1245,14 @@ var ObservabilityMSSQL = class extends storage.ObservabilityStorage {
         data.startedAt = data.startedAt.toISOString();
       }
       await this.operations.update({
-        tableName: storage.TABLE_SPANS,
+        tableName: storage.TABLE_AI_SPANS,
         keys: { spanId, traceId },
         data
       });
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MSSQL_STORE_UPDATE_SPAN_FAILED",
+          id: "MSSQL_STORE_UPDATE_AI_SPAN_FAILED",
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER,
           details: {
@@ -1115,7 +1264,7 @@ var ObservabilityMSSQL = class extends storage.ObservabilityStorage {
       );
     }
   }
-  async getTracesPaginated({
+  async getAITracesPaginated({
     filters,
     pagination
   }) {
@@ -1140,7 +1289,7 @@ var ObservabilityMSSQL = class extends storage.ObservabilityStorage {
         name = `agent run: '${entityId}'`;
       } else {
         const error$1 = new error.MastraError({
-          id: "MSSQL_STORE_GET_TRACES_PAGINATED_FAILED",
+          id: "MSSQL_STORE_GET_AI_TRACES_PAGINATED_FAILED",
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER,
           details: {
@@ -1159,7 +1308,7 @@ var ObservabilityMSSQL = class extends storage.ObservabilityStorage {
       params[entityParam] = name;
     }
     const tableName = getTableName({
-      indexName: storage.TABLE_SPANS,
+      indexName: storage.TABLE_AI_SPANS,
       schemaName: getSchemaName(this.schema)
     });
     try {
@@ -1193,7 +1342,7 @@ var ObservabilityMSSQL = class extends storage.ObservabilityStorage {
       );
       const spans = dataResult.recordset.map(
         (row) => transformFromSqlRow({
-          tableName: storage.TABLE_SPANS,
+          tableName: storage.TABLE_AI_SPANS,
           sqlRow: row
         })
       );
@@ -1209,7 +1358,7 @@ var ObservabilityMSSQL = class extends storage.ObservabilityStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MSSQL_STORE_GET_TRACES_PAGINATED_FAILED",
+          id: "MSSQL_STORE_GET_AI_TRACES_PAGINATED_FAILED",
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER
         },
@@ -1217,13 +1366,13 @@ var ObservabilityMSSQL = class extends storage.ObservabilityStorage {
       );
     }
   }
-  async batchCreateSpans(args) {
+  async batchCreateAISpans(args) {
     if (!args.records || args.records.length === 0) {
       return;
     }
     try {
       await this.operations.batchInsert({
-        tableName: storage.TABLE_SPANS,
+        tableName: storage.TABLE_AI_SPANS,
         records: args.records.map((span) => ({
           ...span,
           startedAt: span.startedAt instanceof Date ? span.startedAt.toISOString() : span.startedAt,
@@ -1233,7 +1382,7 @@ var ObservabilityMSSQL = class extends storage.ObservabilityStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MSSQL_STORE_BATCH_CREATE_SPANS_FAILED",
+          id: "MSSQL_STORE_BATCH_CREATE_AI_SPANS_FAILED",
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER,
           details: {
@@ -1244,7 +1393,7 @@ var ObservabilityMSSQL = class extends storage.ObservabilityStorage {
       );
     }
   }
-  async batchUpdateSpans(args) {
+  async batchUpdateAISpans(args) {
     if (!args.records || args.records.length === 0) {
       return;
     }
@@ -1263,13 +1412,13 @@ var ObservabilityMSSQL = class extends storage.ObservabilityStorage {
         };
       });
       await this.operations.batchUpdate({
-        tableName: storage.TABLE_SPANS,
+        tableName: storage.TABLE_AI_SPANS,
         updates
       });
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MSSQL_STORE_BATCH_UPDATE_SPANS_FAILED",
+          id: "MSSQL_STORE_BATCH_UPDATE_AI_SPANS_FAILED",
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER,
           details: {
@@ -1280,20 +1429,20 @@ var ObservabilityMSSQL = class extends storage.ObservabilityStorage {
       );
     }
   }
-  async batchDeleteTraces(args) {
+  async batchDeleteAITraces(args) {
     if (!args.traceIds || args.traceIds.length === 0) {
       return;
     }
     try {
       const keys = args.traceIds.map((traceId) => ({ traceId }));
       await this.operations.batchDelete({
-        tableName: storage.TABLE_SPANS,
+        tableName: storage.TABLE_AI_SPANS,
         keys
       });
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MSSQL_STORE_BATCH_DELETE_TRACES_FAILED",
+          id: "MSSQL_STORE_BATCH_DELETE_AI_TRACES_FAILED",
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER,
           details: {
@@ -1408,7 +1557,7 @@ var StoreOperationsMSSQL = class extends storage.StoreOperations {
         const value = record[col];
         const preparedValue = this.prepareValue(value, col, tableName);
         if (preparedValue instanceof Date) {
-          request.input(`param${i}`, sql2__default.default.DateTime2, preparedValue);
+          request.input(`param${i}`, sql3__default.default.DateTime2, preparedValue);
         } else if (preparedValue === null || preparedValue === void 0) {
           request.input(`param${i}`, this.getMssqlType(tableName, col), null);
         } else {
@@ -1623,7 +1772,7 @@ ${columns}
     try {
       const keyEntries = Object.entries(keys).map(([key, value]) => [utils.parseSqlIdentifier(key, "column name"), value]);
       const conditions = keyEntries.map(([key], i) => `[${key}] = @param${i}`).join(" AND ");
-      const sql5 = `SELECT * FROM ${getTableName({ indexName: tableName, schemaName: getSchemaName(this.schemaName) })} WHERE ${conditions}`;
+      const sql7 = `SELECT * FROM ${getTableName({ indexName: tableName, schemaName: getSchemaName(this.schemaName) })} WHERE ${conditions}`;
       const request = this.pool.request();
       keyEntries.forEach(([key, value], i) => {
         const preparedValue = this.prepareValue(value, key, tableName);
@@ -1633,7 +1782,7 @@ ${columns}
           request.input(`param${i}`, preparedValue);
         }
       });
-      const resultSet = await request.query(sql5);
+      const resultSet = await request.query(sql7);
       const result = resultSet.recordset[0] || null;
       if (!result) {
         return null;
@@ -1746,23 +1895,23 @@ ${columns}
     const col = storage.TABLE_SCHEMAS[tableName]?.[columnName];
     switch (col?.type) {
       case "text":
-        return sql2__default.default.NVarChar;
+        return sql3__default.default.NVarChar;
       case "timestamp":
-        return sql2__default.default.DateTime2;
+        return sql3__default.default.DateTime2;
       case "uuid":
-        return sql2__default.default.UniqueIdentifier;
+        return sql3__default.default.UniqueIdentifier;
       case "jsonb":
-        return sql2__default.default.NVarChar;
+        return sql3__default.default.NVarChar;
       case "integer":
-        return sql2__default.default.Int;
+        return sql3__default.default.Int;
       case "bigint":
-        return sql2__default.default.BigInt;
+        return sql3__default.default.BigInt;
       case "float":
-        return sql2__default.default.Float;
+        return sql3__default.default.Float;
       case "boolean":
-        return sql2__default.default.Bit;
+        return sql3__default.default.Bit;
       default:
-        return sql2__default.default.NVarChar;
+        return sql3__default.default.NVarChar;
     }
   }
   /**
@@ -2206,30 +2355,35 @@ ${columns}
         table: storage.TABLE_TRACES,
         columns: ["name", "seq_id DESC"]
       },
+      {
+        name: `${schemaPrefix}mastra_evals_agent_name_seqid_idx`,
+        table: storage.TABLE_EVALS,
+        columns: ["agent_name", "seq_id DESC"]
+      },
       {
         name: `${schemaPrefix}mastra_scores_trace_id_span_id_seqid_idx`,
         table: storage.TABLE_SCORERS,
         columns: ["traceId", "spanId", "seq_id DESC"]
       },
-      // Spans indexes for optimal trace querying
+      // AI Spans indexes for optimal trace querying
       {
         name: `${schemaPrefix}mastra_ai_spans_traceid_startedat_idx`,
-        table: storage.TABLE_SPANS,
+        table: storage.TABLE_AI_SPANS,
         columns: ["traceId", "startedAt DESC"]
       },
       {
         name: `${schemaPrefix}mastra_ai_spans_parentspanid_startedat_idx`,
-        table: storage.TABLE_SPANS,
+        table: storage.TABLE_AI_SPANS,
         columns: ["parentSpanId", "startedAt DESC"]
       },
       {
         name: `${schemaPrefix}mastra_ai_spans_name_idx`,
-        table: storage.TABLE_SPANS,
+        table: storage.TABLE_AI_SPANS,
         columns: ["name"]
       },
       {
         name: `${schemaPrefix}mastra_ai_spans_spantype_startedat_idx`,
-        table: storage.TABLE_SPANS,
+        table: storage.TABLE_AI_SPANS,
         columns: ["spanType", "startedAt DESC"]
       }
     ];
@@ -2270,7 +2424,7 @@ function transformScoreRow(row) {
     metadata: storage.safelyParseJSON(row.metadata),
     output: storage.safelyParseJSON(row.output),
     additionalContext: storage.safelyParseJSON(row.additionalContext),
-    requestContext: storage.safelyParseJSON(row.requestContext),
+    runtimeContext: storage.safelyParseJSON(row.runtimeContext),
     entity: storage.safelyParseJSON(row.entity),
     createdAt: new Date(row.createdAt),
     updatedAt: new Date(row.updatedAt)
@@ -2316,7 +2470,7 @@ var ScoresMSSQL = class extends storage.ScoresStorage {
   async saveScore(score) {
     let validatedScore;
     try {
-      validatedScore = evals.saveScorePayloadSchema.parse(score);
+      validatedScore = scores.saveScorePayloadSchema.parse(score);
     } catch (error$1) {
       throw new error.MastraError(
         {
@@ -2337,7 +2491,7 @@ var ScoresMSSQL = class extends storage.ScoresStorage {
         input,
         output,
         additionalContext,
-        requestContext,
+        runtimeContext,
         entity,
         ...rest
       } = validatedScore;
@@ -2352,7 +2506,7 @@ var ScoresMSSQL = class extends storage.ScoresStorage {
           analyzeStepResult: analyzeStepResult || null,
           metadata: metadata || null,
           additionalContext: additionalContext || null,
-          requestContext: requestContext || null,
+          runtimeContext: runtimeContext || null,
           entity: entity || null,
           scorer: scorer || null,
           createdAt: (/* @__PURE__ */ new Date()).toISOString(),
@@ -2372,7 +2526,7 @@ var ScoresMSSQL = class extends storage.ScoresStorage {
       );
     }
   }
-  async listScoresByScorerId({
+  async getScoresByScorerId({
     scorerId,
     pagination,
     entityId,
@@ -2406,36 +2560,31 @@ var ScoresMSSQL = class extends storage.ScoresStorage {
       });
       const totalResult = await countRequest.query(`SELECT COUNT(*) as count FROM ${tableName} WHERE ${whereClause}`);
       const total = totalResult.recordset[0]?.count || 0;
-      const { page, perPage: perPageInput } = pagination;
       if (total === 0) {
         return {
           pagination: {
             total: 0,
-            page,
-            perPage: perPageInput,
+            page: pagination.page,
+            perPage: pagination.perPage,
             hasMore: false
           },
           scores: []
         };
       }
-      const perPage = storage.normalizePerPage(perPageInput, 100);
-      const { offset: start, perPage: perPageForResponse } = storage.calculatePagination(page, perPageInput, perPage);
-      const limitValue = perPageInput === false ? total : perPage;
-      const end = perPageInput === false ? total : start + perPage;
       const dataRequest = this.pool.request();
       Object.entries(params).forEach(([key, value]) => {
         dataRequest.input(key, value);
       });
-      dataRequest.input("perPage", limitValue);
-      dataRequest.input("offset", start);
+      dataRequest.input("perPage", pagination.perPage);
+      dataRequest.input("offset", pagination.page * pagination.perPage);
       const dataQuery = `SELECT * FROM ${tableName} WHERE ${whereClause} ORDER BY [createdAt] DESC OFFSET @offset ROWS FETCH NEXT @perPage ROWS ONLY`;
       const result = await dataRequest.query(dataQuery);
       return {
         pagination: {
           total: Number(total),
-          page,
-          perPage: perPageForResponse,
-          hasMore: end < total
+          page: pagination.page,
+          perPage: pagination.perPage,
+          hasMore: Number(total) > (pagination.page + 1) * pagination.perPage
         },
         scores: result.recordset.map((row) => transformScoreRow(row))
       };
@@ -2451,7 +2600,7 @@ var ScoresMSSQL = class extends storage.ScoresStorage {
       );
     }
   }
-  async listScoresByRunId({
+  async getScoresByRunId({
     runId,
     pagination
   }) {
@@ -2462,35 +2611,30 @@ var ScoresMSSQL = class extends storage.ScoresStorage {
         `SELECT COUNT(*) as count FROM ${getTableName({ indexName: storage.TABLE_SCORERS, schemaName: getSchemaName(this.schema) })} WHERE [runId] = @p1`
       );
       const total = totalResult.recordset[0]?.count || 0;
-      const { page, perPage: perPageInput } = pagination;
       if (total === 0) {
         return {
           pagination: {
             total: 0,
-            page,
-            perPage: perPageInput,
+            page: pagination.page,
+            perPage: pagination.perPage,
             hasMore: false
           },
           scores: []
         };
       }
-      const perPage = storage.normalizePerPage(perPageInput, 100);
-      const { offset: start, perPage: perPageForResponse } = storage.calculatePagination(page, perPageInput, perPage);
-      const limitValue = perPageInput === false ? total : perPage;
-      const end = perPageInput === false ? total : start + perPage;
       const dataRequest = this.pool.request();
       dataRequest.input("p1", runId);
-      dataRequest.input("p2", limitValue);
-      dataRequest.input("p3", start);
+      dataRequest.input("p2", pagination.perPage);
+      dataRequest.input("p3", pagination.page * pagination.perPage);
       const result = await dataRequest.query(
         `SELECT * FROM ${getTableName({ indexName: storage.TABLE_SCORERS, schemaName: getSchemaName(this.schema) })} WHERE [runId] = @p1 ORDER BY [createdAt] DESC OFFSET @p3 ROWS FETCH NEXT @p2 ROWS ONLY`
       );
       return {
         pagination: {
           total: Number(total),
-          page,
-          perPage: perPageForResponse,
-          hasMore: end < total
+          page: pagination.page,
+          perPage: pagination.perPage,
+          hasMore: Number(total) > (pagination.page + 1) * pagination.perPage
         },
         scores: result.recordset.map((row) => transformScoreRow(row))
       };
@@ -2506,7 +2650,7 @@ var ScoresMSSQL = class extends storage.ScoresStorage {
       );
     }
   }
-  async listScoresByEntityId({
+  async getScoresByEntityId({
     entityId,
     entityType,
     pagination
@@ -2519,36 +2663,31 @@ var ScoresMSSQL = class extends storage.ScoresStorage {
         `SELECT COUNT(*) as count FROM ${getTableName({ indexName: storage.TABLE_SCORERS, schemaName: getSchemaName(this.schema) })} WHERE [entityId] = @p1 AND [entityType] = @p2`
       );
       const total = totalResult.recordset[0]?.count || 0;
-      const { page, perPage: perPageInput } = pagination;
-      const perPage = storage.normalizePerPage(perPageInput, 100);
-      const { offset: start, perPage: perPageForResponse } = storage.calculatePagination(page, perPageInput, perPage);
       if (total === 0) {
         return {
           pagination: {
             total: 0,
-            page,
-            perPage: perPageForResponse,
+            page: pagination.page,
+            perPage: pagination.perPage,
             hasMore: false
           },
           scores: []
         };
       }
-      const limitValue = perPageInput === false ? total : perPage;
-      const end = perPageInput === false ? total : start + perPage;
       const dataRequest = this.pool.request();
       dataRequest.input("p1", entityId);
       dataRequest.input("p2", entityType);
-      dataRequest.input("p3", limitValue);
-      dataRequest.input("p4", start);
+      dataRequest.input("p3", pagination.perPage);
+      dataRequest.input("p4", pagination.page * pagination.perPage);
       const result = await dataRequest.query(
         `SELECT * FROM ${getTableName({ indexName: storage.TABLE_SCORERS, schemaName: getSchemaName(this.schema) })} WHERE [entityId] = @p1 AND [entityType] = @p2 ORDER BY [createdAt] DESC OFFSET @p4 ROWS FETCH NEXT @p3 ROWS ONLY`
       );
       return {
         pagination: {
           total: Number(total),
-          page,
-          perPage: perPageForResponse,
-          hasMore: end < total
+          page: pagination.page,
+          perPage: pagination.perPage,
+          hasMore: Number(total) > (pagination.page + 1) * pagination.perPage
         },
         scores: result.recordset.map((row) => transformScoreRow(row))
       };
@@ -2564,7 +2703,7 @@ var ScoresMSSQL = class extends storage.ScoresStorage {
       );
     }
   }
-  async listScoresBySpan({
+  async getScoresBySpan({
     traceId,
     spanId,
     pagination
@@ -2577,38 +2716,34 @@ var ScoresMSSQL = class extends storage.ScoresStorage {
         `SELECT COUNT(*) as count FROM ${getTableName({ indexName: storage.TABLE_SCORERS, schemaName: getSchemaName(this.schema) })} WHERE [traceId] = @p1 AND [spanId] = @p2`
       );
       const total = totalResult.recordset[0]?.count || 0;
-      const { page, perPage: perPageInput } = pagination;
-      const perPage = storage.normalizePerPage(perPageInput, 100);
-      const { offset: start, perPage: perPageForResponse } = storage.calculatePagination(page, perPageInput, perPage);
       if (total === 0) {
         return {
           pagination: {
             total: 0,
-            page,
-            perPage: perPageForResponse,
+            page: pagination.page,
+            perPage: pagination.perPage,
             hasMore: false
           },
           scores: []
         };
       }
-      const limitValue = perPageInput === false ? total : perPage;
-      const end = perPageInput === false ? total : start + perPage;
+      const limit = pagination.perPage + 1;
       const dataRequest = this.pool.request();
       dataRequest.input("p1", traceId);
       dataRequest.input("p2", spanId);
-      dataRequest.input("p3", limitValue);
-      dataRequest.input("p4", start);
+      dataRequest.input("p3", limit);
+      dataRequest.input("p4", pagination.page * pagination.perPage);
       const result = await dataRequest.query(
         `SELECT * FROM ${getTableName({ indexName: storage.TABLE_SCORERS, schemaName: getSchemaName(this.schema) })} WHERE [traceId] = @p1 AND [spanId] = @p2 ORDER BY [createdAt] DESC OFFSET @p4 ROWS FETCH NEXT @p3 ROWS ONLY`
       );
       return {
         pagination: {
           total: Number(total),
-          page,
-          perPage: perPageForResponse,
-          hasMore: end < total
+          page: pagination.page,
+          perPage: pagination.perPage,
+          hasMore: result.recordset.length > pagination.perPage
         },
-        scores: result.recordset.map((row) => transformScoreRow(row))
+        scores: result.recordset.slice(0, pagination.perPage).map((row) => transformScoreRow(row))
       };
     } catch (error$1) {
       throw new error.MastraError(
@@ -2623,6 +2758,173 @@ var ScoresMSSQL = class extends storage.ScoresStorage {
     }
   }
 };
+var TracesMSSQL = class extends storage.TracesStorage {
+  pool;
+  operations;
+  schema;
+  constructor({
+    pool,
+    operations,
+    schema
+  }) {
+    super();
+    this.pool = pool;
+    this.operations = operations;
+    this.schema = schema;
+  }
+  /** @deprecated use getTracesPaginated instead*/
+  async getTraces(args) {
+    if (args.fromDate || args.toDate) {
+      args.dateRange = {
+        start: args.fromDate,
+        end: args.toDate
+      };
+    }
+    const result = await this.getTracesPaginated(args);
+    return result.traces;
+  }
+  async getTracesPaginated(args) {
+    const { name, scope, page = 0, perPage: perPageInput, attributes, filters, dateRange } = args;
+    const fromDate = dateRange?.start;
+    const toDate = dateRange?.end;
+    const perPage = perPageInput !== void 0 ? perPageInput : 100;
+    const currentOffset = page * perPage;
+    const paramMap = {};
+    const conditions = [];
+    let paramIndex = 1;
+    if (name) {
+      const paramName = `p${paramIndex++}`;
+      conditions.push(`[name] LIKE @${paramName}`);
+      paramMap[paramName] = `${name}%`;
+    }
+    if (scope) {
+      const paramName = `p${paramIndex++}`;
+      conditions.push(`[scope] = @${paramName}`);
+      paramMap[paramName] = scope;
+    }
+    if (attributes) {
+      Object.entries(attributes).forEach(([key, value]) => {
+        const parsedKey = utils.parseFieldKey(key);
+        const paramName = `p${paramIndex++}`;
+        conditions.push(`JSON_VALUE([attributes], '$.${parsedKey}') = @${paramName}`);
+        paramMap[paramName] = value;
+      });
+    }
+    if (filters) {
+      Object.entries(filters).forEach(([key, value]) => {
+        const parsedKey = utils.parseFieldKey(key);
+        const paramName = `p${paramIndex++}`;
+        conditions.push(`[${parsedKey}] = @${paramName}`);
+        paramMap[paramName] = value;
+      });
+    }
+    if (fromDate instanceof Date && !isNaN(fromDate.getTime())) {
+      const paramName = `p${paramIndex++}`;
+      conditions.push(`[createdAt] >= @${paramName}`);
+      paramMap[paramName] = fromDate.toISOString();
+    }
+    if (toDate instanceof Date && !isNaN(toDate.getTime())) {
+      const paramName = `p${paramIndex++}`;
+      conditions.push(`[createdAt] <= @${paramName}`);
+      paramMap[paramName] = toDate.toISOString();
+    }
+    const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
+    const countQuery = `SELECT COUNT(*) as total FROM ${getTableName({ indexName: storage.TABLE_TRACES, schemaName: getSchemaName(this.schema) })} ${whereClause}`;
+    let total = 0;
+    try {
+      const countRequest = this.pool.request();
+      Object.entries(paramMap).forEach(([key, value]) => {
+        if (value instanceof Date) {
+          countRequest.input(key, sql3__default.default.DateTime, value);
+        } else {
+          countRequest.input(key, value);
+        }
+      });
+      const countResult = await countRequest.query(countQuery);
+      total = parseInt(countResult.recordset[0].total, 10);
+    } catch (error$1) {
+      throw new error.MastraError(
+        {
+          id: "MASTRA_STORAGE_MSSQL_STORE_GET_TRACES_PAGINATED_FAILED_TO_RETRIEVE_TOTAL_COUNT",
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          details: {
+            name: args.name ?? "",
+            scope: args.scope ?? ""
+          }
+        },
+        error$1
+      );
+    }
+    if (total === 0) {
+      return {
+        traces: [],
+        total: 0,
+        page,
+        perPage,
+        hasMore: false
+      };
+    }
+    const dataQuery = `SELECT * FROM ${getTableName({ indexName: storage.TABLE_TRACES, schemaName: getSchemaName(this.schema) })} ${whereClause} ORDER BY [seq_id] DESC OFFSET @offset ROWS FETCH NEXT @limit ROWS ONLY`;
+    const dataRequest = this.pool.request();
+    Object.entries(paramMap).forEach(([key, value]) => {
+      if (value instanceof Date) {
+        dataRequest.input(key, sql3__default.default.DateTime, value);
+      } else {
+        dataRequest.input(key, value);
+      }
+    });
+    dataRequest.input("offset", currentOffset);
+    dataRequest.input("limit", perPage);
+    try {
+      const rowsResult = await dataRequest.query(dataQuery);
+      const rows = rowsResult.recordset;
+      const traces = rows.map((row) => ({
+        id: row.id,
+        parentSpanId: row.parentSpanId,
+        traceId: row.traceId,
+        name: row.name,
+        scope: row.scope,
+        kind: row.kind,
+        status: JSON.parse(row.status),
+        events: JSON.parse(row.events),
+        links: JSON.parse(row.links),
+        attributes: JSON.parse(row.attributes),
+        startTime: row.startTime,
+        endTime: row.endTime,
+        other: row.other,
+        createdAt: row.createdAt
+      }));
+      return {
+        traces,
+        total,
+        page,
+        perPage,
+        hasMore: currentOffset + traces.length < total
+      };
+    } catch (error$1) {
+      throw new error.MastraError(
+        {
+          id: "MASTRA_STORAGE_MSSQL_STORE_GET_TRACES_PAGINATED_FAILED_TO_RETRIEVE_TRACES",
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          details: {
+            name: args.name ?? "",
+            scope: args.scope ?? ""
+          }
+        },
+        error$1
+      );
+    }
+  }
+  async batchTraceInsert({ records }) {
+    this.logger.debug("Batch inserting traces", { count: records.length });
+    await this.operations.batchInsert({
+      tableName: storage.TABLE_TRACES,
+      records
+    });
+  }
+};
 var WorkflowsMSSQL = class extends storage.WorkflowsStorage {
   pool;
   operations;
@@ -2660,13 +2962,13 @@ var WorkflowsMSSQL = class extends storage.WorkflowsStorage {
     runId,
     stepId,
     result,
-    requestContext
+    runtimeContext
   }) {
     const table = getTableName({ indexName: storage.TABLE_WORKFLOW_SNAPSHOT, schemaName: getSchemaName(this.schema) });
     const transaction = this.pool.transaction();
     try {
       await transaction.begin();
-      const selectRequest = new sql2__default.default.Request(transaction);
+      const selectRequest = new sql3__default.default.Request(transaction);
       selectRequest.input("workflow_name", workflowName);
       selectRequest.input("run_id", runId);
       const existingSnapshotResult = await selectRequest.query(
@@ -2686,20 +2988,20 @@ var WorkflowsMSSQL = class extends storage.WorkflowsStorage {
           value: {},
           waitingPaths: {},
           runId,
-          requestContext: {}
+          runtimeContext: {}
         };
       } else {
         const existingSnapshot = existingSnapshotResult.recordset[0].snapshot;
         snapshot = typeof existingSnapshot === "string" ? JSON.parse(existingSnapshot) : existingSnapshot;
       }
       snapshot.context[stepId] = result;
-      snapshot.requestContext = { ...snapshot.requestContext, ...requestContext };
-      const upsertReq = new sql2__default.default.Request(transaction);
+      snapshot.runtimeContext = { ...snapshot.runtimeContext, ...runtimeContext };
+      const upsertReq = new sql3__default.default.Request(transaction);
       upsertReq.input("workflow_name", workflowName);
       upsertReq.input("run_id", runId);
       upsertReq.input("snapshot", JSON.stringify(snapshot));
-      upsertReq.input("createdAt", sql2__default.default.DateTime2, /* @__PURE__ */ new Date());
-      upsertReq.input("updatedAt", sql2__default.default.DateTime2, /* @__PURE__ */ new Date());
+      upsertReq.input("createdAt", sql3__default.default.DateTime2, /* @__PURE__ */ new Date());
+      upsertReq.input("updatedAt", sql3__default.default.DateTime2, /* @__PURE__ */ new Date());
       await upsertReq.query(
         `MERGE ${table} AS target
          USING (SELECT @workflow_name AS workflow_name, @run_id AS run_id) AS src
@@ -2739,7 +3041,7 @@ var WorkflowsMSSQL = class extends storage.WorkflowsStorage {
     const transaction = this.pool.transaction();
     try {
       await transaction.begin();
-      const selectRequest = new sql2__default.default.Request(transaction);
+      const selectRequest = new sql3__default.default.Request(transaction);
       selectRequest.input("workflow_name", workflowName);
       selectRequest.input("run_id", runId);
       const existingSnapshotResult = await selectRequest.query(
@@ -2767,11 +3069,11 @@ var WorkflowsMSSQL = class extends storage.WorkflowsStorage {
         );
       }
       const updatedSnapshot = { ...snapshot, ...opts };
-      const updateRequest = new sql2__default.default.Request(transaction);
+      const updateRequest = new sql3__default.default.Request(transaction);
       updateRequest.input("snapshot", JSON.stringify(updatedSnapshot));
       updateRequest.input("workflow_name", workflowName);
       updateRequest.input("run_id", runId);
-      updateRequest.input("updatedAt", sql2__default.default.DateTime2, /* @__PURE__ */ new Date());
+      updateRequest.input("updatedAt", sql3__default.default.DateTime2, /* @__PURE__ */ new Date());
       await updateRequest.query(
         `UPDATE ${table} SET snapshot = @snapshot, [updatedAt] = @updatedAt WHERE workflow_name = @workflow_name AND run_id = @run_id`
       );
@@ -2810,8 +3112,8 @@ var WorkflowsMSSQL = class extends storage.WorkflowsStorage {
       request.input("run_id", runId);
       request.input("resourceId", resourceId);
       request.input("snapshot", JSON.stringify(snapshot));
-      request.input("createdAt", sql2__default.default.DateTime2, new Date(now));
-      request.input("updatedAt", sql2__default.default.DateTime2, new Date(now));
+      request.input("createdAt", sql3__default.default.DateTime2, new Date(now));
+      request.input("updatedAt", sql3__default.default.DateTime2, new Date(now));
       const mergeSql = `MERGE INTO ${table} AS target
         USING (SELECT @workflow_name AS workflow_name, @run_id AS run_id) AS src
         ON target.workflow_name = src.workflow_name AND target.run_id = src.run_id
@@ -2908,12 +3210,12 @@ var WorkflowsMSSQL = class extends storage.WorkflowsStorage {
       );
     }
   }
-  async listWorkflowRuns({
+  async getWorkflowRuns({
     workflowName,
     fromDate,
     toDate,
-    page,
-    perPage,
+    limit,
+    offset,
     resourceId,
     status
   } = {}) {
@@ -2951,23 +3253,20 @@ var WorkflowsMSSQL = class extends storage.WorkflowsStorage {
       const request = this.pool.request();
       Object.entries(paramMap).forEach(([key, value]) => {
         if (value instanceof Date) {
-          request.input(key, sql2__default.default.DateTime, value);
+          request.input(key, sql3__default.default.DateTime, value);
         } else {
           request.input(key, value);
         }
       });
-      const usePagination = typeof perPage === "number" && typeof page === "number";
-      if (usePagination) {
+      if (limit !== void 0 && offset !== void 0) {
         const countQuery = `SELECT COUNT(*) as count FROM ${tableName} ${whereClause}`;
         const countResult = await request.query(countQuery);
         total = Number(countResult.recordset[0]?.count || 0);
       }
       let query = `SELECT * FROM ${tableName} ${whereClause} ORDER BY [seq_id] DESC`;
-      if (usePagination) {
-        const normalizedPerPage = storage.normalizePerPage(perPage, Number.MAX_SAFE_INTEGER);
-        const offset = page * normalizedPerPage;
-        query += ` OFFSET @offset ROWS FETCH NEXT @perPage ROWS ONLY`;
-        request.input("perPage", normalizedPerPage);
+      if (limit !== void 0 && offset !== void 0) {
+        query += ` OFFSET @offset ROWS FETCH NEXT @limit ROWS ONLY`;
+        request.input("limit", limit);
         request.input("offset", offset);
       }
       const result = await request.query(query);
@@ -2976,7 +3275,7 @@ var WorkflowsMSSQL = class extends storage.WorkflowsStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_LIST_WORKFLOW_RUNS_FAILED",
+          id: "MASTRA_STORAGE_MSSQL_STORE_GET_WORKFLOW_RUNS_FAILED",
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -2996,10 +3295,7 @@ var MSSQLStore = class extends storage.MastraStorage {
   isConnected = null;
   stores;
   constructor(config) {
-    if (!config.id || typeof config.id !== "string" || config.id.trim() === "") {
-      throw new Error("MSSQLStore: id must be provided and cannot be empty.");
-    }
-    super({ id: config.id, name: "MSSQLStore" });
+    super({ name: "MSSQLStore" });
     try {
       if ("connectionString" in config) {
         if (!config.connectionString || typeof config.connectionString !== "string" || config.connectionString.trim() === "") {
@@ -3014,7 +3310,7 @@ var MSSQLStore = class extends storage.MastraStorage {
         }
       }
       this.schema = config.schemaName || "dbo";
-      this.pool = "connectionString" in config ? new sql2__default.default.ConnectionPool(config.connectionString) : new sql2__default.default.ConnectionPool({
+      this.pool = "connectionString" in config ? new sql3__default.default.ConnectionPool(config.connectionString) : new sql3__default.default.ConnectionPool({
         server: config.server,
         database: config.database,
         user: config.user,
@@ -3022,15 +3318,19 @@ var MSSQLStore = class extends storage.MastraStorage {
         port: config.port,
         options: config.options || { encrypt: true, trustServerCertificate: true }
       });
+      const legacyEvals = new LegacyEvalsMSSQL({ pool: this.pool, schema: this.schema });
       const operations = new StoreOperationsMSSQL({ pool: this.pool, schemaName: this.schema });
       const scores = new ScoresMSSQL({ pool: this.pool, operations, schema: this.schema });
+      const traces = new TracesMSSQL({ pool: this.pool, operations, schema: this.schema });
       const workflows = new WorkflowsMSSQL({ pool: this.pool, operations, schema: this.schema });
       const memory = new MemoryMSSQL({ pool: this.pool, schema: this.schema, operations });
       const observability = new ObservabilityMSSQL({ pool: this.pool, operations, schema: this.schema });
       this.stores = {
         operations,
         scores,
+        traces,
         workflows,
+        legacyEvals,
         memory,
         observability
       };
@@ -3084,11 +3384,30 @@ var MSSQLStore = class extends storage.MastraStorage {
       hasColumn: true,
       createTable: true,
       deleteMessages: true,
-      listScoresBySpan: true,
-      observabilityInstance: true,
+      getScoresBySpan: true,
+      aiTracing: true,
       indexManagement: true
     };
   }
+  /** @deprecated use getEvals instead */
+  async getEvalsByAgentName(agentName, type) {
+    return this.stores.legacyEvals.getEvalsByAgentName(agentName, type);
+  }
+  async getEvals(options = {}) {
+    return this.stores.legacyEvals.getEvals(options);
+  }
+  /**
+   * @deprecated use getTracesPaginated instead
+   */
+  async getTraces(args) {
+    return this.stores.traces.getTraces(args);
+  }
+  async getTracesPaginated(args) {
+    return this.stores.traces.getTracesPaginated(args);
+  }
+  async batchTraceInsert({ records }) {
+    return this.stores.traces.batchTraceInsert({ records });
+  }
   async createTable({
     tableName,
     schema
@@ -3123,6 +3442,15 @@ var MSSQLStore = class extends storage.MastraStorage {
   async getThreadById({ threadId }) {
     return this.stores.memory.getThreadById({ threadId });
   }
+  /**
+   * @deprecated use getThreadsByResourceIdPaginated instead
+   */
+  async getThreadsByResourceId(args) {
+    return this.stores.memory.getThreadsByResourceId(args);
+  }
+  async getThreadsByResourceIdPaginated(args) {
+    return this.stores.memory.getThreadsByResourceIdPaginated(args);
+  }
   async saveThread({ thread }) {
     return this.stores.memory.saveThread({ thread });
   }
@@ -3136,8 +3464,17 @@ var MSSQLStore = class extends storage.MastraStorage {
   async deleteThread({ threadId }) {
     return this.stores.memory.deleteThread({ threadId });
   }
-  async listMessagesById({ messageIds }) {
-    return this.stores.memory.listMessagesById({ messageIds });
+  async getMessages(args) {
+    return this.stores.memory.getMessages(args);
+  }
+  async getMessagesById({
+    messageIds,
+    format
+  }) {
+    return this.stores.memory.getMessagesById({ messageIds, format });
+  }
+  async getMessagesPaginated(args) {
+    return this.stores.memory.getMessagesPaginated(args);
   }
   async saveMessages(args) {
     return this.stores.memory.saveMessages(args);
@@ -3171,9 +3508,9 @@ var MSSQLStore = class extends storage.MastraStorage {
     runId,
     stepId,
     result,
-    requestContext
+    runtimeContext
   }) {
-    return this.stores.workflows.updateWorkflowResults({ workflowName, runId, stepId, result, requestContext });
+    return this.stores.workflows.updateWorkflowResults({ workflowName, runId, stepId, result, runtimeContext });
   }
   async updateWorkflowState({
     workflowName,
@@ -3196,8 +3533,8 @@ var MSSQLStore = class extends storage.MastraStorage {
   }) {
     return this.stores.workflows.loadWorkflowSnapshot({ workflowName, runId });
   }
-  async listWorkflowRuns(args = {}) {
-    return this.stores.workflows.listWorkflowRuns(args);
+  async getWorkflowRuns(args = {}) {
+    return this.stores.workflows.getWorkflowRuns(args);
   }
   async getWorkflowRunById({
     runId,
@@ -3224,7 +3561,7 @@ var MSSQLStore = class extends storage.MastraStorage {
     return this.stores.operations.dropIndex(indexName);
   }
   /**
-   * Tracing / Observability
+   * AI Tracing / Observability
    */
   getObservabilityStore() {
     if (!this.stores.observability) {
@@ -3237,30 +3574,30 @@ var MSSQLStore = class extends storage.MastraStorage {
     }
     return this.stores.observability;
   }
-  async createSpan(span) {
-    return this.getObservabilityStore().createSpan(span);
+  async createAISpan(span) {
+    return this.getObservabilityStore().createAISpan(span);
   }
-  async updateSpan({
+  async updateAISpan({
     spanId,
     traceId,
     updates
   }) {
-    return this.getObservabilityStore().updateSpan({ spanId, traceId, updates });
+    return this.getObservabilityStore().updateAISpan({ spanId, traceId, updates });
   }
-  async getTrace(traceId) {
-    return this.getObservabilityStore().getTrace(traceId);
+  async getAITrace(traceId) {
+    return this.getObservabilityStore().getAITrace(traceId);
   }
-  async getTracesPaginated(args) {
-    return this.getObservabilityStore().getTracesPaginated(args);
+  async getAITracesPaginated(args) {
+    return this.getObservabilityStore().getAITracesPaginated(args);
   }
-  async batchCreateSpans(args) {
-    return this.getObservabilityStore().batchCreateSpans(args);
+  async batchCreateAISpans(args) {
+    return this.getObservabilityStore().batchCreateAISpans(args);
   }
-  async batchUpdateSpans(args) {
-    return this.getObservabilityStore().batchUpdateSpans(args);
+  async batchUpdateAISpans(args) {
+    return this.getObservabilityStore().batchUpdateAISpans(args);
   }
-  async batchDeleteTraces(args) {
-    return this.getObservabilityStore().batchDeleteTraces(args);
+  async batchDeleteAITraces(args) {
+    return this.getObservabilityStore().batchDeleteAITraces(args);
   }
   /**
    * Scorers
@@ -3268,14 +3605,14 @@ var MSSQLStore = class extends storage.MastraStorage {
   async getScoreById({ id: _id }) {
     return this.stores.scores.getScoreById({ id: _id });
   }
-  async listScoresByScorerId({
+  async getScoresByScorerId({
     scorerId: _scorerId,
     pagination: _pagination,
     entityId: _entityId,
     entityType: _entityType,
     source: _source
   }) {
-    return this.stores.scores.listScoresByScorerId({
+    return this.stores.scores.getScoresByScorerId({
       scorerId: _scorerId,
       pagination: _pagination,
       entityId: _entityId,
@@ -3286,29 +3623,29 @@ var MSSQLStore = class extends storage.MastraStorage {
   async saveScore(_score) {
     return this.stores.scores.saveScore(_score);
   }
-  async listScoresByRunId({
+  async getScoresByRunId({
     runId: _runId,
     pagination: _pagination
   }) {
-    return this.stores.scores.listScoresByRunId({ runId: _runId, pagination: _pagination });
+    return this.stores.scores.getScoresByRunId({ runId: _runId, pagination: _pagination });
   }
-  async listScoresByEntityId({
+  async getScoresByEntityId({
     entityId: _entityId,
     entityType: _entityType,
     pagination: _pagination
   }) {
-    return this.stores.scores.listScoresByEntityId({
+    return this.stores.scores.getScoresByEntityId({
       entityId: _entityId,
       entityType: _entityType,
       pagination: _pagination
     });
   }
-  async listScoresBySpan({
+  async getScoresBySpan({
     traceId,
     spanId,
     pagination: _pagination
   }) {
-    return this.stores.scores.listScoresBySpan({ traceId, spanId, pagination: _pagination });
+    return this.stores.scores.getScoresBySpan({ traceId, spanId, pagination: _pagination });
   }
 };