@mastra/pg 1.20.0-alpha.0 → 1.20.0-alpha.1

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @mastra/pg
 
+## 1.20.0-alpha.1
+
+### Patch Changes
+
+- Improved chat response time with PostgresStore. Message history now reads a page of messages and its total count in one query instead of two. When semantic recall is on, the recall read also starts at the same time as the page read. Each agent turn therefore makes fewer database round-trips, which is most noticeable on remote Postgres. ([#20979](https://github.com/mastra-ai/mastra/pull/20979))
+
+- Updated dependencies [[`cdd5c33`](https://github.com/mastra-ai/mastra/commit/cdd5c33ac6c7118a9f139e6dc0e14e6a8ae31658), [`d7cf7fa`](https://github.com/mastra-ai/mastra/commit/d7cf7fafc1ae1b50bd8462dd0e6c671a8606db93), [`0f9a448`](https://github.com/mastra-ai/mastra/commit/0f9a448502157e59f7b76f24360ad497168f5ef8), [`289f4ce`](https://github.com/mastra-ai/mastra/commit/289f4ce16e3293370440172132c52ee787cbc09f), [`4f16ff8`](https://github.com/mastra-ai/mastra/commit/4f16ff824bf2f9b0ddc93f210477c10c8a4fb1ab), [`1c67d85`](https://github.com/mastra-ai/mastra/commit/1c67d85e9da8285662f4dbbf47e0378c3fee0747), [`ba24be6`](https://github.com/mastra-ai/mastra/commit/ba24be662439c331ab23a600041f93803c89eca8), [`842b5fe`](https://github.com/mastra-ai/mastra/commit/842b5fe22b6a7fa811bd14e48eb9af523ac989f2), [`80bdf3a`](https://github.com/mastra-ai/mastra/commit/80bdf3ae16ade6ff63bde0cb16fa2df8ab7dd4dd), [`9ba1247`](https://github.com/mastra-ai/mastra/commit/9ba12470c77f1c03642d720ce67e517e878f666e), [`fd96298`](https://github.com/mastra-ai/mastra/commit/fd96298a8367622f4ebfcaa97b5b6c1fbbd14564), [`6a84954`](https://github.com/mastra-ai/mastra/commit/6a84954a2667f85b6d59da652dab1bbff007ccb0), [`52d8ef0`](https://github.com/mastra-ai/mastra/commit/52d8ef03801f1deb7ee48532fc4190dd4a33916c), [`cdd5c33`](https://github.com/mastra-ai/mastra/commit/cdd5c33ac6c7118a9f139e6dc0e14e6a8ae31658), [`efd5c81`](https://github.com/mastra-ai/mastra/commit/efd5c81cc25fde3c2ddd86fc1178deb4ec176e19), [`0976933`](https://github.com/mastra-ai/mastra/commit/0976933142333ec78451feef265b68bcb45aa5e7), [`242b945`](https://github.com/mastra-ai/mastra/commit/242b94558777bfbdeb42cbfea84afff0b6ad0633), [`fea5cae`](https://github.com/mastra-ai/mastra/commit/fea5caedc7e2cfea51784a15e015952692027abf), [`4b59f78`](https://github.com/mastra-ai/mastra/commit/4b59f786cbc9a7d1ef07a07517dbd4b96865e99d), [`7010c5d`](https://github.com/mastra-ai/mastra/commit/7010c5d15728bf9c5dfe4fb6b1bf80ce23bf143a)]:
+  - @mastra/core@1.58.0-alpha.3
+
 ## 1.20.0-alpha.0
 
 ### Minor Changes

package/dist/docs/SKILL.md

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

package/dist/docs/assets/SOURCE_MAP.json

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

package/dist/docs/references/reference-storage-composite.md

@@ -251,6 +251,64 @@ const memoryStore = await storage.getStore('memory')
 const thread = await memoryStore?.getThreadById({ threadId: '...' })
 ```
 
+## Closing connections
+
+`close()` releases the connections of the stores a composite was built from: the `default` and `editor` stores, plus any domain that owns its own client. Each store is closed once, even when it backs several domains. When passed to the Mastra class, `close()` is called by `shutdown()`:
+
+```typescript
+import { MastraCompositeStore } from '@mastra/core/storage'
+import { PostgresStore } from '@mastra/pg'
+import { Mastra } from '@mastra/core'
+
+const pgStore = new PostgresStore({
+  id: 'pg-storage',
+  connectionString: process.env.DATABASE_URL,
+})
+
+export const mastra = new Mastra({
+  storage: new MastraCompositeStore({ id: 'composite', default: pgStore }),
+})
+
+process.on('SIGTERM', async () => {
+  // Releases the Postgres pool, so the process can exit
+  await mastra.shutdown()
+})
+```
+
+A store you construct only to supply a domain isn't reachable through the composite. Keep a reference to it and close it yourself:
+
+```typescript
+import { MastraCompositeStore } from '@mastra/core/storage'
+import { ClickhouseStore } from '@mastra/clickhouse'
+import { PostgresStore } from '@mastra/pg'
+import { Mastra } from '@mastra/core'
+
+const pgStore = new PostgresStore({
+  id: 'pg-storage',
+  connectionString: process.env.DATABASE_URL,
+})
+
+const clickhouseStore = new ClickhouseStore({
+  id: 'clickhouse-storage',
+  url: process.env.CLICKHOUSE_URL,
+  username: process.env.CLICKHOUSE_USERNAME,
+  password: process.env.CLICKHOUSE_PASSWORD,
+})
+
+export const mastra = new Mastra({
+  storage: new MastraCompositeStore({
+    id: 'composite',
+    default: pgStore,
+    domains: { observability: clickhouseStore.stores?.observability },
+  }),
+})
+
+process.on('SIGTERM', async () => {
+  await mastra.shutdown()
+  await clickhouseStore.close()
+})
+```
+
 ## Use cases
 
 ### Separate databases for different workloads

package/dist/index.cjs

@@ -9413,6 +9413,38 @@ var MemoryPG = class MemoryPG extends _mastra_core_storage.MemoryStorage {
 			throw mastraError;
 		}
 	}
+	/**
+	* Reads one page of messages together with the total row count.
+	*
+	* `COUNT(*) OVER ()` reports the count over the whole WHERE result on the same
+	* statement as the page, so the page costs one database round-trip instead of
+	* two. The page and the count also come from one snapshot, so the count always
+	* describes the returned rows. A separate `COUNT(*)` runs only when the page is
+	* empty and the caller asked for a page after the last row, because a window
+	* function has no row to carry the count on.
+	*/
+	async #fetchMessagePage({ selectStatement, tableName, whereClause, orderByStatement, queryParams, perPageInput, perPage, offset }) {
+		const limitClause = perPageInput === false ? "" : ` LIMIT $${queryParams.length + 1} OFFSET $${queryParams.length + 2}`;
+		const dataParams = perPageInput === false ? queryParams : [
+			...queryParams,
+			perPage,
+			offset
+		];
+		const rows = await this.#db.client.manyOrNone(`${selectStatement}, COUNT(*) OVER () AS "__total" FROM ${tableName} ${whereClause} ${orderByStatement}${limitClause}`, dataParams) || [];
+		if (rows.length > 0) return {
+			total: Number(rows[0].__total),
+			messages: rows
+		};
+		if (offset === 0) return {
+			total: 0,
+			messages: []
+		};
+		const countResult = await this.#db.client.one(`SELECT COUNT(*) FROM ${tableName} ${whereClause}`, queryParams);
+		return {
+			total: parseInt(countResult.count, 10),
+			messages: []
+		};
+	}
 	async listMessages(args) {
 		const { threadId, resourceId, include, filter, perPage: perPageInput, page = 0, orderBy } = args;
 		const threadIds = (Array.isArray(threadId) ? threadId : [threadId]).filter((id) => typeof id === "string");
@@ -9487,23 +9519,27 @@ var MemoryPG = class MemoryPG extends _mastra_core_storage.MemoryStorage {
 					hasMore: false
 				};
 			}
+			let includeFailure;
+			const includePromise = include && include.length > 0 ? this._getIncludedMessages({ include }).catch((error) => {
+				includeFailure = error;
+				return null;
+			}) : null;
 			let total;
 			let messages;
 			if (metadataFilter) {
 				const filteredRows = (await this.#db.client.manyOrNone(`${selectStatement} FROM ${tableName} ${whereClause} ${orderByStatement}`, queryParams) || []).filter((row) => (0, _mastra_core_storage.storageMessageMatchesMetadataFilter)(row.content, metadataFilter));
 				total = filteredRows.length;
 				messages = perPageInput === false ? filteredRows : filteredRows.slice(offset, offset + perPage);
-			} else {
-				const countResult = await this.#db.client.one(`SELECT COUNT(*) FROM ${tableName} ${whereClause}`, queryParams);
-				total = parseInt(countResult.count, 10);
-				const limitValue = perPageInput === false ? total : perPage;
-				const dataQuery = `${selectStatement} FROM ${tableName} ${whereClause} ${orderByStatement} LIMIT $${paramIndex++} OFFSET $${paramIndex++}`;
-				messages = [...await this.#db.client.manyOrNone(dataQuery, [
-					...queryParams,
-					limitValue,
-					offset
-				]) || []];
-			}
+			} else ({total, messages} = await this.#fetchMessagePage({
+				selectStatement,
+				tableName,
+				whereClause,
+				orderByStatement,
+				queryParams,
+				perPageInput,
+				perPage,
+				offset
+			}));
 			const primaryPageCount = messages.length;
 			if (total === 0 && messages.length === 0 && (!include || include.length === 0)) return {
 				messages: [],
@@ -9514,7 +9550,8 @@ var MemoryPG = class MemoryPG 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 includePromise;
+				if (includeFailure) throw includeFailure;
 				if (includeMessages) {
 					for (const includeMsg of includeMessages) if (!messageIds.has(includeMsg.id)) {
 						messages.push(includeMsg);
@@ -9622,23 +9659,27 @@ var MemoryPG = class MemoryPG extends _mastra_core_storage.MemoryStorage {
 					hasMore: false
 				};
 			}
+			let includeFailure;
+			const includePromise = include && include.length > 0 ? this._getIncludedMessages({ include }).catch((error) => {
+				includeFailure = error;
+				return null;
+			}) : null;
 			let total;
 			let messages;
 			if (metadataFilter) {
 				const filteredRows = (await this.#db.client.manyOrNone(`${selectStatement} FROM ${tableName} ${whereClause} ${orderByStatement}`, queryParams) || []).filter((row) => (0, _mastra_core_storage.storageMessageMatchesMetadataFilter)(row.content, metadataFilter));
 				total = filteredRows.length;
 				messages = perPageInput === false ? filteredRows : filteredRows.slice(offset, offset + perPage);
-			} else {
-				const countResult = await this.#db.client.one(`SELECT COUNT(*) FROM ${tableName} ${whereClause}`, queryParams);
-				total = parseInt(countResult.count, 10);
-				const limitValue = perPageInput === false ? total : perPage;
-				const dataQuery = `${selectStatement} FROM ${tableName} ${whereClause} ${orderByStatement} LIMIT $${paramIndex++} OFFSET $${paramIndex++}`;
-				messages = [...await this.#db.client.manyOrNone(dataQuery, [
-					...queryParams,
-					limitValue,
-					offset
-				]) || []];
-			}
+			} else ({total, messages} = await this.#fetchMessagePage({
+				selectStatement,
+				tableName,
+				whereClause,
+				orderByStatement,
+				queryParams,
+				perPageInput,
+				perPage,
+				offset
+			}));
 			if (total === 0 && messages.length === 0 && (!include || include.length === 0)) return {
 				messages: [],
 				total: 0,
@@ -9648,7 +9689,8 @@ var MemoryPG = class MemoryPG 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 includePromise;
+				if (includeFailure) throw includeFailure;
 				if (includeMessages) {
 					for (const includeMsg of includeMessages) if (!messageIds.has(includeMsg.id)) {
 						messages.push(includeMsg);