@mastra/dynamodb 1.2.2 → 1.3.0-alpha.1

package/dist/index.js

@@ -1745,7 +1745,10 @@ var MemoryStorageDynamoDB = class extends MemoryStorage {
 				hasMore: false
 			};
 			if (perPage === 0 && include && include.length > 0) {
-				const includeMessages = await this._getIncludedMessages({ include });
+				const includeMessages = await this._getIncludedMessages({
+					include,
+					resourceId
+				});
 				const list = new MessageList().add(includeMessages, "memory");
 				return {
 					messages: this._sortMessages(list.get.all.db(), field, direction),
@@ -1834,7 +1837,10 @@ var MemoryStorageDynamoDB = class extends MemoryStorage {
 			const messageIds = new Set(paginatedMessages.map((m) => m.id));
 			let includeMessages = [];
 			if (include && include.length > 0) {
-				includeMessages = await this._getIncludedMessages({ include });
+				includeMessages = await this._getIncludedMessages({
+					include,
+					resourceId
+				});
 				for (const includeMsg of includeMessages) if (!messageIds.has(includeMsg.id)) {
 					paginatedMessages.push(includeMsg);
 					messageIds.add(includeMsg.id);
@@ -1852,6 +1858,7 @@ var MemoryStorageDynamoDB = class extends MemoryStorage {
 				hasMore
 			};
 		} catch (error) {
+			if (error instanceof MastraError && error.category === ErrorCategory.USER) throw error;
 			const mastraError = new MastraError({
 				id: createStorageErrorId("DYNAMODB", "LIST_MESSAGES", "FAILED"),
 				domain: ErrorDomain.STORAGE,
@@ -1863,13 +1870,7 @@ var MemoryStorageDynamoDB = 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 saveMessages(args) {
@@ -1989,7 +1990,8 @@ var MemoryStorageDynamoDB = class extends MemoryStorage {
 				hasMore: offset + perPage < total
 			};
 		} catch (error) {
-			throw new MastraError({
+			if (error instanceof MastraError && error.category === ErrorCategory.USER) throw error;
+			const mastraError = new MastraError({
 				id: createStorageErrorId("DYNAMODB", "LIST_THREADS", "FAILED"),
 				domain: ErrorDomain.STORAGE,
 				category: ErrorCategory.THIRD_PARTY,
@@ -2000,6 +2002,9 @@ var MemoryStorageDynamoDB = class extends MemoryStorage {
 					perPage: perPageForResponse
 				}
 			}, error);
+			this.logger?.error?.(mastraError.toString());
+			this.logger?.trackException?.(mastraError);
+			throw mastraError;
 		}
 	}
 	_sortMessages(messages, field, direction) {
@@ -2010,7 +2015,14 @@ var MemoryStorageDynamoDB = 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, restricts both the pinned messages and their context
+	* to that resource so an id from another resource returns nothing.
+	*/
+	async _getIncludedMessages({ include, resourceId }) {
 		if (!include?.length) return [];
 		const targetResults = await Promise.all(include.map((inc) => this.service.entities.message.get({
 			entity: "message",
@@ -2023,7 +2035,7 @@ var MemoryStorageDynamoDB = class extends MemoryStorage {
 			data: null
 		}))));
 		const targetMap = /* @__PURE__ */ new Map();
-		for (const { id, data } of targetResults) if (data) {
+		for (const { id, data } of targetResults) if (data && (!resourceId || data.resourceId === resourceId)) {
 			const createdAt = typeof data.createdAt === "string" ? data.createdAt : new Date(data.createdAt).toISOString();
 			targetMap.set(id, {
 				threadId: data.threadId,
@@ -2031,7 +2043,7 @@ var MemoryStorageDynamoDB = class extends MemoryStorage {
 			});
 		}
 		if (targetMap.size === 0) return [];
-		const parseQueryMessages = (data) => data.map((item) => this.parseMessageData(item)).filter((msg) => "content" in msg && typeof msg.content === "object");
+		const parseQueryMessages = (data) => data.map((item) => this.parseMessageData(item)).filter((msg) => "content" in msg && typeof msg.content === "object").filter((msg) => !resourceId || msg.resourceId === resourceId);
 		const includeMessages = [];
 		for (const includeItem of include) {
 			const { id, withPreviousMessages = 0, withNextMessages = 0 } = includeItem;