@mastra/mongodb 1.17.0-alpha.0 → 1.17.0-alpha.2

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.17.0-alpha.0";
+var version = "1.17.0-alpha.2";
 //#endregion
 //#region src/vector/filter.ts
 /**
@@ -5404,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
@@ -5426,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
@@ -5435,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
@@ -5510,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),
@@ -5546,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);
@@ -5627,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,
@@ -5670,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);
@@ -5978,7 +6003,7 @@ var MemoryStorageMongoDB = class MemoryStorageMongoDB extends MemoryStorage {
 		const now = /* @__PURE__ */ new Date();
 		const updatedThread = {
 			...thread,
-			title,
+			title: title ?? thread.title,
 			metadata: {
 				...thread.metadata,
 				...metadata
@@ -5987,7 +6012,7 @@ var MemoryStorageMongoDB = class MemoryStorageMongoDB extends MemoryStorage {
 		};
 		try {
 			await (await this.getCollection(TABLE_THREADS)).updateOne({ id }, { $set: {
-				title,
+				title: updatedThread.title,
 				metadata: updatedThread.metadata,
 				updatedAt: now
 			} });