@mastra/pg 1.19.0 → 1.20.0-alpha.1

package/dist/index.js

@@ -146,13 +146,23 @@ var PGFilterTranslator = class extends BaseFilterTranslator {
 };
 //#endregion
 //#region src/vector/sql-builder.ts
+const getTextExtractExpr = (key) => {
+	const jsonPathKey = parseJsonPathKey(key);
+	if (!key.includes(".")) return `metadata->>'${jsonPathKey}'`;
+	return `metadata#>>'{${jsonPathKey}}'`;
+};
+const getJsonExtractExpr = (key) => {
+	const jsonPathKey = parseJsonPathKey(key);
+	if (!key.includes(".")) return `metadata->'${jsonPathKey}'`;
+	return `metadata#>'{${jsonPathKey}}'`;
+};
 const createBasicOperator = (symbol) => {
 	return (key, paramIndex) => {
-		const jsonPathKey = parseJsonPathKey(key);
+		const textExtract = getTextExtractExpr(key);
 		return {
-			sql: `CASE 
-        WHEN $${paramIndex}::text IS NULL THEN metadata#>>'{${jsonPathKey}}' IS ${symbol === "=" ? "" : "NOT"} NULL
-        ELSE metadata#>>'{${jsonPathKey}}' ${symbol} $${paramIndex}::text
+			sql: `CASE
+        WHEN $${paramIndex}::text IS NULL THEN ${textExtract} IS ${symbol === "=" ? "" : "NOT"} NULL
+        ELSE ${textExtract} ${symbol} $${paramIndex}::text
       END`,
 			needsValue: true
 		};
@@ -160,13 +170,14 @@ const createBasicOperator = (symbol) => {
 };
 const createNumericOperator = (symbol) => {
 	return (key, paramIndex, value) => {
-		const jsonPathKey = parseJsonPathKey(key);
+		const textExtract = getTextExtractExpr(key);
+		const jsonExtract = getJsonExtractExpr(key);
 		if (typeof value === "number" || typeof value === "string" && !isNaN(Number(value)) && value.trim() !== "") return {
-			sql: `(CASE WHEN jsonb_typeof(metadata#>'{${jsonPathKey}}') = 'number' THEN (metadata#>>'{${jsonPathKey}}')::numeric ${symbol} $${paramIndex}::numeric ELSE NULL END)`,
+			sql: `(CASE WHEN jsonb_typeof(${jsonExtract}) = 'number' THEN (${textExtract})::numeric ${symbol} $${paramIndex}::numeric ELSE NULL END)`,
 			needsValue: true
 		};
 		else return {
-			sql: `metadata#>>'{${jsonPathKey}}' ${symbol} $${paramIndex}::text`,
+			sql: `${textExtract} ${symbol} $${paramIndex}::text`,
 			needsValue: true
 		};
 	};
@@ -197,7 +208,7 @@ function buildElemMatchConditions(value, paramIndex) {
 		const operatorFn = FILTER_OPERATORS[paramOperator];
 		if (!operatorFn) throw new Error(`Invalid operator: ${paramOperator}`);
 		const result = operatorFn(paramKey, nextParamIndex, paramValue);
-		const sql = result.sql.replaceAll("metadata#>>", "elem#>>").replaceAll("metadata#>", "elem#>");
+		const sql = result.sql.replaceAll("metadata->>", "elem->>").replaceAll("metadata->", "elem->").replaceAll("metadata#>>", "elem#>>").replaceAll("metadata#>", "elem#>");
 		conditions.push(sql);
 		if (result.needsValue) values.push(paramValue);
 	});
@@ -214,32 +225,34 @@ const FILTER_OPERATORS = {
 	$lt: createNumericOperator("<"),
 	$lte: createNumericOperator("<="),
 	$in: (key, paramIndex) => {
-		const jsonPathKey = parseJsonPathKey(key);
+		const textExtract = getTextExtractExpr(key);
+		const jsonExtract = getJsonExtractExpr(key);
 		return {
 			sql: `(
         CASE
-          WHEN jsonb_typeof(metadata->'${jsonPathKey}') = 'array' THEN
+          WHEN jsonb_typeof(${jsonExtract}) = 'array' THEN
             EXISTS (
-              SELECT 1 FROM jsonb_array_elements_text(metadata->'${jsonPathKey}') as elem
+              SELECT 1 FROM jsonb_array_elements_text(${jsonExtract}) as elem
               WHERE elem = ANY($${paramIndex}::text[])
             )
-          ELSE metadata#>>'{${jsonPathKey}}' = ANY($${paramIndex}::text[])
+          ELSE ${textExtract} = ANY($${paramIndex}::text[])
         END
       )`,
 			needsValue: true
 		};
 	},
 	$nin: (key, paramIndex) => {
-		const jsonPathKey = parseJsonPathKey(key);
+		const textExtract = getTextExtractExpr(key);
+		const jsonExtract = getJsonExtractExpr(key);
 		return {
 			sql: `(
         CASE
-          WHEN jsonb_typeof(metadata->'${jsonPathKey}') = 'array' THEN
+          WHEN jsonb_typeof(${jsonExtract}) = 'array' THEN
             NOT EXISTS (
-              SELECT 1 FROM jsonb_array_elements_text(metadata->'${jsonPathKey}') as elem
+              SELECT 1 FROM jsonb_array_elements_text(${jsonExtract}) as elem
               WHERE elem = ANY($${paramIndex}::text[])
             )
-          ELSE metadata#>>'{${jsonPathKey}}' != ALL($${paramIndex}::text[])
+          ELSE ${textExtract} != ALL($${paramIndex}::text[])
         END
       )`,
 			needsValue: true
@@ -247,21 +260,21 @@ const FILTER_OPERATORS = {
 	},
 	$all: (key, paramIndex) => {
 		return {
-			sql: `CASE WHEN array_length($${paramIndex}::text[], 1) IS NULL THEN false 
-            ELSE (metadata#>'{${parseJsonPathKey(key)}}')::jsonb ?& $${paramIndex}::text[] END`,
+			sql: `CASE WHEN array_length($${paramIndex}::text[], 1) IS NULL THEN false
+            ELSE (${getJsonExtractExpr(key)})::jsonb ?& $${paramIndex}::text[] END`,
 			needsValue: true
 		};
 	},
 	$elemMatch: (key, paramIndex, value) => {
 		const { sql, values } = buildElemMatchConditions(value, paramIndex);
-		const jsonPathKey = parseJsonPathKey(key);
+		const jsonExtract = getJsonExtractExpr(key);
 		return {
 			sql: `(
         CASE
-          WHEN jsonb_typeof(metadata->'${jsonPathKey}') = 'array' THEN
+          WHEN jsonb_typeof(${jsonExtract}) = 'array' THEN
             EXISTS (
-              SELECT 1 
-              FROM jsonb_array_elements(metadata->'${jsonPathKey}') as elem
+              SELECT 1
+              FROM jsonb_array_elements(${jsonExtract}) as elem
               WHERE ${sql}
             )
           ELSE FALSE
@@ -291,7 +304,7 @@ const FILTER_OPERATORS = {
 		needsValue: false
 	}),
 	$not: (key) => ({
-		sql: `NOT (${key})`,
+		sql: `(${key})`,
 		needsValue: false
 	}),
 	$nor: (key) => ({
@@ -300,16 +313,17 @@ const FILTER_OPERATORS = {
 	}),
 	$regex: (key, paramIndex) => {
 		return {
-			sql: `metadata#>>'{${parseJsonPathKey(key)}}' ~ $${paramIndex}`,
+			sql: `${getTextExtractExpr(key)} ~ $${paramIndex}`,
 			needsValue: true
 		};
 	},
 	$contains: (key, paramIndex, value) => {
-		const jsonPathKey = parseJsonPathKey(key);
+		const textExtract = getTextExtractExpr(key);
+		const jsonExtract = getJsonExtractExpr(key);
 		let sql;
-		if (Array.isArray(value)) sql = `(metadata->'${jsonPathKey}') ?& $${paramIndex}`;
-		else if (typeof value === "string") sql = `metadata->>'${jsonPathKey}' ILIKE '%' || $${paramIndex} || '%' ESCAPE '\\'`;
-		else sql = `metadata->>'${jsonPathKey}' = $${paramIndex}`;
+		if (Array.isArray(value)) sql = `(${jsonExtract}) ?& $${paramIndex}`;
+		else if (typeof value === "string") sql = `${textExtract} ILIKE '%' || $${paramIndex} || '%' ESCAPE '\\'`;
+		else sql = `${textExtract} = $${paramIndex}`;
 		return {
 			sql,
 			needsValue: true,
@@ -321,12 +335,12 @@ const FILTER_OPERATORS = {
 	* Usage: { field: { $objectContains: { ...subobject } } }
 	*/
 	$size: (key, paramIndex) => {
-		const jsonPathKey = parseJsonPathKey(key);
+		const jsonExtract = getJsonExtractExpr(key);
 		return {
 			sql: `(
       CASE
-        WHEN jsonb_typeof(metadata#>'{${jsonPathKey}}') = 'array' THEN 
-          jsonb_array_length(metadata#>'{${jsonPathKey}}') = $${paramIndex}
+        WHEN jsonb_typeof(${jsonExtract}) = 'array' THEN
+          jsonb_array_length(${jsonExtract}) = $${paramIndex}
         ELSE FALSE
       END
     )`,
@@ -354,7 +368,7 @@ function buildDeleteFilterQuery(filter) {
 		].includes(key)) return handleLogicalOperator(key, value, parentPath);
 		if (!value || typeof value !== "object") {
 			values.push(value);
-			return `metadata#>>'{${parseJsonPathKey(key)}}' = $${values.length}`;
+			return `${getTextExtractExpr(key)} = $${values.length}`;
 		}
 		const entries = Object.entries(value);
 		if (entries.length > 1) return entries.map(([operator, operatorValue]) => {
@@ -445,7 +459,7 @@ function buildFilterQuery(filter, minScore, topK) {
 		].includes(key)) return handleLogicalOperator(key, value, parentPath);
 		if (!value || typeof value !== "object") {
 			values.push(value);
-			return `metadata#>>'{${parseJsonPathKey(key)}}' = $${values.length}`;
+			return `${getTextExtractExpr(key)} = $${values.length}`;
 		}
 		const entries = Object.entries(value);
 		if (entries.length > 1) return entries.map(([operator, operatorValue]) => {
@@ -1778,16 +1792,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();
 		}
@@ -1795,41 +1814,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 / PinnedClientAdapter call 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;
+		}
 	}
-	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];
+	none(query, values) {
+		return this.#enqueue(async () => {
+			await this.client.query(query, values);
+			return null;
+		});
 	}
-	async any(query, values) {
-		return (await this.client.query(query, values)).rows;
+	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 manyOrNone(query, values) {
+	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];
+		});
+	}
+	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);
@@ -1922,11 +1985,14 @@ var PinnedClientAdapter = class {
 	tx(callback) {
 		return this.#enqueue(async () => {
 			await this.pinnedClient.query("BEGIN");
+			const txClient = new TransactionClient(this.pinnedClient);
 			try {
-				const result = await callback(new TransactionClient(this.pinnedClient));
+				const result = await callback(txClient);
+				await txClient.drain();
 				await this.pinnedClient.query("COMMIT");
 				return result;
 			} catch (error) {
+				await txClient.drain().catch(() => void 0);
 				try {
 					await this.pinnedClient.query("ROLLBACK");
 				} catch (rollbackError) {
@@ -6416,7 +6482,13 @@ var ExperimentsPG = class ExperimentsPG extends ExperimentsStorage {
 			ifNotExists: [
 				"agentVersion",
 				"organizationId",
-				"projectId"
+				"projectId",
+				"provenance",
+				"runnerAttestation",
+				"experimentSetId",
+				"comparisonId",
+				"variantId",
+				"trialIndex"
 			]
 		});
 		await this.#db.alterTable({
@@ -6522,6 +6594,16 @@ var ExperimentsPG = class ExperimentsPG extends ExperimentsStorage {
 				table: TABLE_EXPERIMENTS,
 				columns: ["datasetId"]
 			},
+			{
+				name: "idx_experiments_grouping",
+				table: TABLE_EXPERIMENTS,
+				columns: [
+					"experimentSetId",
+					"comparisonId",
+					"variantId",
+					"trialIndex"
+				]
+			},
 			{
 				name: "idx_experiment_results_experimentid",
 				table: TABLE_EXPERIMENT_RESULTS,
@@ -6567,6 +6649,12 @@ var ExperimentsPG = class ExperimentsPG extends ExperimentsStorage {
 			name: row.name ?? void 0,
 			description: row.description ?? void 0,
 			metadata: row.metadata ? safelyParseJSON(row.metadata) : void 0,
+			provenance: row.provenance ? safelyParseJSON(row.provenance) : null,
+			runnerAttestation: row.runnerAttestation ? safelyParseJSON(row.runnerAttestation) : null,
+			experimentSetId: row.experimentSetId ?? null,
+			comparisonId: row.comparisonId ?? null,
+			variantId: row.variantId ?? null,
+			trialIndex: row.trialIndex != null ? row.trialIndex : null,
 			datasetId: row.datasetId ?? null,
 			datasetVersion: row.datasetVersion != null ? row.datasetVersion : null,
 			agentVersion: row.agentVersion ?? null,
@@ -6620,6 +6708,12 @@ var ExperimentsPG = class ExperimentsPG extends ExperimentsStorage {
 					name: input.name ?? null,
 					description: input.description ?? null,
 					metadata: input.metadata ?? null,
+					provenance: input.provenance ?? null,
+					runnerAttestation: input.runnerAttestation ?? null,
+					experimentSetId: input.experimentSetId ?? null,
+					comparisonId: input.comparisonId ?? null,
+					variantId: input.variantId ?? null,
+					trialIndex: input.trialIndex ?? null,
 					datasetId: input.datasetId ?? null,
 					datasetVersion: input.datasetVersion ?? null,
 					agentVersion: input.agentVersion ?? null,
@@ -6643,6 +6737,12 @@ var ExperimentsPG = class ExperimentsPG extends ExperimentsStorage {
 				name: input.name,
 				description: input.description,
 				metadata: input.metadata,
+				provenance: input.provenance ?? null,
+				runnerAttestation: input.runnerAttestation ?? null,
+				experimentSetId: input.experimentSetId ?? null,
+				comparisonId: input.comparisonId ?? null,
+				variantId: input.variantId ?? null,
+				trialIndex: input.trialIndex ?? null,
 				datasetId: input.datasetId ?? null,
 				datasetVersion: input.datasetVersion ?? null,
 				agentVersion: input.agentVersion ?? null,
@@ -6784,6 +6884,22 @@ var ExperimentsPG = class ExperimentsPG extends ExperimentsStorage {
 				conditions.push(`"status" = $${paramIndex++}`);
 				queryParams.push(args.status);
 			}
+			if (args.experimentSetId !== void 0) {
+				conditions.push(`"experimentSetId" = $${paramIndex++}`);
+				queryParams.push(args.experimentSetId);
+			}
+			if (args.comparisonId !== void 0) {
+				conditions.push(`"comparisonId" = $${paramIndex++}`);
+				queryParams.push(args.comparisonId);
+			}
+			if (args.variantId !== void 0) {
+				conditions.push(`"variantId" = $${paramIndex++}`);
+				queryParams.push(args.variantId);
+			}
+			if (args.trialIndex !== void 0) {
+				conditions.push(`"trialIndex" = $${paramIndex++}`);
+				queryParams.push(args.trialIndex);
+			}
 			if (args.filters) {
 				const { organizationId, projectId } = args.filters;
 				if (organizationId !== void 0) {
@@ -8565,6 +8681,13 @@ function getTableName$3({ indexName, schemaName }) {
 function inPlaceholders(count, startIndex = 1) {
 	return Array.from({ length: count }, (_, i) => `$${i + startIndex}`).join(", ");
 }
+/**
+* Bind dates as UTC strings because node-postgres serializes Date parameters
+* for TIMESTAMP columns using the process's local timezone.
+*/
+function toUtcISOString(date) {
+	return date.toISOString();
+}
 function dedupeMessagesForSave(messages) {
 	const deduped = /* @__PURE__ */ new Map();
 	for (const message of messages) {
@@ -8979,6 +9102,7 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 				hasMore: perPageInput === false ? false : offset + perPage < total
 			};
 		} catch (error) {
+			if (error instanceof MastraError && error.category === ErrorCategory.USER) throw error;
 			const mastraError = new MastraError({
 				id: createStorageErrorId("PG", "LIST_THREADS", "FAILED"),
 				domain: ErrorDomain.STORAGE,
@@ -8991,13 +9115,7 @@ var MemoryPG = class MemoryPG 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 }) {
@@ -9006,6 +9124,8 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 				indexName: TABLE_THREADS,
 				schemaName: getSchemaName$3(this.#schema)
 			});
+			const createdAt = toUtcISOString(thread.createdAt);
+			const updatedAt = toUtcISOString(thread.updatedAt);
 			await this.#db.client.none(`INSERT INTO ${tableName} (
           id,
           "resourceId",
@@ -9028,10 +9148,10 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 				thread.resourceId,
 				thread.title,
 				thread.metadata ? JSON.stringify(thread.metadata) : null,
-				thread.createdAt,
-				thread.createdAt,
-				thread.updatedAt,
-				thread.updatedAt
+				createdAt,
+				createdAt,
+				updatedAt,
+				updatedAt
 			]);
 			return thread;
 		} catch (error) {
@@ -9064,7 +9184,7 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 			...metadata
 		};
 		try {
-			const now = /* @__PURE__ */ new Date();
+			const nowStr = toUtcISOString(/* @__PURE__ */ new Date());
 			const thread = await this.#db.client.one(`UPDATE ${threadTableName}
                     SET
                         title = $1,
@@ -9076,8 +9196,8 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
                 `, [
 				title,
 				mergedMetadata,
-				now,
-				now,
+				nowStr,
+				nowStr,
 				id
 			]);
 			return {
@@ -9266,9 +9386,41 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 			}, error);
 			this.logger?.error?.(mastraError.toString());
 			this.logger?.trackException(mastraError);
-			return { messages: [] };
+			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");
@@ -9343,23 +9495,27 @@ var MemoryPG = class MemoryPG extends 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) => 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: [],
@@ -9370,7 +9526,8 @@ var MemoryPG = class MemoryPG extends 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);
@@ -9392,6 +9549,7 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 				hasMore
 			};
 		} catch (error) {
+			if (error instanceof MastraError && error.category === ErrorCategory.USER) throw error;
 			const mastraError = new MastraError({
 				id: createStorageErrorId("PG", "LIST_MESSAGES", "FAILED"),
 				domain: ErrorDomain.STORAGE,
@@ -9403,13 +9561,7 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 			}, error);
 			this.logger?.error?.(mastraError.toString());
 			this.logger?.trackException(mastraError);
-			return {
-				messages: [],
-				total: 0,
-				page,
-				perPage: perPageForResponse,
-				hasMore: false
-			};
+			throw mastraError;
 		}
 	}
 	async listMessagesByResourceId(args) {
@@ -9483,23 +9635,27 @@ var MemoryPG = class MemoryPG extends 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) => 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,
@@ -9509,7 +9665,8 @@ var MemoryPG = class MemoryPG extends 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);
@@ -9529,6 +9686,7 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 				hasMore
 			};
 		} catch (error) {
+			if (error instanceof MastraError && error.category === ErrorCategory.USER) throw error;
 			const mastraError = new MastraError({
 				id: createStorageErrorId("PG", "LIST_MESSAGES_BY_RESOURCE_ID", "FAILED"),
 				domain: ErrorDomain.STORAGE,
@@ -9537,13 +9695,7 @@ var MemoryPG = class MemoryPG 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 }) {
@@ -9579,7 +9731,7 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 					const batch = messagesToSave.slice(offset, offset + MAX_MESSAGES_PER_INSERT);
 					const values = [];
 					const valuePlaceholders = batch.map((message, messageIndex) => {
-						const createdAt = message.createdAt || /* @__PURE__ */ new Date();
+						const createdAt = toUtcISOString(message.createdAt || /* @__PURE__ */ new Date());
 						values.push(message.id, message.threadId, typeof message.content === "string" ? message.content : JSON.stringify(message.content), createdAt, createdAt, message.role, message.type || "v2", message.resourceId);
 						const paramOffset = messageIndex * MESSAGE_INSERT_BIND_PARAMETERS;
 						return `(${Array.from({ length: MESSAGE_INSERT_BIND_PARAMETERS }, (_, paramIndex) => `$${paramOffset + paramIndex + 1}`).join(", ")})`;
@@ -9597,7 +9749,7 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 					indexName: TABLE_THREADS,
 					schemaName: getSchemaName$3(this.#schema)
 				});
-				const now = /* @__PURE__ */ new Date();
+				const now = toUtcISOString(/* @__PURE__ */ new Date());
 				for (const threadIdToUpdate of threadIds) await t.none(`UPDATE ${threadTableName}
               SET
                 "updatedAt" = $1,
@@ -9749,11 +9901,15 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 		};
 	}
 	async saveResource({ resource }) {
+		const createdAt = toUtcISOString(resource.createdAt);
+		const updatedAt = toUtcISOString(resource.updatedAt);
 		await this.#db.insert({
 			tableName: TABLE_RESOURCES,
 			record: {
 				...resource,
-				metadata: JSON.stringify(resource.metadata)
+				metadata: JSON.stringify(resource.metadata),
+				createdAt,
+				updatedAt
 			}
 		});
 		return resource;
@@ -9857,6 +10013,7 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 				}
 				const sourceMessages = await t.manyOrNone(messageQuery, messageParams);
 				const now = /* @__PURE__ */ new Date();
+				const nowStr = toUtcISOString(now);
 				const lastMessageId = sourceMessages.length > 0 ? sourceMessages[sourceMessages.length - 1].id : void 0;
 				const cloneMetadata = {
 					sourceThreadId,
@@ -9888,10 +10045,10 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 					newThread.resourceId,
 					newThread.title,
 					newThread.metadata ? JSON.stringify(newThread.metadata) : null,
-					now,
-					now,
-					now,
-					now
+					nowStr,
+					nowStr,
+					nowStr,
+					nowStr
 				]);
 				const clonedMessages = [];
 				const messageIdMap = {};
@@ -9904,13 +10061,14 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 					try {
 						parsedContent = JSON.parse(normalizedMsg.content);
 					} catch {}
+					const createdAt = toUtcISOString(new Date(normalizedMsg.createdAt));
 					await t.none(`INSERT INTO ${messageTableName} (id, thread_id, content, "createdAt", "createdAtZ", role, type, "resourceId")
              VALUES ($1, $2, $3, $4, $5, $6, $7, $8)`, [
 						newMessageId,
 						newThreadId,
 						typeof normalizedMsg.content === "string" ? normalizedMsg.content : JSON.stringify(normalizedMsg.content),
-						normalizedMsg.createdAt,
-						normalizedMsg.createdAt,
+						createdAt,
+						createdAt,
 						normalizedMsg.role,
 						normalizedMsg.type || "v2",
 						targetResourceId