@mastra/convex 1.5.2 → 1.5.3-alpha.0

package/dist/index.js

@@ -1088,7 +1088,7 @@ var MemoryConvex = class extends MemoryStorage {
 			hasMore: false
 		};
 		if (perPage === 0 && include && include.length > 0) {
-			const messages = await this._getIncludedMessages(include);
+			const messages = await this._getIncludedMessages(include, void 0, resourceId);
 			const list = new MessageList().add(messages, "memory");
 			return {
 				messages: this._sortMessages(list.get.all.db(), field, direction),
@@ -1121,7 +1121,7 @@ var MemoryConvex = class extends MemoryStorage {
 		if (include && include.length > 0) {
 			const preloadedThreads = /* @__PURE__ */ new Map();
 			if (!resourceId && !filter?.dateRange && !metadataFilter) for (const tid of threadIds) preloadedThreads.set(tid, rows.filter((r) => r.thread_id === tid));
-			const includedMessages = await this._getIncludedMessages(include, preloadedThreads);
+			const includedMessages = await this._getIncludedMessages(include, preloadedThreads, resourceId);
 			for (const msg of includedMessages) if (!messageIds.has(msg.id)) {
 				messages.push(msg);
 				messageIds.add(msg.id);
@@ -1303,8 +1303,20 @@ var MemoryConvex = class extends MemoryStorage {
 			return direction === "ASC" ? String(aValue).localeCompare(String(bValue)) : String(bValue).localeCompare(String(aValue));
 		});
 	}
-	async _getIncludedMessages(include, preloadedThreads) {
+	/**
+	* 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 preloadedThreads - Thread snapshots already loaded by the caller, reused instead of re-querying.
+	* @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, preloadedThreads, resourceId) {
 		if (include.length === 0) return [];
+		const resourceFilters = resourceId ? [{
+			field: "resourceId",
+			value: resourceId
+		}] : [];
 		const messages = [];
 		const messageIds = /* @__PURE__ */ new Set();
 		const threadMessagesCache = new Map(preloadedThreads ?? []);
@@ -1325,7 +1337,7 @@ var MemoryConvex = class extends MemoryStorage {
 				const messageRows = await this.#db.queryTable(TABLE_MESSAGES$1, [{
 					field: "id",
 					value: includeItem.id
-				}]);
+				}, ...resourceFilters]);
 				if (messageRows.length > 0) {
 					target = messageRows[0];
 					targetThreadId = target.thread_id;
@@ -1333,7 +1345,7 @@ var MemoryConvex = class extends MemoryStorage {
 						const otherThreadRows = await this.#db.queryTable(TABLE_MESSAGES$1, [{
 							field: "thread_id",
 							value: targetThreadId
-						}]);
+						}, ...resourceFilters]);
 						threadMessagesCache.set(targetThreadId, otherThreadRows);
 						for (const row of otherThreadRows) cachedTargets.set(row.id, {
 							threadId: targetThreadId,