@mastra/mssql 0.0.0-fix-thread-list-20251105222841 → 0.0.0-fix-issue-10434-concurrent-write-corruption-20251124213939

package/dist/index.js

@@ -1,5 +1,5 @@
 import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
-import { MastraStorage, StoreOperations, TABLE_WORKFLOW_SNAPSHOT, TABLE_SCHEMAS, TABLE_THREADS, TABLE_MESSAGES, TABLE_TRACES, TABLE_SCORERS, TABLE_AI_SPANS, ScoresStorage, normalizePerPage, calculatePagination, WorkflowsStorage, MemoryStorage, TABLE_RESOURCES, ObservabilityStorage, safelyParseJSON } from '@mastra/core/storage';
+import { MastraStorage, StoreOperations, TABLE_WORKFLOW_SNAPSHOT, TABLE_SCHEMAS, TABLE_THREADS, TABLE_MESSAGES, TABLE_TRACES, TABLE_SCORERS, TABLE_SPANS, ScoresStorage, normalizePerPage, calculatePagination, WorkflowsStorage, MemoryStorage, TABLE_RESOURCES, ObservabilityStorage, safelyParseJSON } from '@mastra/core/storage';
 import sql2 from 'mssql';
 import { MessageList } from '@mastra/core/agent';
 import { parseSqlIdentifier } from '@mastra/core/utils';
@@ -150,6 +150,18 @@ var MemoryMSSQL = class extends MemoryStorage {
   }
   async listThreadsByResourceId(args) {
     const { resourceId, page = 0, perPage: perPageInput, orderBy } = args;
+    if (page < 0) {
+      throw new MastraError({
+        id: "MASTRA_STORAGE_MSSQL_STORE_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);
@@ -505,43 +517,59 @@ var MemoryMSSQL = class extends MemoryStorage {
         new Error("threadId must be a non-empty string")
       );
     }
+    if (page < 0) {
+      throw new MastraError({
+        id: "MASTRA_STORAGE_MSSQL_STORE_INVALID_PAGE",
+        domain: ErrorDomain.STORAGE,
+        category: ErrorCategory.USER,
+        text: "Page number must be non-negative",
+        details: {
+          threadId,
+          page
+        }
+      });
+    }
     const perPage = normalizePerPage(perPageInput, 40);
     const { offset, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
     try {
       const { field, direction } = this.parseOrderBy(orderBy, "ASC");
-      const orderByStatement = `ORDER BY [${field}] ${direction}`;
-      const selectStatement = `SELECT seq_id, id, content, role, type, [createdAt], thread_id AS threadId, resourceId`;
+      const orderByStatement = `ORDER BY [${field}] ${direction}, [seq_id] ${direction}`;
       const tableName = getTableName({ indexName: TABLE_MESSAGES, schemaName: getSchemaName(this.schema) });
-      const conditions = ["[thread_id] = @threadId"];
-      const request = this.pool.request();
-      request.input("threadId", threadId);
-      if (resourceId) {
-        conditions.push("[resourceId] = @resourceId");
-        request.input("resourceId", resourceId);
-      }
-      if (filter?.dateRange?.start) {
-        conditions.push("[createdAt] >= @fromDate");
-        request.input("fromDate", filter.dateRange.start);
-      }
-      if (filter?.dateRange?.end) {
-        conditions.push("[createdAt] <= @toDate");
-        request.input("toDate", filter.dateRange.end);
-      }
-      const whereClause = `WHERE ${conditions.join(" AND ")}`;
-      const countQuery = `SELECT COUNT(*) as total FROM ${tableName} ${whereClause}`;
-      const countResult = await request.query(countQuery);
+      const baseQuery = `SELECT seq_id, id, content, role, type, [createdAt], thread_id AS threadId, resourceId FROM ${tableName}`;
+      const filters = {
+        thread_id: threadId,
+        ...resourceId ? { resourceId } : {},
+        ...buildDateRangeFilter(filter?.dateRange, "createdAt")
+      };
+      const { sql: actualWhereClause = "", params: whereParams } = prepareWhereClause(
+        filters);
+      const bindWhereParams = (req) => {
+        Object.entries(whereParams).forEach(([paramName, paramValue]) => req.input(paramName, paramValue));
+      };
+      const countRequest = this.pool.request();
+      bindWhereParams(countRequest);
+      const countResult = await countRequest.query(`SELECT COUNT(*) as total FROM ${tableName}${actualWhereClause}`);
       const total = parseInt(countResult.recordset[0]?.total, 10) || 0;
-      const limitValue = perPageInput === false ? total : perPage;
-      const dataQuery = `${selectStatement} FROM ${tableName} ${whereClause} ${orderByStatement} OFFSET @offset ROWS FETCH NEXT @limit ROWS ONLY`;
-      request.input("offset", offset);
-      if (limitValue > 2147483647) {
-        request.input("limit", sql2.BigInt, limitValue);
-      } else {
-        request.input("limit", limitValue);
-      }
-      const rowsResult = await request.query(dataQuery);
-      const rows = rowsResult.recordset || [];
-      const messages = [...rows];
+      const fetchBaseMessages = async () => {
+        const request = this.pool.request();
+        bindWhereParams(request);
+        if (perPageInput === false) {
+          const result2 = await request.query(`${baseQuery}${actualWhereClause} ${orderByStatement}`);
+          return result2.recordset || [];
+        }
+        request.input("offset", offset);
+        request.input("limit", perPage > 2147483647 ? sql2.BigInt : sql2.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: [],
@@ -551,28 +579,33 @@ var MemoryMSSQL = class extends MemoryStorage {
           hasMore: false
         };
       }
-      const messageIds = new Set(messages.map((m) => m.id));
-      if (include && include.length > 0) {
+      if (include?.length) {
+        const messageIds = new Set(messages.map((m) => m.id));
         const includeMessages = await this._getIncludedMessages({ threadId, include });
-        if (includeMessages) {
-          for (const includeMsg of includeMessages) {
-            if (!messageIds.has(includeMsg.id)) {
-              messages.push(includeMsg);
-              messageIds.add(includeMsg.id);
-            }
+        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");
-      let finalMessages = parsed;
-      finalMessages = finalMessages.sort((a, b) => {
-        const aValue = field === "createdAt" ? new Date(a.createdAt).getTime() : a[field];
-        const bValue = field === "createdAt" ? new Date(b.createdAt).getTime() : b[field];
-        return direction === "ASC" ? aValue - bValue : bValue - aValue;
+      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 returnedThreadMessageIds = new Set(finalMessages.filter((m) => m.threadId === threadId).map((m) => m.id));
-      const allThreadMessagesReturned = returnedThreadMessageIds.size >= total;
-      const hasMore = perPageInput !== false && !allThreadMessagesReturned && offset + perPage < total;
+      const returnedThreadMessageCount = finalMessages.filter((m) => m.threadId === threadId).length;
+      const hasMore = perPageInput !== false && returnedThreadMessageCount < total && offset + perPage < total;
       return {
         messages: finalMessages,
         total,
@@ -982,11 +1015,11 @@ var ObservabilityMSSQL = class extends ObservabilityStorage {
         endedAt
         // Note: createdAt/updatedAt will be set by default values
       };
-      return this.operations.insert({ tableName: TABLE_AI_SPANS, record });
+      return this.operations.insert({ tableName: TABLE_SPANS, record });
     } catch (error) {
       throw new MastraError(
         {
-          id: "MSSQL_STORE_CREATE_AI_SPAN_FAILED",
+          id: "MSSQL_STORE_CREATE_SPAN_FAILED",
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.USER,
           details: {
@@ -1000,10 +1033,10 @@ var ObservabilityMSSQL = class extends ObservabilityStorage {
       );
     }
   }
-  async getAITrace(traceId) {
+  async getTrace(traceId) {
     try {
       const tableName = getTableName({
-        indexName: TABLE_AI_SPANS,
+        indexName: TABLE_SPANS,
         schemaName: getSchemaName(this.schema)
       });
       const request = this.pool.request();
@@ -1024,7 +1057,7 @@ var ObservabilityMSSQL = class extends ObservabilityStorage {
         traceId,
         spans: result.recordset.map(
           (span) => transformFromSqlRow({
-            tableName: TABLE_AI_SPANS,
+            tableName: TABLE_SPANS,
             sqlRow: span
           })
         )
@@ -1032,7 +1065,7 @@ var ObservabilityMSSQL = class extends ObservabilityStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "MSSQL_STORE_GET_AI_TRACE_FAILED",
+          id: "MSSQL_STORE_GET_TRACE_FAILED",
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.USER,
           details: {
@@ -1057,14 +1090,14 @@ var ObservabilityMSSQL = class extends ObservabilityStorage {
         data.startedAt = data.startedAt.toISOString();
       }
       await this.operations.update({
-        tableName: TABLE_AI_SPANS,
+        tableName: TABLE_SPANS,
         keys: { spanId, traceId },
         data
       });
     } catch (error) {
       throw new MastraError(
         {
-          id: "MSSQL_STORE_UPDATE_AI_SPAN_FAILED",
+          id: "MSSQL_STORE_UPDATE_SPAN_FAILED",
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.USER,
           details: {
@@ -1076,7 +1109,7 @@ var ObservabilityMSSQL = class extends ObservabilityStorage {
       );
     }
   }
-  async getAITracesPaginated({
+  async getTracesPaginated({
     filters,
     pagination
   }) {
@@ -1101,7 +1134,7 @@ var ObservabilityMSSQL = class extends ObservabilityStorage {
         name = `agent run: '${entityId}'`;
       } else {
         const error = new MastraError({
-          id: "MSSQL_STORE_GET_AI_TRACES_PAGINATED_FAILED",
+          id: "MSSQL_STORE_GET_TRACES_PAGINATED_FAILED",
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.USER,
           details: {
@@ -1120,7 +1153,7 @@ var ObservabilityMSSQL = class extends ObservabilityStorage {
       params[entityParam] = name;
     }
     const tableName = getTableName({
-      indexName: TABLE_AI_SPANS,
+      indexName: TABLE_SPANS,
       schemaName: getSchemaName(this.schema)
     });
     try {
@@ -1154,7 +1187,7 @@ var ObservabilityMSSQL = class extends ObservabilityStorage {
       );
       const spans = dataResult.recordset.map(
         (row) => transformFromSqlRow({
-          tableName: TABLE_AI_SPANS,
+          tableName: TABLE_SPANS,
           sqlRow: row
         })
       );
@@ -1170,7 +1203,7 @@ var ObservabilityMSSQL = class extends ObservabilityStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "MSSQL_STORE_GET_AI_TRACES_PAGINATED_FAILED",
+          id: "MSSQL_STORE_GET_TRACES_PAGINATED_FAILED",
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.USER
         },
@@ -1184,7 +1217,7 @@ var ObservabilityMSSQL = class extends ObservabilityStorage {
     }
     try {
       await this.operations.batchInsert({
-        tableName: TABLE_AI_SPANS,
+        tableName: TABLE_SPANS,
         records: args.records.map((span) => ({
           ...span,
           startedAt: span.startedAt instanceof Date ? span.startedAt.toISOString() : span.startedAt,
@@ -1194,7 +1227,7 @@ var ObservabilityMSSQL = class extends ObservabilityStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: "MSSQL_STORE_BATCH_CREATE_AI_SPANS_FAILED",
+          id: "MSSQL_STORE_BATCH_CREATE_SPANS_FAILED",
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.USER,
           details: {
@@ -1224,13 +1257,13 @@ var ObservabilityMSSQL = class extends ObservabilityStorage {
         };
       });
       await this.operations.batchUpdate({
-        tableName: TABLE_AI_SPANS,
+        tableName: TABLE_SPANS,
         updates
       });
     } catch (error) {
       throw new MastraError(
         {
-          id: "MSSQL_STORE_BATCH_UPDATE_AI_SPANS_FAILED",
+          id: "MSSQL_STORE_BATCH_UPDATE_SPANS_FAILED",
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.USER,
           details: {
@@ -1241,20 +1274,20 @@ var ObservabilityMSSQL = class extends ObservabilityStorage {
       );
     }
   }
-  async batchDeleteAITraces(args) {
+  async batchDeleteTraces(args) {
     if (!args.traceIds || args.traceIds.length === 0) {
       return;
     }
     try {
       const keys = args.traceIds.map((traceId) => ({ traceId }));
       await this.operations.batchDelete({
-        tableName: TABLE_AI_SPANS,
+        tableName: TABLE_SPANS,
         keys
       });
     } catch (error) {
       throw new MastraError(
         {
-          id: "MSSQL_STORE_BATCH_DELETE_AI_TRACES_FAILED",
+          id: "MSSQL_STORE_BATCH_DELETE_TRACES_FAILED",
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.USER,
           details: {
@@ -1679,6 +1712,20 @@ ${columns}
       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") {
@@ -2161,22 +2208,22 @@ ${columns}
       // Spans indexes for optimal trace querying
       {
         name: `${schemaPrefix}mastra_ai_spans_traceid_startedat_idx`,
-        table: TABLE_AI_SPANS,
+        table: TABLE_SPANS,
         columns: ["traceId", "startedAt DESC"]
       },
       {
         name: `${schemaPrefix}mastra_ai_spans_parentspanid_startedat_idx`,
-        table: TABLE_AI_SPANS,
+        table: TABLE_SPANS,
         columns: ["parentSpanId", "startedAt DESC"]
       },
       {
         name: `${schemaPrefix}mastra_ai_spans_name_idx`,
-        table: TABLE_AI_SPANS,
+        table: TABLE_SPANS,
         columns: ["name"]
       },
       {
         name: `${schemaPrefix}mastra_ai_spans_spantype_startedat_idx`,
-        table: TABLE_AI_SPANS,
+        table: TABLE_SPANS,
         columns: ["spanType", "startedAt DESC"]
       }
     ];
@@ -2624,13 +2671,14 @@ var WorkflowsMSSQL = class extends WorkflowsStorage {
         snapshot = {
           context: {},
           activePaths: [],
+          activeStepsPath: {},
           timestamp: Date.now(),
           suspendedPaths: {},
           resumeLabels: {},
           serializedStepGraph: [],
+          status: "pending",
           value: {},
           waitingPaths: {},
-          status: "pending",
           runId,
           requestContext: {}
         };
@@ -2860,7 +2908,8 @@ var WorkflowsMSSQL = class extends WorkflowsStorage {
     toDate,
     page,
     perPage,
-    resourceId
+    resourceId,
+    status
   } = {}) {
     try {
       const conditions = [];
@@ -2869,6 +2918,10 @@ 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) {
@@ -2937,7 +2990,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" });
     try {
       if ("connectionString" in config) {
         if (!config.connectionString || typeof config.connectionString !== "string" || config.connectionString.trim() === "") {
@@ -3134,15 +3190,8 @@ var MSSQLStore = class extends MastraStorage {
   }) {
     return this.stores.workflows.loadWorkflowSnapshot({ workflowName, runId });
   }
-  async listWorkflowRuns({
-    workflowName,
-    fromDate,
-    toDate,
-    perPage,
-    page,
-    resourceId
-  } = {}) {
-    return this.stores.workflows.listWorkflowRuns({ workflowName, fromDate, toDate, perPage, page, resourceId });
+  async listWorkflowRuns(args = {}) {
+    return this.stores.workflows.listWorkflowRuns(args);
   }
   async getWorkflowRunById({
     runId,
@@ -3192,11 +3241,11 @@ var MSSQLStore = class extends MastraStorage {
   }) {
     return this.getObservabilityStore().updateSpan({ spanId, traceId, updates });
   }
-  async getAITrace(traceId) {
-    return this.getObservabilityStore().getAITrace(traceId);
+  async getTrace(traceId) {
+    return this.getObservabilityStore().getTrace(traceId);
   }
-  async getAITracesPaginated(args) {
-    return this.getObservabilityStore().getAITracesPaginated(args);
+  async getTracesPaginated(args) {
+    return this.getObservabilityStore().getTracesPaginated(args);
   }
   async batchCreateSpans(args) {
     return this.getObservabilityStore().batchCreateSpans(args);
@@ -3204,8 +3253,8 @@ var MSSQLStore = class extends MastraStorage {
   async batchUpdateSpans(args) {
     return this.getObservabilityStore().batchUpdateSpans(args);
   }
-  async batchDeleteAITraces(args) {
-    return this.getObservabilityStore().batchDeleteAITraces(args);
+  async batchDeleteTraces(args) {
+    return this.getObservabilityStore().batchDeleteTraces(args);
   }
   /**
    * Scorers