@mastra/spanner 1.6.0-alpha.0 → 1.6.0-alpha.2

package/dist/index.js

@@ -6602,7 +6602,7 @@ var MemorySpanner = class MemorySpanner extends MemoryStorage {
 						text: `Thread ${id} not found`,
 						details: {
 							threadId: id,
-							title
+							title: title ?? null
 						}
 					});
 					existingThread = this.formatThreadRow(row);
@@ -6614,7 +6614,7 @@ var MemorySpanner = class MemorySpanner extends MemoryStorage {
 						tableName: TABLE_THREADS,
 						keys: { id },
 						data: {
-							title,
+							title: title ?? existingThread.title,
 							metadata: merged,
 							updatedAt: now
 						},
@@ -6642,7 +6642,7 @@ var MemorySpanner = class MemorySpanner extends MemoryStorage {
 				category: ErrorCategory.THIRD_PARTY,
 				details: {
 					threadId: id,
-					title
+					title: title ?? null
 				}
 			}, error);
 		}
@@ -6737,12 +6737,20 @@ var MemorySpanner = class MemorySpanner extends MemoryStorage {
 			throw mastraError;
 		}
 	}
-	/** Resolves the `include` clause: pinned messages plus their before/after windows. */
-	async getIncludedMessages({ include }) {
+	/**
+	* Resolves the `include` clause: pinned messages plus their before/after windows.
+	*
+	* @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 resourceCondition = resourceId ? ` AND ${quoteIdent("resourceId", "column name")} = @scopedResourceId` : "";
+		const resourceParams = resourceId ? { scopedResourceId: resourceId } : {};
 		const ids = include.map((i) => i.id);
 		const placeholders = [];
-		const idParams = {};
+		const idParams = { ...resourceParams };
 		ids.forEach((id, i) => {
 			const name = `tid${i}`;
 			placeholders.push(`@${name}`);
@@ -6750,7 +6758,7 @@ var MemorySpanner = class MemorySpanner extends MemoryStorage {
 		});
 		const targetsSql = `SELECT id, content, role, type, ${quoteIdent("createdAt", "column name")}, ${quoteIdent("thread_id", "column name")} AS threadId, ${quoteIdent("resourceId", "column name")}
                         FROM ${quoteIdent(TABLE_MESSAGES, "table name")}
-                        WHERE id IN (${placeholders.join(", ")})`;
+                        WHERE id IN (${placeholders.join(", ")})${resourceCondition}`;
 		const [targetRows] = await this.database.run({
 			sql: targetsSql,
 			params: idParams,
@@ -6775,14 +6783,15 @@ var MemorySpanner = class MemorySpanner extends MemoryStorage {
 					sql: `SELECT id, content, role, type, ${quoteIdent("createdAt", "column name")}, ${quoteIdent("thread_id", "column name")} AS threadId, ${quoteIdent("resourceId", "column name")}
                 FROM ${quoteIdent(TABLE_MESSAGES, "table name")}
                 WHERE ${quoteIdent("thread_id", "column name")} = @threadId
-                  AND (${quoteIdent("createdAt", "column name")} < @ts OR (${quoteIdent("createdAt", "column name")} = @ts AND id < @id))
+                  AND (${quoteIdent("createdAt", "column name")} < @ts OR (${quoteIdent("createdAt", "column name")} = @ts AND id < @id))${resourceCondition}
                 ORDER BY ${quoteIdent("createdAt", "column name")} DESC, id DESC
                 LIMIT @lim`,
 					params: {
 						threadId,
 						ts: targetCreatedAt,
 						id: target.id,
-						lim: withPreviousMessages
+						lim: withPreviousMessages,
+						...resourceParams
 					},
 					json: true
 				});
@@ -6796,14 +6805,15 @@ var MemorySpanner = class MemorySpanner extends MemoryStorage {
 					sql: `SELECT id, content, role, type, ${quoteIdent("createdAt", "column name")}, ${quoteIdent("thread_id", "column name")} AS threadId, ${quoteIdent("resourceId", "column name")}
                 FROM ${quoteIdent(TABLE_MESSAGES, "table name")}
                 WHERE ${quoteIdent("thread_id", "column name")} = @threadId
-                  AND (${quoteIdent("createdAt", "column name")} > @ts OR (${quoteIdent("createdAt", "column name")} = @ts AND id > @id))
+                  AND (${quoteIdent("createdAt", "column name")} > @ts OR (${quoteIdent("createdAt", "column name")} = @ts AND id > @id))${resourceCondition}
                 ORDER BY ${quoteIdent("createdAt", "column name")} ASC, id ASC
                 LIMIT @lim`,
 					params: {
 						threadId,
 						ts: targetCreatedAt,
 						id: target.id,
-						lim: withNextMessages
+						lim: withNextMessages,
+						...resourceParams
 					},
 					json: true
 				});
@@ -6856,7 +6866,10 @@ var MemorySpanner = class MemorySpanner 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 parsedIncludes = this.parseAndFormatMessages(includeMessages, "v2");
 				const dirMul = direction === "ASC" ? 1 : -1;
 				return {
@@ -6914,7 +6927,10 @@ var MemorySpanner = class MemorySpanner extends MemoryStorage {
 			};
 			if (include?.length) {
 				const seen = new Set(messages.map((m) => m.id));
-				(await this.getIncludedMessages({ include }))?.forEach((msg) => {
+				(await this.getIncludedMessages({
+					include,
+					resourceId
+				}))?.forEach((msg) => {
 					if (!seen.has(msg.id)) {
 						messages.push(msg);
 						seen.add(msg.id);