@mastra/mssql 1.7.0-alpha.0 → 1.7.0-alpha.1

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @mastra/mssql
 
+## 1.7.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.7.0-alpha.0
 
 ### Minor Changes

package/dist/docs/SKILL.md

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

package/dist/docs/assets/SOURCE_MAP.json

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

package/dist/index.cjs

@@ -2511,7 +2511,14 @@ var MemoryMSSQL = class MemoryMSSQL extends _mastra_core_storage.MemoryStorage {
 			return diff !== 0 ? diff : a.id.localeCompare(b.id);
 		});
 	}
-	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 paramValues = [];
@@ -2521,6 +2528,7 @@ var MemoryMSSQL = class MemoryMSSQL extends _mastra_core_storage.MemoryStorage {
 			indexName: _mastra_core_storage.TABLE_MESSAGES,
 			schemaName: getSchemaName(this.schema)
 		});
+		const resourceCondition = resourceId ? ` AND [resourceId] = @presource` : "";
 		for (const inc of include) {
 			const { id, withPreviousMessages = 0, withNextMessages = 0 } = inc;
 			const pId = `@p${paramIdx}`;
@@ -2539,7 +2547,7 @@ var MemoryMSSQL = class MemoryMSSQL extends _mastra_core_storage.MemoryStorage {
           FROM (
             SELECT *, ROW_NUMBER() OVER (ORDER BY [createdAt] ASC) as row_num
             FROM ${tableName}
-            WHERE [thread_id] = (SELECT thread_id FROM ${tableName} WHERE id = ${pId})
+            WHERE [thread_id] = (SELECT thread_id FROM ${tableName} WHERE id = ${pId}${resourceCondition})${resourceCondition}
           ) AS m
           WHERE m.id = ${pId}
           OR EXISTS (
@@ -2547,7 +2555,7 @@ var MemoryMSSQL = class MemoryMSSQL extends _mastra_core_storage.MemoryStorage {
             FROM (
               SELECT *, ROW_NUMBER() OVER (ORDER BY [createdAt] ASC) as row_num
               FROM ${tableName}
-              WHERE [thread_id] = (SELECT thread_id FROM ${tableName} WHERE id = ${pId})
+              WHERE [thread_id] = (SELECT thread_id FROM ${tableName} WHERE id = ${pId}${resourceCondition})${resourceCondition}
             ) AS target
             WHERE target.id = ${pId}
             AND (
@@ -2571,6 +2579,7 @@ var MemoryMSSQL = class MemoryMSSQL extends _mastra_core_storage.MemoryStorage {
     `;
 		const req = this.pool.request();
 		for (let i = 0; i < paramValues.length; ++i) req.input(paramNames[i], paramValues[i]);
+		if (resourceId) req.input("presource", resourceId);
 		const includedRows = (await req.query(finalQuery)).recordset || [];
 		const seen = /* @__PURE__ */ new Set();
 		return includedRows.filter((row) => {
@@ -2670,7 +2679,10 @@ var MemoryMSSQL = class MemoryMSSQL extends _mastra_core_storage.MemoryStorage {
 				hasMore: false
 			};
 			if (perPage === 0 && include && include.length > 0) {
-				const includeMessages = await this._getIncludedMessages({ include });
+				const includeMessages = await this._getIncludedMessages({
+					include,
+					resourceId
+				});
 				const messages = this._parseAndFormatMessages(includeMessages ?? [], "v2");
 				return {
 					messages: this._sortMessages(messages, field, direction),
@@ -2707,7 +2719,10 @@ var MemoryMSSQL = class MemoryMSSQL extends _mastra_core_storage.MemoryStorage {
 			};
 			if (include?.length) {
 				const messageIds = new Set(messages.map((m) => m.id));
-				(await this._getIncludedMessages({ include }))?.forEach((msg) => {
+				(await this._getIncludedMessages({
+					include,
+					resourceId
+				}))?.forEach((msg) => {
 					if (!messageIds.has(msg.id)) {
 						messages.push(msg);
 						messageIds.add(msg.id);