@mastra/mssql 0.0.0-feat-support-ai-sdk-5-again-20250813225910 → 0.0.0-feat-add-query-option-to-playground-20251209160219

package/dist/index.js

@@ -1,8 +1,10 @@
 import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
-import { MastraStorage, LegacyEvalsStorage, StoreOperations, TABLE_WORKFLOW_SNAPSHOT, ScoresStorage, TABLE_SCORERS, TracesStorage, TABLE_TRACES, WorkflowsStorage, MemoryStorage, resolveMessageLimit, TABLE_RESOURCES, TABLE_EVALS, TABLE_THREADS, TABLE_MESSAGES } from '@mastra/core/storage';
-import sql2 from 'mssql';
-import { parseSqlIdentifier, parseFieldKey } from '@mastra/core/utils';
+import { MastraStorage, createStorageErrorId, StoreOperations, TABLE_WORKFLOW_SNAPSHOT, TABLE_SCHEMAS, TABLE_THREADS, TABLE_MESSAGES, TABLE_TRACES, TABLE_SCORERS, TABLE_SPANS, ScoresStorage, normalizePerPage, calculatePagination, WorkflowsStorage, MemoryStorage, TABLE_RESOURCES, ObservabilityStorage, transformScoreRow as transformScoreRow$1 } from '@mastra/core/storage';
+import sql3 from 'mssql';
 import { MessageList } from '@mastra/core/agent';
+import { parseSqlIdentifier } from '@mastra/core/utils';
+import { randomUUID } from 'crypto';
+import { saveScorePayloadSchema } from '@mastra/core/evals';
 
 // src/storage/index.ts
 function getSchemaName(schema) {
@@ -14,154 +16,109 @@ function getTableName({ indexName, schemaName }) {
   const quotedSchemaName = schemaName;
   return quotedSchemaName ? `${quotedSchemaName}.${quotedIndexName}` : quotedIndexName;
 }
-
-// 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 {
-    }
+function buildDateRangeFilter(dateRange, fieldName) {
+  const filters = {};
+  if (dateRange?.start) {
+    filters[`${fieldName}_gte`] = dateRange.start;
   }
-  if (row.test_info) {
-    try {
-      resultValue = typeof row.result === "string" ? JSON.parse(row.result) : row.result;
-    } catch {
-    }
+  if (dateRange?.end) {
+    filters[`${fieldName}_lte`] = dateRange.end;
   }
-  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
-  };
+  return filters;
 }
-var LegacyEvalsMSSQL = class extends 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: 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 [];
-      }
-      console.error("Failed to get evals for the specified agent: " + error?.message);
-      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: 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, sql2.DateTime, value);
-        } else {
-          countReq.input(key, value);
+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;
+    if (key.endsWith("_gte")) {
+      const paramName = `p${paramIndex++}`;
+      const fieldName = key.slice(0, -4);
+      conditions.push(`[${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(`[${parseSqlIdentifier(fieldName, "field name")}] <= @${paramName}`);
+      params[paramName] = value instanceof Date ? value.toISOString() : value;
+    } else if (value === null) {
+      conditions.push(`[${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(`[${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;
         }
-      });
-      const countResult = await countReq.query(countQuery);
-      const total = countResult.recordset[0]?.total || 0;
-      if (total === 0) {
-        return {
-          evals: [],
-          total: 0,
-          page,
-          perPage,
-          hasMore: false
-        };
+        conditions.push(`[${parseSqlIdentifier(key, "field name")}] IN (${inParamNames.join(", ")})`);
       }
-      const req = this.pool.request();
-      Object.entries(params).forEach(([key, value]) => {
-        if (value instanceof Date) {
-          req.input(key, sql2.DateTime, value);
-        } else {
-          req.input(key, value);
+    } else if (Array.isArray(value)) {
+      if (value.length === 0) {
+        conditions.push("1 = 0");
+      } else if (value.length === 1) {
+        const paramName = `p${paramIndex++}`;
+        conditions.push(`[${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;
         }
-      });
-      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) {
-      const mastraError = new MastraError(
-        {
-          id: "MASTRA_STORAGE_MSSQL_STORE_GET_EVALS_FAILED",
-          domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY,
-          details: {
-            agentName: agentName || "all",
-            type: type || "all",
-            page,
-            perPage
-          }
-        },
-        error
-      );
-      this.logger?.error?.(mastraError.toString());
-      this.logger?.trackException(mastraError);
-      throw mastraError;
+        conditions.push(`[${parseSqlIdentifier(key, "field name")}] IN (${inParamNames.join(", ")})`);
+      }
+    } else {
+      const paramName = `p${paramIndex++}`;
+      conditions.push(`[${parseSqlIdentifier(key, "field name")}] = @${paramName}`);
+      params[paramName] = value instanceof Date ? value.toISOString() : value;
     }
-  }
-};
+  });
+  return {
+    sql: conditions.length > 0 ? ` WHERE ${conditions.join(" AND ")}` : "",
+    params
+  };
+}
+function transformFromSqlRow({
+  tableName,
+  sqlRow
+}) {
+  const schema = TABLE_SCHEMAS[tableName];
+  const result = {};
+  Object.entries(sqlRow).forEach(([key, value]) => {
+    const columnSchema = schema?.[key];
+    if (columnSchema?.type === "jsonb" && typeof value === "string") {
+      try {
+        result[key] = JSON.parse(value);
+      } catch {
+        result[key] = value;
+      }
+    } else if (columnSchema?.type === "timestamp" && value && typeof value === "string") {
+      result[key] = new Date(value);
+    } else if (columnSchema?.type === "timestamp" && value instanceof Date) {
+      result[key] = value;
+    } else if (columnSchema?.type === "boolean") {
+      result[key] = Boolean(value);
+    } else {
+      result[key] = value;
+    }
+  });
+  return result;
+}
+
+// src/storage/domains/memory/index.ts
 var MemoryMSSQL = class extends MemoryStorage {
   pool;
   schema;
@@ -179,7 +136,7 @@ var MemoryMSSQL = class extends MemoryStorage {
     });
     const cleanMessages = messagesWithParsedContent.map(({ seq_id, ...rest }) => rest);
     const list = new 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,
@@ -193,7 +150,7 @@ var MemoryMSSQL = class extends MemoryStorage {
   }
   async getThreadById({ threadId }) {
     try {
-      const sql7 = `SELECT 
+      const sql5 = `SELECT 
         id,
         [resourceId],
         title,
@@ -204,7 +161,7 @@ var MemoryMSSQL = class extends 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;
@@ -218,7 +175,7 @@ var MemoryMSSQL = class extends MemoryStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_GET_THREAD_BY_ID_FAILED",
+          id: createStorageErrorId("MSSQL", "GET_THREAD_BY_ID", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -229,11 +186,24 @@ var MemoryMSSQL = class extends 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 MastraError({
+        id: createStorageErrorId("MSSQL", "LIST_THREADS_BY_RESOURCE_ID", "INVALID_PAGE"),
+        domain: ErrorDomain.STORAGE,
+        category: ErrorCategory.USER,
+        text: "Page number must be non-negative",
+        details: {
+          resourceId,
+          page
+        }
+      });
+    }
+    const perPage = normalizePerPage(perPageInput, 100);
+    const { offset, perPage: perPageForResponse } = 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: TABLE_THREADS, schemaName: getSchemaName(this.schema) })} WHERE [resourceId] = @resourceId`;
       const countQuery = `SELECT COUNT(*) as count ${baseQuery}`;
       const countRequest = this.pool.request();
@@ -245,16 +215,22 @@ var MemoryMSSQL = class extends MemoryStorage {
           threads: [],
           total: 0,
           page,
-          perPage,
+          perPage: perPageForResponse,
           hasMore: false
         };
       }
-      const orderByField = orderBy === "createdAt" ? "[createdAt]" : "[updatedAt]";
-      const dataQuery = `SELECT id, [resourceId], title, metadata, [createdAt], [updatedAt] ${baseQuery} ORDER BY ${orderByField} ${sortDirection} OFFSET @offset ROWS FETCH NEXT @perPage ROWS ONLY`;
+      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", sql3.BigInt, limitValue);
+      } else {
+        dataRequest.input("perPage", limitValue);
+      }
       const rowsResult = await dataRequest.query(dataQuery);
       const rows = rowsResult.recordset || [];
       const threads = rows.map((thread) => ({
@@ -267,13 +243,13 @@ var MemoryMSSQL = class extends MemoryStorage {
         threads,
         total,
         page,
-        perPage,
-        hasMore: currentOffset + threads.length < total
+        perPage: perPageForResponse,
+        hasMore: perPageInput === false ? false : offset + perPage < total
       };
     } catch (error) {
       const mastraError = new MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_GET_THREADS_BY_RESOURCE_ID_PAGINATED_FAILED",
+          id: createStorageErrorId("MSSQL", "LIST_THREADS_BY_RESOURCE_ID", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -285,7 +261,13 @@ var MemoryMSSQL = class extends 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 }) {
@@ -307,15 +289,20 @@ var MemoryMSSQL = class extends MemoryStorage {
       req.input("id", thread.id);
       req.input("resourceId", thread.resourceId);
       req.input("title", thread.title);
-      req.input("metadata", thread.metadata ? JSON.stringify(thread.metadata) : null);
-      req.input("createdAt", sql2.DateTime2, thread.createdAt);
-      req.input("updatedAt", sql2.DateTime2, thread.updatedAt);
+      const metadata = thread.metadata ? JSON.stringify(thread.metadata) : null;
+      if (metadata === null) {
+        req.input("metadata", sql3.NVarChar, null);
+      } else {
+        req.input("metadata", metadata);
+      }
+      req.input("createdAt", sql3.DateTime2, thread.createdAt);
+      req.input("updatedAt", sql3.DateTime2, thread.updatedAt);
       await req.query(mergeSql);
       return thread;
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_SAVE_THREAD_FAILED",
+          id: createStorageErrorId("MSSQL", "SAVE_THREAD", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -326,30 +313,6 @@ var MemoryMSSQL = class extends MemoryStorage {
       );
     }
   }
-  /**
-   * @deprecated use getThreadsByResourceIdPaginated instead
-   */
-  async getThreadsByResourceId(args) {
-    const { resourceId, orderBy = "createdAt", sortDirection = "DESC" } = args;
-    try {
-      const baseQuery = `FROM ${getTableName({ indexName: TABLE_THREADS, schemaName: getSchemaName(this.schema) })} WHERE [resourceId] = @resourceId`;
-      const orderByField = orderBy === "createdAt" ? "[createdAt]" : "[updatedAt]";
-      const dataQuery = `SELECT id, [resourceId], title, metadata, [createdAt], [updatedAt] ${baseQuery} ORDER BY ${orderByField} ${sortDirection}`;
-      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.
    */
@@ -361,7 +324,7 @@ var MemoryMSSQL = class extends MemoryStorage {
     const existingThread = await this.getThreadById({ threadId: id });
     if (!existingThread) {
       throw new MastraError({
-        id: "MASTRA_STORAGE_MSSQL_STORE_UPDATE_THREAD_FAILED",
+        id: createStorageErrorId("MSSQL", "UPDATE_THREAD", "NOT_FOUND"),
         domain: ErrorDomain.STORAGE,
         category: ErrorCategory.USER,
         text: `Thread ${id} not found`,
@@ -377,7 +340,7 @@ var MemoryMSSQL = class extends MemoryStorage {
     };
     try {
       const table = getTableName({ indexName: TABLE_THREADS, schemaName: getSchemaName(this.schema) });
-      const sql7 = `UPDATE ${table}
+      const sql5 = `UPDATE ${table}
         SET title = @title,
             metadata = @metadata,
             [updatedAt] = @updatedAt
@@ -388,7 +351,7 @@ var MemoryMSSQL = class extends 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;
@@ -396,7 +359,7 @@ var MemoryMSSQL = class extends MemoryStorage {
       }
       if (!thread) {
         throw new MastraError({
-          id: "MASTRA_STORAGE_MSSQL_STORE_UPDATE_THREAD_FAILED",
+          id: createStorageErrorId("MSSQL", "UPDATE_THREAD", "NOT_FOUND"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.USER,
           text: `Thread ${id} not found after update`,
@@ -415,7 +378,7 @@ var MemoryMSSQL = class extends MemoryStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_UPDATE_THREAD_FAILED",
+          id: createStorageErrorId("MSSQL", "UPDATE_THREAD", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -445,7 +408,7 @@ var MemoryMSSQL = class extends MemoryStorage {
       });
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_DELETE_THREAD_FAILED",
+          id: createStorageErrorId("MSSQL", "DELETE_THREAD", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -456,24 +419,18 @@ var MemoryMSSQL = class extends MemoryStorage {
       );
     }
   }
-  async _getIncludedMessages({
-    threadId,
-    selectBy,
-    orderByStatement
-  }) {
-    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: 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
@@ -486,30 +443,32 @@ var MemoryMSSQL = class extends MemoryStorage {
             m.[resourceId],
             m.seq_id
           FROM (
-            SELECT *, ROW_NUMBER() OVER (${orderByStatement}) as row_num
-            FROM ${getTableName({ indexName: 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: 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 (
@@ -531,33 +490,16 @@ var MemoryMSSQL = class extends MemoryStorage {
     });
     return dedupedRows;
   }
-  async getMessages(args) {
-    const { threadId, 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 = resolveMessageLimit({ last: selectBy?.last, defaultLimit: 40 });
     try {
       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: TABLE_MESSAGES, schemaName: getSchemaName(this.schema) })} WHERE [thread_id] = @threadId`;
+      let query = `${selectStatement} FROM ${getTableName({ indexName: 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);
@@ -565,120 +507,177 @@ var MemoryMSSQL = class extends 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 MessageList().add(cleanMessages, "memory");
+      return { messages: list.get.all.db() };
     } catch (error) {
       const mastraError = new MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_GET_MESSAGES_FAILED",
+          id: createStorageErrorId("MSSQL", "LIST_MESSAGES_BY_ID", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
-            threadId
+            messageIds: JSON.stringify(messageIds)
           }
         },
         error
       );
       this.logger?.error?.(mastraError.toString());
-      this.logger?.trackException(mastraError);
-      return [];
+      this.logger?.trackException?.(mastraError);
+      return { messages: [] };
     }
   }
-  async getMessagesPaginated(args) {
-    const { threadId, selectBy } = args;
-    const { page = 0, perPage: perPageInput } = selectBy?.pagination || {};
-    const orderByStatement = `ORDER BY [seq_id] DESC`;
-    if (selectBy?.include?.length) {
-      await this._getIncludedMessages({ threadId, selectBy, orderByStatement });
+  async listMessages(args) {
+    const { threadId, resourceId, include, filter, perPage: perPageInput, page = 0, orderBy } = args;
+    const threadIds = Array.isArray(threadId) ? threadId : [threadId];
+    if (threadIds.length === 0 || threadIds.some((id) => !id.trim())) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("MSSQL", "LIST_MESSAGES", "INVALID_THREAD_ID"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { threadId: Array.isArray(threadId) ? threadId.join(",") : threadId }
+        },
+        new Error("threadId must be a non-empty string or array of non-empty strings")
+      );
+    }
+    if (page < 0) {
+      throw new MastraError({
+        id: createStorageErrorId("MSSQL", "LIST_MESSAGES", "INVALID_PAGE"),
+        domain: ErrorDomain.STORAGE,
+        category: ErrorCategory.USER,
+        text: "Page number must be non-negative",
+        details: {
+          threadId: Array.isArray(threadId) ? threadId.join(",") : threadId,
+          page
+        }
+      });
     }
+    const perPage = normalizePerPage(perPageInput, 40);
+    const { offset, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
     try {
-      const { threadId: threadId2, format, selectBy: selectBy2 } = args;
-      const { page: page2 = 0, perPage: perPageInput2, dateRange } = selectBy2?.pagination || {};
-      const fromDate = dateRange?.start;
-      const toDate = dateRange?.end;
-      const selectStatement = `SELECT seq_id, id, content, role, type, [createdAt], thread_id AS threadId, resourceId`;
-      const orderByStatement2 = `ORDER BY [seq_id] DESC`;
-      let messages2 = [];
-      if (selectBy2?.include?.length) {
-        const includeMessages = await this._getIncludedMessages({ threadId: threadId2, selectBy: selectBy2, orderByStatement: orderByStatement2 });
-        if (includeMessages) messages2.push(...includeMessages);
-      }
-      const perPage = perPageInput2 !== void 0 ? perPageInput2 : resolveMessageLimit({ last: selectBy2?.last, defaultLimit: 40 });
-      const currentOffset = page2 * perPage;
-      const conditions = ["[thread_id] = @threadId"];
-      const request = this.pool.request();
-      request.input("threadId", threadId2);
-      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: 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: 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 && messages2.length > 0) {
-        const parsedIncluded = this._parseAndFormatMessages(messages2, 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 ? sql3.BigInt : sql3.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,
-          page: page2,
-          perPage,
+          messages: [],
+          total: 0,
+          page,
+          perPage: perPageForResponse,
           hasMore: false
         };
       }
-      const excludeIds = messages2.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: TABLE_MESSAGES, schemaName: getSchemaName(this.schema) })} ${finalWhereClause} ${orderByStatement2} 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);
-      messages2.push(...rows);
-      const parsed = this._parseAndFormatMessages(messages2, format);
+      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,
-        total: total + excludeIds.length,
-        page: page2,
-        perPage,
-        hasMore: currentOffset + rows.length < total
+        messages: finalMessages,
+        total,
+        page,
+        perPage: perPageForResponse,
+        hasMore
       };
     } catch (error) {
       const mastraError = new MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_GET_MESSAGES_PAGINATED_FAILED",
+          id: createStorageErrorId("MSSQL", "LIST_MESSAGES", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
-            threadId,
-            page
+            threadId: Array.isArray(threadId) ? threadId.join(",") : threadId,
+            resourceId: resourceId ?? ""
           }
         },
         error
       );
       this.logger?.error?.(mastraError.toString());
-      this.logger?.trackException(mastraError);
-      return { messages: [], total: 0, page, perPage: perPageInput || 40, hasMore: false };
+      this.logger?.trackException?.(mastraError);
+      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 MastraError({
-        id: "MASTRA_STORAGE_MSSQL_STORE_SAVE_MESSAGES_FAILED",
+        id: createStorageErrorId("MSSQL", "SAVE_MESSAGES", "INVALID_THREAD_ID"),
         domain: ErrorDomain.STORAGE,
         category: ErrorCategory.THIRD_PARTY,
         text: `Thread ID is required`
@@ -687,7 +686,7 @@ var MemoryMSSQL = class extends MemoryStorage {
     const thread = await this.getThreadById({ threadId });
     if (!thread) {
       throw new MastraError({
-        id: "MASTRA_STORAGE_MSSQL_STORE_SAVE_MESSAGES_FAILED",
+        id: createStorageErrorId("MSSQL", "SAVE_MESSAGES", "THREAD_NOT_FOUND"),
         domain: ErrorDomain.STORAGE,
         category: ErrorCategory.THIRD_PARTY,
         text: `Thread ${threadId} not found`,
@@ -718,7 +717,7 @@ var MemoryMSSQL = class extends MemoryStorage {
             "content",
             typeof message.content === "string" ? message.content : JSON.stringify(message.content)
           );
-          request.input("createdAt", sql2.DateTime2, message.createdAt);
+          request.input("createdAt", sql3.DateTime2, message.createdAt);
           request.input("role", message.role);
           request.input("type", message.type || "v2");
           request.input("resourceId", message.resourceId);
@@ -737,7 +736,7 @@ var MemoryMSSQL = class extends MemoryStorage {
           await request.query(mergeSql);
         }
         const threadReq = transaction.request();
-        threadReq.input("updatedAt", sql2.DateTime2, /* @__PURE__ */ new Date());
+        threadReq.input("updatedAt", sql3.DateTime2, /* @__PURE__ */ new Date());
         threadReq.input("id", threadId);
         await threadReq.query(`UPDATE ${tableThreads} SET [updatedAt] = @updatedAt WHERE id = @id`);
         await transaction.commit();
@@ -756,12 +755,11 @@ var MemoryMSSQL = class extends MemoryStorage {
         return message;
       });
       const list = new 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) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_SAVE_MESSAGES_FAILED",
+          id: createStorageErrorId("MSSQL", "SAVE_MESSAGES", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { threadId }
@@ -852,7 +850,7 @@ var MemoryMSSQL = class extends MemoryStorage {
       await transaction.rollback();
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_UPDATE_MESSAGES_FAILED",
+          id: createStorageErrorId("MSSQL", "UPDATE_MESSAGES", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY
         },
@@ -914,7 +912,7 @@ var MemoryMSSQL = class extends MemoryStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_DELETE_MESSAGES_FAILED",
+          id: createStorageErrorId("MSSQL", "DELETE_MESSAGES", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { messageIds: messageIds.join(", ") }
@@ -933,14 +931,16 @@ var MemoryMSSQL = class extends MemoryStorage {
         return null;
       }
       return {
-        ...result,
-        workingMemory: typeof result.workingMemory === "object" ? JSON.stringify(result.workingMemory) : result.workingMemory,
+        id: result.id,
+        createdAt: result.createdAt,
+        updatedAt: result.updatedAt,
+        workingMemory: result.workingMemory,
         metadata: typeof result.metadata === "string" ? JSON.parse(result.metadata) : result.metadata
       };
     } catch (error) {
       const mastraError = new MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_GET_RESOURCE_BY_ID_FAILED",
+          id: createStorageErrorId("MSSQL", "GET_RESOURCE_BY_ID", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { resourceId }
@@ -948,7 +948,7 @@ var MemoryMSSQL = class extends MemoryStorage {
         error
       );
       this.logger?.error?.(mastraError.toString());
-      this.logger?.trackException(mastraError);
+      this.logger?.trackException?.(mastraError);
       throw mastraError;
     }
   }
@@ -957,7 +957,7 @@ var MemoryMSSQL = class extends MemoryStorage {
       tableName: TABLE_RESOURCES,
       record: {
         ...resource,
-        metadata: JSON.stringify(resource.metadata)
+        metadata: resource.metadata
       }
     });
     return resource;
@@ -1007,7 +1007,7 @@ var MemoryMSSQL = class extends MemoryStorage {
     } catch (error) {
       const mastraError = new MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_UPDATE_RESOURCE_FAILED",
+          id: createStorageErrorId("MSSQL", "UPDATE_RESOURCE", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { resourceId }
@@ -1015,115 +1015,440 @@ var MemoryMSSQL = class extends MemoryStorage {
         error
       );
       this.logger?.error?.(mastraError.toString());
-      this.logger?.trackException(mastraError);
+      this.logger?.trackException?.(mastraError);
       throw mastraError;
     }
   }
 };
-var StoreOperationsMSSQL = class extends StoreOperations {
+var ObservabilityMSSQL = class extends ObservabilityStorage {
   pool;
-  schemaName;
-  setupSchemaPromise = null;
-  schemaSetupComplete = void 0;
-  getSqlType(type, isPrimaryKey = false) {
-    switch (type) {
-      case "text":
-        return isPrimaryKey ? "NVARCHAR(255)" : "NVARCHAR(MAX)";
-      case "timestamp":
-        return "DATETIME2(7)";
-      case "uuid":
-        return "UNIQUEIDENTIFIER";
-      case "jsonb":
-        return "NVARCHAR(MAX)";
-      case "integer":
-        return "INT";
-      case "bigint":
-        return "BIGINT";
-      case "float":
-        return "FLOAT";
-      default:
-        throw new MastraError({
-          id: "MASTRA_STORAGE_MSSQL_STORE_TYPE_NOT_SUPPORTED",
-          domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY
-        });
-    }
-  }
-  constructor({ pool, schemaName }) {
+  operations;
+  schema;
+  constructor({
+    pool,
+    operations,
+    schema
+  }) {
     super();
     this.pool = pool;
-    this.schemaName = schemaName;
-  }
-  async hasColumn(table, column) {
-    const schema = this.schemaName || "dbo";
-    const request = this.pool.request();
-    request.input("schema", schema);
-    request.input("table", table);
-    request.input("column", column);
-    request.input("columnLower", column.toLowerCase());
-    const result = await request.query(
-      `SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = @schema AND TABLE_NAME = @table AND (COLUMN_NAME = @column OR COLUMN_NAME = @columnLower)`
-    );
-    return result.recordset.length > 0;
+    this.operations = operations;
+    this.schema = schema;
   }
-  async setupSchema() {
-    if (!this.schemaName || this.schemaSetupComplete) {
-      return;
-    }
-    if (!this.setupSchemaPromise) {
-      this.setupSchemaPromise = (async () => {
-        try {
-          const checkRequest = this.pool.request();
-          checkRequest.input("schemaName", this.schemaName);
-          const checkResult = await checkRequest.query(`
-            SELECT 1 AS found FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = @schemaName
-          `);
-          const schemaExists = Array.isArray(checkResult.recordset) && checkResult.recordset.length > 0;
-          if (!schemaExists) {
-            try {
-              await this.pool.request().query(`CREATE SCHEMA [${this.schemaName}]`);
-              this.logger?.info?.(`Schema "${this.schemaName}" created successfully`);
-            } catch (error) {
-              this.logger?.error?.(`Failed to create schema "${this.schemaName}"`, { error });
-              throw new Error(
-                `Unable to create schema "${this.schemaName}". This requires CREATE privilege on the database. Either create the schema manually or grant CREATE privilege to the user.`
-              );
-            }
-          }
-          this.schemaSetupComplete = true;
-          this.logger?.debug?.(`Schema "${this.schemaName}" is ready for use`);
-        } catch (error) {
-          this.schemaSetupComplete = void 0;
-          this.setupSchemaPromise = null;
-          throw error;
-        } finally {
-          this.setupSchemaPromise = null;
-        }
-      })();
-    }
-    await this.setupSchemaPromise;
+  get tracingStrategy() {
+    return {
+      preferred: "batch-with-updates",
+      supported: ["batch-with-updates", "insert-only"]
+    };
   }
-  async insert({ tableName, record }) {
+  async createSpan(span) {
     try {
-      const columns = Object.keys(record).map((col) => parseSqlIdentifier(col, "column name"));
-      const values = Object.values(record);
-      const paramNames = values.map((_, i) => `@param${i}`);
-      const insertSql = `INSERT INTO ${getTableName({ indexName: tableName, schemaName: getSchemaName(this.schemaName) })} (${columns.map((c) => `[${c}]`).join(", ")}) VALUES (${paramNames.join(", ")})`;
-      const request = this.pool.request();
-      values.forEach((value, i) => {
-        if (value instanceof Date) {
-          request.input(`param${i}`, sql2.DateTime2, value);
-        } else if (typeof value === "object" && value !== null) {
-          request.input(`param${i}`, JSON.stringify(value));
+      const startedAt = span.startedAt instanceof Date ? span.startedAt.toISOString() : span.startedAt;
+      const endedAt = span.endedAt instanceof Date ? span.endedAt.toISOString() : span.endedAt;
+      const record = {
+        ...span,
+        startedAt,
+        endedAt
+        // Note: createdAt/updatedAt will be set by default values
+      };
+      return this.operations.insert({ tableName: TABLE_SPANS, record });
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("MSSQL", "CREATE_SPAN", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER,
+          details: {
+            spanId: span.spanId,
+            traceId: span.traceId,
+            spanType: span.spanType,
+            spanName: span.name
+          }
+        },
+        error
+      );
+    }
+  }
+  async getTrace(traceId) {
+    try {
+      const tableName = getTableName({
+        indexName: TABLE_SPANS,
+        schemaName: getSchemaName(this.schema)
+      });
+      const request = this.pool.request();
+      request.input("traceId", traceId);
+      const result = await request.query(
+        `SELECT
+          [traceId], [spanId], [parentSpanId], [name], [scope], [spanType],
+          [attributes], [metadata], [links], [input], [output], [error], [isEvent],
+          [startedAt], [endedAt], [createdAt], [updatedAt]
+        FROM ${tableName}
+        WHERE [traceId] = @traceId
+        ORDER BY [startedAt] DESC`
+      );
+      if (!result.recordset || result.recordset.length === 0) {
+        return null;
+      }
+      return {
+        traceId,
+        spans: result.recordset.map(
+          (span) => transformFromSqlRow({
+            tableName: TABLE_SPANS,
+            sqlRow: span
+          })
+        )
+      };
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("MSSQL", "GET_TRACE", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER,
+          details: {
+            traceId
+          }
+        },
+        error
+      );
+    }
+  }
+  async updateSpan({
+    spanId,
+    traceId,
+    updates
+  }) {
+    try {
+      const data = { ...updates };
+      if (data.endedAt instanceof Date) {
+        data.endedAt = data.endedAt.toISOString();
+      }
+      if (data.startedAt instanceof Date) {
+        data.startedAt = data.startedAt.toISOString();
+      }
+      await this.operations.update({
+        tableName: TABLE_SPANS,
+        keys: { spanId, traceId },
+        data
+      });
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("MSSQL", "UPDATE_SPAN", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER,
+          details: {
+            spanId,
+            traceId
+          }
+        },
+        error
+      );
+    }
+  }
+  async getTracesPaginated({
+    filters,
+    pagination
+  }) {
+    const page = pagination?.page ?? 0;
+    const perPage = pagination?.perPage ?? 10;
+    const { entityId, entityType, ...actualFilters } = filters || {};
+    const filtersWithDateRange = {
+      ...actualFilters,
+      ...buildDateRangeFilter(pagination?.dateRange, "startedAt"),
+      parentSpanId: null
+      // Only get root spans for traces
+    };
+    const whereClause = prepareWhereClause(filtersWithDateRange);
+    let actualWhereClause = whereClause.sql;
+    const params = { ...whereClause.params };
+    let currentParamIndex = Object.keys(params).length + 1;
+    if (entityId && entityType) {
+      let name = "";
+      if (entityType === "workflow") {
+        name = `workflow run: '${entityId}'`;
+      } else if (entityType === "agent") {
+        name = `agent run: '${entityId}'`;
+      } else {
+        const error = new MastraError({
+          id: createStorageErrorId("MSSQL", "GET_TRACES_PAGINATED", "INVALID_ENTITY_TYPE"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER,
+          details: {
+            entityType
+          },
+          text: `Cannot filter by entity type: ${entityType}`
+        });
+        throw error;
+      }
+      const entityParam = `p${currentParamIndex++}`;
+      if (actualWhereClause) {
+        actualWhereClause += ` AND [name] = @${entityParam}`;
+      } else {
+        actualWhereClause = ` WHERE [name] = @${entityParam}`;
+      }
+      params[entityParam] = name;
+    }
+    const tableName = getTableName({
+      indexName: TABLE_SPANS,
+      schemaName: getSchemaName(this.schema)
+    });
+    try {
+      const countRequest = this.pool.request();
+      Object.entries(params).forEach(([key, value]) => {
+        countRequest.input(key, value);
+      });
+      const countResult = await countRequest.query(
+        `SELECT COUNT(*) as count FROM ${tableName}${actualWhereClause}`
+      );
+      const total = countResult.recordset[0]?.count ?? 0;
+      if (total === 0) {
+        return {
+          pagination: {
+            total: 0,
+            page,
+            perPage,
+            hasMore: false
+          },
+          spans: []
+        };
+      }
+      const dataRequest = this.pool.request();
+      Object.entries(params).forEach(([key, value]) => {
+        dataRequest.input(key, value);
+      });
+      dataRequest.input("offset", page * perPage);
+      dataRequest.input("limit", perPage);
+      const dataResult = await dataRequest.query(
+        `SELECT * FROM ${tableName}${actualWhereClause} ORDER BY [startedAt] DESC OFFSET @offset ROWS FETCH NEXT @limit ROWS ONLY`
+      );
+      const spans = dataResult.recordset.map(
+        (row) => transformFromSqlRow({
+          tableName: TABLE_SPANS,
+          sqlRow: row
+        })
+      );
+      return {
+        pagination: {
+          total,
+          page,
+          perPage,
+          hasMore: (page + 1) * perPage < total
+        },
+        spans
+      };
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("MSSQL", "GET_TRACES_PAGINATED", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER
+        },
+        error
+      );
+    }
+  }
+  async batchCreateSpans(args) {
+    if (!args.records || args.records.length === 0) {
+      return;
+    }
+    try {
+      await this.operations.batchInsert({
+        tableName: TABLE_SPANS,
+        records: args.records.map((span) => ({
+          ...span,
+          startedAt: span.startedAt instanceof Date ? span.startedAt.toISOString() : span.startedAt,
+          endedAt: span.endedAt instanceof Date ? span.endedAt.toISOString() : span.endedAt
+        }))
+      });
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("MSSQL", "BATCH_CREATE_SPANS", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER,
+          details: {
+            count: args.records.length
+          }
+        },
+        error
+      );
+    }
+  }
+  async batchUpdateSpans(args) {
+    if (!args.records || args.records.length === 0) {
+      return;
+    }
+    try {
+      const updates = args.records.map(({ traceId, spanId, updates: data }) => {
+        const processedData = { ...data };
+        if (processedData.endedAt instanceof Date) {
+          processedData.endedAt = processedData.endedAt.toISOString();
+        }
+        if (processedData.startedAt instanceof Date) {
+          processedData.startedAt = processedData.startedAt.toISOString();
+        }
+        return {
+          keys: { spanId, traceId },
+          data: processedData
+        };
+      });
+      await this.operations.batchUpdate({
+        tableName: TABLE_SPANS,
+        updates
+      });
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("MSSQL", "BATCH_UPDATE_SPANS", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER,
+          details: {
+            count: args.records.length
+          }
+        },
+        error
+      );
+    }
+  }
+  async batchDeleteTraces(args) {
+    if (!args.traceIds || args.traceIds.length === 0) {
+      return;
+    }
+    try {
+      const keys = args.traceIds.map((traceId) => ({ traceId }));
+      await this.operations.batchDelete({
+        tableName: TABLE_SPANS,
+        keys
+      });
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("MSSQL", "BATCH_DELETE_TRACES", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER,
+          details: {
+            count: args.traceIds.length
+          }
+        },
+        error
+      );
+    }
+  }
+};
+var StoreOperationsMSSQL = class extends StoreOperations {
+  pool;
+  schemaName;
+  setupSchemaPromise = null;
+  schemaSetupComplete = void 0;
+  getSqlType(type, isPrimaryKey = false, useLargeStorage = false) {
+    switch (type) {
+      case "text":
+        if (useLargeStorage) {
+          return "NVARCHAR(MAX)";
+        }
+        return isPrimaryKey ? "NVARCHAR(255)" : "NVARCHAR(400)";
+      case "timestamp":
+        return "DATETIME2(7)";
+      case "uuid":
+        return "UNIQUEIDENTIFIER";
+      case "jsonb":
+        return "NVARCHAR(MAX)";
+      case "integer":
+        return "INT";
+      case "bigint":
+        return "BIGINT";
+      case "float":
+        return "FLOAT";
+      case "boolean":
+        return "BIT";
+      default:
+        throw new MastraError({
+          id: createStorageErrorId("MSSQL", "TYPE", "NOT_SUPPORTED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY
+        });
+    }
+  }
+  constructor({ pool, schemaName }) {
+    super();
+    this.pool = pool;
+    this.schemaName = schemaName;
+  }
+  async hasColumn(table, column) {
+    const schema = this.schemaName || "dbo";
+    const request = this.pool.request();
+    request.input("schema", schema);
+    request.input("table", table);
+    request.input("column", column);
+    request.input("columnLower", column.toLowerCase());
+    const result = await request.query(
+      `SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = @schema AND TABLE_NAME = @table AND (COLUMN_NAME = @column OR COLUMN_NAME = @columnLower)`
+    );
+    return result.recordset.length > 0;
+  }
+  async setupSchema() {
+    if (!this.schemaName || this.schemaSetupComplete) {
+      return;
+    }
+    if (!this.setupSchemaPromise) {
+      this.setupSchemaPromise = (async () => {
+        try {
+          const checkRequest = this.pool.request();
+          checkRequest.input("schemaName", this.schemaName);
+          const checkResult = await checkRequest.query(`
+            SELECT 1 AS found FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = @schemaName
+          `);
+          const schemaExists = Array.isArray(checkResult.recordset) && checkResult.recordset.length > 0;
+          if (!schemaExists) {
+            try {
+              await this.pool.request().query(`CREATE SCHEMA [${this.schemaName}]`);
+              this.logger?.info?.(`Schema "${this.schemaName}" created successfully`);
+            } catch (error) {
+              this.logger?.error?.(`Failed to create schema "${this.schemaName}"`, { error });
+              throw new Error(
+                `Unable to create schema "${this.schemaName}". This requires CREATE privilege on the database. Either create the schema manually or grant CREATE privilege to the user.`
+              );
+            }
+          }
+          this.schemaSetupComplete = true;
+          this.logger?.debug?.(`Schema "${this.schemaName}" is ready for use`);
+        } catch (error) {
+          this.schemaSetupComplete = void 0;
+          this.setupSchemaPromise = null;
+          throw error;
+        } finally {
+          this.setupSchemaPromise = null;
+        }
+      })();
+    }
+    await this.setupSchemaPromise;
+  }
+  async insert({
+    tableName,
+    record,
+    transaction
+  }) {
+    try {
+      const columns = Object.keys(record);
+      const parsedColumns = columns.map((col) => parseSqlIdentifier(col, "column name"));
+      const paramNames = columns.map((_, i) => `@param${i}`);
+      const insertSql = `INSERT INTO ${getTableName({ indexName: tableName, schemaName: getSchemaName(this.schemaName) })} (${parsedColumns.map((c) => `[${c}]`).join(", ")}) VALUES (${paramNames.join(", ")})`;
+      const request = transaction ? transaction.request() : this.pool.request();
+      columns.forEach((col, i) => {
+        const value = record[col];
+        const preparedValue = this.prepareValue(value, col, tableName);
+        if (preparedValue instanceof Date) {
+          request.input(`param${i}`, sql3.DateTime2, preparedValue);
+        } else if (preparedValue === null || preparedValue === void 0) {
+          request.input(`param${i}`, this.getMssqlType(tableName, col), null);
         } else {
-          request.input(`param${i}`, value);
+          request.input(`param${i}`, preparedValue);
         }
       });
       await request.query(insertSql);
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_INSERT_FAILED",
+          id: createStorageErrorId("MSSQL", "INSERT", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -1140,7 +1465,7 @@ var StoreOperationsMSSQL = class extends StoreOperations {
       try {
         await this.pool.request().query(`TRUNCATE TABLE ${fullTableName}`);
       } catch (truncateError) {
-        if (truncateError.message && truncateError.message.includes("foreign key")) {
+        if (truncateError?.number === 4712) {
           await this.pool.request().query(`DELETE FROM ${fullTableName}`);
         } else {
           throw truncateError;
@@ -1149,7 +1474,7 @@ var StoreOperationsMSSQL = class extends StoreOperations {
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_CLEAR_TABLE_FAILED",
+          id: createStorageErrorId("MSSQL", "CLEAR_TABLE", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -1163,9 +1488,11 @@ var StoreOperationsMSSQL = class extends StoreOperations {
   getDefaultValue(type) {
     switch (type) {
       case "timestamp":
-        return "DEFAULT SYSDATETIMEOFFSET()";
+        return "DEFAULT SYSUTCDATETIME()";
       case "jsonb":
         return "DEFAULT N'{}'";
+      case "boolean":
+        return "DEFAULT 0";
       default:
         return super.getDefaultValue(type);
     }
@@ -1176,13 +1503,29 @@ var StoreOperationsMSSQL = class extends StoreOperations {
   }) {
     try {
       const uniqueConstraintColumns = tableName === TABLE_WORKFLOW_SNAPSHOT ? ["workflow_name", "run_id"] : [];
+      const largeDataColumns = [
+        "workingMemory",
+        "snapshot",
+        "metadata",
+        "content",
+        // messages.content - can be very long conversation content
+        "input",
+        // evals.input - test input data
+        "output",
+        // evals.output - test output data
+        "instructions",
+        // evals.instructions - evaluation instructions
+        "other"
+        // traces.other - additional trace data
+      ];
       const columns = Object.entries(schema).map(([name, def]) => {
         const parsedName = parseSqlIdentifier(name, "column name");
         const constraints = [];
         if (def.primaryKey) constraints.push("PRIMARY KEY");
         if (!def.nullable) constraints.push("NOT NULL");
         const isIndexed = !!def.primaryKey || uniqueConstraintColumns.includes(name);
-        return `[${parsedName}] ${this.getSqlType(def.type, isIndexed)} ${constraints.join(" ")}`.trim();
+        const useLargeStorage = largeDataColumns.includes(name);
+        return `[${parsedName}] ${this.getSqlType(def.type, isIndexed, useLargeStorage)} ${constraints.join(" ")}`.trim();
       }).join(",\n");
       if (this.schemaName) {
         await this.setupSchema();
@@ -1234,7 +1577,7 @@ ${columns}
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_CREATE_TABLE_FAILED",
+          id: createStorageErrorId("MSSQL", "CREATE_TABLE", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -1269,7 +1612,19 @@ ${columns}
           const columnExists = Array.isArray(checkResult.recordset) && checkResult.recordset.length > 0;
           if (!columnExists) {
             const columnDef = schema[columnName];
-            const sqlType = this.getSqlType(columnDef.type);
+            const largeDataColumns = [
+              "workingMemory",
+              "snapshot",
+              "metadata",
+              "content",
+              "input",
+              "output",
+              "instructions",
+              "other"
+            ];
+            const useLargeStorage = largeDataColumns.includes(columnName);
+            const isIndexed = !!columnDef.primaryKey;
+            const sqlType = this.getSqlType(columnDef.type, isIndexed, useLargeStorage);
             const nullable = columnDef.nullable === false ? "NOT NULL" : "";
             const defaultValue = columnDef.nullable === false ? this.getDefaultValue(columnDef.type) : "";
             const parsedColumnName = parseSqlIdentifier(columnName, "column name");
@@ -1282,7 +1637,7 @@ ${columns}
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_ALTER_TABLE_FAILED",
+          id: createStorageErrorId("MSSQL", "ALTER_TABLE", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -1297,13 +1652,17 @@ ${columns}
     try {
       const keyEntries = Object.entries(keys).map(([key, value]) => [parseSqlIdentifier(key, "column name"), value]);
       const conditions = keyEntries.map(([key], i) => `[${key}] = @param${i}`).join(" AND ");
-      const values = keyEntries.map(([_, value]) => value);
-      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();
-      values.forEach((value, i) => {
-        request.input(`param${i}`, value);
+      keyEntries.forEach(([key, value], i) => {
+        const preparedValue = this.prepareValue(value, key, tableName);
+        if (preparedValue === null || preparedValue === void 0) {
+          request.input(`param${i}`, this.getMssqlType(tableName, key), null);
+        } else {
+          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;
@@ -1319,7 +1678,7 @@ ${columns}
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_LOAD_FAILED",
+          id: createStorageErrorId("MSSQL", "LOAD", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -1335,14 +1694,14 @@ ${columns}
     try {
       await transaction.begin();
       for (const record of records) {
-        await this.insert({ tableName, record });
+        await this.insert({ tableName, record, transaction });
       }
       await transaction.commit();
     } catch (error) {
       await transaction.rollback();
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_BATCH_INSERT_FAILED",
+          id: createStorageErrorId("MSSQL", "BATCH_INSERT", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -1361,7 +1720,7 @@ ${columns}
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_DROP_TABLE_FAILED",
+          id: createStorageErrorId("MSSQL", "DROP_TABLE", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -1372,29 +1731,568 @@ ${columns}
       );
     }
   }
-};
-function parseJSON(jsonString) {
-  try {
-    return JSON.parse(jsonString);
-  } catch {
-    return jsonString;
+  /**
+   * Prepares a value for database operations, handling Date objects and JSON serialization
+   */
+  prepareValue(value, columnName, tableName) {
+    if (value === null || value === void 0) {
+      return value;
+    }
+    if (value instanceof Date) {
+      return value;
+    }
+    const schema = TABLE_SCHEMAS[tableName];
+    const columnSchema = schema?.[columnName];
+    if (columnSchema?.type === "boolean") {
+      return value ? 1 : 0;
+    }
+    if (columnSchema?.type === "jsonb") {
+      if (typeof value === "string") {
+        const trimmed = value.trim();
+        if (trimmed.length > 0) {
+          try {
+            JSON.parse(trimmed);
+            return trimmed;
+          } catch {
+          }
+        }
+        return JSON.stringify(value);
+      }
+      if (typeof value === "bigint") {
+        return value.toString();
+      }
+      return JSON.stringify(value);
+    }
+    if (typeof value === "object") {
+      return JSON.stringify(value);
+    }
+    return value;
   }
-}
+  /**
+   * Maps TABLE_SCHEMAS types to mssql param types (used when value is null)
+   */
+  getMssqlType(tableName, columnName) {
+    const col = TABLE_SCHEMAS[tableName]?.[columnName];
+    switch (col?.type) {
+      case "text":
+        return sql3.NVarChar;
+      case "timestamp":
+        return sql3.DateTime2;
+      case "uuid":
+        return sql3.UniqueIdentifier;
+      case "jsonb":
+        return sql3.NVarChar;
+      case "integer":
+        return sql3.Int;
+      case "bigint":
+        return sql3.BigInt;
+      case "float":
+        return sql3.Float;
+      case "boolean":
+        return sql3.Bit;
+      default:
+        return sql3.NVarChar;
+    }
+  }
+  /**
+   * Update a single record in the database
+   */
+  async update({
+    tableName,
+    keys,
+    data,
+    transaction
+  }) {
+    try {
+      if (!data || Object.keys(data).length === 0) {
+        throw new MastraError({
+          id: createStorageErrorId("MSSQL", "UPDATE", "EMPTY_DATA"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER,
+          text: "Cannot update with empty data payload"
+        });
+      }
+      if (!keys || Object.keys(keys).length === 0) {
+        throw new MastraError({
+          id: createStorageErrorId("MSSQL", "UPDATE", "EMPTY_KEYS"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER,
+          text: "Cannot update without keys to identify records"
+        });
+      }
+      const setClauses = [];
+      const request = transaction ? transaction.request() : this.pool.request();
+      let paramIndex = 0;
+      Object.entries(data).forEach(([key, value]) => {
+        const parsedKey = parseSqlIdentifier(key, "column name");
+        const paramName = `set${paramIndex++}`;
+        setClauses.push(`[${parsedKey}] = @${paramName}`);
+        const preparedValue = this.prepareValue(value, key, tableName);
+        if (preparedValue === null || preparedValue === void 0) {
+          request.input(paramName, this.getMssqlType(tableName, key), null);
+        } else {
+          request.input(paramName, preparedValue);
+        }
+      });
+      const whereConditions = [];
+      Object.entries(keys).forEach(([key, value]) => {
+        const parsedKey = parseSqlIdentifier(key, "column name");
+        const paramName = `where${paramIndex++}`;
+        whereConditions.push(`[${parsedKey}] = @${paramName}`);
+        const preparedValue = this.prepareValue(value, key, tableName);
+        if (preparedValue === null || preparedValue === void 0) {
+          request.input(paramName, this.getMssqlType(tableName, key), null);
+        } else {
+          request.input(paramName, preparedValue);
+        }
+      });
+      const tableName_ = getTableName({
+        indexName: tableName,
+        schemaName: getSchemaName(this.schemaName)
+      });
+      const updateSql = `UPDATE ${tableName_} SET ${setClauses.join(", ")} WHERE ${whereConditions.join(" AND ")}`;
+      await request.query(updateSql);
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("MSSQL", "UPDATE", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            tableName
+          }
+        },
+        error
+      );
+    }
+  }
+  /**
+   * Update multiple records in a single batch transaction
+   */
+  async batchUpdate({
+    tableName,
+    updates
+  }) {
+    const transaction = this.pool.transaction();
+    try {
+      await transaction.begin();
+      for (const { keys, data } of updates) {
+        await this.update({ tableName, keys, data, transaction });
+      }
+      await transaction.commit();
+    } catch (error) {
+      await transaction.rollback();
+      throw new MastraError(
+        {
+          id: createStorageErrorId("MSSQL", "BATCH_UPDATE", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            tableName,
+            numberOfRecords: updates.length
+          }
+        },
+        error
+      );
+    }
+  }
+  /**
+   * Delete multiple records by keys
+   */
+  async batchDelete({ tableName, keys }) {
+    if (keys.length === 0) {
+      return;
+    }
+    const tableName_ = getTableName({
+      indexName: tableName,
+      schemaName: getSchemaName(this.schemaName)
+    });
+    const transaction = this.pool.transaction();
+    try {
+      await transaction.begin();
+      for (const keySet of keys) {
+        const conditions = [];
+        const request = transaction.request();
+        let paramIndex = 0;
+        Object.entries(keySet).forEach(([key, value]) => {
+          const parsedKey = parseSqlIdentifier(key, "column name");
+          const paramName = `p${paramIndex++}`;
+          conditions.push(`[${parsedKey}] = @${paramName}`);
+          const preparedValue = this.prepareValue(value, key, tableName);
+          if (preparedValue === null || preparedValue === void 0) {
+            request.input(paramName, this.getMssqlType(tableName, key), null);
+          } else {
+            request.input(paramName, preparedValue);
+          }
+        });
+        const deleteSql = `DELETE FROM ${tableName_} WHERE ${conditions.join(" AND ")}`;
+        await request.query(deleteSql);
+      }
+      await transaction.commit();
+    } catch (error) {
+      await transaction.rollback();
+      throw new MastraError(
+        {
+          id: createStorageErrorId("MSSQL", "BATCH_DELETE", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            tableName,
+            numberOfRecords: keys.length
+          }
+        },
+        error
+      );
+    }
+  }
+  /**
+   * Create a new index on a table
+   */
+  async createIndex(options) {
+    try {
+      const { name, table, columns, unique = false, where } = options;
+      const schemaName = this.schemaName || "dbo";
+      const fullTableName = getTableName({
+        indexName: table,
+        schemaName: getSchemaName(this.schemaName)
+      });
+      const indexNameSafe = parseSqlIdentifier(name, "index name");
+      const checkRequest = this.pool.request();
+      checkRequest.input("indexName", indexNameSafe);
+      checkRequest.input("schemaName", schemaName);
+      checkRequest.input("tableName", table);
+      const indexExists = await checkRequest.query(`
+        SELECT 1 as found
+        FROM sys.indexes i
+        INNER JOIN sys.tables t ON i.object_id = t.object_id
+        INNER JOIN sys.schemas s ON t.schema_id = s.schema_id
+        WHERE i.name = @indexName
+          AND s.name = @schemaName
+          AND t.name = @tableName
+      `);
+      if (indexExists.recordset && indexExists.recordset.length > 0) {
+        return;
+      }
+      const uniqueStr = unique ? "UNIQUE " : "";
+      const columnsStr = columns.map((col) => {
+        if (col.includes(" DESC") || col.includes(" ASC")) {
+          const [colName, ...modifiers] = col.split(" ");
+          if (!colName) {
+            throw new Error(`Invalid column specification: ${col}`);
+          }
+          return `[${parseSqlIdentifier(colName, "column name")}] ${modifiers.join(" ")}`;
+        }
+        return `[${parseSqlIdentifier(col, "column name")}]`;
+      }).join(", ");
+      const whereStr = where ? ` WHERE ${where}` : "";
+      const createIndexSql = `CREATE ${uniqueStr}INDEX [${indexNameSafe}] ON ${fullTableName} (${columnsStr})${whereStr}`;
+      await this.pool.request().query(createIndexSql);
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("MSSQL", "INDEX_CREATE", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            indexName: options.name,
+            tableName: options.table
+          }
+        },
+        error
+      );
+    }
+  }
+  /**
+   * Drop an existing index
+   */
+  async dropIndex(indexName) {
+    try {
+      const schemaName = this.schemaName || "dbo";
+      const indexNameSafe = parseSqlIdentifier(indexName, "index name");
+      const checkRequest = this.pool.request();
+      checkRequest.input("indexName", indexNameSafe);
+      checkRequest.input("schemaName", schemaName);
+      const result = await checkRequest.query(`
+        SELECT t.name as table_name
+        FROM sys.indexes i
+        INNER JOIN sys.tables t ON i.object_id = t.object_id
+        INNER JOIN sys.schemas s ON t.schema_id = s.schema_id
+        WHERE i.name = @indexName
+          AND s.name = @schemaName
+      `);
+      if (!result.recordset || result.recordset.length === 0) {
+        return;
+      }
+      if (result.recordset.length > 1) {
+        const tables = result.recordset.map((r) => r.table_name).join(", ");
+        throw new MastraError({
+          id: createStorageErrorId("MSSQL", "INDEX", "AMBIGUOUS"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER,
+          text: `Index "${indexNameSafe}" exists on multiple tables (${tables}) in schema "${schemaName}". Please drop indexes manually or ensure unique index names.`
+        });
+      }
+      const tableName = result.recordset[0].table_name;
+      const fullTableName = getTableName({
+        indexName: tableName,
+        schemaName: getSchemaName(this.schemaName)
+      });
+      const dropSql = `DROP INDEX [${indexNameSafe}] ON ${fullTableName}`;
+      await this.pool.request().query(dropSql);
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("MSSQL", "INDEX_DROP", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            indexName
+          }
+        },
+        error
+      );
+    }
+  }
+  /**
+   * List indexes for a specific table or all tables
+   */
+  async listIndexes(tableName) {
+    try {
+      const schemaName = this.schemaName || "dbo";
+      let query;
+      const request = this.pool.request();
+      request.input("schemaName", schemaName);
+      if (tableName) {
+        query = `
+          SELECT 
+            i.name as name,
+            o.name as [table],
+            i.is_unique as is_unique,
+            CAST(SUM(s.used_page_count) * 8 / 1024.0 AS VARCHAR(50)) + ' MB' as size
+          FROM sys.indexes i
+          INNER JOIN sys.objects o ON i.object_id = o.object_id
+          INNER JOIN sys.schemas sch ON o.schema_id = sch.schema_id
+          LEFT JOIN sys.dm_db_partition_stats s ON i.object_id = s.object_id AND i.index_id = s.index_id
+          WHERE sch.name = @schemaName
+          AND o.name = @tableName
+          AND i.name IS NOT NULL
+          GROUP BY i.name, o.name, i.is_unique
+        `;
+        request.input("tableName", tableName);
+      } else {
+        query = `
+          SELECT 
+            i.name as name,
+            o.name as [table],
+            i.is_unique as is_unique,
+            CAST(SUM(s.used_page_count) * 8 / 1024.0 AS VARCHAR(50)) + ' MB' as size
+          FROM sys.indexes i
+          INNER JOIN sys.objects o ON i.object_id = o.object_id
+          INNER JOIN sys.schemas sch ON o.schema_id = sch.schema_id
+          LEFT JOIN sys.dm_db_partition_stats s ON i.object_id = s.object_id AND i.index_id = s.index_id
+          WHERE sch.name = @schemaName
+          AND i.name IS NOT NULL
+          GROUP BY i.name, o.name, i.is_unique
+        `;
+      }
+      const result = await request.query(query);
+      const indexes = [];
+      for (const row of result.recordset) {
+        const colRequest = this.pool.request();
+        colRequest.input("indexName", row.name);
+        colRequest.input("schemaName", schemaName);
+        const colResult = await colRequest.query(`
+          SELECT c.name as column_name
+          FROM sys.indexes i
+          INNER JOIN sys.index_columns ic ON i.object_id = ic.object_id AND i.index_id = ic.index_id
+          INNER JOIN sys.columns c ON ic.object_id = c.object_id AND ic.column_id = c.column_id
+          INNER JOIN sys.objects o ON i.object_id = o.object_id
+          INNER JOIN sys.schemas s ON o.schema_id = s.schema_id
+          WHERE i.name = @indexName
+          AND s.name = @schemaName
+          ORDER BY ic.key_ordinal
+        `);
+        indexes.push({
+          name: row.name,
+          table: row.table,
+          columns: colResult.recordset.map((c) => c.column_name),
+          unique: row.is_unique || false,
+          size: row.size || "0 MB",
+          definition: ""
+          // MSSQL doesn't store definition like PG
+        });
+      }
+      return indexes;
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("MSSQL", "INDEX_LIST", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: tableName ? {
+            tableName
+          } : {}
+        },
+        error
+      );
+    }
+  }
+  /**
+   * Get detailed statistics for a specific index
+   */
+  async describeIndex(indexName) {
+    try {
+      const schemaName = this.schemaName || "dbo";
+      const request = this.pool.request();
+      request.input("indexName", indexName);
+      request.input("schemaName", schemaName);
+      const query = `
+        SELECT 
+          i.name as name,
+          o.name as [table],
+          i.is_unique as is_unique,
+          CAST(SUM(s.used_page_count) * 8 / 1024.0 AS VARCHAR(50)) + ' MB' as size,
+          i.type_desc as method,
+          ISNULL(us.user_scans, 0) as scans,
+          ISNULL(us.user_seeks + us.user_scans, 0) as tuples_read,
+          ISNULL(us.user_lookups, 0) as tuples_fetched
+        FROM sys.indexes i
+        INNER JOIN sys.objects o ON i.object_id = o.object_id
+        INNER JOIN sys.schemas sch ON o.schema_id = sch.schema_id
+        LEFT JOIN sys.dm_db_partition_stats s ON i.object_id = s.object_id AND i.index_id = s.index_id
+        LEFT JOIN sys.dm_db_index_usage_stats us ON i.object_id = us.object_id AND i.index_id = us.index_id
+        WHERE i.name = @indexName
+        AND sch.name = @schemaName
+        GROUP BY i.name, o.name, i.is_unique, i.type_desc, us.user_seeks, us.user_scans, us.user_lookups
+      `;
+      const result = await request.query(query);
+      if (!result.recordset || result.recordset.length === 0) {
+        throw new Error(`Index "${indexName}" not found in schema "${schemaName}"`);
+      }
+      const row = result.recordset[0];
+      const colRequest = this.pool.request();
+      colRequest.input("indexName", indexName);
+      colRequest.input("schemaName", schemaName);
+      const colResult = await colRequest.query(`
+        SELECT c.name as column_name
+        FROM sys.indexes i
+        INNER JOIN sys.index_columns ic ON i.object_id = ic.object_id AND i.index_id = ic.index_id
+        INNER JOIN sys.columns c ON ic.object_id = c.object_id AND ic.column_id = c.column_id
+        INNER JOIN sys.objects o ON i.object_id = o.object_id
+        INNER JOIN sys.schemas s ON o.schema_id = s.schema_id
+        WHERE i.name = @indexName
+        AND s.name = @schemaName
+        ORDER BY ic.key_ordinal
+      `);
+      return {
+        name: row.name,
+        table: row.table,
+        columns: colResult.recordset.map((c) => c.column_name),
+        unique: row.is_unique || false,
+        size: row.size || "0 MB",
+        definition: "",
+        method: row.method?.toLowerCase() || "nonclustered",
+        scans: Number(row.scans) || 0,
+        tuples_read: Number(row.tuples_read) || 0,
+        tuples_fetched: Number(row.tuples_fetched) || 0
+      };
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("MSSQL", "INDEX_DESCRIBE", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            indexName
+          }
+        },
+        error
+      );
+    }
+  }
+  /**
+   * Returns definitions for automatic performance indexes
+   * IMPORTANT: Uses seq_id DESC instead of createdAt DESC for MSSQL due to millisecond accuracy limitations
+   * NOTE: Using NVARCHAR(400) for text columns (800 bytes) leaves room for composite indexes
+   */
+  getAutomaticIndexDefinitions() {
+    const schemaPrefix = this.schemaName ? `${this.schemaName}_` : "";
+    return [
+      // Composite indexes for optimal filtering + sorting performance
+      // NVARCHAR(400) = 800 bytes, plus BIGINT (8 bytes) = 808 bytes total (under 900-byte limit)
+      {
+        name: `${schemaPrefix}mastra_threads_resourceid_seqid_idx`,
+        table: TABLE_THREADS,
+        columns: ["resourceId", "seq_id DESC"]
+      },
+      {
+        name: `${schemaPrefix}mastra_messages_thread_id_seqid_idx`,
+        table: TABLE_MESSAGES,
+        columns: ["thread_id", "seq_id DESC"]
+      },
+      {
+        name: `${schemaPrefix}mastra_traces_name_seqid_idx`,
+        table: TABLE_TRACES,
+        columns: ["name", "seq_id DESC"]
+      },
+      {
+        name: `${schemaPrefix}mastra_scores_trace_id_span_id_seqid_idx`,
+        table: TABLE_SCORERS,
+        columns: ["traceId", "spanId", "seq_id DESC"]
+      },
+      // Spans indexes for optimal trace querying
+      {
+        name: `${schemaPrefix}mastra_ai_spans_traceid_startedat_idx`,
+        table: TABLE_SPANS,
+        columns: ["traceId", "startedAt DESC"]
+      },
+      {
+        name: `${schemaPrefix}mastra_ai_spans_parentspanid_startedat_idx`,
+        table: TABLE_SPANS,
+        columns: ["parentSpanId", "startedAt DESC"]
+      },
+      {
+        name: `${schemaPrefix}mastra_ai_spans_name_idx`,
+        table: TABLE_SPANS,
+        columns: ["name"]
+      },
+      {
+        name: `${schemaPrefix}mastra_ai_spans_spantype_startedat_idx`,
+        table: TABLE_SPANS,
+        columns: ["spanType", "startedAt DESC"]
+      }
+    ];
+  }
+  /**
+   * Creates automatic indexes for optimal query performance
+   * Uses getAutomaticIndexDefinitions() to determine which indexes to create
+   */
+  async createAutomaticIndexes() {
+    try {
+      const indexes = this.getAutomaticIndexDefinitions();
+      for (const indexOptions of indexes) {
+        try {
+          await this.createIndex(indexOptions);
+        } catch (error) {
+          this.logger?.warn?.(`Failed to create index ${indexOptions.name}:`, error);
+        }
+      }
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("MSSQL", "CREATE_PERFORMANCE_INDEXES", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY
+        },
+        error
+      );
+    }
+  }
+};
 function transformScoreRow(row) {
-  return {
-    ...row,
-    input: parseJSON(row.input),
-    scorer: parseJSON(row.scorer),
-    preprocessStepResult: parseJSON(row.preprocessStepResult),
-    analyzeStepResult: parseJSON(row.analyzeStepResult),
-    metadata: parseJSON(row.metadata),
-    output: parseJSON(row.output),
-    additionalContext: parseJSON(row.additionalContext),
-    runtimeContext: parseJSON(row.runtimeContext),
-    entity: parseJSON(row.entity),
-    createdAt: row.createdAt,
-    updatedAt: row.updatedAt
-  };
+  return transformScoreRow$1(row, {
+    convertTimestamps: true
+  });
 }
 var ScoresMSSQL = class extends ScoresStorage {
   pool;
@@ -1424,7 +2322,7 @@ var ScoresMSSQL = class extends ScoresStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_GET_SCORE_BY_ID_FAILED",
+          id: createStorageErrorId("MSSQL", "GET_SCORE_BY_ID", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { id }
@@ -1432,10 +2330,31 @@ var ScoresMSSQL = class extends ScoresStorage {
         error
       );
     }
-  }
-  async saveScore(score) {
+  }
+  async saveScore(score) {
+    let validatedScore;
+    try {
+      validatedScore = saveScorePayloadSchema.parse(score);
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("MSSQL", "SAVE_SCORE", "VALIDATION_FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER,
+          details: {
+            scorer: score.scorer?.id ?? "unknown",
+            entityId: score.entityId ?? "unknown",
+            entityType: score.entityType ?? "unknown",
+            traceId: score.traceId ?? "",
+            spanId: score.spanId ?? ""
+          }
+        },
+        error
+      );
+    }
     try {
-      const scoreId = crypto.randomUUID();
+      const scoreId = randomUUID();
+      const now = /* @__PURE__ */ new Date();
       const {
         scorer,
         preprocessStepResult,
@@ -1444,34 +2363,33 @@ var ScoresMSSQL = class extends ScoresStorage {
         input,
         output,
         additionalContext,
-        runtimeContext,
+        requestContext,
         entity,
         ...rest
-      } = score;
+      } = validatedScore;
       await this.operations.insert({
         tableName: TABLE_SCORERS,
         record: {
           id: scoreId,
           ...rest,
-          input: JSON.stringify(input) || "",
-          output: JSON.stringify(output) || "",
-          preprocessStepResult: preprocessStepResult ? JSON.stringify(preprocessStepResult) : null,
-          analyzeStepResult: analyzeStepResult ? JSON.stringify(analyzeStepResult) : null,
-          metadata: metadata ? JSON.stringify(metadata) : null,
-          additionalContext: additionalContext ? JSON.stringify(additionalContext) : null,
-          runtimeContext: runtimeContext ? JSON.stringify(runtimeContext) : null,
-          entity: entity ? JSON.stringify(entity) : null,
-          scorer: scorer ? JSON.stringify(scorer) : null,
-          createdAt: (/* @__PURE__ */ new Date()).toISOString(),
-          updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+          input: input || "",
+          output: output || "",
+          preprocessStepResult: preprocessStepResult || null,
+          analyzeStepResult: analyzeStepResult || null,
+          metadata: metadata || null,
+          additionalContext: additionalContext || null,
+          requestContext: requestContext || null,
+          entity: entity || null,
+          scorer: scorer || null,
+          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) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_SAVE_SCORE_FAILED",
+          id: createStorageErrorId("MSSQL", "SAVE_SCORE", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY
         },
@@ -1479,48 +2397,77 @@ var ScoresMSSQL = class extends ScoresStorage {
       );
     }
   }
-  async getScoresByScorerId({
+  async listScoresByScorerId({
     scorerId,
-    pagination
+    pagination,
+    entityId,
+    entityType,
+    source
   }) {
     try {
-      const request = this.pool.request();
-      request.input("p1", scorerId);
-      const totalResult = await request.query(
-        `SELECT COUNT(*) as count FROM ${getTableName({ indexName: TABLE_SCORERS, schemaName: getSchemaName(this.schema) })} WHERE [scorerId] = @p1`
-      );
+      const conditions = ["[scorerId] = @p1"];
+      const params = { p1: scorerId };
+      let paramIndex = 2;
+      if (entityId) {
+        conditions.push(`[entityId] = @p${paramIndex}`);
+        params[`p${paramIndex}`] = entityId;
+        paramIndex++;
+      }
+      if (entityType) {
+        conditions.push(`[entityType] = @p${paramIndex}`);
+        params[`p${paramIndex}`] = entityType;
+        paramIndex++;
+      }
+      if (source) {
+        conditions.push(`[source] = @p${paramIndex}`);
+        params[`p${paramIndex}`] = source;
+        paramIndex++;
+      }
+      const whereClause = conditions.join(" AND ");
+      const tableName = getTableName({ indexName: TABLE_SCORERS, schemaName: getSchemaName(this.schema) });
+      const countRequest = this.pool.request();
+      Object.entries(params).forEach(([key, value]) => {
+        countRequest.input(key, value);
+      });
+      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 = normalizePerPage(perPageInput, 100);
+      const { offset: start, perPage: perPageForResponse } = 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", scorerId);
-      dataRequest.input("p2", pagination.perPage);
-      dataRequest.input("p3", pagination.page * pagination.perPage);
-      const result = await dataRequest.query(
-        `SELECT * FROM ${getTableName({ indexName: TABLE_SCORERS, schemaName: getSchemaName(this.schema) })} WHERE [scorerId] = @p1 ORDER BY [createdAt] DESC OFFSET @p3 ROWS FETCH NEXT @p2 ROWS ONLY`
-      );
+      Object.entries(params).forEach(([key, value]) => {
+        dataRequest.input(key, value);
+      });
+      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) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_GET_SCORES_BY_SCORER_ID_FAILED",
+          id: createStorageErrorId("MSSQL", "LIST_SCORES_BY_SCORER_ID", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { scorerId }
@@ -1529,7 +2476,7 @@ var ScoresMSSQL = class extends ScoresStorage {
       );
     }
   }
-  async getScoresByRunId({
+  async listScoresByRunId({
     runId,
     pagination
   }) {
@@ -1540,37 +2487,42 @@ var ScoresMSSQL = class extends ScoresStorage {
         `SELECT COUNT(*) as count FROM ${getTableName({ indexName: 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 = normalizePerPage(perPageInput, 100);
+      const { offset: start, perPage: perPageForResponse } = 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: 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) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_GET_SCORES_BY_RUN_ID_FAILED",
+          id: createStorageErrorId("MSSQL", "LIST_SCORES_BY_RUN_ID", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { runId }
@@ -1579,7 +2531,7 @@ var ScoresMSSQL = class extends ScoresStorage {
       );
     }
   }
-  async getScoresByEntityId({
+  async listScoresByEntityId({
     entityId,
     entityType,
     pagination
@@ -1592,38 +2544,43 @@ var ScoresMSSQL = class extends ScoresStorage {
         `SELECT COUNT(*) as count FROM ${getTableName({ indexName: 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 = normalizePerPage(perPageInput, 100);
+      const { offset: start, perPage: perPageForResponse } = 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: 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) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_GET_SCORES_BY_ENTITY_ID_FAILED",
+          id: createStorageErrorId("MSSQL", "LIST_SCORES_BY_ENTITY_ID", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: { entityId, entityType }
@@ -1632,8 +2589,66 @@ var ScoresMSSQL = class extends ScoresStorage {
       );
     }
   }
+  async listScoresBySpan({
+    traceId,
+    spanId,
+    pagination
+  }) {
+    try {
+      const request = this.pool.request();
+      request.input("p1", traceId);
+      request.input("p2", spanId);
+      const totalResult = await request.query(
+        `SELECT COUNT(*) as count FROM ${getTableName({ indexName: 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 = normalizePerPage(perPageInput, 100);
+      const { offset: start, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
+      if (total === 0) {
+        return {
+          pagination: {
+            total: 0,
+            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", traceId);
+      dataRequest.input("p2", spanId);
+      dataRequest.input("p3", limitValue);
+      dataRequest.input("p4", start);
+      const result = await dataRequest.query(
+        `SELECT * FROM ${getTableName({ indexName: TABLE_SCORERS, schemaName: getSchemaName(this.schema) })} WHERE [traceId] = @p1 AND [spanId] = @p2 ORDER BY [createdAt] DESC OFFSET @p4 ROWS FETCH NEXT @p3 ROWS ONLY`
+      );
+      return {
+        pagination: {
+          total: Number(total),
+          page,
+          perPage: perPageForResponse,
+          hasMore: end < total
+        },
+        scores: result.recordset.map((row) => transformScoreRow(row))
+      };
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("MSSQL", "LIST_SCORES_BY_SPAN", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { traceId, spanId }
+        },
+        error
+      );
+    }
+  }
 };
-var TracesMSSQL = class extends TracesStorage {
+var WorkflowsMSSQL = class extends WorkflowsStorage {
   pool;
   operations;
   schema;
@@ -1647,194 +2662,170 @@ var TracesMSSQL = class extends TracesStorage {
     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
-      };
+  parseWorkflowRun(row) {
+    let parsedSnapshot = row.snapshot;
+    if (typeof parsedSnapshot === "string") {
+      try {
+        parsedSnapshot = JSON.parse(row.snapshot);
+      } catch (e) {
+        this.logger?.warn?.(`Failed to parse snapshot for workflow ${row.workflow_name}:`, e);
+      }
     }
-    const result = await this.getTracesPaginated(args);
-    return result.traces;
+    return {
+      workflowName: row.workflow_name,
+      runId: row.run_id,
+      snapshot: parsedSnapshot,
+      createdAt: row.createdAt,
+      updatedAt: row.updatedAt,
+      resourceId: row.resourceId
+    };
   }
-  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 = 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 = 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: TABLE_TRACES, schemaName: getSchemaName(this.schema) })} ${whereClause}`;
-    let total = 0;
+  async updateWorkflowResults({
+    workflowName,
+    runId,
+    stepId,
+    result,
+    requestContext
+  }) {
+    const table = getTableName({ indexName: TABLE_WORKFLOW_SNAPSHOT, schemaName: getSchemaName(this.schema) });
+    const transaction = this.pool.transaction();
     try {
-      const countRequest = this.pool.request();
-      Object.entries(paramMap).forEach(([key, value]) => {
-        if (value instanceof Date) {
-          countRequest.input(key, sql2.DateTime, value);
-        } else {
-          countRequest.input(key, value);
-        }
-      });
-      const countResult = await countRequest.query(countQuery);
-      total = parseInt(countResult.recordset[0].total, 10);
+      await transaction.begin();
+      const selectRequest = new sql3.Request(transaction);
+      selectRequest.input("workflow_name", workflowName);
+      selectRequest.input("run_id", runId);
+      const existingSnapshotResult = await selectRequest.query(
+        `SELECT snapshot FROM ${table} WITH (UPDLOCK, HOLDLOCK) WHERE workflow_name = @workflow_name AND run_id = @run_id`
+      );
+      let snapshot;
+      if (!existingSnapshotResult.recordset || existingSnapshotResult.recordset.length === 0) {
+        snapshot = {
+          context: {},
+          activePaths: [],
+          activeStepsPath: {},
+          timestamp: Date.now(),
+          suspendedPaths: {},
+          resumeLabels: {},
+          serializedStepGraph: [],
+          status: "pending",
+          value: {},
+          waitingPaths: {},
+          runId,
+          requestContext: {}
+        };
+      } else {
+        const existingSnapshot = existingSnapshotResult.recordset[0].snapshot;
+        snapshot = typeof existingSnapshot === "string" ? JSON.parse(existingSnapshot) : existingSnapshot;
+      }
+      snapshot.context[stepId] = result;
+      snapshot.requestContext = { ...snapshot.requestContext, ...requestContext };
+      const upsertReq = new sql3.Request(transaction);
+      upsertReq.input("workflow_name", workflowName);
+      upsertReq.input("run_id", runId);
+      upsertReq.input("snapshot", JSON.stringify(snapshot));
+      upsertReq.input("createdAt", sql3.DateTime2, /* @__PURE__ */ new Date());
+      upsertReq.input("updatedAt", sql3.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
+           ON target.workflow_name = src.workflow_name AND target.run_id = src.run_id
+         WHEN MATCHED THEN UPDATE SET snapshot = @snapshot, [updatedAt] = @updatedAt
+         WHEN NOT MATCHED THEN INSERT (workflow_name, run_id, snapshot, [createdAt], [updatedAt])
+           VALUES (@workflow_name, @run_id, @snapshot, @createdAt, @updatedAt);`
+      );
+      await transaction.commit();
+      return snapshot.context;
     } catch (error) {
+      try {
+        await transaction.rollback();
+      } catch {
+      }
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_GET_TRACES_PAGINATED_FAILED_TO_RETRIEVE_TOTAL_COUNT",
+          id: createStorageErrorId("MSSQL", "UPDATE_WORKFLOW_RESULTS", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
-            name: args.name ?? "",
-            scope: args.scope ?? ""
+            workflowName,
+            runId,
+            stepId
           }
         },
         error
       );
     }
-    if (total === 0) {
-      return {
-        traces: [],
-        total: 0,
-        page,
-        perPage,
-        hasMore: false
-      };
-    }
-    const dataQuery = `SELECT * FROM ${getTableName({ indexName: 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, sql2.DateTime, value);
-      } else {
-        dataRequest.input(key, value);
-      }
-    });
-    dataRequest.input("offset", currentOffset);
-    dataRequest.input("limit", perPage);
+  }
+  async updateWorkflowState({
+    workflowName,
+    runId,
+    opts
+  }) {
+    const table = getTableName({ indexName: TABLE_WORKFLOW_SNAPSHOT, schemaName: getSchemaName(this.schema) });
+    const transaction = this.pool.transaction();
     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
-      };
+      await transaction.begin();
+      const selectRequest = new sql3.Request(transaction);
+      selectRequest.input("workflow_name", workflowName);
+      selectRequest.input("run_id", runId);
+      const existingSnapshotResult = await selectRequest.query(
+        `SELECT snapshot FROM ${table} WITH (UPDLOCK, HOLDLOCK) WHERE workflow_name = @workflow_name AND run_id = @run_id`
+      );
+      if (!existingSnapshotResult.recordset || existingSnapshotResult.recordset.length === 0) {
+        await transaction.rollback();
+        return void 0;
+      }
+      const existingSnapshot = existingSnapshotResult.recordset[0].snapshot;
+      const snapshot = typeof existingSnapshot === "string" ? JSON.parse(existingSnapshot) : existingSnapshot;
+      if (!snapshot || !snapshot?.context) {
+        await transaction.rollback();
+        throw new MastraError(
+          {
+            id: createStorageErrorId("MSSQL", "UPDATE_WORKFLOW_STATE", "SNAPSHOT_NOT_FOUND"),
+            domain: ErrorDomain.STORAGE,
+            category: ErrorCategory.SYSTEM,
+            details: {
+              workflowName,
+              runId
+            }
+          },
+          new Error(`Snapshot not found for runId ${runId}`)
+        );
+      }
+      const updatedSnapshot = { ...snapshot, ...opts };
+      const updateRequest = new sql3.Request(transaction);
+      updateRequest.input("snapshot", JSON.stringify(updatedSnapshot));
+      updateRequest.input("workflow_name", workflowName);
+      updateRequest.input("run_id", runId);
+      updateRequest.input("updatedAt", sql3.DateTime2, /* @__PURE__ */ new Date());
+      await updateRequest.query(
+        `UPDATE ${table} SET snapshot = @snapshot, [updatedAt] = @updatedAt WHERE workflow_name = @workflow_name AND run_id = @run_id`
+      );
+      await transaction.commit();
+      return updatedSnapshot;
     } catch (error) {
+      try {
+        await transaction.rollback();
+      } catch {
+      }
+      if (error instanceof MastraError) throw error;
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_GET_TRACES_PAGINATED_FAILED_TO_RETRIEVE_TRACES",
+          id: createStorageErrorId("MSSQL", "UPDATE_WORKFLOW_STATE", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
-            name: args.name ?? "",
-            scope: args.scope ?? ""
+            workflowName,
+            runId
           }
         },
         error
       );
     }
   }
-  async batchTraceInsert({ records }) {
-    this.logger.debug("Batch inserting traces", { count: records.length });
-    await this.operations.batchInsert({
-      tableName: TABLE_TRACES,
-      records
-    });
-  }
-};
-function parseWorkflowRun(row) {
-  let parsedSnapshot = row.snapshot;
-  if (typeof parsedSnapshot === "string") {
-    try {
-      parsedSnapshot = JSON.parse(row.snapshot);
-    } catch (e) {
-      console.warn(`Failed to parse snapshot for workflow ${row.workflow_name}: ${e}`);
-    }
-  }
-  return {
-    workflowName: row.workflow_name,
-    runId: row.run_id,
-    snapshot: parsedSnapshot,
-    createdAt: row.createdAt,
-    updatedAt: row.updatedAt,
-    resourceId: row.resourceId
-  };
-}
-var WorkflowsMSSQL = class extends WorkflowsStorage {
-  pool;
-  operations;
-  schema;
-  constructor({
-    pool,
-    operations,
-    schema
-  }) {
-    super();
-    this.pool = pool;
-    this.operations = operations;
-    this.schema = schema;
-  }
   async persistWorkflowSnapshot({
     workflowName,
     runId,
+    resourceId,
     snapshot
   }) {
     const table = getTableName({ indexName: TABLE_WORKFLOW_SNAPSHOT, schemaName: getSchemaName(this.schema) });
@@ -1843,22 +2834,24 @@ var WorkflowsMSSQL = class extends WorkflowsStorage {
       const request = this.pool.request();
       request.input("workflow_name", workflowName);
       request.input("run_id", runId);
+      request.input("resourceId", resourceId);
       request.input("snapshot", JSON.stringify(snapshot));
-      request.input("createdAt", sql2.DateTime2, new Date(now));
-      request.input("updatedAt", sql2.DateTime2, new Date(now));
+      request.input("createdAt", sql3.DateTime2, new Date(now));
+      request.input("updatedAt", sql3.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
         WHEN MATCHED THEN UPDATE SET
+          resourceId = @resourceId,
           snapshot = @snapshot,
           [updatedAt] = @updatedAt
-        WHEN NOT MATCHED THEN INSERT (workflow_name, run_id, snapshot, [createdAt], [updatedAt])
-          VALUES (@workflow_name, @run_id, @snapshot, @createdAt, @updatedAt);`;
+        WHEN NOT MATCHED THEN INSERT (workflow_name, run_id, resourceId, snapshot, [createdAt], [updatedAt])
+          VALUES (@workflow_name, @run_id, @resourceId, @snapshot, @createdAt, @updatedAt);`;
       await request.query(mergeSql);
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_PERSIST_WORKFLOW_SNAPSHOT_FAILED",
+          id: createStorageErrorId("MSSQL", "PERSIST_WORKFLOW_SNAPSHOT", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -1889,7 +2882,7 @@ var WorkflowsMSSQL = class extends WorkflowsStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_LOAD_WORKFLOW_SNAPSHOT_FAILED",
+          id: createStorageErrorId("MSSQL", "LOAD_WORKFLOW_SNAPSHOT", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -1925,11 +2918,11 @@ var WorkflowsMSSQL = class extends WorkflowsStorage {
       if (!result.recordset || result.recordset.length === 0) {
         return null;
       }
-      return parseWorkflowRun(result.recordset[0]);
+      return this.parseWorkflowRun(result.recordset[0]);
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_GET_WORKFLOW_RUN_BY_ID_FAILED",
+          id: createStorageErrorId("MSSQL", "GET_WORKFLOW_RUN_BY_ID", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -1941,13 +2934,43 @@ var WorkflowsMSSQL = class extends WorkflowsStorage {
       );
     }
   }
-  async getWorkflowRuns({
+  async deleteWorkflowRunById({ runId, workflowName }) {
+    const table = getTableName({ indexName: TABLE_WORKFLOW_SNAPSHOT, schemaName: getSchemaName(this.schema) });
+    const transaction = this.pool.transaction();
+    try {
+      await transaction.begin();
+      const deleteRequest = new sql3.Request(transaction);
+      deleteRequest.input("workflow_name", workflowName);
+      deleteRequest.input("run_id", runId);
+      await deleteRequest.query(`DELETE FROM ${table} WHERE workflow_name = @workflow_name AND run_id = @run_id`);
+      await transaction.commit();
+    } catch (error) {
+      try {
+        await transaction.rollback();
+      } catch {
+      }
+      throw new MastraError(
+        {
+          id: createStorageErrorId("MSSQL", "DELETE_WORKFLOW_RUN_BY_ID", "FAILED"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            runId,
+            workflowName
+          }
+        },
+        error
+      );
+    }
+  }
+  async listWorkflowRuns({
     workflowName,
     fromDate,
     toDate,
-    limit,
-    offset,
-    resourceId
+    page,
+    perPage,
+    resourceId,
+    status
   } = {}) {
     try {
       const conditions = [];
@@ -1956,13 +2979,17 @@ var WorkflowsMSSQL = class extends 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(TABLE_WORKFLOW_SNAPSHOT, "resourceId");
         if (hasResourceId) {
           conditions.push(`[resourceId] = @resourceId`);
           paramMap["resourceId"] = resourceId;
         } else {
-          console.warn(`[${TABLE_WORKFLOW_SNAPSHOT}] resourceId column not found. Skipping resourceId filter.`);
+          this.logger?.warn?.(`[${TABLE_WORKFLOW_SNAPSHOT}] resourceId column not found. Skipping resourceId filter.`);
         }
       }
       if (fromDate instanceof Date && !isNaN(fromDate.getTime())) {
@@ -1979,29 +3006,32 @@ var WorkflowsMSSQL = class extends WorkflowsStorage {
       const request = this.pool.request();
       Object.entries(paramMap).forEach(([key, value]) => {
         if (value instanceof Date) {
-          request.input(key, sql2.DateTime, value);
+          request.input(key, sql3.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 = 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);
-      const runs = (result.recordset || []).map((row) => parseWorkflowRun(row));
+      const runs = (result.recordset || []).map((row) => this.parseWorkflowRun(row));
       return { runs, total: total || runs.length };
     } catch (error) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_GET_WORKFLOW_RUNS_FAILED",
+          id: createStorageErrorId("MSSQL", "LIST_WORKFLOW_RUNS", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
@@ -2021,7 +3051,10 @@ var MSSQLStore = class extends 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() === "") {
@@ -2036,7 +3069,7 @@ var MSSQLStore = class extends MastraStorage {
         }
       }
       this.schema = config.schemaName || "dbo";
-      this.pool = "connectionString" in config ? new sql2.ConnectionPool(config.connectionString) : new sql2.ConnectionPool({
+      this.pool = "connectionString" in config ? new sql3.ConnectionPool(config.connectionString) : new sql3.ConnectionPool({
         server: config.server,
         database: config.database,
         user: config.user,
@@ -2044,24 +3077,22 @@ var MSSQLStore = class extends 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
+        memory,
+        observability
       };
     } catch (e) {
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_INITIALIZATION_FAILED",
+          id: createStorageErrorId("MSSQL", "INITIALIZATION", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.USER
         },
@@ -2076,11 +3107,16 @@ var MSSQLStore = class extends MastraStorage {
     try {
       await this.isConnected;
       await super.init();
+      try {
+        await this.stores.operations.createAutomaticIndexes();
+      } catch (indexError) {
+        this.logger?.warn?.("Failed to create indexes:", indexError);
+      }
     } catch (error) {
       this.isConnected = null;
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_MSSQL_STORE_INIT_FAILED",
+          id: createStorageErrorId("MSSQL", "INIT", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY
         },
@@ -2102,28 +3138,12 @@ var MSSQLStore = class extends MastraStorage {
       resourceWorkingMemory: true,
       hasColumn: true,
       createTable: true,
-      deleteMessages: true
+      deleteMessages: 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
@@ -2158,15 +3178,6 @@ var MSSQLStore = class extends 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 });
   }
@@ -2180,11 +3191,8 @@ var MSSQLStore = class extends MastraStorage {
   async deleteThread({ threadId }) {
     return this.stores.memory.deleteThread({ threadId });
   }
-  async getMessages(args) {
-    return this.stores.memory.getMessages(args);
-  }
-  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);
@@ -2213,12 +3221,29 @@ var MSSQLStore = class extends MastraStorage {
   /**
    * Workflows
    */
+  async updateWorkflowResults({
+    workflowName,
+    runId,
+    stepId,
+    result,
+    requestContext
+  }) {
+    return this.stores.workflows.updateWorkflowResults({ workflowName, runId, stepId, result, requestContext });
+  }
+  async updateWorkflowState({
+    workflowName,
+    runId,
+    opts
+  }) {
+    return this.stores.workflows.updateWorkflowState({ workflowName, runId, opts });
+  }
   async persistWorkflowSnapshot({
     workflowName,
     runId,
+    resourceId,
     snapshot
   }) {
-    return this.stores.workflows.persistWorkflowSnapshot({ workflowName, runId, snapshot });
+    return this.stores.workflows.persistWorkflowSnapshot({ workflowName, runId, resourceId, snapshot });
   }
   async loadWorkflowSnapshot({
     workflowName,
@@ -2226,15 +3251,8 @@ var MSSQLStore = class extends 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,
@@ -2242,41 +3260,114 @@ var MSSQLStore = class extends MastraStorage {
   }) {
     return this.stores.workflows.getWorkflowRunById({ runId, workflowName });
   }
+  async deleteWorkflowRunById({ runId, workflowName }) {
+    return this.stores.workflows.deleteWorkflowRunById({ runId, workflowName });
+  }
   async close() {
     await this.pool.close();
   }
+  /**
+   * Index Management
+   */
+  async createIndex(options) {
+    return this.stores.operations.createIndex(options);
+  }
+  async listIndexes(tableName) {
+    return this.stores.operations.listIndexes(tableName);
+  }
+  async describeIndex(indexName) {
+    return this.stores.operations.describeIndex(indexName);
+  }
+  async dropIndex(indexName) {
+    return this.stores.operations.dropIndex(indexName);
+  }
+  /**
+   * Tracing / Observability
+   */
+  getObservabilityStore() {
+    if (!this.stores.observability) {
+      throw new MastraError({
+        id: createStorageErrorId("MSSQL", "OBSERVABILITY", "NOT_INITIALIZED"),
+        domain: ErrorDomain.STORAGE,
+        category: ErrorCategory.SYSTEM,
+        text: "Observability storage is not initialized"
+      });
+    }
+    return this.stores.observability;
+  }
+  async createSpan(span) {
+    return this.getObservabilityStore().createSpan(span);
+  }
+  async updateSpan({
+    spanId,
+    traceId,
+    updates
+  }) {
+    return this.getObservabilityStore().updateSpan({ spanId, traceId, updates });
+  }
+  async getTrace(traceId) {
+    return this.getObservabilityStore().getTrace(traceId);
+  }
+  async getTracesPaginated(args) {
+    return this.getObservabilityStore().getTracesPaginated(args);
+  }
+  async batchCreateSpans(args) {
+    return this.getObservabilityStore().batchCreateSpans(args);
+  }
+  async batchUpdateSpans(args) {
+    return this.getObservabilityStore().batchUpdateSpans(args);
+  }
+  async batchDeleteTraces(args) {
+    return this.getObservabilityStore().batchDeleteTraces(args);
+  }
   /**
    * Scorers
    */
   async getScoreById({ id: _id }) {
     return this.stores.scores.getScoreById({ id: _id });
   }
-  async getScoresByScorerId({
+  async listScoresByScorerId({
     scorerId: _scorerId,
-    pagination: _pagination
+    pagination: _pagination,
+    entityId: _entityId,
+    entityType: _entityType,
+    source: _source
   }) {
-    return this.stores.scores.getScoresByScorerId({ scorerId: _scorerId, pagination: _pagination });
+    return this.stores.scores.listScoresByScorerId({
+      scorerId: _scorerId,
+      pagination: _pagination,
+      entityId: _entityId,
+      entityType: _entityType,
+      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 listScoresBySpan({
+    traceId,
+    spanId,
+    pagination: _pagination
+  }) {
+    return this.stores.scores.listScoresBySpan({ traceId, spanId, pagination: _pagination });
+  }
 };
 
 export { MSSQLStore };