@mastra/mongodb 1.16.1 → 1.17.0-alpha.1

package/dist/index.js

@@ -9,7 +9,7 @@ import { MessageList } from "@mastra/core/agent";
 import { saveScorePayloadSchema } from "@mastra/core/evals";
 import { skillSnapshotFieldValuesEqual } from "@mastra/core/storage/domains/skills";
 //#region package.json
-var version = "1.16.1";
+var version = "1.17.0-alpha.1";
 //#endregion
 //#region src/vector/filter.ts
 /**
@@ -3666,6 +3666,12 @@ function transformExperimentRow(row) {
 		name: row.name ?? void 0,
 		description: row.description ?? void 0,
 		metadata: parseJsonField(row.metadata) ?? void 0,
+		provenance: parseJsonField(row.provenance) ?? null,
+		runnerAttestation: parseJsonField(row.runnerAttestation) ?? null,
+		experimentSetId: row.experimentSetId ?? null,
+		comparisonId: row.comparisonId ?? null,
+		variantId: row.variantId ?? null,
+		trialIndex: row.trialIndex != null ? Number(row.trialIndex) : null,
 		datasetId: row.datasetId ?? null,
 		datasetVersion: row.datasetVersion != null ? Number(row.datasetVersion) : null,
 		organizationId: row.organizationId ?? null,
@@ -3812,6 +3818,15 @@ var MongoDBExperimentsStorage = class MongoDBExperimentsStorage extends Experime
 					id: 1
 				}
 			},
+			{
+				collection: TABLE_EXPERIMENTS,
+				keys: {
+					experimentSetId: 1,
+					comparisonId: 1,
+					variantId: 1,
+					trialIndex: 1
+				}
+			},
 			{
 				collection: TABLE_EXPERIMENTS,
 				keys: {
@@ -3885,6 +3900,12 @@ var MongoDBExperimentsStorage = class MongoDBExperimentsStorage extends Experime
 			name: input.name ?? null,
 			description: input.description ?? null,
 			metadata: input.metadata ?? null,
+			provenance: input.provenance ?? null,
+			runnerAttestation: input.runnerAttestation ?? null,
+			experimentSetId: input.experimentSetId ?? null,
+			comparisonId: input.comparisonId ?? null,
+			variantId: input.variantId ?? null,
+			trialIndex: input.trialIndex ?? null,
 			datasetId: input.datasetId ?? null,
 			datasetVersion: input.datasetVersion ?? null,
 			organizationId: input.organizationId ?? null,
@@ -3904,28 +3925,7 @@ var MongoDBExperimentsStorage = class MongoDBExperimentsStorage extends Experime
 		};
 		try {
 			await (await this.getCollection(TABLE_EXPERIMENTS)).insertOne(doc);
-			return {
-				id,
-				name: input.name,
-				description: input.description,
-				metadata: input.metadata,
-				datasetId: input.datasetId ?? null,
-				datasetVersion: input.datasetVersion ?? null,
-				organizationId: input.organizationId ?? null,
-				projectId: input.projectId ?? null,
-				targetType: input.targetType,
-				targetId: input.targetId,
-				status: "pending",
-				totalItems: input.totalItems,
-				succeededCount: 0,
-				failedCount: 0,
-				skippedCount: 0,
-				agentVersion: input.agentVersion ?? null,
-				startedAt: null,
-				completedAt: null,
-				createdAt: now,
-				updatedAt: now
-			};
+			return transformExperimentRow(structuredClone(doc));
 		} catch (error) {
 			throw new MastraError({
 				id: createStorageErrorId("MONGODB", "CREATE_EXPERIMENT", "FAILED"),
@@ -3992,6 +3992,10 @@ var MongoDBExperimentsStorage = class MongoDBExperimentsStorage extends Experime
 			if (args.targetId) filter.targetId = args.targetId;
 			if (args.agentVersion) filter.agentVersion = args.agentVersion;
 			if (args.status) filter.status = args.status;
+			if (args.experimentSetId !== void 0) filter.experimentSetId = args.experimentSetId;
+			if (args.comparisonId !== void 0) filter.comparisonId = args.comparisonId;
+			if (args.variantId !== void 0) filter.variantId = args.variantId;
+			if (args.trialIndex !== void 0) filter.trialIndex = args.trialIndex;
 			if (args.filters) {
 				const { organizationId, projectId } = args.filters;
 				if (organizationId !== void 0) filter.organizationId = organizationId;
@@ -5400,12 +5404,23 @@ var MemoryStorageMongoDB = class MemoryStorageMongoDB extends MemoryStorage {
 			return direction === "ASC" ? String(aValue).localeCompare(String(bValue)) : String(bValue).localeCompare(String(aValue));
 		});
 	}
-	async _getIncludedMessages({ include }) {
+	/**
+	* Fetches the messages named by `include` together with their surrounding context.
+	*
+	* @param include - Message ids to pin, each with an optional before/after window.
+	* @param resourceId - When set, restricts both the pinned messages and their context
+	* to that resource so an id from another resource returns nothing.
+	*/
+	async _getIncludedMessages({ include, resourceId }) {
 		if (!include || include.length === 0) return null;
 		const collection = await this.getCollection(TABLE_MESSAGES);
+		const resourceFilter = resourceId ? { resourceId } : {};
 		const targetIds = include.map((inc) => inc.id).filter(Boolean);
 		if (targetIds.length === 0) return null;
-		const targetDocs = await collection.find({ id: { $in: targetIds } }, { projection: {
+		const targetDocs = await collection.find({
+			id: { $in: targetIds },
+			...resourceFilter
+		}, { projection: {
 			id: 1,
 			thread_id: 1,
 			createdAt: 1
@@ -5422,7 +5437,8 @@ var MemoryStorageMongoDB = class MemoryStorageMongoDB extends MemoryStorage {
 			if (!target) continue;
 			const prevMessages = await collection.find({
 				thread_id: target.threadId,
-				createdAt: { $lte: target.createdAt }
+				createdAt: { $lte: target.createdAt },
+				...resourceFilter
 			}).sort({
 				createdAt: -1,
 				id: -1
@@ -5431,7 +5447,8 @@ var MemoryStorageMongoDB = class MemoryStorageMongoDB extends MemoryStorage {
 			if (withNextMessages > 0) {
 				const nextMessages = await collection.find({
 					thread_id: target.threadId,
-					createdAt: { $gt: target.createdAt }
+					createdAt: { $gt: target.createdAt },
+					...resourceFilter
 				}).sort({
 					createdAt: 1,
 					id: 1
@@ -5506,7 +5523,10 @@ var MemoryStorageMongoDB = class MemoryStorageMongoDB extends MemoryStorage {
 				hasMore: false
 			};
 			if (perPage === 0 && include && include.length > 0) {
-				const includeMessages = await this._getIncludedMessages({ include });
+				const includeMessages = await this._getIncludedMessages({
+					include,
+					resourceId
+				});
 				const list = new MessageList().add(includeMessages ?? [], "memory");
 				return {
 					messages: this._sortMessages(list.get.all.db(), field, direction),
@@ -5542,7 +5562,10 @@ var MemoryStorageMongoDB = class MemoryStorageMongoDB extends MemoryStorage {
 			};
 			const messageIds = new Set(messages.map((m) => m.id));
 			if (include && include.length > 0) {
-				const includeMessages = await this._getIncludedMessages({ include });
+				const includeMessages = await this._getIncludedMessages({
+					include,
+					resourceId
+				});
 				if (includeMessages) {
 					for (const includeMsg of includeMessages) if (!messageIds.has(includeMsg.id)) {
 						messages.push(includeMsg);
@@ -5563,6 +5586,7 @@ var MemoryStorageMongoDB = class MemoryStorageMongoDB extends MemoryStorage {
 				hasMore
 			};
 		} catch (error) {
+			if (error instanceof MastraError && error.category === ErrorCategory.USER) throw error;
 			const mastraError = new MastraError({
 				id: createStorageErrorId("MONGODB", "LIST_MESSAGES", "FAILED"),
 				domain: ErrorDomain.STORAGE,
@@ -5574,13 +5598,7 @@ var MemoryStorageMongoDB = class MemoryStorageMongoDB extends MemoryStorage {
 			}, error);
 			this.logger?.error?.(mastraError.toString());
 			this.logger?.trackException?.(mastraError);
-			return {
-				messages: [],
-				total: 0,
-				page,
-				perPage: perPageForResponse,
-				hasMore: false
-			};
+			throw mastraError;
 		}
 	}
 	async listMessagesByResourceId(args) {
@@ -5628,7 +5646,10 @@ var MemoryStorageMongoDB = class MemoryStorageMongoDB extends MemoryStorage {
 				hasMore: false
 			};
 			if (perPage === 0 && include && include.length > 0) {
-				const includeMessages = await this._getIncludedMessages({ include });
+				const includeMessages = await this._getIncludedMessages({
+					include,
+					resourceId
+				});
 				if (!includeMessages || includeMessages.length === 0) return {
 					messages: [],
 					total: 0,
@@ -5671,7 +5692,10 @@ var MemoryStorageMongoDB = class MemoryStorageMongoDB extends MemoryStorage {
 			};
 			const messageIds = new Set(messages.map((m) => m.id));
 			if (include && include.length > 0) {
-				const includeMessages = await this._getIncludedMessages({ include });
+				const includeMessages = await this._getIncludedMessages({
+					include,
+					resourceId
+				});
 				if (includeMessages) {
 					for (const includeMsg of includeMessages) if (!messageIds.has(includeMsg.id)) {
 						messages.push(includeMsg);
@@ -5690,6 +5714,7 @@ var MemoryStorageMongoDB = class MemoryStorageMongoDB extends MemoryStorage {
 				hasMore
 			};
 		} catch (error) {
+			if (error instanceof MastraError && error.category === ErrorCategory.USER) throw error;
 			const mastraError = new MastraError({
 				id: createStorageErrorId("MONGODB", "LIST_MESSAGES_BY_RESOURCE_ID", "FAILED"),
 				domain: ErrorDomain.STORAGE,
@@ -5698,13 +5723,7 @@ var MemoryStorageMongoDB = class MemoryStorageMongoDB extends MemoryStorage {
 			}, error);
 			this.logger?.error?.(mastraError.toString());
 			this.logger?.trackException?.(mastraError);
-			return {
-				messages: [],
-				total: 0,
-				page,
-				perPage: perPageForResponse,
-				hasMore: false
-			};
+			throw mastraError;
 		}
 	}
 	async saveMessages({ messages }) {
@@ -5938,7 +5957,8 @@ var MemoryStorageMongoDB = class MemoryStorageMongoDB extends MemoryStorage {
 				hasMore: perPageInput === false ? false : offset + perPage < total
 			};
 		} catch (error) {
-			throw new MastraError({
+			if (error instanceof MastraError && error.category === ErrorCategory.USER) throw error;
+			const mastraError = new MastraError({
 				id: createStorageErrorId("MONGODB", "LIST_THREADS", "FAILED"),
 				domain: ErrorDomain.STORAGE,
 				category: ErrorCategory.THIRD_PARTY,
@@ -5947,6 +5967,9 @@ var MemoryStorageMongoDB = class MemoryStorageMongoDB extends MemoryStorage {
 					hasMetadataFilter: !!filter?.metadata
 				}
 			}, error);
+			this.logger?.error?.(mastraError.toString());
+			this.logger?.trackException?.(mastraError);
+			throw mastraError;
 		}
 	}
 	async saveThread({ thread }) {