@mastra/upstash 1.3.1 → 1.4.0-alpha.1

package/CHANGELOG.md

@@ -1,5 +1,43 @@
 # @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
+
+- Memory list reads now surface database errors instead of silently returning empty results. ([#17910](https://github.com/mastra-ai/mastra/pull/17910))
+
+  Previously, the paginated memory reads (`listThreads`, `listMessages`, `listMessagesByResourceId`, and `listMessagesById`) caught backend failures, logged them, and returned an empty payload like `{ threads: [], total: 0, hasMore: false }`. A transient outage (locked table, dropped connection) was therefore indistinguishable from a genuinely empty result, so an agent reading conversation history during a brief failure would treat it as "no history" and could overwrite real state. These methods now re-throw the failure as a `MastraError`. Validation (USER) errors and genuinely empty results are unchanged.
+
+  **Behavior change**
+
+  Callers that previously received an empty result on a backend failure will now receive a thrown `MastraError`. If you call these read methods directly (rather than through an agent, which already surfaces errors), wrap them so a transient outage doesn't crash the caller:
+
+  ```ts
+  try {
+    const { threads } = await storage.listThreads({ resourceId });
+    // ...use threads
+  } catch (error) {
+    // a real backend failure. Decide whether to retry, surface, or degrade.
+    // An empty thread list no longer hides here; it only means "no threads".
+  }
+  ```
+
+### Patch Changes
+
+- Updated dependencies [[`e7109ee`](https://github.com/mastra-ai/mastra/commit/e7109ee6f731bacc79c885906f3c7dca8d8f013a), [`772c0c8`](https://github.com/mastra-ai/mastra/commit/772c0c897cec383258de2e6178147f8014767c7b), [`578bf2e`](https://github.com/mastra-ai/mastra/commit/578bf2e6a88e9d5b8bf502204e15a95dfbb679ae), [`06b2d87`](https://github.com/mastra-ai/mastra/commit/06b2d87e63bcdd0ed59215c6789692b9b12de376), [`ac01d63`](https://github.com/mastra-ai/mastra/commit/ac01d6355974aec73fdb8781449ed12bac582094), [`8627c23`](https://github.com/mastra-ai/mastra/commit/8627c23d794485fb97d533fc2a7a8323bfec2225), [`a810a05`](https://github.com/mastra-ai/mastra/commit/a810a058f62ad407cfc1701e0be36ae91145d7cf), [`f8da216`](https://github.com/mastra-ai/mastra/commit/f8da21633e7eb0e31c9ce0fc30567870d19416d3), [`6104347`](https://github.com/mastra-ai/mastra/commit/61043473ba6bfd0a25156824e853e13165562e6c), [`45bfb88`](https://github.com/mastra-ai/mastra/commit/45bfb88fd52f1dd3be20e2a38905777c96499c90), [`e3b9307`](https://github.com/mastra-ai/mastra/commit/e3b9307098daefbfae2a52ae2ef51bc9fc701190), [`d6834c5`](https://github.com/mastra-ai/mastra/commit/d6834c5a7866b16734d23900163c2414ed70d791), [`c52d346`](https://github.com/mastra-ai/mastra/commit/c52d3462ec831a5d95926ecd3d3373f5928ad2e5), [`0023e79`](https://github.com/mastra-ai/mastra/commit/0023e7919431078280abd11c89d1edeae35fcc69), [`c2ad51e`](https://github.com/mastra-ai/mastra/commit/c2ad51e2467f901eecba8c9f4a45e22a50bd7c18), [`3dc97ea`](https://github.com/mastra-ai/mastra/commit/3dc97ea415fad353b48a13095fad1835933cc12a), [`3d01cd3`](https://github.com/mastra-ai/mastra/commit/3d01cd387321b6f9c5cac31d487c84bf51b19c78), [`7bf3086`](https://github.com/mastra-ai/mastra/commit/7bf308663f0115ca74ad20554ade740f06640859), [`a8dd139`](https://github.com/mastra-ai/mastra/commit/a8dd1391a9fe9a6632c25809ef236980afa9a020), [`e5786be`](https://github.com/mastra-ai/mastra/commit/e5786be02bb903073082bd9d6da880ebaacc343f), [`2093fbd`](https://github.com/mastra-ai/mastra/commit/2093fbd53bb744bae19ec89f6d73db9a66fbe8a7), [`e7a5da4`](https://github.com/mastra-ai/mastra/commit/e7a5da4ef8e4dd452d2f232961b4e682a85ffe43), [`7b4393d`](https://github.com/mastra-ai/mastra/commit/7b4393d557411fdcf07b0e30e5acaf7cc85154ae)]:
+  - @mastra/core@1.58.0-alpha.1
+  - @mastra/redis@1.4.0-alpha.0
+
 ## 1.3.1
 
 ### Patch 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.3.1"
+  version: "1.4.0-alpha.1"
 ---
 
 ## When to use

package/dist/docs/assets/SOURCE_MAP.json

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

package/dist/index.cjs

@@ -437,6 +437,7 @@ var StoreMemoryUpstash = class extends _mastra_core_storage.MemoryStorage {
 				hasMore: perPageInput === false ? false : end < total
 			};
 		} catch (error) {
+			if (error instanceof _mastra_core_error.MastraError && error.category === _mastra_core_error.ErrorCategory.USER) throw error;
 			const mastraError = new _mastra_core_error.MastraError({
 				id: (0, _mastra_core_storage.createStorageErrorId)("UPSTASH", "LIST_THREADS", "FAILED"),
 				domain: _mastra_core_error.ErrorDomain.STORAGE,
@@ -450,13 +451,7 @@ var StoreMemoryUpstash = class extends _mastra_core_storage.MemoryStorage {
 			}, error);
 			this.logger?.trackException(mastraError);
 			this.logger.error(mastraError.toString());
-			return {
-				threads: [],
-				total: 0,
-				page,
-				perPage: perPageForResponse,
-				hasMore: false
-			};
+			throw mastraError;
 		}
 	}
 	async saveThread({ thread }) {
@@ -663,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) {
@@ -693,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 = {
@@ -787,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 {
@@ -848,6 +866,7 @@ var StoreMemoryUpstash = class extends _mastra_core_storage.MemoryStorage {
 				hasMore
 			};
 		} catch (error) {
+			if (error instanceof _mastra_core_error.MastraError && error.category === _mastra_core_error.ErrorCategory.USER) throw error;
 			const mastraError = new _mastra_core_error.MastraError({
 				id: (0, _mastra_core_storage.createStorageErrorId)("UPSTASH", "LIST_MESSAGES", "FAILED"),
 				domain: _mastra_core_error.ErrorDomain.STORAGE,
@@ -859,13 +878,7 @@ var StoreMemoryUpstash = class extends _mastra_core_storage.MemoryStorage {
 			}, error);
 			this.logger.error(mastraError.toString());
 			this.logger?.trackException(mastraError);
-			return {
-				messages: [],
-				total: 0,
-				page,
-				perPage: perPageForResponse,
-				hasMore: false
-			};
+			throw mastraError;
 		}
 	}
 	async getResourceById({ resourceId }) {