@mastra/dsql 1.3.0-alpha.0 → 1.3.0-alpha.1

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @mastra/dsql
 
+## 1.3.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.3.0-alpha.0
 
 ### Minor Changes

package/dist/index.cjs

@@ -2173,7 +2173,14 @@ var MemoryDSQL = class MemoryDSQL extends _mastra_core_storage.MemoryStorage {
 			}, error);
 		});
 	}
-	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 unionQueries = [];
 		const params = [];
@@ -2184,17 +2191,18 @@ var MemoryDSQL = class MemoryDSQL extends _mastra_core_storage.MemoryStorage {
 		});
 		for (const inc of include) {
 			const { id, withPreviousMessages = 0, withNextMessages = 0 } = inc;
+			const resourceCondition = resourceId ? ` AND "resourceId" = $${paramIdx + 3}` : "";
 			unionQueries.push(`
             SELECT * FROM (
               WITH target_thread AS (
-                SELECT thread_id FROM ${tableName} WHERE id = $${paramIdx}
+                SELECT thread_id FROM ${tableName} WHERE id = $${paramIdx}${resourceCondition}
               ),
               ordered_messages AS (
                 SELECT
                   *,
                   ROW_NUMBER() OVER (ORDER BY "createdAt" ASC) as row_num
                 FROM ${tableName}
-                WHERE thread_id = (SELECT thread_id FROM target_thread)
+                WHERE thread_id = (SELECT thread_id FROM target_thread)${resourceCondition}
               )
               SELECT
                 m.id,
@@ -2220,6 +2228,10 @@ var MemoryDSQL = class MemoryDSQL extends _mastra_core_storage.MemoryStorage {
             `);
 			params.push(id, withPreviousMessages, withNextMessages);
 			paramIdx += 3;
+			if (resourceId) {
+				params.push(resourceId);
+				paramIdx += 1;
+			}
 		}
 		const finalQuery = unionQueries.join(" UNION ALL ") + " ORDER BY \"createdAt\" ASC";
 		const includedRows = await this.#db.client.manyOrNone(finalQuery, params);
@@ -2345,7 +2357,10 @@ var MemoryDSQL = class MemoryDSQL extends _mastra_core_storage.MemoryStorage {
 			};
 			const messageIds = new Set(messages.map((m) => m.id));
 			if (include && include.length > 0) {
-				const includeMessages = await this._getIncludedMessages({ include });
+				const includeMessages = await this._getIncludedMessages({
+					include,
+					resourceId
+				});
 				if (includeMessages) {
 					for (const includeMsg of includeMessages) if (!messageIds.has(includeMsg.id)) {
 						messages.push(includeMsg);