@mastra/upstash 1.4.0-alpha.0 → 1.4.0-alpha.1

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @mastra/upstash
 
+## 1.4.0-alpha.1
+
+### 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), [`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
+  - @mastra/redis@1.4.0-alpha.1
+
 ## 1.4.0-alpha.0
 
 ### Minor Changes

package/dist/docs/SKILL.md

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

package/dist/docs/assets/SOURCE_MAP.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.4.0-alpha.0",
+  "version": "1.4.0-alpha.1",
   "package": "@mastra/upstash",
   "exports": {},
   "modules": {}

package/dist/index.cjs

@@ -658,16 +658,38 @@ var StoreMemoryUpstash = class extends _mastra_core_storage.MemoryStorage {
 			return direction === "ASC" ? aValue - bValue : bValue - 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, drops any pinned or context message owned by another
+	* resource so an id from another resource returns nothing.
+	*/
+	async _getIncludedMessages(include, resourceId) {
 		if (!include?.length) return [];
 		const messageIds = /* @__PURE__ */ new Set();
 		const messageIdToThreadIds = {};
 		for (const item of include) {
 			const itemThreadId = await this._getThreadIdForMessage(item.id);
 			if (!itemThreadId) continue;
+			const itemThreadMessagesKey = getThreadMessagesKey(itemThreadId);
+			if (resourceId !== void 0) {
+				const threadMessageIds = await this.client.zrange(itemThreadMessagesKey, 0, -1);
+				const threadPipeline = this.client.pipeline();
+				threadMessageIds.forEach((id) => threadPipeline.get(getMessageKey(itemThreadId, id)));
+				const threadMessages = (await threadPipeline.exec()).filter((message) => message !== null).filter((message) => message.resourceId === resourceId);
+				const targetIndex = threadMessages.findIndex((message) => message.id === item.id);
+				if (targetIndex === -1) continue;
+				const start = Math.max(0, targetIndex - (item.withPreviousMessages ?? 0));
+				const end = Math.min(threadMessages.length, targetIndex + (item.withNextMessages ?? 0) + 1);
+				for (const message of threadMessages.slice(start, end)) {
+					messageIds.add(message.id);
+					messageIdToThreadIds[message.id] = itemThreadId;
+				}
+				continue;
+			}
 			messageIds.add(item.id);
 			messageIdToThreadIds[item.id] = itemThreadId;
-			const itemThreadMessagesKey = getThreadMessagesKey(itemThreadId);
 			const rank = await this.client.zrank(itemThreadMessagesKey, item.id);
 			if (rank === null) continue;
 			if (item.withPreviousMessages) {
@@ -688,7 +710,8 @@ var StoreMemoryUpstash = class extends _mastra_core_storage.MemoryStorage {
 			const tId = messageIdToThreadIds[id];
 			pipeline.get(getMessageKey(tId, id));
 		});
-		return (await pipeline.exec()).filter((result) => result !== null);
+		const includedMessages = (await pipeline.exec()).filter((result) => result !== null);
+		return resourceId ? includedMessages.filter((message) => message.resourceId === resourceId) : includedMessages;
 	}
 	parseStoredMessage(storedMessage) {
 		const defaultMessageContent = {
@@ -782,7 +805,7 @@ var StoreMemoryUpstash = class extends _mastra_core_storage.MemoryStorage {
 				hasMore: false
 			};
 			let includedMessages = [];
-			if (include && include.length > 0) includedMessages = (await this._getIncludedMessages(include)).map(this.parseStoredMessage);
+			if (include && include.length > 0) includedMessages = (await this._getIncludedMessages(include, resourceId)).map(this.parseStoredMessage);
 			if (perPage === 0 && include && include.length > 0) {
 				const list = new _mastra_core_agent.MessageList().add(includedMessages, "memory");
 				return {