@mastra/dsql 1.2.2 → 1.3.0-alpha.1

package/CHANGELOG.md

@@ -1,5 +1,46 @@
 # @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
+
+- Memory list reads now surface database errors instead of silently returning empty results. ([#17910](https://github.com/mastra-ai/mastra/pull/17910))
+
+  Previously, the paginated memory reads (`listThreads`, `listMessages`, `listMessagesByResourceId`, and `listMessagesById`) caught backend failures, logged them, and returned an empty payload like `{ threads: [], total: 0, hasMore: false }`. A transient outage (locked table, dropped connection) was therefore indistinguishable from a genuinely empty result, so an agent reading conversation history during a brief failure would treat it as "no history" and could overwrite real state. These methods now re-throw the failure as a `MastraError`. Validation (USER) errors and genuinely empty results are unchanged.
+
+  **Behavior change**
+
+  Callers that previously received an empty result on a backend failure will now receive a thrown `MastraError`. If you call these read methods directly (rather than through an agent, which already surfaces errors), wrap them so a transient outage doesn't crash the caller:
+
+  ```ts
+  try {
+    const { threads } = await storage.listThreads({ resourceId });
+    // ...use threads
+  } catch (error) {
+    // a real backend failure. Decide whether to retry, surface, or degrade.
+    // An empty thread list no longer hides here; it only means "no threads".
+  }
+  ```
+
+### Patch Changes
+
+- dependencies updates: ([#20406](https://github.com/mastra-ai/mastra/pull/20406))
+  - Updated dependency [`@aws-sdk/types@^3.974.2` ↗︎](https://www.npmjs.com/package/@aws-sdk/types/v/3.974.2) (from `^3.973.9`, in `dependencies`)
+
+- Fixed transaction completion when applications start several database operations at the same time. Pending operations now finish before the transaction completes or is cancelled, preventing query conflicts after batch failures and operations that application code does not await. ([#20869](https://github.com/mastra-ai/mastra/pull/20869))
+
+- Updated dependencies [[`e7109ee`](https://github.com/mastra-ai/mastra/commit/e7109ee6f731bacc79c885906f3c7dca8d8f013a), [`772c0c8`](https://github.com/mastra-ai/mastra/commit/772c0c897cec383258de2e6178147f8014767c7b), [`578bf2e`](https://github.com/mastra-ai/mastra/commit/578bf2e6a88e9d5b8bf502204e15a95dfbb679ae), [`06b2d87`](https://github.com/mastra-ai/mastra/commit/06b2d87e63bcdd0ed59215c6789692b9b12de376), [`ac01d63`](https://github.com/mastra-ai/mastra/commit/ac01d6355974aec73fdb8781449ed12bac582094), [`a810a05`](https://github.com/mastra-ai/mastra/commit/a810a058f62ad407cfc1701e0be36ae91145d7cf), [`f8da216`](https://github.com/mastra-ai/mastra/commit/f8da21633e7eb0e31c9ce0fc30567870d19416d3), [`6104347`](https://github.com/mastra-ai/mastra/commit/61043473ba6bfd0a25156824e853e13165562e6c), [`45bfb88`](https://github.com/mastra-ai/mastra/commit/45bfb88fd52f1dd3be20e2a38905777c96499c90), [`e3b9307`](https://github.com/mastra-ai/mastra/commit/e3b9307098daefbfae2a52ae2ef51bc9fc701190), [`d6834c5`](https://github.com/mastra-ai/mastra/commit/d6834c5a7866b16734d23900163c2414ed70d791), [`c52d346`](https://github.com/mastra-ai/mastra/commit/c52d3462ec831a5d95926ecd3d3373f5928ad2e5), [`0023e79`](https://github.com/mastra-ai/mastra/commit/0023e7919431078280abd11c89d1edeae35fcc69), [`c2ad51e`](https://github.com/mastra-ai/mastra/commit/c2ad51e2467f901eecba8c9f4a45e22a50bd7c18), [`3dc97ea`](https://github.com/mastra-ai/mastra/commit/3dc97ea415fad353b48a13095fad1835933cc12a), [`3d01cd3`](https://github.com/mastra-ai/mastra/commit/3d01cd387321b6f9c5cac31d487c84bf51b19c78), [`7bf3086`](https://github.com/mastra-ai/mastra/commit/7bf308663f0115ca74ad20554ade740f06640859), [`a8dd139`](https://github.com/mastra-ai/mastra/commit/a8dd1391a9fe9a6632c25809ef236980afa9a020), [`e5786be`](https://github.com/mastra-ai/mastra/commit/e5786be02bb903073082bd9d6da880ebaacc343f), [`2093fbd`](https://github.com/mastra-ai/mastra/commit/2093fbd53bb744bae19ec89f6d73db9a66fbe8a7), [`e7a5da4`](https://github.com/mastra-ai/mastra/commit/e7a5da4ef8e4dd452d2f232961b4e682a85ffe43), [`7b4393d`](https://github.com/mastra-ai/mastra/commit/7b4393d557411fdcf07b0e30e5acaf7cc85154ae)]:
+  - @mastra/core@1.58.0-alpha.1
+
 ## 1.2.2
 
 ### Patch Changes

package/dist/index.cjs

@@ -126,16 +126,21 @@ var PoolAdapter = class {
 		const client = await this.$pool.connect();
 		try {
 			await client.query("BEGIN");
-			const result = await callback(new TransactionClient(client));
-			await client.query("COMMIT");
-			return result;
-		} catch (error) {
+			const txClient = new TransactionClient(client);
 			try {
-				await client.query("ROLLBACK");
-			} catch (rollbackError) {
-				console.error("Transaction rollback failed:", rollbackError);
+				const result = await callback(txClient);
+				await txClient.drain();
+				await client.query("COMMIT");
+				return result;
+			} catch (error) {
+				await txClient.drain().catch(() => void 0);
+				try {
+					await client.query("ROLLBACK");
+				} catch (rollbackError) {
+					console.error("Transaction rollback failed:", rollbackError);
+				}
+				throw error;
 			}
-			throw error;
 		} finally {
 			client.release();
 		}
@@ -143,41 +148,85 @@ var PoolAdapter = class {
 };
 /**
 * Transaction client that wraps a PoolClient for executing queries within a transaction.
+*
+* Query methods are serialized through a tail promise (same pattern as
+* PinnedClientAdapter). Callers such as memory.updateMessages historically
+* did `queries.push(t.none(...))` then `await t.batch(queries)` — each
+* `t.none()` is async and starts `client.query` immediately, so by the time
+* batch runs, N queries are already in flight on one PoolClient. pg@8 queues
+* those internally and emits a DeprecationWarning; pg@9 will throw.
+* (#20820)
 */
 var TransactionClient = class {
 	client;
+	/**
+	* Serialization tail. Without this gate, concurrent t.none()/t.query()
+	* from Promise.all / batch land on the same PoolClient at once.
+	*/
+	#tail = Promise.resolve();
+	#error;
 	constructor(client) {
 		this.client = client;
 	}
-	async none(query, values) {
-		await this.client.query(query, values);
-		return null;
+	#enqueue(fn) {
+		const next = this.#tail.then(fn);
+		this.#tail = next.then(() => void 0, (error) => {
+			this.#error ??= { value: error };
+		});
+		return next;
 	}
-	async one(query, values) {
-		const result = await this.client.query(query, values);
-		if (result.rows.length === 0) throw new Error(`No data returned from query: ${truncateQuery(query)}`);
-		if (result.rows.length > 1) throw new Error(`Multiple rows returned when one was expected: ${truncateQuery(query)}`);
-		return result.rows[0];
+	/**
+	* Wait until every enqueued query has settled and surface the first failure.
+	* PoolAdapter calls this before COMMIT/ROLLBACK so those control
+	* statements never overlap in-flight work on the same client.
+	*/
+	async drain() {
+		await this.#tail;
+		if (this.#error) {
+			const { value } = this.#error;
+			this.#error = void 0;
+			throw value;
+		}
+	}
+	none(query, values) {
+		return this.#enqueue(async () => {
+			await this.client.query(query, values);
+			return null;
+		});
 	}
-	async oneOrNone(query, values) {
-		const result = await this.client.query(query, values);
-		if (result.rows.length === 0) return null;
-		if (result.rows.length > 1) throw new Error(`Multiple rows returned when one or none was expected: ${truncateQuery(query)}`);
-		return result.rows[0];
+	one(query, values) {
+		return this.#enqueue(async () => {
+			const result = await this.client.query(query, values);
+			if (result.rows.length === 0) throw new Error(`No data returned from query: ${truncateQuery(query)}`);
+			if (result.rows.length > 1) throw new Error(`Multiple rows returned when one was expected: ${truncateQuery(query)}`);
+			return result.rows[0];
+		});
 	}
-	async any(query, values) {
-		return (await this.client.query(query, values)).rows;
+	oneOrNone(query, values) {
+		return this.#enqueue(async () => {
+			const result = await this.client.query(query, values);
+			if (result.rows.length === 0) return null;
+			if (result.rows.length > 1) throw new Error(`Multiple rows returned when one or none was expected: ${truncateQuery(query)}`);
+			return result.rows[0];
+		});
 	}
-	async manyOrNone(query, values) {
+	any(query, values) {
+		return this.#enqueue(async () => {
+			return (await this.client.query(query, values)).rows;
+		});
+	}
+	manyOrNone(query, values) {
 		return this.any(query, values);
 	}
-	async many(query, values) {
-		const result = await this.client.query(query, values);
-		if (result.rows.length === 0) throw new Error(`No data returned from query: ${truncateQuery(query)}`);
-		return result.rows;
+	many(query, values) {
+		return this.#enqueue(async () => {
+			const result = await this.client.query(query, values);
+			if (result.rows.length === 0) throw new Error(`No data returned from query: ${truncateQuery(query)}`);
+			return result.rows;
+		});
 	}
-	async query(query, values) {
-		return this.client.query(query, values);
+	query(query, values) {
+		return this.#enqueue(() => this.client.query(query, values));
 	}
 	async batch(promises) {
 		return Promise.all(promises);
@@ -1977,6 +2026,7 @@ var MemoryDSQL = class MemoryDSQL extends _mastra_core_storage.MemoryStorage {
 				hasMore: perPageInput === false ? false : offset + perPage < total
 			};
 		} catch (error) {
+			if (error instanceof _mastra_core_error.MastraError && error.category === _mastra_core_error.ErrorCategory.USER) throw error;
 			const mastraError = new _mastra_core_error.MastraError({
 				id: (0, _mastra_core_storage.createStorageErrorId)("DSQL", "LIST_THREADS", "FAILED"),
 				domain: _mastra_core_error.ErrorDomain.STORAGE,
@@ -1989,13 +2039,7 @@ var MemoryDSQL = class MemoryDSQL extends _mastra_core_storage.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 }) {
@@ -2129,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 = [];
@@ -2140,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,
@@ -2176,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);
@@ -2225,7 +2281,7 @@ var MemoryDSQL = class MemoryDSQL extends _mastra_core_storage.MemoryStorage {
 			}, error);
 			this.logger?.error?.(mastraError.toString());
 			this.logger?.trackException(mastraError);
-			return { messages: [] };
+			throw mastraError;
 		}
 	}
 	async listMessages(args) {
@@ -2301,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);
@@ -2332,6 +2391,7 @@ var MemoryDSQL = class MemoryDSQL extends _mastra_core_storage.MemoryStorage {
 				hasMore
 			};
 		} catch (error) {
+			if (error instanceof _mastra_core_error.MastraError && error.category === _mastra_core_error.ErrorCategory.USER) throw error;
 			const mastraError = new _mastra_core_error.MastraError({
 				id: (0, _mastra_core_storage.createStorageErrorId)("DSQL", "LIST_MESSAGES", "FAILED"),
 				domain: _mastra_core_error.ErrorDomain.STORAGE,
@@ -2343,13 +2403,7 @@ var MemoryDSQL = class MemoryDSQL extends _mastra_core_storage.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 }) {