@mastra/cloudflare-d1 1.2.0 → 1.3.0-alpha.1

package/dist/index.js

@@ -1205,13 +1205,7 @@ var MemoryStorageD1 = class extends MemoryStorage {
 			}, error);
 			this.logger?.error(mastraError.toString());
 			this.logger?.trackException(mastraError);
-			return {
-				threads: [],
-				total: 0,
-				page,
-				perPage: perPageForResponse,
-				hasMore: false
-			};
+			throw mastraError;
 		}
 	}
 	async saveThread({ thread }) {
@@ -1372,15 +1366,23 @@ var MemoryStorageD1 = class extends MemoryStorage {
 			return direction === "ASC" ? String(aValue).localeCompare(String(bValue)) : String(bValue).localeCompare(String(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 || include.length === 0) return null;
 		const tableName = this.#db.getTableName(TABLE_MESSAGES);
+		const resourceCondition = resourceId ? ` AND resourceId = ?` : "";
 		const targetIds = include.map((inc) => inc.id).filter(Boolean);
 		if (targetIds.length === 0) return null;
 		const idPlaceholders = targetIds.map(() => "?").join(", ");
 		const targetResult = await this.#db.executeQuery({
-			sql: `SELECT id, thread_id, createdAt FROM ${tableName} WHERE id IN (${idPlaceholders})`,
-			params: targetIds
+			sql: `SELECT id, thread_id, createdAt FROM ${tableName} WHERE id IN (${idPlaceholders})${resourceCondition}`,
+			params: resourceId ? [...targetIds, resourceId] : targetIds
 		});
 		if (!Array.isArray(targetResult) || targetResult.length === 0) return null;
 		const targetMap = new Map(targetResult.map((r) => [r.id, {
@@ -1412,21 +1414,25 @@ var MemoryStorageD1 = class extends MemoryStorage {
         SELECT id, content, role, type, createdAt, thread_id AS threadId, resourceId
         FROM ${tableName}
         WHERE thread_id = ?
-          AND createdAt <= ?
+          AND createdAt <= ?${resourceCondition}
         ORDER BY createdAt DESC, id DESC
         LIMIT ?
       )`);
-			unionParams.push(target.threadId, target.createdAt, withPreviousMessages + 1);
+			unionParams.push(target.threadId, target.createdAt);
+			if (resourceId) unionParams.push(resourceId);
+			unionParams.push(withPreviousMessages + 1);
 			if (withNextMessages > 0) {
 				unionQueries.push(`SELECT * FROM (
           SELECT id, content, role, type, createdAt, thread_id AS threadId, resourceId
           FROM ${tableName}
           WHERE thread_id = ?
-            AND createdAt > ?
+            AND createdAt > ?${resourceCondition}
           ORDER BY createdAt ASC, id ASC
           LIMIT ?
         )`);
-				unionParams.push(target.threadId, target.createdAt, withNextMessages);
+				unionParams.push(target.threadId, target.createdAt);
+				if (resourceId) unionParams.push(resourceId);
+				unionParams.push(withNextMessages);
 			}
 		}
 		await flushBatch();
@@ -1545,7 +1551,7 @@ var MemoryStorageD1 = class extends MemoryStorage {
 				hasMore: false
 			};
 			if (perPage === 0 && include && include.length > 0) {
-				const includeResult = await this._getIncludedMessages(include);
+				const includeResult = await this._getIncludedMessages(include, resourceId);
 				if (!Array.isArray(includeResult) || includeResult.length === 0) return {
 					messages: [],
 					total: 0,
@@ -1616,7 +1622,7 @@ var MemoryStorageD1 = class extends MemoryStorage {
 			const messageIds = new Set(paginatedMessages.map((m) => m.id));
 			let includeMessages = [];
 			if (include && include.length > 0) {
-				const includeResult = await this._getIncludedMessages(include);
+				const includeResult = await this._getIncludedMessages(include, resourceId);
 				if (Array.isArray(includeResult)) {
 					includeMessages = includeResult;
 					for (const includeMsg of includeMessages) if (!messageIds.has(includeMsg.id)) {
@@ -1637,6 +1643,7 @@ var MemoryStorageD1 = class extends MemoryStorage {
 				hasMore: metadataFilter ? perPageInput !== false && offset + paginatedCount < total : perPageInput !== false && !allThreadMessagesReturned && offset + perPage < total
 			};
 		} catch (error) {
+			if (error instanceof MastraError && error.category === ErrorCategory.USER) throw error;
 			const mastraError = new MastraError({
 				id: createStorageErrorId("CLOUDFLARE_D1", "LIST_MESSAGES", "FAILED"),
 				domain: ErrorDomain.STORAGE,
@@ -1649,13 +1656,7 @@ var MemoryStorageD1 = 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 updateMessages(args) {