@mastra/mssql 1.6.0 → 1.7.0-alpha.1

package/dist/index.js

@@ -2340,13 +2340,7 @@ var MemoryMSSQL = class MemoryMSSQL 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 }) {
@@ -2493,7 +2487,14 @@ var MemoryMSSQL = class MemoryMSSQL extends 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 = [];
@@ -2503,6 +2504,7 @@ var MemoryMSSQL = class MemoryMSSQL extends MemoryStorage {
 			indexName: 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}`;
@@ -2521,7 +2523,7 @@ var MemoryMSSQL = class MemoryMSSQL extends 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 (
@@ -2529,7 +2531,7 @@ var MemoryMSSQL = class MemoryMSSQL extends 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 (
@@ -2553,6 +2555,7 @@ var MemoryMSSQL = class MemoryMSSQL extends 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) => {
@@ -2600,7 +2603,7 @@ var MemoryMSSQL = class MemoryMSSQL extends MemoryStorage {
 			}, error);
 			this.logger?.error?.(mastraError.toString());
 			this.logger?.trackException?.(mastraError);
-			return { messages: [] };
+			throw mastraError;
 		}
 	}
 	async listMessages(args) {
@@ -2652,7 +2655,10 @@ var MemoryMSSQL = class MemoryMSSQL 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 messages = this._parseAndFormatMessages(includeMessages ?? [], "v2");
 				return {
 					messages: this._sortMessages(messages, field, direction),
@@ -2689,7 +2695,10 @@ var MemoryMSSQL = class MemoryMSSQL extends 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);
@@ -2719,6 +2728,7 @@ var MemoryMSSQL = class MemoryMSSQL extends MemoryStorage {
 				hasMore: metadataFilter ? perPageInput !== false && offset + primaryPageCount < total : perPageInput !== false && returnedThreadMessageCount < total && offset + perPage < total
 			};
 		} catch (error) {
+			if (error instanceof MastraError && error.category === ErrorCategory.USER) throw error;
 			const mastraError = new MastraError({
 				id: createStorageErrorId("MSSQL", "LIST_MESSAGES", "FAILED"),
 				domain: ErrorDomain.STORAGE,
@@ -2730,13 +2740,7 @@ var MemoryMSSQL = class MemoryMSSQL extends MemoryStorage {
 			}, error);
 			this.logger?.error?.(mastraError.toString());
 			this.logger?.trackException?.(mastraError);
-			return {
-				messages: [],
-				total: 0,
-				page,
-				perPage: perPageForResponse,
-				hasMore: false
-			};
+			throw mastraError;
 		}
 	}
 	async saveMessages({ messages }) {