@mastra/mongodb 1.0.0-beta.1 → 1.0.0-beta.3

package/CHANGELOG.md

@@ -1,5 +1,39 @@
 # @mastra/mongodb
 
+## 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
+
+- Add new deleteVectors, updateVector by filter ([#10408](https://github.com/mastra-ai/mastra/pull/10408))
+
+- Updated dependencies [[`21a15de`](https://github.com/mastra-ai/mastra/commit/21a15de369fe82aac26bb642ed7be73505475e8b), [`feb7ee4`](https://github.com/mastra-ai/mastra/commit/feb7ee4d09a75edb46c6669a3beaceec78811747), [`b0e2ea5`](https://github.com/mastra-ai/mastra/commit/b0e2ea5b52c40fae438b9e2f7baee6f0f89c5442), [`c456e01`](https://github.com/mastra-ai/mastra/commit/c456e0149e3c176afcefdbd9bb1d2c5917723725), [`ab035c2`](https://github.com/mastra-ai/mastra/commit/ab035c2ef6d8cc7bb25f06f1a38508bd9e6f126b), [`1a46a56`](https://github.com/mastra-ai/mastra/commit/1a46a566f45a3fcbadc1cf36bf86d351f264bfa3), [`3cf540b`](https://github.com/mastra-ai/mastra/commit/3cf540b9fbfea8f4fc8d3a2319a4e6c0b0cbfd52), [`1c6ce51`](https://github.com/mastra-ai/mastra/commit/1c6ce51f875915ab57fd36873623013699a2a65d), [`898a972`](https://github.com/mastra-ai/mastra/commit/898a9727d286c2510d6b702dfd367e6aaf5c6b0f), [`a97003a`](https://github.com/mastra-ai/mastra/commit/a97003aa1cf2f4022a41912324a1e77263b326b8), [`ccc141e`](https://github.com/mastra-ai/mastra/commit/ccc141ed27da0abc3a3fc28e9e5128152e8e37f4), [`fe3b897`](https://github.com/mastra-ai/mastra/commit/fe3b897c2ccbcd2b10e81b099438c7337feddf89), [`00123ba`](https://github.com/mastra-ai/mastra/commit/00123ba96dc9e5cd0b110420ebdba56d8f237b25), [`29c4309`](https://github.com/mastra-ai/mastra/commit/29c4309f818b24304c041bcb4a8f19b5f13f6b62), [`16785ce`](https://github.com/mastra-ai/mastra/commit/16785ced928f6f22638f4488cf8a125d99211799), [`de8239b`](https://github.com/mastra-ai/mastra/commit/de8239bdcb1d8c0cfa06da21f1569912a66bbc8a), [`b5e6cd7`](https://github.com/mastra-ai/mastra/commit/b5e6cd77fc8c8e64e0494c1d06cee3d84e795d1e), [`3759cb0`](https://github.com/mastra-ai/mastra/commit/3759cb064935b5f74c65ac2f52a1145f7352899d), [`651e772`](https://github.com/mastra-ai/mastra/commit/651e772eb1475fb13e126d3fcc01751297a88214), [`b61b93f`](https://github.com/mastra-ai/mastra/commit/b61b93f9e058b11dd2eec169853175d31dbdd567), [`bae33d9`](https://github.com/mastra-ai/mastra/commit/bae33d91a63fbb64d1e80519e1fc1acaed1e9013), [`c0b731f`](https://github.com/mastra-ai/mastra/commit/c0b731fb27d712dc8582e846df5c0332a6a0c5ba), [`43ca8f2`](https://github.com/mastra-ai/mastra/commit/43ca8f2c7334851cc7b4d3d2f037d8784bfbdd5f), [`2ca67cc`](https://github.com/mastra-ai/mastra/commit/2ca67cc3bb1f6a617353fdcab197d9efebe60d6f), [`9e67002`](https://github.com/mastra-ai/mastra/commit/9e67002b52c9be19936c420a489dbee9c5fd6a78), [`35edc49`](https://github.com/mastra-ai/mastra/commit/35edc49ac0556db609189641d6341e76771b81fc)]:
+  - @mastra/core@1.0.0-beta.5
+
 ## 1.0.0-beta.1
 
 ### Patch Changes

package/README.md

@@ -161,10 +161,11 @@ The following distance metrics are supported:
 
 > **Note:** `documentFilter` allows filtering results based on the content of the `document` field. Example: `{ $contains: 'specific text' }` will return only vectors whose associated document contains the specified text.
 
+- `updateVector({ indexName, id?, filter?, update })`: Update a single vector by ID or metadata filter
+- `deleteVector({ indexName, id })`: Delete a single vector by ID
+- `deleteVectors({ indexName, ids?, filter? })`: Delete multiple vectors by IDs or metadata filter
 - `listIndexes()`: List all vector-enabled collections
 - `describeIndex(indexName)`: Get collection statistics (dimension, count, metric)
-- `updateIndexById(indexName, id, { vector?, metadata? })`: Update a vector and/or its metadata by ID
-- `deleteIndexById(indexName, id)`: Delete a vector by ID
 - `deleteIndex(indexName)`: Delete a collection
 - `disconnect()`: Close the MongoDB connection
 

package/dist/index.cjs

@@ -13,7 +13,7 @@ var evals = require('@mastra/core/evals');
 
 // package.json
 var package_default = {
-  version: "1.0.0-beta.1"};
+  version: "1.0.0-beta.3"};
 var MongoDBFilterTranslator = class extends filter.BaseFilterTranslator {
   getSupportedOperators() {
     return {
@@ -355,12 +355,17 @@ var MongoDBVector = class extends vector.MastraVector {
         limit: topK
       };
       if (Object.keys(combinedFilter).length > 0) {
-        const candidateIds = await collection.aggregate([{ $match: combinedFilter }, { $project: { _id: 1 } }]).map((doc) => doc._id).toArray();
+        const filterWithExclusion = {
+          $and: [{ _id: { $ne: "__index_metadata__" } }, combinedFilter]
+        };
+        const candidateIds = await collection.aggregate([{ $match: filterWithExclusion }, { $project: { _id: 1 } }]).map((doc) => doc._id).toArray();
         if (candidateIds.length > 0) {
           vectorSearch.filter = { _id: { $in: candidateIds } };
         } else {
           return [];
         }
+      } else {
+        vectorSearch.filter = { _id: { $ne: "__index_metadata__" } };
       }
       const pipeline = [
         {
@@ -481,7 +486,26 @@ var MongoDBVector = class extends vector.MastraVector {
    * @returns A promise that resolves when the update is complete.
    * @throws Will throw an error if no updates are provided or if the update operation fails.
    */
-  async updateVector({ indexName, id, update }) {
+  async updateVector(params) {
+    const { indexName, update } = params;
+    if ("id" in params && params.id && "filter" in params && params.filter) {
+      throw new error.MastraError({
+        id: "STORAGE_MONGODB_VECTOR_UPDATE_MUTUALLY_EXCLUSIVE_PARAMS",
+        domain: error.ErrorDomain.STORAGE,
+        category: error.ErrorCategory.USER,
+        details: { indexName },
+        text: "id and filter are mutually exclusive - provide only one"
+      });
+    }
+    if (!("id" in params || "filter" in params) || !params.id && !params.filter) {
+      throw new error.MastraError({
+        id: "STORAGE_MONGODB_VECTOR_UPDATE_MISSING_PARAMS",
+        domain: error.ErrorDomain.STORAGE,
+        category: error.ErrorCategory.USER,
+        text: "Either id or filter must be provided",
+        details: { indexName }
+      });
+    }
     try {
       if (!update.vector && !update.metadata) {
         throw new Error("No updates provided");
@@ -503,17 +527,49 @@ var MongoDBVector = class extends vector.MastraVector {
         );
         updateDoc[this.metadataFieldName] = normalizedMeta;
       }
-      await collection.findOneAndUpdate({ _id: id }, { $set: updateDoc });
+      if ("id" in params && params.id) {
+        await collection.findOneAndUpdate({ _id: params.id }, { $set: updateDoc });
+      } else if ("filter" in params && params.filter) {
+        const filter = params.filter;
+        if (!filter || Object.keys(filter).length === 0) {
+          throw new error.MastraError({
+            id: "STORAGE_MONGODB_VECTOR_UPDATE_EMPTY_FILTER",
+            domain: error.ErrorDomain.STORAGE,
+            category: error.ErrorCategory.USER,
+            details: { indexName },
+            text: "Cannot update with empty filter"
+          });
+        }
+        const mongoFilter = this.transformFilter(filter);
+        const transformedFilter = this.transformMetadataFilter(mongoFilter);
+        if (!transformedFilter || Object.keys(transformedFilter).length === 0) {
+          throw new error.MastraError({
+            id: "STORAGE_MONGODB_VECTOR_UPDATE_INVALID_FILTER",
+            domain: error.ErrorDomain.STORAGE,
+            category: error.ErrorCategory.USER,
+            details: { indexName },
+            text: "Filter produced empty query"
+          });
+        }
+        await collection.updateMany(transformedFilter, { $set: updateDoc });
+      }
     } catch (error$1) {
+      if (error$1 instanceof error.MastraError) {
+        throw error$1;
+      }
+      const errorDetails = { indexName };
+      if ("id" in params && params.id) {
+        errorDetails.id = params.id;
+      }
+      if ("filter" in params && params.filter) {
+        errorDetails.filter = JSON.stringify(params.filter);
+      }
       throw new error.MastraError(
         {
           id: "STORAGE_MONGODB_VECTOR_UPDATE_VECTOR_FAILED",
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
-          details: {
-            indexName,
-            id
-          }
+          details: errorDetails
         },
         error$1
       );
@@ -545,6 +601,83 @@ var MongoDBVector = class extends vector.MastraVector {
       );
     }
   }
+  async deleteVectors({ indexName, filter, ids }) {
+    if (!filter && !ids) {
+      throw new error.MastraError({
+        id: "STORAGE_MONGODB_VECTOR_DELETE_MISSING_PARAMS",
+        domain: error.ErrorDomain.STORAGE,
+        category: error.ErrorCategory.USER,
+        details: { indexName },
+        text: "Either filter or ids must be provided"
+      });
+    }
+    if (filter && ids) {
+      throw new error.MastraError({
+        id: "STORAGE_MONGODB_VECTOR_DELETE_CONFLICTING_PARAMS",
+        domain: error.ErrorDomain.STORAGE,
+        category: error.ErrorCategory.USER,
+        details: { indexName },
+        text: "Cannot provide both filter and ids - they are mutually exclusive"
+      });
+    }
+    try {
+      const collection = await this.getCollection(indexName, true);
+      if (ids) {
+        if (ids.length === 0) {
+          throw new error.MastraError({
+            id: "STORAGE_MONGODB_VECTOR_DELETE_EMPTY_IDS",
+            domain: error.ErrorDomain.STORAGE,
+            category: error.ErrorCategory.USER,
+            details: { indexName },
+            text: "Cannot delete with empty ids array"
+          });
+        }
+        await collection.deleteMany({ _id: { $in: ids } });
+      } else {
+        if (!filter || Object.keys(filter).length === 0) {
+          throw new error.MastraError({
+            id: "STORAGE_MONGODB_VECTOR_DELETE_EMPTY_FILTER",
+            domain: error.ErrorDomain.STORAGE,
+            category: error.ErrorCategory.USER,
+            details: { indexName },
+            text: "Cannot delete with empty filter"
+          });
+        }
+        const mongoFilter = this.transformFilter(filter);
+        const transformedFilter = this.transformMetadataFilter(mongoFilter);
+        if (!transformedFilter || Object.keys(transformedFilter).length === 0) {
+          throw new error.MastraError({
+            id: "STORAGE_MONGODB_VECTOR_DELETE_INVALID_FILTER",
+            domain: error.ErrorDomain.STORAGE,
+            category: error.ErrorCategory.USER,
+            details: { indexName },
+            text: "Filter produced empty query"
+          });
+        }
+        const finalFilter = {
+          $and: [{ _id: { $ne: "__index_metadata__" } }, transformedFilter]
+        };
+        await collection.deleteMany(finalFilter);
+      }
+    } catch (error$1) {
+      if (error$1 instanceof error.MastraError) {
+        throw error$1;
+      }
+      throw new error.MastraError(
+        {
+          id: "STORAGE_MONGODB_VECTOR_DELETE_VECTORS_FAILED",
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          details: {
+            indexName,
+            ...filter && { filter: JSON.stringify(filter) },
+            ...ids && { idsCount: ids.length }
+          }
+        },
+        error$1
+      );
+    }
+  }
   // Private methods
   async getCollection(indexName, throwIfNotExists = true) {
     if (this.collections.has(indexName)) {
@@ -592,16 +725,26 @@ var MongoDBVector = class extends vector.MastraVector {
    */
   transformMetadataFilter(filter) {
     if (!filter || typeof filter !== "object") return filter;
+    if (Array.isArray(filter)) {
+      return filter.map((item) => this.transformMetadataFilter(item));
+    }
     const transformed = {};
     for (const [key, value] of Object.entries(filter)) {
       if (key.startsWith("$")) {
         if (Array.isArray(value)) {
           transformed[key] = value.map((item) => this.transformMetadataFilter(item));
-        } else {
+        } else if (typeof value === "object" && value !== null) {
           transformed[key] = this.transformMetadataFilter(value);
+        } else {
+          transformed[key] = value;
         }
       } else if (key.startsWith("metadata.")) {
-        transformed[key] = value;
+        if (typeof value === "object" && value !== null && !Array.isArray(value)) {
+          const hasOperator = Object.keys(value).some((k) => k.startsWith("$"));
+          transformed[key] = hasOperator ? value : value;
+        } else {
+          transformed[key] = value;
+        }
       } else if (this.isMetadataField(key)) {
         transformed[`metadata.${key}`] = value;
       } else {
@@ -695,8 +838,6 @@ var MongoDBConnector = class _MongoDBConnector {
     }
   }
 };
-
-// src/storage/domains/utils.ts
 function formatDateForMongoDB(date) {
   return typeof date === "string" ? new Date(date) : date;
 }
@@ -727,18 +868,16 @@ var MemoryStorageMongoDB = class extends storage.MemoryStorage {
     if (row.type && row.type !== "v2") result.type = row.type;
     return result;
   }
-  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 collection = await this.operations.getCollection(storage.TABLE_MESSAGES);
     const includedMessages = [];
     for (const inc of include) {
       const { id, withPreviousMessages = 0, withNextMessages = 0 } = inc;
-      const searchThreadId = inc.threadId || threadId;
-      const allMessages = await collection.find({ thread_id: searchThreadId }).sort({ createdAt: 1 }).toArray();
+      const targetMessage = await collection.findOne({ id });
+      if (!targetMessage) continue;
+      const messageThreadId = targetMessage.thread_id;
+      const allMessages = await collection.find({ thread_id: messageThreadId }).sort({ createdAt: 1 }).toArray();
       const targetIndex = allMessages.findIndex((msg) => msg.id === id);
       if (targetIndex === -1) continue;
       const startIndex = Math.max(0, targetIndex - withPreviousMessages);
@@ -779,15 +918,16 @@ var MemoryStorageMongoDB = 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_MONGODB_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) {
@@ -807,7 +947,7 @@ var MemoryStorageMongoDB = class extends storage.MemoryStorage {
       const { field, direction } = this.parseOrderBy(orderBy, "ASC");
       const sortOrder = direction === "ASC" ? 1 : -1;
       const collection = await this.operations.getCollection(storage.TABLE_MESSAGES);
-      const query = { thread_id: threadId };
+      const query = { thread_id: threadIds.length === 1 ? threadIds[0] : { $in: threadIds } };
       if (resourceId) {
         query.resourceId = resourceId;
       }
@@ -839,7 +979,7 @@ var MemoryStorageMongoDB = class extends storage.MemoryStorage {
       }
       const messageIds = new Set(messages.map((m) => m.id));
       if (include && include.length > 0) {
-        const includeMessages = await this._getIncludedMessages({ threadId, include });
+        const includeMessages = await this._getIncludedMessages({ include });
         if (includeMessages) {
           for (const includeMsg of includeMessages) {
             if (!messageIds.has(includeMsg.id)) {
@@ -860,7 +1000,10 @@ var MemoryStorageMongoDB = class extends storage.MemoryStorage {
         }
         return direction === "ASC" ? String(aValue).localeCompare(String(bValue)) : String(bValue).localeCompare(String(aValue));
       });
-      const returnedThreadMessageIds = new Set(finalMessages.filter((m) => m.threadId === threadId).map((m) => m.id));
+      const threadIdSet = new Set(threadIds);
+      const returnedThreadMessageIds = new Set(
+        finalMessages.filter((m) => m.threadId && threadIdSet.has(m.threadId)).map((m) => m.id)
+      );
       const allThreadMessagesReturned = returnedThreadMessageIds.size >= total;
       const hasMore = perPageInput !== false && !allThreadMessagesReturned && offset + perPage < total;
       return {
@@ -877,7 +1020,7 @@ var MemoryStorageMongoDB = class extends storage.MemoryStorage {
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           details: {
-            threadId,
+            threadId: Array.isArray(threadId) ? threadId.join(",") : threadId,
             resourceId: resourceId ?? ""
           }
         },
@@ -1757,98 +1900,9 @@ var StoreOperationsMongoDB = class extends storage.StoreOperations {
   }
 };
 function transformScoreRow(row) {
-  let scorerValue = null;
-  if (row.scorer) {
-    try {
-      scorerValue = typeof row.scorer === "string" ? storage.safelyParseJSON(row.scorer) : row.scorer;
-    } catch (e) {
-      console.warn("Failed to parse scorer:", e);
-    }
-  }
-  let preprocessStepResultValue = null;
-  if (row.preprocessStepResult) {
-    try {
-      preprocessStepResultValue = typeof row.preprocessStepResult === "string" ? storage.safelyParseJSON(row.preprocessStepResult) : row.preprocessStepResult;
-    } catch (e) {
-      console.warn("Failed to parse preprocessStepResult:", e);
-    }
-  }
-  let analyzeStepResultValue = null;
-  if (row.analyzeStepResult) {
-    try {
-      analyzeStepResultValue = typeof row.analyzeStepResult === "string" ? storage.safelyParseJSON(row.analyzeStepResult) : row.analyzeStepResult;
-    } catch (e) {
-      console.warn("Failed to parse analyzeStepResult:", e);
-    }
-  }
-  let inputValue = null;
-  if (row.input) {
-    try {
-      inputValue = typeof row.input === "string" ? storage.safelyParseJSON(row.input) : row.input;
-    } catch (e) {
-      console.warn("Failed to parse input:", e);
-    }
-  }
-  let outputValue = null;
-  if (row.output) {
-    try {
-      outputValue = typeof row.output === "string" ? storage.safelyParseJSON(row.output) : row.output;
-    } catch (e) {
-      console.warn("Failed to parse output:", e);
-    }
-  }
-  let entityValue = null;
-  if (row.entity) {
-    try {
-      entityValue = typeof row.entity === "string" ? storage.safelyParseJSON(row.entity) : row.entity;
-    } catch (e) {
-      console.warn("Failed to parse entity:", e);
-    }
-  }
-  let requestContextValue = null;
-  if (row.requestContext) {
-    try {
-      requestContextValue = typeof row.requestContext === "string" ? storage.safelyParseJSON(row.requestContext) : row.requestContext;
-    } catch (e) {
-      console.warn("Failed to parse requestContext:", e);
-    }
-  }
-  let metadataValue = null;
-  if (row.metadata) {
-    try {
-      metadataValue = typeof row.metadata === "string" ? storage.safelyParseJSON(row.metadata) : row.metadata;
-    } catch (e) {
-      console.warn("Failed to parse metadata:", e);
-    }
-  }
-  return {
-    id: row.id,
-    entityId: row.entityId,
-    entityType: row.entityType,
-    scorerId: row.scorerId,
-    traceId: row.traceId,
-    spanId: row.spanId,
-    runId: row.runId,
-    scorer: scorerValue,
-    preprocessStepResult: preprocessStepResultValue,
-    preprocessPrompt: row.preprocessPrompt,
-    analyzeStepResult: analyzeStepResultValue,
-    generateScorePrompt: row.generateScorePrompt,
-    score: row.score,
-    analyzePrompt: row.analyzePrompt,
-    reasonPrompt: row.reasonPrompt,
-    metadata: metadataValue,
-    input: inputValue,
-    output: outputValue,
-    additionalContext: row.additionalContext,
-    requestContext: requestContextValue,
-    entity: entityValue,
-    source: row.source,
-    resourceId: row.resourceId,
-    threadId: row.threadId,
-    createdAt: new Date(row.createdAt),
-    updatedAt: new Date(row.updatedAt)
-  };
+  return storage.transformScoreRow(row, {
+    convertTimestamps: true
+  });
 }
 var ScoresStorageMongoDB = class extends storage.ScoresStorage {
   operations;
@@ -1893,36 +1947,29 @@ var ScoresStorageMongoDB = class extends storage.ScoresStorage {
     try {
       const now = /* @__PURE__ */ new Date();
       const scoreId = `score-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
-      const scoreData = {
-        id: scoreId,
-        entityId: validatedScore.entityId,
-        entityType: validatedScore.entityType,
-        scorerId: validatedScore.scorerId,
-        traceId: validatedScore.traceId || "",
-        spanId: validatedScore.spanId || "",
-        runId: validatedScore.runId,
-        scorer: typeof validatedScore.scorer === "string" ? storage.safelyParseJSON(validatedScore.scorer) : validatedScore.scorer,
-        preprocessStepResult: typeof validatedScore.preprocessStepResult === "string" ? storage.safelyParseJSON(validatedScore.preprocessStepResult) : validatedScore.preprocessStepResult,
-        analyzeStepResult: typeof validatedScore.analyzeStepResult === "string" ? storage.safelyParseJSON(validatedScore.analyzeStepResult) : validatedScore.analyzeStepResult,
-        score: validatedScore.score,
-        reason: validatedScore.reason,
-        preprocessPrompt: validatedScore.preprocessPrompt,
-        generateScorePrompt: validatedScore.generateScorePrompt,
-        generateReasonPrompt: validatedScore.generateReasonPrompt,
-        analyzePrompt: validatedScore.analyzePrompt,
-        input: typeof validatedScore.input === "string" ? storage.safelyParseJSON(validatedScore.input) : validatedScore.input,
-        output: typeof validatedScore.output === "string" ? storage.safelyParseJSON(validatedScore.output) : validatedScore.output,
-        additionalContext: validatedScore.additionalContext,
-        requestContext: typeof validatedScore.requestContext === "string" ? storage.safelyParseJSON(validatedScore.requestContext) : validatedScore.requestContext,
-        entity: typeof validatedScore.entity === "string" ? storage.safelyParseJSON(validatedScore.entity) : validatedScore.entity,
-        source: validatedScore.source,
-        resourceId: validatedScore.resourceId || "",
-        threadId: validatedScore.threadId || "",
-        createdAt: now,
-        updatedAt: now
+      const scorer = typeof validatedScore.scorer === "string" ? storage.safelyParseJSON(validatedScore.scorer) : validatedScore.scorer;
+      const preprocessStepResult = typeof validatedScore.preprocessStepResult === "string" ? storage.safelyParseJSON(validatedScore.preprocessStepResult) : validatedScore.preprocessStepResult;
+      const analyzeStepResult = typeof validatedScore.analyzeStepResult === "string" ? storage.safelyParseJSON(validatedScore.analyzeStepResult) : validatedScore.analyzeStepResult;
+      const input = typeof validatedScore.input === "string" ? storage.safelyParseJSON(validatedScore.input) : validatedScore.input;
+      const output = typeof validatedScore.output === "string" ? storage.safelyParseJSON(validatedScore.output) : validatedScore.output;
+      const requestContext = typeof validatedScore.requestContext === "string" ? storage.safelyParseJSON(validatedScore.requestContext) : validatedScore.requestContext;
+      const entity = typeof validatedScore.entity === "string" ? storage.safelyParseJSON(validatedScore.entity) : validatedScore.entity;
+      const createdAt = now;
+      const updatedAt = now;
+      const dataToSave = {
+        ...validatedScore,
+        scorer,
+        preprocessStepResult,
+        analyzeStepResult,
+        input,
+        output,
+        requestContext,
+        entity,
+        createdAt,
+        updatedAt
       };
       const collection = await this.operations.getCollection(storage.TABLE_SCORERS);
-      await collection.insertOne(scoreData);
+      await collection.insertOne(dataToSave);
       const savedScore = {
         ...score,
         id: scoreId,