@mastra/mssql 0.0.0-fix-backport-setserver-20251201151948 → 0.0.0-fix-request-context-as-query-key-20251209130646

package/dist/index.cjs

@@ -2,15 +2,15 @@
 
 var error = require('@mastra/core/error');
 var storage = require('@mastra/core/storage');
-var sql3 = require('mssql');
-var utils = require('@mastra/core/utils');
+var sql2 = require('mssql');
 var agent = require('@mastra/core/agent');
+var utils = require('@mastra/core/utils');
 var crypto = require('crypto');
-var scores = require('@mastra/core/scores');
+var evals = require('@mastra/core/evals');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
-var sql3__default = /*#__PURE__*/_interopDefault(sql3);
+var sql2__default = /*#__PURE__*/_interopDefault(sql2);
 
 // src/storage/index.ts
 function getSchemaName(schema) {
@@ -32,24 +32,62 @@ function buildDateRangeFilter(dateRange, fieldName) {
   }
   return filters;
 }
+function isInOperator(value) {
+  return typeof value === "object" && value !== null && "$in" in value && Array.isArray(value.$in);
+}
 function prepareWhereClause(filters, _schema) {
   const conditions = [];
   const params = {};
   let paramIndex = 1;
   Object.entries(filters).forEach(([key, value]) => {
     if (value === void 0) return;
-    const paramName = `p${paramIndex++}`;
     if (key.endsWith("_gte")) {
+      const paramName = `p${paramIndex++}`;
       const fieldName = key.slice(0, -4);
       conditions.push(`[${utils.parseSqlIdentifier(fieldName, "field name")}] >= @${paramName}`);
       params[paramName] = value instanceof Date ? value.toISOString() : value;
     } else if (key.endsWith("_lte")) {
+      const paramName = `p${paramIndex++}`;
       const fieldName = key.slice(0, -4);
       conditions.push(`[${utils.parseSqlIdentifier(fieldName, "field name")}] <= @${paramName}`);
       params[paramName] = value instanceof Date ? value.toISOString() : value;
     } else if (value === null) {
       conditions.push(`[${utils.parseSqlIdentifier(key, "field name")}] IS NULL`);
+    } else if (isInOperator(value)) {
+      const inValues = value.$in;
+      if (inValues.length === 0) {
+        conditions.push("1 = 0");
+      } else if (inValues.length === 1) {
+        const paramName = `p${paramIndex++}`;
+        conditions.push(`[${utils.parseSqlIdentifier(key, "field name")}] = @${paramName}`);
+        params[paramName] = inValues[0] instanceof Date ? inValues[0].toISOString() : inValues[0];
+      } else {
+        const inParamNames = [];
+        for (const item of inValues) {
+          const paramName = `p${paramIndex++}`;
+          inParamNames.push(`@${paramName}`);
+          params[paramName] = item instanceof Date ? item.toISOString() : item;
+        }
+        conditions.push(`[${utils.parseSqlIdentifier(key, "field name")}] IN (${inParamNames.join(", ")})`);
+      }
+    } else if (Array.isArray(value)) {
+      if (value.length === 0) {
+        conditions.push("1 = 0");
+      } else if (value.length === 1) {
+        const paramName = `p${paramIndex++}`;
+        conditions.push(`[${utils.parseSqlIdentifier(key, "field name")}] = @${paramName}`);
+        params[paramName] = value[0] instanceof Date ? value[0].toISOString() : value[0];
+      } else {
+        const inParamNames = [];
+        for (const item of value) {
+          const paramName = `p${paramIndex++}`;
+          inParamNames.push(`@${paramName}`);
+          params[paramName] = item instanceof Date ? item.toISOString() : item;
+        }
+        conditions.push(`[${utils.parseSqlIdentifier(key, "field name")}] IN (${inParamNames.join(", ")})`);
+      }
     } else {
+      const paramName = `p${paramIndex++}`;
       conditions.push(`[${utils.parseSqlIdentifier(key, "field name")}] = @${paramName}`);
       params[paramName] = value instanceof Date ? value.toISOString() : value;
     }
@@ -86,153 +124,7 @@ function transformFromSqlRow({
   return result;
 }
 
-// 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;
-    }
-  }
-};
+// src/storage/domains/memory/index.ts
 var MemoryMSSQL = class extends storage.MemoryStorage {
   pool;
   schema;
@@ -250,7 +142,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.v2() : list.get.all.v1();
+    return format === "v2" ? list.get.all.db() : list.get.all.v1();
   }
   constructor({
     pool,
@@ -264,7 +156,7 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
   }
   async getThreadById({ threadId }) {
     try {
-      const sql7 = `SELECT 
+      const sql5 = `SELECT 
         id,
         [resourceId],
         title,
@@ -275,7 +167,7 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
       WHERE id = @threadId`;
       const request = this.pool.request();
       request.input("threadId", threadId);
-      const resultSet = await request.query(sql7);
+      const resultSet = await request.query(sql5);
       const thread = resultSet.recordset[0] || null;
       if (!thread) {
         return null;
@@ -289,7 +181,7 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_GET_THREAD_BY_ID_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "GET_THREAD_BY_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -300,11 +192,24 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
       );
     }
   }
-  async getThreadsByResourceIdPaginated(args) {
-    const { resourceId, page = 0, perPage: perPageInput, orderBy = "createdAt", sortDirection = "DESC" } = args;
+  async listThreadsByResourceId(args) {
+    const { resourceId, page = 0, perPage: perPageInput, orderBy } = args;
+    if (page < 0) {
+      throw new error.MastraError({
+        id: storage.createStorageErrorId("MSSQL", "LIST_THREADS_BY_RESOURCE_ID", "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);
     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();
@@ -316,17 +221,22 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
           threads: [],
           total: 0,
           page,
-          perPage,
+          perPage: perPageForResponse,
           hasMore: false
         };
       }
-      const orderByField = orderBy === "createdAt" ? "[createdAt]" : "[updatedAt]";
-      const dir = (sortDirection || "DESC").toUpperCase() === "ASC" ? "ASC" : "DESC";
+      const orderByField = field === "createdAt" ? "[createdAt]" : "[updatedAt]";
+      const dir = (direction || "DESC").toUpperCase() === "ASC" ? "ASC" : "DESC";
+      const limitValue = perPageInput === false ? total : perPage;
       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("perPage", perPage);
-      dataRequest.input("offset", currentOffset);
+      dataRequest.input("offset", offset);
+      if (limitValue > 2147483647) {
+        dataRequest.input("perPage", sql2__default.default.BigInt, limitValue);
+      } else {
+        dataRequest.input("perPage", limitValue);
+      }
       const rowsResult = await dataRequest.query(dataQuery);
       const rows = rowsResult.recordset || [];
       const threads = rows.map((thread) => ({
@@ -339,13 +249,13 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
         threads,
         total,
         page,
-        perPage,
-        hasMore: currentOffset + threads.length < total
+        perPage: perPageForResponse,
+        hasMore: perPageInput === false ? false : offset + perPage < total
       };
     } catch (error$1) {
       const mastraError = new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_GET_THREADS_BY_RESOURCE_ID_PAGINATED_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "LIST_THREADS_BY_RESOURCE_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -357,7 +267,13 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
       );
       this.logger?.error?.(mastraError.toString());
       this.logger?.trackException?.(mastraError);
-      return { threads: [], total: 0, page, perPage: perPageInput || 100, hasMore: false };
+      return {
+        threads: [],
+        total: 0,
+        page,
+        perPage: perPageForResponse,
+        hasMore: false
+      };
     }
   }
   async saveThread({ thread }) {
@@ -381,18 +297,18 @@ 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", sql3__default.default.NVarChar, null);
+        req.input("metadata", sql2__default.default.NVarChar, null);
       } else {
         req.input("metadata", metadata);
       }
-      req.input("createdAt", sql3__default.default.DateTime2, thread.createdAt);
-      req.input("updatedAt", sql3__default.default.DateTime2, thread.updatedAt);
+      req.input("createdAt", sql2__default.default.DateTime2, thread.createdAt);
+      req.input("updatedAt", sql2__default.default.DateTime2, thread.updatedAt);
       await req.query(mergeSql);
       return thread;
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_SAVE_THREAD_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "SAVE_THREAD", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -403,31 +319,6 @@ 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.
    */
@@ -439,7 +330,7 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
     const existingThread = await this.getThreadById({ threadId: id });
     if (!existingThread) {
       throw new error.MastraError({
-        id: "MASTRA_STORAGE_MSSQL_STORE_UPDATE_THREAD_FAILED",
+        id: storage.createStorageErrorId("MSSQL", "UPDATE_THREAD", "NOT_FOUND"),
         domain: error.ErrorDomain.STORAGE,
         category: error.ErrorCategory.USER,
         text: `Thread ${id} not found`,
@@ -455,7 +346,7 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
     };
     try {
       const table = getTableName({ indexName: storage.TABLE_THREADS, schemaName: getSchemaName(this.schema) });
-      const sql7 = `UPDATE ${table}
+      const sql5 = `UPDATE ${table}
         SET title = @title,
             metadata = @metadata,
             [updatedAt] = @updatedAt
@@ -466,7 +357,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(sql7);
+      const result = await req.query(sql5);
       let thread = result.recordset && result.recordset[0];
       if (thread && "seq_id" in thread) {
         const { seq_id, ...rest } = thread;
@@ -474,7 +365,7 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
       }
       if (!thread) {
         throw new error.MastraError({
-          id: "MASTRA_STORAGE_MSSQL_STORE_UPDATE_THREAD_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "UPDATE_THREAD", "NOT_FOUND"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER,
           text: `Thread ${id} not found after update`,
@@ -493,7 +384,7 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_UPDATE_THREAD_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "UPDATE_THREAD", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -523,7 +414,7 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
       });
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_DELETE_THREAD_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "DELETE_THREAD", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -534,25 +425,18 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
       );
     }
   }
-  async _getIncludedMessages({
-    threadId,
-    selectBy,
-    orderByStatement
-  }) {
-    if (!threadId.trim()) throw new Error("threadId must be a non-empty string");
-    const include = selectBy?.include;
-    if (!include) return null;
+  async _getIncludedMessages({ include }) {
+    if (!include || include.length === 0) return null;
     const unionQueries = [];
     const paramValues = [];
     let paramIdx = 1;
     const paramNames = [];
+    const tableName = getTableName({ indexName: storage.TABLE_MESSAGES, schemaName: getSchemaName(this.schema) });
     for (const inc of include) {
       const { id, withPreviousMessages = 0, withNextMessages = 0 } = inc;
-      const searchId = inc.threadId || threadId;
-      const pThreadId = `@p${paramIdx}`;
-      const pId = `@p${paramIdx + 1}`;
-      const pPrev = `@p${paramIdx + 2}`;
-      const pNext = `@p${paramIdx + 3}`;
+      const pId = `@p${paramIdx}`;
+      const pPrev = `@p${paramIdx + 1}`;
+      const pNext = `@p${paramIdx + 2}`;
       unionQueries.push(
         `
           SELECT
@@ -565,30 +449,32 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
             m.[resourceId],
             m.seq_id
           FROM (
-            SELECT *, ROW_NUMBER() OVER (${orderByStatement}) as row_num
-            FROM ${getTableName({ indexName: storage.TABLE_MESSAGES, schemaName: getSchemaName(this.schema) })}
-            WHERE [thread_id] = ${pThreadId}
+            SELECT *, ROW_NUMBER() OVER (ORDER BY [createdAt] ASC) as row_num
+            FROM ${tableName}
+            WHERE [thread_id] = (SELECT thread_id FROM ${tableName} WHERE id = ${pId})
           ) AS m
           WHERE m.id = ${pId}
           OR EXISTS (
             SELECT 1
             FROM (
-              SELECT *, ROW_NUMBER() OVER (${orderByStatement}) as row_num
-              FROM ${getTableName({ indexName: storage.TABLE_MESSAGES, schemaName: getSchemaName(this.schema) })}
-              WHERE [thread_id] = ${pThreadId}
+              SELECT *, ROW_NUMBER() OVER (ORDER BY [createdAt] ASC) as row_num
+              FROM ${tableName}
+              WHERE [thread_id] = (SELECT thread_id FROM ${tableName} WHERE id = ${pId})
             ) AS target
             WHERE target.id = ${pId}
             AND (
-              (m.row_num <= target.row_num + ${pPrev} AND m.row_num > target.row_num)
+              -- Get previous messages (messages that come BEFORE the target)
+              (m.row_num < target.row_num AND m.row_num >= target.row_num - ${pPrev})
               OR
-              (m.row_num >= target.row_num - ${pNext} AND m.row_num < target.row_num)
+              -- Get next messages (messages that come AFTER the target)
+              (m.row_num > target.row_num AND m.row_num <= target.row_num + ${pNext})
             )
           )
         `
       );
-      paramValues.push(searchId, id, withPreviousMessages, withNextMessages);
-      paramNames.push(`p${paramIdx}`, `p${paramIdx + 1}`, `p${paramIdx + 2}`, `p${paramIdx + 3}`);
-      paramIdx += 4;
+      paramValues.push(id, withPreviousMessages, withNextMessages);
+      paramNames.push(`p${paramIdx}`, `p${paramIdx + 1}`, `p${paramIdx + 2}`);
+      paramIdx += 3;
     }
     const finalQuery = `
       SELECT * FROM (
@@ -610,34 +496,16 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
     });
     return dedupedRows;
   }
-  async getMessages(args) {
-    const { threadId, resourceId, format, selectBy } = args;
+  async listMessagesById({ messageIds }) {
+    if (messageIds.length === 0) return { messages: [] };
     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 = [];
-      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`;
+      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();
-      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);
+      messageIds.forEach((id, i) => request.input(`id${i}`, id));
+      query += ` ${orderByStatement}`;
       const result = await request.query(query);
       const remainingRows = result.recordset || [];
       rows.push(...remainingRows);
@@ -645,158 +513,177 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
         const timeDiff = a.seq_id - b.seq_id;
         return timeDiff;
       });
-      rows = rows.map(({ seq_id, ...rest }) => rest);
-      return this._parseAndFormatMessages(rows, format);
+      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() };
     } catch (error$1) {
       const mastraError = new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_GET_MESSAGES_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "LIST_MESSAGES_BY_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
-            threadId,
-            resourceId: resourceId ?? ""
+            messageIds: JSON.stringify(messageIds)
           }
         },
         error$1
       );
       this.logger?.error?.(mastraError.toString());
       this.logger?.trackException?.(mastraError);
-      return [];
+      return { messages: [] };
     }
   }
-  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(
+  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 error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_GET_MESSAGES_BY_ID_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "LIST_MESSAGES", "INVALID_THREAD_ID"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
-          details: {
-            messageIds: JSON.stringify(messageIds)
-          }
+          details: { threadId: Array.isArray(threadId) ? threadId.join(",") : threadId }
         },
-        error$1
+        new Error("threadId must be a non-empty string or array of non-empty strings")
       );
-      this.logger?.error?.(mastraError.toString());
-      this.logger?.trackException?.(mastraError);
-      return [];
     }
-  }
-  async getMessagesPaginated(args) {
-    const { threadId, resourceId, format, selectBy } = args;
-    const { page = 0, perPage: perPageInput, dateRange } = selectBy?.pagination || {};
+    if (page < 0) {
+      throw new error.MastraError({
+        id: storage.createStorageErrorId("MSSQL", "LIST_MESSAGES", "INVALID_PAGE"),
+        domain: error.ErrorDomain.STORAGE,
+        category: error.ErrorCategory.USER,
+        text: "Page number must be non-negative",
+        details: {
+          threadId: Array.isArray(threadId) ? threadId.join(",") : threadId,
+          page
+        }
+      });
+    }
+    const perPage = storage.normalizePerPage(perPageInput, 40);
+    const { offset, perPage: perPageForResponse } = storage.calculatePagination(page, perPageInput, perPage);
     try {
-      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 { 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: threadIds.length === 1 ? threadIds[0] : { $in: threadIds },
+        ...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}`);
       const total = parseInt(countResult.recordset[0]?.total, 10) || 0;
-      if (total === 0 && messages.length > 0) {
-        const parsedIncluded = this._parseAndFormatMessages(messages, format);
+      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)) {
         return {
-          messages: parsedIncluded,
-          total: parsedIncluded.length,
+          messages: [],
+          total: 0,
           page,
-          perPage,
+          perPage: perPageForResponse,
           hasMore: false
         };
       }
-      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());
+      if (include?.length) {
+        const messageIds = new Set(messages.map((m) => m.id));
+        const includeMessages = await this._getIncludedMessages({ 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 threadIdSet = new Set(threadIds);
+      const returnedThreadMessageCount = finalMessages.filter((m) => m.threadId && threadIdSet.has(m.threadId)).length;
+      const hasMore = perPageInput !== false && returnedThreadMessageCount < total && offset + perPage < total;
       return {
-        messages: parsed,
+        messages: finalMessages,
         total,
         page,
-        perPage,
-        hasMore: currentOffset + rows.length < total
+        perPage: perPageForResponse,
+        hasMore
       };
     } catch (error$1) {
       const mastraError = new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_GET_MESSAGES_PAGINATED_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "LIST_MESSAGES", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
-            threadId,
-            resourceId: resourceId ?? "",
-            page
+            threadId: Array.isArray(threadId) ? threadId.join(",") : threadId,
+            resourceId: resourceId ?? ""
           }
         },
         error$1
       );
       this.logger?.error?.(mastraError.toString());
       this.logger?.trackException?.(mastraError);
-      return { messages: [], total: 0, page, perPage: perPageInput || 40, hasMore: false };
+      return {
+        messages: [],
+        total: 0,
+        page,
+        perPage: perPageForResponse,
+        hasMore: false
+      };
     }
   }
-  async saveMessages({
-    messages,
-    format
-  }) {
-    if (messages.length === 0) return messages;
+  async saveMessages({ messages }) {
+    if (messages.length === 0) return { messages: [] };
     const threadId = messages[0]?.threadId;
     if (!threadId) {
       throw new error.MastraError({
-        id: "MASTRA_STORAGE_MSSQL_STORE_SAVE_MESSAGES_FAILED",
+        id: storage.createStorageErrorId("MSSQL", "SAVE_MESSAGES", "INVALID_THREAD_ID"),
         domain: error.ErrorDomain.STORAGE,
         category: error.ErrorCategory.THIRD_PARTY,
         text: `Thread ID is required`
@@ -805,7 +692,7 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
     const thread = await this.getThreadById({ threadId });
     if (!thread) {
       throw new error.MastraError({
-        id: "MASTRA_STORAGE_MSSQL_STORE_SAVE_MESSAGES_FAILED",
+        id: storage.createStorageErrorId("MSSQL", "SAVE_MESSAGES", "THREAD_NOT_FOUND"),
         domain: error.ErrorDomain.STORAGE,
         category: error.ErrorCategory.THIRD_PARTY,
         text: `Thread ${threadId} not found`,
@@ -836,7 +723,7 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
             "content",
             typeof message.content === "string" ? message.content : JSON.stringify(message.content)
           );
-          request.input("createdAt", sql3__default.default.DateTime2, message.createdAt);
+          request.input("createdAt", sql2__default.default.DateTime2, message.createdAt);
           request.input("role", message.role);
           request.input("type", message.type || "v2");
           request.input("resourceId", message.resourceId);
@@ -855,7 +742,7 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
           await request.query(mergeSql);
         }
         const threadReq = transaction.request();
-        threadReq.input("updatedAt", sql3__default.default.DateTime2, /* @__PURE__ */ new Date());
+        threadReq.input("updatedAt", sql2__default.default.DateTime2, /* @__PURE__ */ new Date());
         threadReq.input("id", threadId);
         await threadReq.query(`UPDATE ${tableThreads} SET [updatedAt] = @updatedAt WHERE id = @id`);
         await transaction.commit();
@@ -874,12 +761,11 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
         return message;
       });
       const list = new agent.MessageList().add(messagesWithParsedContent, "memory");
-      if (format === "v2") return list.get.all.v2();
-      return list.get.all.v1();
+      return { messages: list.get.all.db() };
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_SAVE_MESSAGES_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "SAVE_MESSAGES", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { threadId }
@@ -970,7 +856,7 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
       await transaction.rollback();
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_UPDATE_MESSAGES_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "UPDATE_MESSAGES", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY
         },
@@ -1032,7 +918,7 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_DELETE_MESSAGES_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "DELETE_MESSAGES", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { messageIds: messageIds.join(", ") }
@@ -1060,7 +946,7 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
     } catch (error$1) {
       const mastraError = new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_GET_RESOURCE_BY_ID_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "GET_RESOURCE_BY_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { resourceId }
@@ -1127,7 +1013,7 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
     } catch (error$1) {
       const mastraError = new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_UPDATE_RESOURCE_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "UPDATE_RESOURCE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { resourceId }
@@ -1154,13 +1040,13 @@ var ObservabilityMSSQL = class extends storage.ObservabilityStorage {
     this.operations = operations;
     this.schema = schema;
   }
-  get aiTracingStrategy() {
+  get tracingStrategy() {
     return {
       preferred: "batch-with-updates",
       supported: ["batch-with-updates", "insert-only"]
     };
   }
-  async createAISpan(span) {
+  async createSpan(span) {
     try {
       const startedAt = span.startedAt instanceof Date ? span.startedAt.toISOString() : span.startedAt;
       const endedAt = span.endedAt instanceof Date ? span.endedAt.toISOString() : span.endedAt;
@@ -1170,11 +1056,11 @@ var ObservabilityMSSQL = class extends storage.ObservabilityStorage {
         endedAt
         // Note: createdAt/updatedAt will be set by default values
       };
-      return this.operations.insert({ tableName: storage.TABLE_AI_SPANS, record });
+      return this.operations.insert({ tableName: storage.TABLE_SPANS, record });
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MSSQL_STORE_CREATE_AI_SPAN_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "CREATE_SPAN", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER,
           details: {
@@ -1188,10 +1074,10 @@ var ObservabilityMSSQL = class extends storage.ObservabilityStorage {
       );
     }
   }
-  async getAITrace(traceId) {
+  async getTrace(traceId) {
     try {
       const tableName = getTableName({
-        indexName: storage.TABLE_AI_SPANS,
+        indexName: storage.TABLE_SPANS,
         schemaName: getSchemaName(this.schema)
       });
       const request = this.pool.request();
@@ -1212,7 +1098,7 @@ var ObservabilityMSSQL = class extends storage.ObservabilityStorage {
         traceId,
         spans: result.recordset.map(
           (span) => transformFromSqlRow({
-            tableName: storage.TABLE_AI_SPANS,
+            tableName: storage.TABLE_SPANS,
             sqlRow: span
           })
         )
@@ -1220,7 +1106,7 @@ var ObservabilityMSSQL = class extends storage.ObservabilityStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MSSQL_STORE_GET_AI_TRACE_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "GET_TRACE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER,
           details: {
@@ -1231,7 +1117,7 @@ var ObservabilityMSSQL = class extends storage.ObservabilityStorage {
       );
     }
   }
-  async updateAISpan({
+  async updateSpan({
     spanId,
     traceId,
     updates
@@ -1245,14 +1131,14 @@ var ObservabilityMSSQL = class extends storage.ObservabilityStorage {
         data.startedAt = data.startedAt.toISOString();
       }
       await this.operations.update({
-        tableName: storage.TABLE_AI_SPANS,
+        tableName: storage.TABLE_SPANS,
         keys: { spanId, traceId },
         data
       });
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MSSQL_STORE_UPDATE_AI_SPAN_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "UPDATE_SPAN", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER,
           details: {
@@ -1264,7 +1150,7 @@ var ObservabilityMSSQL = class extends storage.ObservabilityStorage {
       );
     }
   }
-  async getAITracesPaginated({
+  async getTracesPaginated({
     filters,
     pagination
   }) {
@@ -1289,7 +1175,7 @@ var ObservabilityMSSQL = class extends storage.ObservabilityStorage {
         name = `agent run: '${entityId}'`;
       } else {
         const error$1 = new error.MastraError({
-          id: "MSSQL_STORE_GET_AI_TRACES_PAGINATED_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "GET_TRACES_PAGINATED", "INVALID_ENTITY_TYPE"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER,
           details: {
@@ -1308,7 +1194,7 @@ var ObservabilityMSSQL = class extends storage.ObservabilityStorage {
       params[entityParam] = name;
     }
     const tableName = getTableName({
-      indexName: storage.TABLE_AI_SPANS,
+      indexName: storage.TABLE_SPANS,
       schemaName: getSchemaName(this.schema)
     });
     try {
@@ -1342,7 +1228,7 @@ var ObservabilityMSSQL = class extends storage.ObservabilityStorage {
       );
       const spans = dataResult.recordset.map(
         (row) => transformFromSqlRow({
-          tableName: storage.TABLE_AI_SPANS,
+          tableName: storage.TABLE_SPANS,
           sqlRow: row
         })
       );
@@ -1358,7 +1244,7 @@ var ObservabilityMSSQL = class extends storage.ObservabilityStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MSSQL_STORE_GET_AI_TRACES_PAGINATED_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "GET_TRACES_PAGINATED", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER
         },
@@ -1366,13 +1252,13 @@ var ObservabilityMSSQL = class extends storage.ObservabilityStorage {
       );
     }
   }
-  async batchCreateAISpans(args) {
+  async batchCreateSpans(args) {
     if (!args.records || args.records.length === 0) {
       return;
     }
     try {
       await this.operations.batchInsert({
-        tableName: storage.TABLE_AI_SPANS,
+        tableName: storage.TABLE_SPANS,
         records: args.records.map((span) => ({
           ...span,
           startedAt: span.startedAt instanceof Date ? span.startedAt.toISOString() : span.startedAt,
@@ -1382,7 +1268,7 @@ var ObservabilityMSSQL = class extends storage.ObservabilityStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MSSQL_STORE_BATCH_CREATE_AI_SPANS_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "BATCH_CREATE_SPANS", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER,
           details: {
@@ -1393,7 +1279,7 @@ var ObservabilityMSSQL = class extends storage.ObservabilityStorage {
       );
     }
   }
-  async batchUpdateAISpans(args) {
+  async batchUpdateSpans(args) {
     if (!args.records || args.records.length === 0) {
       return;
     }
@@ -1412,13 +1298,13 @@ var ObservabilityMSSQL = class extends storage.ObservabilityStorage {
         };
       });
       await this.operations.batchUpdate({
-        tableName: storage.TABLE_AI_SPANS,
+        tableName: storage.TABLE_SPANS,
         updates
       });
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MSSQL_STORE_BATCH_UPDATE_AI_SPANS_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "BATCH_UPDATE_SPANS", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER,
           details: {
@@ -1429,20 +1315,20 @@ var ObservabilityMSSQL = class extends storage.ObservabilityStorage {
       );
     }
   }
-  async batchDeleteAITraces(args) {
+  async batchDeleteTraces(args) {
     if (!args.traceIds || args.traceIds.length === 0) {
       return;
     }
     try {
       const keys = args.traceIds.map((traceId) => ({ traceId }));
       await this.operations.batchDelete({
-        tableName: storage.TABLE_AI_SPANS,
+        tableName: storage.TABLE_SPANS,
         keys
       });
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MSSQL_STORE_BATCH_DELETE_AI_TRACES_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "BATCH_DELETE_TRACES", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER,
           details: {
@@ -1482,7 +1368,7 @@ var StoreOperationsMSSQL = class extends storage.StoreOperations {
         return "BIT";
       default:
         throw new error.MastraError({
-          id: "MASTRA_STORAGE_MSSQL_STORE_TYPE_NOT_SUPPORTED",
+          id: storage.createStorageErrorId("MSSQL", "TYPE", "NOT_SUPPORTED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY
         });
@@ -1557,7 +1443,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}`, sql3__default.default.DateTime2, preparedValue);
+          request.input(`param${i}`, sql2__default.default.DateTime2, preparedValue);
         } else if (preparedValue === null || preparedValue === void 0) {
           request.input(`param${i}`, this.getMssqlType(tableName, col), null);
         } else {
@@ -1568,7 +1454,7 @@ var StoreOperationsMSSQL = class extends storage.StoreOperations {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_INSERT_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "INSERT", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -1594,7 +1480,7 @@ var StoreOperationsMSSQL = class extends storage.StoreOperations {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_CLEAR_TABLE_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "CLEAR_TABLE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -1697,7 +1583,7 @@ ${columns}
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_CREATE_TABLE_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "CREATE_TABLE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -1757,7 +1643,7 @@ ${columns}
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_ALTER_TABLE_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "ALTER_TABLE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -1772,7 +1658,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 sql7 = `SELECT * FROM ${getTableName({ indexName: tableName, schemaName: getSchemaName(this.schemaName) })} WHERE ${conditions}`;
+      const sql5 = `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);
@@ -1782,7 +1668,7 @@ ${columns}
           request.input(`param${i}`, preparedValue);
         }
       });
-      const resultSet = await request.query(sql7);
+      const resultSet = await request.query(sql5);
       const result = resultSet.recordset[0] || null;
       if (!result) {
         return null;
@@ -1798,7 +1684,7 @@ ${columns}
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_LOAD_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "LOAD", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -1821,7 +1707,7 @@ ${columns}
       await transaction.rollback();
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_BATCH_INSERT_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "BATCH_INSERT", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -1840,7 +1726,7 @@ ${columns}
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_DROP_TABLE_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "DROP_TABLE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -1895,23 +1781,23 @@ ${columns}
     const col = storage.TABLE_SCHEMAS[tableName]?.[columnName];
     switch (col?.type) {
       case "text":
-        return sql3__default.default.NVarChar;
+        return sql2__default.default.NVarChar;
       case "timestamp":
-        return sql3__default.default.DateTime2;
+        return sql2__default.default.DateTime2;
       case "uuid":
-        return sql3__default.default.UniqueIdentifier;
+        return sql2__default.default.UniqueIdentifier;
       case "jsonb":
-        return sql3__default.default.NVarChar;
+        return sql2__default.default.NVarChar;
       case "integer":
-        return sql3__default.default.Int;
+        return sql2__default.default.Int;
       case "bigint":
-        return sql3__default.default.BigInt;
+        return sql2__default.default.BigInt;
       case "float":
-        return sql3__default.default.Float;
+        return sql2__default.default.Float;
       case "boolean":
-        return sql3__default.default.Bit;
+        return sql2__default.default.Bit;
       default:
-        return sql3__default.default.NVarChar;
+        return sql2__default.default.NVarChar;
     }
   }
   /**
@@ -1926,7 +1812,7 @@ ${columns}
     try {
       if (!data || Object.keys(data).length === 0) {
         throw new error.MastraError({
-          id: "MASTRA_STORAGE_MSSQL_UPDATE_EMPTY_DATA",
+          id: storage.createStorageErrorId("MSSQL", "UPDATE", "EMPTY_DATA"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER,
           text: "Cannot update with empty data payload"
@@ -1934,7 +1820,7 @@ ${columns}
       }
       if (!keys || Object.keys(keys).length === 0) {
         throw new error.MastraError({
-          id: "MASTRA_STORAGE_MSSQL_UPDATE_EMPTY_KEYS",
+          id: storage.createStorageErrorId("MSSQL", "UPDATE", "EMPTY_KEYS"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER,
           text: "Cannot update without keys to identify records"
@@ -1975,7 +1861,7 @@ ${columns}
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_UPDATE_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "UPDATE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -2004,7 +1890,7 @@ ${columns}
       await transaction.rollback();
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_BATCH_UPDATE_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "BATCH_UPDATE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -2053,7 +1939,7 @@ ${columns}
       await transaction.rollback();
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_BATCH_DELETE_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "BATCH_DELETE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -2110,7 +1996,7 @@ ${columns}
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_INDEX_CREATE_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "INDEX_CREATE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -2146,7 +2032,7 @@ ${columns}
       if (result.recordset.length > 1) {
         const tables = result.recordset.map((r) => r.table_name).join(", ");
         throw new error.MastraError({
-          id: "MASTRA_STORAGE_MSSQL_INDEX_AMBIGUOUS",
+          id: storage.createStorageErrorId("MSSQL", "INDEX", "AMBIGUOUS"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER,
           text: `Index "${indexNameSafe}" exists on multiple tables (${tables}) in schema "${schemaName}". Please drop indexes manually or ensure unique index names.`
@@ -2162,7 +2048,7 @@ ${columns}
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_INDEX_DROP_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "INDEX_DROP", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -2246,7 +2132,7 @@ ${columns}
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_INDEX_LIST_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "INDEX_LIST", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: tableName ? {
@@ -2319,7 +2205,7 @@ ${columns}
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_INDEX_DESCRIBE_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "INDEX_DESCRIBE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -2355,35 +2241,30 @@ ${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"]
       },
-      // AI Spans indexes for optimal trace querying
+      // Spans indexes for optimal trace querying
       {
         name: `${schemaPrefix}mastra_ai_spans_traceid_startedat_idx`,
-        table: storage.TABLE_AI_SPANS,
+        table: storage.TABLE_SPANS,
         columns: ["traceId", "startedAt DESC"]
       },
       {
         name: `${schemaPrefix}mastra_ai_spans_parentspanid_startedat_idx`,
-        table: storage.TABLE_AI_SPANS,
+        table: storage.TABLE_SPANS,
         columns: ["parentSpanId", "startedAt DESC"]
       },
       {
         name: `${schemaPrefix}mastra_ai_spans_name_idx`,
-        table: storage.TABLE_AI_SPANS,
+        table: storage.TABLE_SPANS,
         columns: ["name"]
       },
       {
         name: `${schemaPrefix}mastra_ai_spans_spantype_startedat_idx`,
-        table: storage.TABLE_AI_SPANS,
+        table: storage.TABLE_SPANS,
         columns: ["spanType", "startedAt DESC"]
       }
     ];
@@ -2405,7 +2286,7 @@ ${columns}
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_CREATE_PERFORMANCE_INDEXES_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "CREATE_PERFORMANCE_INDEXES", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY
         },
@@ -2415,20 +2296,9 @@ ${columns}
   }
 };
 function transformScoreRow(row) {
-  return {
-    ...row,
-    input: storage.safelyParseJSON(row.input),
-    scorer: storage.safelyParseJSON(row.scorer),
-    preprocessStepResult: storage.safelyParseJSON(row.preprocessStepResult),
-    analyzeStepResult: storage.safelyParseJSON(row.analyzeStepResult),
-    metadata: storage.safelyParseJSON(row.metadata),
-    output: storage.safelyParseJSON(row.output),
-    additionalContext: storage.safelyParseJSON(row.additionalContext),
-    runtimeContext: storage.safelyParseJSON(row.runtimeContext),
-    entity: storage.safelyParseJSON(row.entity),
-    createdAt: new Date(row.createdAt),
-    updatedAt: new Date(row.updatedAt)
-  };
+  return storage.transformScoreRow(row, {
+    convertTimestamps: true
+  });
 }
 var ScoresMSSQL = class extends storage.ScoresStorage {
   pool;
@@ -2458,7 +2328,7 @@ var ScoresMSSQL = class extends storage.ScoresStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_GET_SCORE_BY_ID_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "GET_SCORE_BY_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { id }
@@ -2470,19 +2340,27 @@ var ScoresMSSQL = class extends storage.ScoresStorage {
   async saveScore(score) {
     let validatedScore;
     try {
-      validatedScore = scores.saveScorePayloadSchema.parse(score);
+      validatedScore = evals.saveScorePayloadSchema.parse(score);
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_SAVE_SCORE_VALIDATION_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "SAVE_SCORE", "VALIDATION_FAILED"),
           domain: error.ErrorDomain.STORAGE,
-          category: error.ErrorCategory.THIRD_PARTY
+          category: error.ErrorCategory.USER,
+          details: {
+            scorer: score.scorer?.id ?? "unknown",
+            entityId: score.entityId ?? "unknown",
+            entityType: score.entityType ?? "unknown",
+            traceId: score.traceId ?? "",
+            spanId: score.spanId ?? ""
+          }
         },
         error$1
       );
     }
     try {
       const scoreId = crypto.randomUUID();
+      const now = /* @__PURE__ */ new Date();
       const {
         scorer,
         preprocessStepResult,
@@ -2491,7 +2369,7 @@ var ScoresMSSQL = class extends storage.ScoresStorage {
         input,
         output,
         additionalContext,
-        runtimeContext,
+        requestContext,
         entity,
         ...rest
       } = validatedScore;
@@ -2506,19 +2384,18 @@ var ScoresMSSQL = class extends storage.ScoresStorage {
           analyzeStepResult: analyzeStepResult || null,
           metadata: metadata || null,
           additionalContext: additionalContext || null,
-          runtimeContext: runtimeContext || null,
+          requestContext: requestContext || null,
           entity: entity || null,
           scorer: scorer || null,
-          createdAt: (/* @__PURE__ */ new Date()).toISOString(),
-          updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+          createdAt: now.toISOString(),
+          updatedAt: now.toISOString()
         }
       });
-      const scoreFromDb = await this.getScoreById({ id: scoreId });
-      return { score: scoreFromDb };
+      return { score: { ...validatedScore, id: scoreId, createdAt: now, updatedAt: now } };
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_SAVE_SCORE_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "SAVE_SCORE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY
         },
@@ -2526,7 +2403,7 @@ var ScoresMSSQL = class extends storage.ScoresStorage {
       );
     }
   }
-  async getScoresByScorerId({
+  async listScoresByScorerId({
     scorerId,
     pagination,
     entityId,
@@ -2560,38 +2437,43 @@ 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: pagination.page,
-            perPage: pagination.perPage,
+            page,
+            perPage: perPageInput,
             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", pagination.perPage);
-      dataRequest.input("offset", pagination.page * pagination.perPage);
+      dataRequest.input("perPage", limitValue);
+      dataRequest.input("offset", start);
       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: pagination.page,
-          perPage: pagination.perPage,
-          hasMore: Number(total) > (pagination.page + 1) * pagination.perPage
+          page,
+          perPage: perPageForResponse,
+          hasMore: end < total
         },
         scores: result.recordset.map((row) => transformScoreRow(row))
       };
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_GET_SCORES_BY_SCORER_ID_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "LIST_SCORES_BY_SCORER_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { scorerId }
@@ -2600,7 +2482,7 @@ var ScoresMSSQL = class extends storage.ScoresStorage {
       );
     }
   }
-  async getScoresByRunId({
+  async listScoresByRunId({
     runId,
     pagination
   }) {
@@ -2611,37 +2493,42 @@ 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: pagination.page,
-            perPage: pagination.perPage,
+            page,
+            perPage: perPageInput,
             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", pagination.perPage);
-      dataRequest.input("p3", pagination.page * pagination.perPage);
+      dataRequest.input("p2", limitValue);
+      dataRequest.input("p3", start);
       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: pagination.page,
-          perPage: pagination.perPage,
-          hasMore: Number(total) > (pagination.page + 1) * pagination.perPage
+          page,
+          perPage: perPageForResponse,
+          hasMore: end < total
         },
         scores: result.recordset.map((row) => transformScoreRow(row))
       };
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_GET_SCORES_BY_RUN_ID_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "LIST_SCORES_BY_RUN_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { runId }
@@ -2650,7 +2537,7 @@ var ScoresMSSQL = class extends storage.ScoresStorage {
       );
     }
   }
-  async getScoresByEntityId({
+  async listScoresByEntityId({
     entityId,
     entityType,
     pagination
@@ -2663,38 +2550,43 @@ 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: pagination.page,
-            perPage: pagination.perPage,
+            page,
+            perPage: perPageForResponse,
             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", pagination.perPage);
-      dataRequest.input("p4", pagination.page * pagination.perPage);
+      dataRequest.input("p3", limitValue);
+      dataRequest.input("p4", start);
       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: pagination.page,
-          perPage: pagination.perPage,
-          hasMore: Number(total) > (pagination.page + 1) * pagination.perPage
+          page,
+          perPage: perPageForResponse,
+          hasMore: end < total
         },
         scores: result.recordset.map((row) => transformScoreRow(row))
       };
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_GET_SCORES_BY_ENTITY_ID_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "LIST_SCORES_BY_ENTITY_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { entityId, entityType }
@@ -2703,7 +2595,7 @@ var ScoresMSSQL = class extends storage.ScoresStorage {
       );
     }
   }
-  async getScoresBySpan({
+  async listScoresBySpan({
     traceId,
     spanId,
     pagination
@@ -2716,39 +2608,43 @@ 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: pagination.page,
-            perPage: pagination.perPage,
+            page,
+            perPage: perPageForResponse,
             hasMore: false
           },
           scores: []
         };
       }
-      const limit = pagination.perPage + 1;
+      const limitValue = perPageInput === false ? total : perPage;
+      const end = perPageInput === false ? total : start + perPage;
       const dataRequest = this.pool.request();
       dataRequest.input("p1", traceId);
       dataRequest.input("p2", spanId);
-      dataRequest.input("p3", limit);
-      dataRequest.input("p4", pagination.page * pagination.perPage);
+      dataRequest.input("p3", limitValue);
+      dataRequest.input("p4", start);
       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: pagination.page,
-          perPage: pagination.perPage,
-          hasMore: result.recordset.length > pagination.perPage
+          page,
+          perPage: perPageForResponse,
+          hasMore: end < total
         },
-        scores: result.recordset.slice(0, pagination.perPage).map((row) => transformScoreRow(row))
+        scores: result.recordset.map((row) => transformScoreRow(row))
       };
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_GET_SCORES_BY_SPAN_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "LIST_SCORES_BY_SPAN", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: { traceId, spanId }
@@ -2758,173 +2654,6 @@ 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;
@@ -2962,13 +2691,13 @@ var WorkflowsMSSQL = class extends storage.WorkflowsStorage {
     runId,
     stepId,
     result,
-    runtimeContext
+    requestContext
   }) {
     const table = getTableName({ indexName: storage.TABLE_WORKFLOW_SNAPSHOT, schemaName: getSchemaName(this.schema) });
     const transaction = this.pool.transaction();
     try {
       await transaction.begin();
-      const selectRequest = new sql3__default.default.Request(transaction);
+      const selectRequest = new sql2__default.default.Request(transaction);
       selectRequest.input("workflow_name", workflowName);
       selectRequest.input("run_id", runId);
       const existingSnapshotResult = await selectRequest.query(
@@ -2979,28 +2708,29 @@ var WorkflowsMSSQL = class extends storage.WorkflowsStorage {
         snapshot = {
           context: {},
           activePaths: [],
+          activeStepsPath: {},
           timestamp: Date.now(),
           suspendedPaths: {},
           resumeLabels: {},
           serializedStepGraph: [],
+          status: "pending",
           value: {},
           waitingPaths: {},
-          status: "pending",
           runId,
-          runtimeContext: {}
+          requestContext: {}
         };
       } else {
         const existingSnapshot = existingSnapshotResult.recordset[0].snapshot;
         snapshot = typeof existingSnapshot === "string" ? JSON.parse(existingSnapshot) : existingSnapshot;
       }
       snapshot.context[stepId] = result;
-      snapshot.runtimeContext = { ...snapshot.runtimeContext, ...runtimeContext };
-      const upsertReq = new sql3__default.default.Request(transaction);
+      snapshot.requestContext = { ...snapshot.requestContext, ...requestContext };
+      const upsertReq = new sql2__default.default.Request(transaction);
       upsertReq.input("workflow_name", workflowName);
       upsertReq.input("run_id", runId);
       upsertReq.input("snapshot", JSON.stringify(snapshot));
-      upsertReq.input("createdAt", sql3__default.default.DateTime2, /* @__PURE__ */ new Date());
-      upsertReq.input("updatedAt", sql3__default.default.DateTime2, /* @__PURE__ */ new Date());
+      upsertReq.input("createdAt", sql2__default.default.DateTime2, /* @__PURE__ */ new Date());
+      upsertReq.input("updatedAt", sql2__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
@@ -3018,7 +2748,7 @@ var WorkflowsMSSQL = class extends storage.WorkflowsStorage {
       }
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_UPDATE_WORKFLOW_RESULTS_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "UPDATE_WORKFLOW_RESULTS", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -3040,7 +2770,7 @@ var WorkflowsMSSQL = class extends storage.WorkflowsStorage {
     const transaction = this.pool.transaction();
     try {
       await transaction.begin();
-      const selectRequest = new sql3__default.default.Request(transaction);
+      const selectRequest = new sql2__default.default.Request(transaction);
       selectRequest.input("workflow_name", workflowName);
       selectRequest.input("run_id", runId);
       const existingSnapshotResult = await selectRequest.query(
@@ -3056,7 +2786,7 @@ var WorkflowsMSSQL = class extends storage.WorkflowsStorage {
         await transaction.rollback();
         throw new error.MastraError(
           {
-            id: "MASTRA_STORAGE_MSSQL_STORE_UPDATE_WORKFLOW_STATE_SNAPSHOT_NOT_FOUND",
+            id: storage.createStorageErrorId("MSSQL", "UPDATE_WORKFLOW_STATE", "SNAPSHOT_NOT_FOUND"),
             domain: error.ErrorDomain.STORAGE,
             category: error.ErrorCategory.SYSTEM,
             details: {
@@ -3068,11 +2798,11 @@ var WorkflowsMSSQL = class extends storage.WorkflowsStorage {
         );
       }
       const updatedSnapshot = { ...snapshot, ...opts };
-      const updateRequest = new sql3__default.default.Request(transaction);
+      const updateRequest = new sql2__default.default.Request(transaction);
       updateRequest.input("snapshot", JSON.stringify(updatedSnapshot));
       updateRequest.input("workflow_name", workflowName);
       updateRequest.input("run_id", runId);
-      updateRequest.input("updatedAt", sql3__default.default.DateTime2, /* @__PURE__ */ new Date());
+      updateRequest.input("updatedAt", sql2__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`
       );
@@ -3083,9 +2813,10 @@ var WorkflowsMSSQL = class extends storage.WorkflowsStorage {
         await transaction.rollback();
       } catch {
       }
+      if (error$1 instanceof error.MastraError) throw error$1;
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_UPDATE_WORKFLOW_STATE_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "UPDATE_WORKFLOW_STATE", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -3111,8 +2842,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", sql3__default.default.DateTime2, new Date(now));
-      request.input("updatedAt", sql3__default.default.DateTime2, new Date(now));
+      request.input("createdAt", sql2__default.default.DateTime2, new Date(now));
+      request.input("updatedAt", sql2__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
@@ -3126,7 +2857,7 @@ var WorkflowsMSSQL = class extends storage.WorkflowsStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_PERSIST_WORKFLOW_SNAPSHOT_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "PERSIST_WORKFLOW_SNAPSHOT", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -3157,7 +2888,7 @@ var WorkflowsMSSQL = class extends storage.WorkflowsStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_LOAD_WORKFLOW_SNAPSHOT_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "LOAD_WORKFLOW_SNAPSHOT", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -3197,7 +2928,7 @@ var WorkflowsMSSQL = class extends storage.WorkflowsStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_GET_WORKFLOW_RUN_BY_ID_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "GET_WORKFLOW_RUN_BY_ID", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -3209,13 +2940,14 @@ var WorkflowsMSSQL = class extends storage.WorkflowsStorage {
       );
     }
   }
-  async getWorkflowRuns({
+  async listWorkflowRuns({
     workflowName,
     fromDate,
     toDate,
-    limit,
-    offset,
-    resourceId
+    page,
+    perPage,
+    resourceId,
+    status
   } = {}) {
     try {
       const conditions = [];
@@ -3224,6 +2956,10 @@ var WorkflowsMSSQL = class extends storage.WorkflowsStorage {
         conditions.push(`[workflow_name] = @workflowName`);
         paramMap["workflowName"] = workflowName;
       }
+      if (status) {
+        conditions.push(`JSON_VALUE([snapshot], '$.status') = @status`);
+        paramMap["status"] = status;
+      }
       if (resourceId) {
         const hasResourceId = await this.operations.hasColumn(storage.TABLE_WORKFLOW_SNAPSHOT, "resourceId");
         if (hasResourceId) {
@@ -3247,20 +2983,23 @@ var WorkflowsMSSQL = class extends storage.WorkflowsStorage {
       const request = this.pool.request();
       Object.entries(paramMap).forEach(([key, value]) => {
         if (value instanceof Date) {
-          request.input(key, sql3__default.default.DateTime, value);
+          request.input(key, sql2__default.default.DateTime, value);
         } else {
           request.input(key, value);
         }
       });
-      if (limit !== void 0 && offset !== void 0) {
+      const usePagination = typeof perPage === "number" && typeof page === "number";
+      if (usePagination) {
         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 (limit !== void 0 && offset !== void 0) {
-        query += ` OFFSET @offset ROWS FETCH NEXT @limit ROWS ONLY`;
-        request.input("limit", limit);
+      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);
         request.input("offset", offset);
       }
       const result = await request.query(query);
@@ -3269,7 +3008,7 @@ var WorkflowsMSSQL = class extends storage.WorkflowsStorage {
     } catch (error$1) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_GET_WORKFLOW_RUNS_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "LIST_WORKFLOW_RUNS", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
@@ -3289,7 +3028,10 @@ var MSSQLStore = class extends storage.MastraStorage {
   isConnected = null;
   stores;
   constructor(config) {
-    super({ name: "MSSQLStore" });
+    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", disableInit: config.disableInit });
     try {
       if ("connectionString" in config) {
         if (!config.connectionString || typeof config.connectionString !== "string" || config.connectionString.trim() === "") {
@@ -3304,7 +3046,7 @@ var MSSQLStore = class extends storage.MastraStorage {
         }
       }
       this.schema = config.schemaName || "dbo";
-      this.pool = "connectionString" in config ? new sql3__default.default.ConnectionPool(config.connectionString) : new sql3__default.default.ConnectionPool({
+      this.pool = "connectionString" in config ? new sql2__default.default.ConnectionPool(config.connectionString) : new sql2__default.default.ConnectionPool({
         server: config.server,
         database: config.database,
         user: config.user,
@@ -3312,26 +3054,22 @@ 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
       };
     } catch (e) {
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_INITIALIZATION_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "INITIALIZATION", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.USER
         },
@@ -3355,7 +3093,7 @@ var MSSQLStore = class extends storage.MastraStorage {
       this.isConnected = null;
       throw new error.MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_INIT_FAILED",
+          id: storage.createStorageErrorId("MSSQL", "INIT", "FAILED"),
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY
         },
@@ -3378,30 +3116,11 @@ var MSSQLStore = class extends storage.MastraStorage {
       hasColumn: true,
       createTable: true,
       deleteMessages: true,
-      getScoresBySpan: true,
-      aiTracing: true,
+      listScoresBySpan: true,
+      observabilityInstance: 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
@@ -3436,15 +3155,6 @@ 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 });
   }
@@ -3458,17 +3168,8 @@ var MSSQLStore = class extends storage.MastraStorage {
   async deleteThread({ threadId }) {
     return this.stores.memory.deleteThread({ threadId });
   }
-  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 listMessagesById({ messageIds }) {
+    return this.stores.memory.listMessagesById({ messageIds });
   }
   async saveMessages(args) {
     return this.stores.memory.saveMessages(args);
@@ -3502,9 +3203,9 @@ var MSSQLStore = class extends storage.MastraStorage {
     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,
@@ -3527,15 +3228,8 @@ var MSSQLStore = class extends storage.MastraStorage {
   }) {
     return this.stores.workflows.loadWorkflowSnapshot({ workflowName, runId });
   }
-  async getWorkflowRuns({
-    workflowName,
-    fromDate,
-    toDate,
-    limit,
-    offset,
-    resourceId
-  } = {}) {
-    return this.stores.workflows.getWorkflowRuns({ workflowName, fromDate, toDate, limit, offset, resourceId });
+  async listWorkflowRuns(args = {}) {
+    return this.stores.workflows.listWorkflowRuns(args);
   }
   async getWorkflowRunById({
     runId,
@@ -3562,12 +3256,12 @@ var MSSQLStore = class extends storage.MastraStorage {
     return this.stores.operations.dropIndex(indexName);
   }
   /**
-   * AI Tracing / Observability
+   * Tracing / Observability
    */
   getObservabilityStore() {
     if (!this.stores.observability) {
       throw new error.MastraError({
-        id: "MSSQL_STORE_OBSERVABILITY_NOT_INITIALIZED",
+        id: storage.createStorageErrorId("MSSQL", "OBSERVABILITY", "NOT_INITIALIZED"),
         domain: error.ErrorDomain.STORAGE,
         category: error.ErrorCategory.SYSTEM,
         text: "Observability storage is not initialized"
@@ -3575,30 +3269,30 @@ var MSSQLStore = class extends storage.MastraStorage {
     }
     return this.stores.observability;
   }
-  async createAISpan(span) {
-    return this.getObservabilityStore().createAISpan(span);
+  async createSpan(span) {
+    return this.getObservabilityStore().createSpan(span);
   }
-  async updateAISpan({
+  async updateSpan({
     spanId,
     traceId,
     updates
   }) {
-    return this.getObservabilityStore().updateAISpan({ spanId, traceId, updates });
+    return this.getObservabilityStore().updateSpan({ spanId, traceId, updates });
   }
-  async getAITrace(traceId) {
-    return this.getObservabilityStore().getAITrace(traceId);
+  async getTrace(traceId) {
+    return this.getObservabilityStore().getTrace(traceId);
   }
-  async getAITracesPaginated(args) {
-    return this.getObservabilityStore().getAITracesPaginated(args);
+  async getTracesPaginated(args) {
+    return this.getObservabilityStore().getTracesPaginated(args);
   }
-  async batchCreateAISpans(args) {
-    return this.getObservabilityStore().batchCreateAISpans(args);
+  async batchCreateSpans(args) {
+    return this.getObservabilityStore().batchCreateSpans(args);
   }
-  async batchUpdateAISpans(args) {
-    return this.getObservabilityStore().batchUpdateAISpans(args);
+  async batchUpdateSpans(args) {
+    return this.getObservabilityStore().batchUpdateSpans(args);
   }
-  async batchDeleteAITraces(args) {
-    return this.getObservabilityStore().batchDeleteAITraces(args);
+  async batchDeleteTraces(args) {
+    return this.getObservabilityStore().batchDeleteTraces(args);
   }
   /**
    * Scorers
@@ -3606,14 +3300,14 @@ var MSSQLStore = class extends storage.MastraStorage {
   async getScoreById({ id: _id }) {
     return this.stores.scores.getScoreById({ id: _id });
   }
-  async getScoresByScorerId({
+  async listScoresByScorerId({
     scorerId: _scorerId,
     pagination: _pagination,
     entityId: _entityId,
     entityType: _entityType,
     source: _source
   }) {
-    return this.stores.scores.getScoresByScorerId({
+    return this.stores.scores.listScoresByScorerId({
       scorerId: _scorerId,
       pagination: _pagination,
       entityId: _entityId,
@@ -3621,32 +3315,32 @@ var MSSQLStore = class extends storage.MastraStorage {
       source: _source
     });
   }
-  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 getScoresBySpan({
+  async listScoresBySpan({
     traceId,
     spanId,
     pagination: _pagination
   }) {
-    return this.stores.scores.getScoresBySpan({ traceId, spanId, pagination: _pagination });
+    return this.stores.scores.listScoresBySpan({ traceId, spanId, pagination: _pagination });
   }
 };