@mastra/convex 1.5.2 → 1.5.3-alpha.0

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @mastra/convex
 
+## 1.5.3-alpha.0
+
+### Patch Changes
+
+- Fixed resource-scoped message includes across storage adapters so included context cannot cross resource boundaries. ([#20984](https://github.com/mastra-ai/mastra/pull/20984))
+
+- Updated dependencies [[`6445eba`](https://github.com/mastra-ai/mastra/commit/6445eba6020abac681aba1cc9289f446cb400cbe), [`df31eb0`](https://github.com/mastra-ai/mastra/commit/df31eb0c7087d782a0d9346e467f9a4af4b0eef6), [`fcd0667`](https://github.com/mastra-ai/mastra/commit/fcd0667a4e378be35c9a1b1eb19cce78fbfd7282), [`bab06b1`](https://github.com/mastra-ai/mastra/commit/bab06b18923873a584bdfc71a6b4ec7fb4727fb7)]:
+  - @mastra/core@1.58.0-alpha.5
+
 ## 1.5.2
 
 ### Patch Changes

package/dist/docs/SKILL.md

@@ -3,7 +3,7 @@ name: mastra-convex
 description: Documentation for @mastra/convex. Use when working with @mastra/convex APIs, configuration, or implementation.
 metadata:
   package: "@mastra/convex"
-  version: "1.5.2"
+  version: "1.5.3-alpha.0"
 ---
 
 ## When to use

package/dist/docs/assets/SOURCE_MAP.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.5.2",
+  "version": "1.5.3-alpha.0",
   "package": "@mastra/convex",
   "exports": {},
   "modules": {}

package/dist/index.cjs

@@ -1090,7 +1090,7 @@ var MemoryConvex = class extends _mastra_core_storage.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 _mastra_core_agent.MessageList().add(messages, "memory");
 			return {
 				messages: this._sortMessages(list.get.all.db(), field, direction),
@@ -1123,7 +1123,7 @@ var MemoryConvex = class extends _mastra_core_storage.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);
@@ -1305,8 +1305,20 @@ var MemoryConvex = class extends _mastra_core_storage.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 ?? []);
@@ -1327,7 +1339,7 @@ var MemoryConvex = class extends _mastra_core_storage.MemoryStorage {
 				const messageRows = await this.#db.queryTable(_mastra_core_storage.TABLE_MESSAGES, [{
 					field: "id",
 					value: includeItem.id
-				}]);
+				}, ...resourceFilters]);
 				if (messageRows.length > 0) {
 					target = messageRows[0];
 					targetThreadId = target.thread_id;
@@ -1335,7 +1347,7 @@ var MemoryConvex = class extends _mastra_core_storage.MemoryStorage {
 						const otherThreadRows = await this.#db.queryTable(_mastra_core_storage.TABLE_MESSAGES, [{
 							field: "thread_id",
 							value: targetThreadId
-						}]);
+						}, ...resourceFilters]);
 						threadMessagesCache.set(targetThreadId, otherThreadRows);
 						for (const row of otherThreadRows) cachedTargets.set(row.id, {
 							threadId: targetThreadId,