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

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @mastra/spanner
 
+## 1.6.0-alpha.1
+
+### Patch Changes
+
+- Fixed resource-scoped message includes across storage adapters so included context cannot cross resource boundaries. ([#20984](https://github.com/mastra-ai/mastra/pull/20984))
+
+- Updated dependencies [[`6445eba`](https://github.com/mastra-ai/mastra/commit/6445eba6020abac681aba1cc9289f446cb400cbe), [`df31eb0`](https://github.com/mastra-ai/mastra/commit/df31eb0c7087d782a0d9346e467f9a4af4b0eef6), [`fcd0667`](https://github.com/mastra-ai/mastra/commit/fcd0667a4e378be35c9a1b1eb19cce78fbfd7282), [`bab06b1`](https://github.com/mastra-ai/mastra/commit/bab06b18923873a584bdfc71a6b4ec7fb4727fb7)]:
+  - @mastra/core@1.58.0-alpha.5
+
 ## 1.6.0-alpha.0
 
 ### Minor Changes

package/dist/docs/SKILL.md

@@ -3,7 +3,7 @@ name: mastra-spanner
 description: Documentation for @mastra/spanner. Use when working with @mastra/spanner APIs, configuration, or implementation.
 metadata:
   package: "@mastra/spanner"
-  version: "1.6.0-alpha.0"
+  version: "1.6.0-alpha.1"
 ---
 
 ## When to use

package/dist/docs/assets/SOURCE_MAP.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.6.0-alpha.0",
+  "version": "1.6.0-alpha.1",
   "package": "@mastra/spanner",
   "exports": {},
   "modules": {}

package/dist/index.cjs

@@ -6738,12 +6738,20 @@ var MemorySpanner = class MemorySpanner extends _mastra_core_storage.MemoryStora
 			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}`);
@@ -6751,7 +6759,7 @@ var MemorySpanner = class MemorySpanner extends _mastra_core_storage.MemoryStora
 		});
 		const targetsSql = `SELECT id, content, role, type, ${quoteIdent("createdAt", "column name")}, ${quoteIdent("thread_id", "column name")} AS threadId, ${quoteIdent("resourceId", "column name")}
                         FROM ${quoteIdent(_mastra_core_storage.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,
@@ -6776,14 +6784,15 @@ var MemorySpanner = class MemorySpanner extends _mastra_core_storage.MemoryStora
 					sql: `SELECT id, content, role, type, ${quoteIdent("createdAt", "column name")}, ${quoteIdent("thread_id", "column name")} AS threadId, ${quoteIdent("resourceId", "column name")}
                 FROM ${quoteIdent(_mastra_core_storage.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
 				});
@@ -6797,14 +6806,15 @@ var MemorySpanner = class MemorySpanner extends _mastra_core_storage.MemoryStora
 					sql: `SELECT id, content, role, type, ${quoteIdent("createdAt", "column name")}, ${quoteIdent("thread_id", "column name")} AS threadId, ${quoteIdent("resourceId", "column name")}
                 FROM ${quoteIdent(_mastra_core_storage.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
 				});
@@ -6857,7 +6867,10 @@ var MemorySpanner = class MemorySpanner extends _mastra_core_storage.MemoryStora
 				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 {
@@ -6915,7 +6928,10 @@ var MemorySpanner = class MemorySpanner extends _mastra_core_storage.MemoryStora
 			};
 			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);