@mastra/upstash 1.3.1 → 1.4.0-alpha.1

package/dist/index.js

@@ -436,6 +436,7 @@ var StoreMemoryUpstash = class extends MemoryStorage {
 				hasMore: perPageInput === false ? false : end < total
 			};
 		} catch (error) {
+			if (error instanceof MastraError && error.category === ErrorCategory.USER) throw error;
 			const mastraError = new MastraError({
 				id: createStorageErrorId("UPSTASH", "LIST_THREADS", "FAILED"),
 				domain: ErrorDomain.STORAGE,
@@ -449,13 +450,7 @@ var StoreMemoryUpstash = class extends 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 }) {
@@ -662,16 +657,38 @@ var StoreMemoryUpstash = class extends 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) {
@@ -692,7 +709,8 @@ var StoreMemoryUpstash = class extends 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 = {
@@ -786,7 +804,7 @@ var StoreMemoryUpstash = class extends 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 MessageList().add(includedMessages, "memory");
 				return {
@@ -847,6 +865,7 @@ var StoreMemoryUpstash = class extends MemoryStorage {
 				hasMore
 			};
 		} catch (error) {
+			if (error instanceof MastraError && error.category === ErrorCategory.USER) throw error;
 			const mastraError = new MastraError({
 				id: createStorageErrorId("UPSTASH", "LIST_MESSAGES", "FAILED"),
 				domain: ErrorDomain.STORAGE,
@@ -858,13 +877,7 @@ var StoreMemoryUpstash = class extends 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 }) {