@mastra/mssql 1.0.0-beta.2 → 1.0.0-beta.3

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @mastra/mssql
 
+## 1.0.0-beta.3
+
+### Patch Changes
+
+- feat(storage): support querying messages from multiple threads ([#10663](https://github.com/mastra-ai/mastra/pull/10663))
+  - Fixed TypeScript errors where `threadId: string | string[]` was being passed to places expecting `Scalar` type
+  - Added proper multi-thread support for `listMessages` across all adapters when `threadId` is an array
+  - Updated `_getIncludedMessages` to look up message threadId by ID (since message IDs are globally unique)
+  - **upstash**: Added `msg-idx:{messageId}` index for O(1) message lookups (backwards compatible with fallback to scan for old messages, with automatic backfill)
+
+- fix: ensure score responses match saved payloads for Mastra Stores. ([#10557](https://github.com/mastra-ai/mastra/pull/10557))
+
+- Unify transformScoreRow functions across storage adapters ([#10648](https://github.com/mastra-ai/mastra/pull/10648))
+
+  Added a unified `transformScoreRow` function in `@mastra/core/storage` that provides schema-driven row transformation for score data. This eliminates code duplication across 10 storage adapters while maintaining store-specific behavior through configurable options:
+  - `preferredTimestampFields`: Preferred source fields for timestamps (PostgreSQL, Cloudflare D1)
+  - `convertTimestamps`: Convert timestamp strings to Date objects (MSSQL, MongoDB, ClickHouse)
+  - `nullValuePattern`: Skip values matching pattern (ClickHouse's `'_null_'`)
+  - `fieldMappings`: Map source column names to schema fields (LibSQL's `additionalLLMContext`)
+
+  Each store adapter now uses the unified function with appropriate options, reducing ~200 lines of duplicate transformation logic while ensuring consistent behavior across all storage backends.
+
+- Updated dependencies [[`ac0d2f4`](https://github.com/mastra-ai/mastra/commit/ac0d2f4ff8831f72c1c66c2be809706d17f65789), [`1a0d3fc`](https://github.com/mastra-ai/mastra/commit/1a0d3fc811482c9c376cdf79ee615c23bae9b2d6), [`85a628b`](https://github.com/mastra-ai/mastra/commit/85a628b1224a8f64cd82ea7f033774bf22df7a7e), [`c237233`](https://github.com/mastra-ai/mastra/commit/c23723399ccedf7f5744b3f40997b79246bfbe64), [`15f9e21`](https://github.com/mastra-ai/mastra/commit/15f9e216177201ea6e3f6d0bfb063fcc0953444f), [`ff94dea`](https://github.com/mastra-ai/mastra/commit/ff94dea935f4e34545c63bcb6c29804732698809), [`5b2ff46`](https://github.com/mastra-ai/mastra/commit/5b2ff4651df70c146523a7fca773f8eb0a2272f8), [`db41688`](https://github.com/mastra-ai/mastra/commit/db4168806d007417e2e60b4f68656dca4e5f40c9), [`5ca599d`](https://github.com/mastra-ai/mastra/commit/5ca599d0bb59a1595f19f58473fcd67cc71cef58), [`bff1145`](https://github.com/mastra-ai/mastra/commit/bff114556b3cbadad9b2768488708f8ad0e91475), [`5c8ca24`](https://github.com/mastra-ai/mastra/commit/5c8ca247094e0cc2cdbd7137822fb47241f86e77), [`e191844`](https://github.com/mastra-ai/mastra/commit/e1918444ca3f80e82feef1dad506cd4ec6e2875f), [`22553f1`](https://github.com/mastra-ai/mastra/commit/22553f11c63ee5e966a9c034a349822249584691), [`7237163`](https://github.com/mastra-ai/mastra/commit/72371635dbf96a87df4b073cc48fc655afbdce3d), [`2500740`](https://github.com/mastra-ai/mastra/commit/2500740ea23da067d6e50ec71c625ab3ce275e64), [`873ecbb`](https://github.com/mastra-ai/mastra/commit/873ecbb517586aa17d2f1e99283755b3ebb2863f), [`4f9bbe5`](https://github.com/mastra-ai/mastra/commit/4f9bbe5968f42c86f4930b8193de3c3c17e5bd36), [`02e51fe`](https://github.com/mastra-ai/mastra/commit/02e51feddb3d4155cfbcc42624fd0d0970d032c0), [`8f3fa3a`](https://github.com/mastra-ai/mastra/commit/8f3fa3a652bb77da092f913ec51ae46e3a7e27dc), [`cd29ad2`](https://github.com/mastra-ai/mastra/commit/cd29ad23a255534e8191f249593849ed29160886), [`bdf4d8c`](https://github.com/mastra-ai/mastra/commit/bdf4d8cdc656d8a2c21d81834bfa3bfa70f56c16), [`854e3da`](https://github.com/mastra-ai/mastra/commit/854e3dad5daac17a91a20986399d3a51f54bf68b), [`ce18d38`](https://github.com/mastra-ai/mastra/commit/ce18d38678c65870350d123955014a8432075fd9), [`cccf9c8`](https://github.com/mastra-ai/mastra/commit/cccf9c8b2d2dfc1a5e63919395b83d78c89682a0), [`61a5705`](https://github.com/mastra-ai/mastra/commit/61a570551278b6743e64243b3ce7d73de915ca8a), [`db70a48`](https://github.com/mastra-ai/mastra/commit/db70a48aeeeeb8e5f92007e8ede52c364ce15287), [`f0fdc14`](https://github.com/mastra-ai/mastra/commit/f0fdc14ee233d619266b3d2bbdeea7d25cfc6d13), [`db18bc9`](https://github.com/mastra-ai/mastra/commit/db18bc9c3825e2c1a0ad9a183cc9935f6691bfa1), [`9b37b56`](https://github.com/mastra-ai/mastra/commit/9b37b565e1f2a76c24f728945cc740c2b09be9da), [`41a23c3`](https://github.com/mastra-ai/mastra/commit/41a23c32f9877d71810f37e24930515df2ff7a0f), [`5d171ad`](https://github.com/mastra-ai/mastra/commit/5d171ad9ef340387276b77c2bb3e83e83332d729), [`f03ae60`](https://github.com/mastra-ai/mastra/commit/f03ae60500fe350c9d828621006cdafe1975fdd8), [`d1e74a0`](https://github.com/mastra-ai/mastra/commit/d1e74a0a293866dece31022047f5dbab65a304d0), [`39e7869`](https://github.com/mastra-ai/mastra/commit/39e7869bc7d0ee391077ce291474d8a84eedccff), [`5761926`](https://github.com/mastra-ai/mastra/commit/57619260c4a2cdd598763abbacd90de594c6bc76), [`c900fdd`](https://github.com/mastra-ai/mastra/commit/c900fdd504c41348efdffb205cfe80d48c38fa33), [`604a79f`](https://github.com/mastra-ai/mastra/commit/604a79fecf276e26a54a3fe01bb94e65315d2e0e), [`887f0b4`](https://github.com/mastra-ai/mastra/commit/887f0b4746cdbd7cb7d6b17ac9f82aeb58037ea5), [`2562143`](https://github.com/mastra-ai/mastra/commit/256214336b4faa78646c9c1776612393790d8784), [`ef11a61`](https://github.com/mastra-ai/mastra/commit/ef11a61920fa0ed08a5b7ceedd192875af119749)]:
+  - @mastra/core@1.0.0-beta.6
+
 ## 1.0.0-beta.2
 
 ### Patch Changes

package/dist/index.cjs

@@ -32,24 +32,62 @@ function buildDateRangeFilter(dateRange, fieldName) {
   }
   return filters;
 }
+function isInOperator(value) {
+  return typeof value === "object" && value !== null && "$in" in value && Array.isArray(value.$in);
+}
 function prepareWhereClause(filters, _schema) {
   const conditions = [];
   const params = {};
   let paramIndex = 1;
   Object.entries(filters).forEach(([key, value]) => {
     if (value === void 0) return;
-    const paramName = `p${paramIndex++}`;
     if (key.endsWith("_gte")) {
+      const paramName = `p${paramIndex++}`;
       const fieldName = key.slice(0, -4);
       conditions.push(`[${utils.parseSqlIdentifier(fieldName, "field name")}] >= @${paramName}`);
       params[paramName] = value instanceof Date ? value.toISOString() : value;
     } else if (key.endsWith("_lte")) {
+      const paramName = `p${paramIndex++}`;
       const fieldName = key.slice(0, -4);
       conditions.push(`[${utils.parseSqlIdentifier(fieldName, "field name")}] <= @${paramName}`);
       params[paramName] = value instanceof Date ? value.toISOString() : value;
     } else if (value === null) {
       conditions.push(`[${utils.parseSqlIdentifier(key, "field name")}] IS NULL`);
+    } else if (isInOperator(value)) {
+      const inValues = value.$in;
+      if (inValues.length === 0) {
+        conditions.push("1 = 0");
+      } else if (inValues.length === 1) {
+        const paramName = `p${paramIndex++}`;
+        conditions.push(`[${utils.parseSqlIdentifier(key, "field name")}] = @${paramName}`);
+        params[paramName] = inValues[0] instanceof Date ? inValues[0].toISOString() : inValues[0];
+      } else {
+        const inParamNames = [];
+        for (const item of inValues) {
+          const paramName = `p${paramIndex++}`;
+          inParamNames.push(`@${paramName}`);
+          params[paramName] = item instanceof Date ? item.toISOString() : item;
+        }
+        conditions.push(`[${utils.parseSqlIdentifier(key, "field name")}] IN (${inParamNames.join(", ")})`);
+      }
+    } else if (Array.isArray(value)) {
+      if (value.length === 0) {
+        conditions.push("1 = 0");
+      } else if (value.length === 1) {
+        const paramName = `p${paramIndex++}`;
+        conditions.push(`[${utils.parseSqlIdentifier(key, "field name")}] = @${paramName}`);
+        params[paramName] = value[0] instanceof Date ? value[0].toISOString() : value[0];
+      } else {
+        const inParamNames = [];
+        for (const item of value) {
+          const paramName = `p${paramIndex++}`;
+          inParamNames.push(`@${paramName}`);
+          params[paramName] = item instanceof Date ? item.toISOString() : item;
+        }
+        conditions.push(`[${utils.parseSqlIdentifier(key, "field name")}] IN (${inParamNames.join(", ")})`);
+      }
     } else {
+      const paramName = `p${paramIndex++}`;
       conditions.push(`[${utils.parseSqlIdentifier(key, "field name")}] = @${paramName}`);
       params[paramName] = value instanceof Date ? value.toISOString() : value;
     }
@@ -387,23 +425,18 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
       );
     }
   }
-  async _getIncludedMessages({
-    threadId,
-    include
-  }) {
-    if (!threadId.trim()) throw new Error("threadId must be a non-empty string");
-    if (!include) return null;
+  async _getIncludedMessages({ include }) {
+    if (!include || include.length === 0) return null;
     const unionQueries = [];
     const paramValues = [];
     let paramIdx = 1;
     const paramNames = [];
+    const tableName = getTableName({ indexName: storage.TABLE_MESSAGES, schemaName: getSchemaName(this.schema) });
     for (const inc of include) {
       const { id, withPreviousMessages = 0, withNextMessages = 0 } = inc;
-      const searchId = inc.threadId || threadId;
-      const pThreadId = `@p${paramIdx}`;
-      const pId = `@p${paramIdx + 1}`;
-      const pPrev = `@p${paramIdx + 2}`;
-      const pNext = `@p${paramIdx + 3}`;
+      const pId = `@p${paramIdx}`;
+      const pPrev = `@p${paramIdx + 1}`;
+      const pNext = `@p${paramIdx + 2}`;
       unionQueries.push(
         `
           SELECT
@@ -417,16 +450,16 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
             m.seq_id
           FROM (
             SELECT *, ROW_NUMBER() OVER (ORDER BY [createdAt] ASC) as row_num
-            FROM ${getTableName({ indexName: storage.TABLE_MESSAGES, schemaName: getSchemaName(this.schema) })}
-            WHERE [thread_id] = ${pThreadId}
+            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 (ORDER BY [createdAt] ASC) as row_num
-              FROM ${getTableName({ indexName: storage.TABLE_MESSAGES, schemaName: getSchemaName(this.schema) })}
-              WHERE [thread_id] = ${pThreadId}
+              FROM ${tableName}
+              WHERE [thread_id] = (SELECT thread_id FROM ${tableName} WHERE id = ${pId})
             ) AS target
             WHERE target.id = ${pId}
             AND (
@@ -439,9 +472,9 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
           )
         `
       );
-      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 (
@@ -512,15 +545,16 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
   }
   async listMessages(args) {
     const { threadId, resourceId, include, filter, perPage: perPageInput, page = 0, orderBy } = args;
-    if (!threadId.trim()) {
+    const threadIds = Array.isArray(threadId) ? threadId : [threadId];
+    if (threadIds.length === 0 || threadIds.some((id) => !id.trim())) {
       throw new error.MastraError(
         {
           id: "STORAGE_MSSQL_LIST_MESSAGES_INVALID_THREAD_ID",
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
-          details: { threadId }
+          details: { threadId: Array.isArray(threadId) ? threadId.join(",") : threadId }
         },
-        new Error("threadId must be a non-empty string")
+        new Error("threadId must be a non-empty string or array of non-empty strings")
       );
     }
     if (page < 0) {
@@ -530,7 +564,7 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
         category: error.ErrorCategory.USER,
         text: "Page number must be non-negative",
         details: {
-          threadId,
+          threadId: Array.isArray(threadId) ? threadId.join(",") : threadId,
           page
         }
       });
@@ -543,7 +577,7 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
       const tableName = getTableName({ indexName: storage.TABLE_MESSAGES, schemaName: getSchemaName(this.schema) });
       const baseQuery = `SELECT seq_id, id, content, role, type, [createdAt], thread_id AS threadId, resourceId FROM ${tableName}`;
       const filters = {
-        thread_id: threadId,
+        thread_id: threadIds.length === 1 ? threadIds[0] : { $in: threadIds },
         ...resourceId ? { resourceId } : {},
         ...buildDateRangeFilter(filter?.dateRange, "createdAt")
       };
@@ -587,7 +621,7 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
       }
       if (include?.length) {
         const messageIds = new Set(messages.map((m) => m.id));
-        const includeMessages = await this._getIncludedMessages({ threadId, include });
+        const includeMessages = await this._getIncludedMessages({ include });
         includeMessages?.forEach((msg) => {
           if (!messageIds.has(msg.id)) {
             messages.push(msg);
@@ -610,7 +644,8 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
         const seqB = seqById.get(b.id);
         return seqA != null && seqB != null ? (seqA - seqB) * mult : a.id.localeCompare(b.id);
       });
-      const returnedThreadMessageCount = finalMessages.filter((m) => m.threadId === threadId).length;
+      const 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: finalMessages,
@@ -626,7 +661,7 @@ var MemoryMSSQL = class extends storage.MemoryStorage {
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
-            threadId,
+            threadId: Array.isArray(threadId) ? threadId.join(",") : threadId,
             resourceId: resourceId ?? ""
           }
         },
@@ -2261,20 +2296,9 @@ ${columns}
   }
 };
 function transformScoreRow(row) {
-  return {
-    ...row,
-    input: storage.safelyParseJSON(row.input),
-    scorer: storage.safelyParseJSON(row.scorer),
-    preprocessStepResult: storage.safelyParseJSON(row.preprocessStepResult),
-    analyzeStepResult: storage.safelyParseJSON(row.analyzeStepResult),
-    metadata: storage.safelyParseJSON(row.metadata),
-    output: storage.safelyParseJSON(row.output),
-    additionalContext: storage.safelyParseJSON(row.additionalContext),
-    requestContext: storage.safelyParseJSON(row.requestContext),
-    entity: storage.safelyParseJSON(row.entity),
-    createdAt: row.createdAt,
-    updatedAt: row.updatedAt
-  };
+  return storage.transformScoreRow(row, {
+    convertTimestamps: true
+  });
 }
 var ScoresMSSQL = class extends storage.ScoresStorage {
   pool;