@mastra/lance 1.2.2 → 1.3.0-alpha.1

package/dist/index.js

@@ -868,7 +868,7 @@ var StoreMemoryLance = class extends MemoryStorage {
 				hasMore: false
 			};
 			if (perPage === 0 && include && include.length > 0) {
-				const includedMessages = await this._getIncludedMessages(table, include);
+				const includedMessages = await this._getIncludedMessages(table, include, resourceId);
 				const list = new MessageList().add(includedMessages, "memory");
 				return {
 					messages: this._sortMessages(list.get.all.db(), field, direction),
@@ -901,7 +901,7 @@ var StoreMemoryLance = class extends MemoryStorage {
 			const primaryPageCount = messages.length;
 			const messageIds = new Set(messages.map((m) => m.id));
 			if (include && include.length > 0) {
-				const includedMessages = await this._getIncludedMessages(table, include);
+				const includedMessages = await this._getIncludedMessages(table, include, resourceId);
 				for (const includeMsg of includedMessages) if (!messageIds.has(includeMsg.id)) {
 					messages.push(includeMsg);
 					messageIds.add(includeMsg.id);
@@ -920,6 +920,7 @@ var StoreMemoryLance = class extends MemoryStorage {
 				hasMore
 			};
 		} catch (error) {
+			if (error instanceof MastraError && error.category === ErrorCategory.USER) throw error;
 			const mastraError = new MastraError({
 				id: createStorageErrorId("LANCE", "LIST_MESSAGES", "FAILED"),
 				domain: ErrorDomain.STORAGE,
@@ -931,13 +932,7 @@ var StoreMemoryLance = 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) {
@@ -1045,6 +1040,7 @@ var StoreMemoryLance = class extends MemoryStorage {
 				hasMore: offset + perPage < total
 			};
 		} catch (error) {
+			if (error instanceof MastraError && error.category === ErrorCategory.USER) throw error;
 			throw new MastraError({
 				id: createStorageErrorId("LANCE", "LIST_THREADS", "FAILED"),
 				domain: ErrorDomain.STORAGE,
@@ -1063,16 +1059,25 @@ var StoreMemoryLance = class extends MemoryStorage {
 			return direction === "ASC" ? aValue - bValue : bValue - aValue;
 		});
 	}
-	async _getIncludedMessages(table, include) {
+	/**
+	* Fetches the messages named by `include` together with their surrounding context.
+	*
+	* @param table - Open handle to the messages table.
+	* @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(table, include, resourceId) {
 		if (include.length === 0) return [];
+		const resourceCondition = resourceId ? ` AND resourceId = '${this.escapeSql(resourceId)}'` : "";
 		const targetIds = include.map((item) => item.id);
 		const idCondition = targetIds.length === 1 ? `id = '${this.escapeSql(targetIds[0])}'` : `id IN (${targetIds.map((id) => `'${this.escapeSql(id)}'`).join(", ")})`;
-		const targetRecords = await table.query().where(idCondition).toArray();
+		const targetRecords = await table.query().where(`${idCondition}${resourceCondition}`).toArray();
 		if (!include.some((item) => item.withPreviousMessages || item.withNextMessages)) return targetRecords.map((row) => this.normalizeMessage(row));
 		const threadIdsToFetch = [...new Set(targetRecords.map((r) => r.thread_id))];
 		const threadCache = /* @__PURE__ */ new Map();
 		for (const tid of threadIdsToFetch) {
-			const threadRecords = await table.query().where(`thread_id = '${this.escapeSql(tid)}'`).toArray();
+			const threadRecords = await table.query().where(`thread_id = '${this.escapeSql(tid)}'${resourceCondition}`).toArray();
 			threadRecords.sort((a, b) => a.createdAt - b.createdAt);
 			threadCache.set(tid, threadRecords);
 		}