@mastra/pg 1.33.0-alpha.1 → 1.33.0-alpha.3

package/dist/index.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-//#region \0rolldown/runtime.js
+// \0rolldown/runtime.js
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -20,7 +20,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 	value: mod,
 	enumerable: true
 }) : target, mod));
-//#endregion
 let _mastra_core_error = require("@mastra/core/error");
 let _mastra_core_storage = require("@mastra/core/storage");
 _mastra_core_storage = __toESM(_mastra_core_storage, 1);
@@ -40,7 +39,7 @@ let _mastra_core_agent = require("@mastra/core/agent");
 let _mastra_core_evals = require("@mastra/core/evals");
 let _mastra_core_storage_domains_skills = require("@mastra/core/storage/domains/skills");
 let util = require("util");
-//#region src/shared/config.ts
+// src/shared/config.ts
 /**
 * Type guard for pre-configured pg.Pool config
 */
@@ -87,8 +86,7 @@ const validateConfig = (name, config) => {
 		]) if (!config[key] || typeof config[key] !== "string" || config[key].trim() === "") throw new Error(`${name}: ${key} must be provided and cannot be empty. Passing an empty string may cause fallback to local Postgres defaults.`);
 	} else throw new Error(`${name}: invalid config. Provide either {pool}, {connectionString}, {host,port,database,user,password}, or a pg ClientConfig (e.g., Cloud SQL connector with \`stream\`).`);
 };
-//#endregion
-//#region src/shared/pool-config.ts
+// src/shared/pool-config.ts
 /**
 * Builds the `pg.Pool` options for a connection-string based config.
 *
@@ -117,8 +115,40 @@ function buildConnectionStringPoolConfig(config, defaults) {
 		idleTimeoutMillis: config.idleTimeoutMillis ?? defaults.idleTimeoutMillis
 	};
 }
-//#endregion
-//#region src/shared/schema-name.ts
+// src/shared/pool-error-guard.ts
+/**
+* A pool-level `error` listener only covers *idle* clients: pg hands ownership
+* of a client to the borrower for the duration of a checkout and takes its own
+* listener off. So a backend restart or network blip that lands on a client
+* mid-transaction reaches an emitter with no listener, and Node escalates that
+* to an uncaughtException that kills the process — the pool handler logs the
+* idle siblings and the borrowed one still brings everything down.
+*
+* Attach a listener once per physical connection instead. `connect` fires when
+* the pool establishes a client, so the client stays covered for its whole life
+* and there is nothing to remove on release.
+*
+* That listener outlives the checkout, so it also sees the failures the pool is
+* already reporting through its own idle listener. Follow `acquire`/`release`
+* to tell the two apart and stay quiet while the client is idle — otherwise one
+* dropped connection is announced twice, the second time as the wrong thing.
+*
+* The pool still discards the failed connection; this only keeps the failure
+* reportable instead of fatal.
+*/
+function guardCheckedOutClientErrors(pool, warn = console.warn) {
+	const borrowed = /* @__PURE__ */ new WeakSet();
+	pool.on("connect", (client) => {
+		borrowed.add(client);
+		client.on("error", (err) => {
+			if (!borrowed.has(client)) return;
+			warn(`PostgreSQL: client error while checked out (the pool discards this connection): ${err instanceof Error ? err.message : String(err)}`);
+		});
+	});
+	pool.on("acquire", (client) => borrowed.add(client));
+	pool.on("release", (_err, client) => borrowed.delete(client));
+}
+// src/shared/schema-name.ts
 const POSTGRES_IDENTIFIER_MAX_BYTES = 63;
 const UNSAFE_SCHEMA_NAME_CHARS = /["'\\$\u0000-\u001f\u007f]/;
 /**
@@ -145,8 +175,7 @@ function schemaNamePrefix(name) {
 	const sanitized = parseSchemaName(name).replace(/[^A-Za-z0-9_]/g, "_");
 	return /^[0-9]/.test(sanitized) ? `_${sanitized}` : sanitized;
 }
-//#endregion
-//#region src/vector/filter.ts
+// src/vector/filter.ts
 /**
 * Translates MongoDB-style filters to PG compatible filters.
 *
@@ -202,8 +231,7 @@ var PGFilterTranslator = class extends _mastra_core_vector_filter.BaseFilterTran
 		return { $regex: flags ? `(?${flags})${pattern}` : pattern };
 	}
 };
-//#endregion
-//#region src/vector/sql-builder.ts
+// src/vector/sql-builder.ts
 const getTextExtractExpr = (key) => {
 	const jsonPathKey = parseJsonPathKey(key);
 	if (!key.includes(".")) return `metadata->>'${jsonPathKey}'`;
@@ -581,8 +609,7 @@ function buildFilterQuery(filter, minScore, topK) {
 		values
 	};
 }
-//#endregion
-//#region src/vector/index.ts
+// src/vector/index.ts
 const DEFAULT_NAMESPACE = "default";
 const MAX_UPSERT_ROWS_PER_STATEMENT = Math.floor(65535 / 4);
 var PgVector = class extends _mastra_core_vector.MastraVector {
@@ -649,6 +676,7 @@ var PgVector = class extends _mastra_core_vector.MastraVector {
 			};
 			else throw new Error("PgVector: invalid configuration provided");
 			this.pool = new pg.Pool(poolConfig);
+			guardCheckedOutClientErrors(this.pool, (message) => this.logger?.warn?.(message));
 			this.pool.on("error", (err) => {
 				this.logger?.warn?.("PgVector: idle pool client error (pool discards the client and reconnects on next checkout)", { err: err instanceof Error ? err.message : err });
 			});
@@ -2047,8 +2075,7 @@ var PgVector = class extends _mastra_core_vector.MastraVector {
 		}
 	}
 };
-//#endregion
-//#region src/storage/client.ts
+// src/storage/client.ts
 /**
 * Truncate a query string for error messages.
 */
@@ -2430,8 +2457,7 @@ function buildConstraintName({ baseName, schemaName, maxLength = 63, hashWhenTru
 	}
 	return truncateIdentifier(fullName, maxLength);
 }
-//#endregion
-//#region src/storage/db/pg-errors.ts
+// src/storage/db/pg-errors.ts
 function asPgError(error) {
 	return error ?? {};
 }
@@ -2459,8 +2485,7 @@ function isDuplicateSchemaError(error) {
 	if (code === "23505" && constraint === "pg_namespace_nspname_index") return true;
 	return /schema .* already exists/i.test(message);
 }
-//#endregion
-//#region src/storage/db/sanitize-json.ts
+// src/storage/db/sanitize-json.ts
 const repair = (value) => value.replace(/[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/g, "�").replaceAll("\0", "");
 function repairJson(value) {
 	if (typeof value === "string") return repair(value);
@@ -2486,8 +2511,7 @@ function toPgJson(value) {
 	if (json === void 0 || !/\\u(?:0000|[dD][89a-fA-F][0-9a-fA-F]{2})/.test(json)) return json;
 	return JSON.stringify(repairJson(JSON.parse(json)));
 }
-//#endregion
-//#region src/storage/db/schema-snapshot.ts
+// src/storage/db/schema-snapshot.ts
 /**
 * Returns the snapshot currently installed on `client`, but only when it was
 * taken from the schema the caller operates on. A store configured for another
@@ -2569,8 +2593,7 @@ async function loadSchemaSnapshot(client, schemaName) {
 		invalidIndexes
 	};
 }
-//#endregion
-//#region src/storage/db/index.ts
+// src/storage/db/index.ts
 const POSTGRES_MAX_BIND_PARAMETERS$1 = 65535;
 /**
 * Resolves PgDomainConfig to a database client and schema.
@@ -2613,6 +2636,7 @@ function resolvePgConfig(config) {
 	pool.on("error", (err) => {
 		console.warn(`resolvePgConfig: idle pool client error (pool discards the client and reconnects on next checkout): ${err instanceof Error ? err.message : String(err)}`);
 	});
+	guardCheckedOutClientErrors(pool);
 	const client = new PoolAdapter(pool);
 	return {
 		client,
@@ -3995,6 +4019,42 @@ MIGRATION REQUIRED: Duplicate spans detected in ${duplicateInfo.tableName}\n====
 			}, error);
 		}
 	}
+	/**
+	* Runs one UPDATE per record in a transaction, changing a row only while every
+	* column in `nullColumns` is still NULL. Never inserts. Returns, in input order,
+	* whether each update changed a row.
+	*/
+	async batchUpdateWhereNull({ tableName, updates, nullColumns }) {
+		const nullConditions = nullColumns.map((column) => ` AND "${(0, _mastra_core_utils.parseSqlIdentifier)(column, "column name")}" IS NULL`).join("");
+		try {
+			return await this.client.tx(async (tx) => {
+				const applied = [];
+				for (const update of updates) {
+					const query = await this.buildUpdateQuery({
+						tableName,
+						...update
+					});
+					if (!query) {
+						applied.push(false);
+						continue;
+					}
+					const rows = await tx.any(`${query.sql}${nullConditions} RETURNING 1`, query.values);
+					applied.push(rows.length > 0);
+				}
+				return applied;
+			});
+		} catch (error) {
+			throw new _mastra_core_error.MastraError({
+				id: (0, _mastra_core_storage.createStorageErrorId)("PG", "BATCH_UPDATE_WHERE_NULL", "FAILED"),
+				domain: _mastra_core_error.ErrorDomain.STORAGE,
+				category: _mastra_core_error.ErrorCategory.THIRD_PARTY,
+				details: {
+					tableName,
+					numberOfRecords: updates.length
+				}
+			}, error);
+		}
+	}
 	async batchDelete({ tableName, keys }) {
 		try {
 			if (keys.length === 0) return;
@@ -4115,9 +4175,14 @@ MIGRATION REQUIRED: Duplicate spans detected in ${duplicateInfo.tableName}\n====
 			columns: [column]
 		});
 	}
-	async executeUpdate(client, { tableName, keys, data }) {
+	async executeUpdate(client, args) {
+		const query = await this.buildUpdateQuery(args);
+		if (!query) return;
+		await client.none(query.sql, query.values);
+	}
+	async buildUpdateQuery({ tableName, keys, data }) {
 		const filteredData = await this.filterRecordToKnownColumns(tableName, data);
-		if (Object.keys(filteredData).length === 0) return;
+		if (Object.keys(filteredData).length === 0) return null;
 		const setColumns = [];
 		const setValues = [];
 		let paramIndex = 1;
@@ -4133,16 +4198,16 @@ MIGRATION REQUIRED: Duplicate spans detected in ${duplicateInfo.tableName}\n====
 			whereConditions.push(`"${parsedKey}" = $${paramIndex++}`);
 			whereValues.push(this.prepareValue(value, key, tableName));
 		});
-		const sql = `UPDATE ${getTableName$6({
-			indexName: tableName,
-			schemaName: getSchemaName$6(this.schemaName)
-		})} SET ${setColumns.join(", ")} WHERE ${whereConditions.join(" AND ")}`;
-		const values = [...setValues, ...whereValues];
-		await client.none(sql, values);
+		return {
+			sql: `UPDATE ${getTableName$6({
+				indexName: tableName,
+				schemaName: getSchemaName$6(this.schemaName)
+			})} SET ${setColumns.join(", ")} WHERE ${whereConditions.join(" AND ")}`,
+			values: [...setValues, ...whereValues]
+		};
 	}
 };
-//#endregion
-//#region src/storage/domains/utils.ts
+// src/storage/domains/utils.ts
 function getSchemaName$5(schema) {
 	return schema ? `"${parseSchemaName(schema)}"` : void 0;
 }
@@ -4223,8 +4288,7 @@ function tenancyWhere(filters, startIndex) {
 		nextIndex: idx
 	};
 }
-//#endregion
-//#region src/storage/domains/agents/index.ts
+// src/storage/domains/agents/index.ts
 var AgentsPG = class AgentsPG extends _mastra_core_storage.AgentsStorage {
 	#db;
 	#schema;
@@ -5071,8 +5135,7 @@ var AgentsPG = class AgentsPG extends _mastra_core_storage.AgentsStorage {
 		};
 	}
 };
-//#endregion
-//#region src/storage/retention.ts
+// src/storage/retention.ts
 function cutoffFor(policy, anchorType, now = Date.now()) {
 	const cutoffMs = (0, _mastra_core_storage.retentionCutoffMs)(policy, now);
 	return anchorType === "epoch-ms" ? cutoffMs : new Date(cutoffMs);
@@ -5099,8 +5162,7 @@ function resolveTargets({ policies, descriptor, order }) {
 		order
 	});
 }
-//#endregion
-//#region src/storage/domains/background-tasks/index.ts
+// src/storage/domains/background-tasks/index.ts
 function getSchemaName$4(schema) {
 	return schema ? `"${schema}"` : "\"public\"";
 }
@@ -5514,8 +5576,7 @@ var BackgroundTasksPG = class BackgroundTasksPG extends _mastra_core_storage.Bac
 		return Number(result?.count ?? 0);
 	}
 };
-//#endregion
-//#region src/storage/domains/blobs/index.ts
+// src/storage/domains/blobs/index.ts
 var BlobsPG = class extends _mastra_core_storage.BlobStore {
 	#db;
 	#schema;
@@ -5617,8 +5678,7 @@ var BlobsPG = class extends _mastra_core_storage.BlobStore {
 		};
 	}
 };
-//#endregion
-//#region src/storage/domains/channels/index.ts
+// src/storage/domains/channels/index.ts
 var ChannelsPG = class ChannelsPG extends _mastra_core_storage.ChannelsStorage {
 	#db;
 	#schema;
@@ -5832,8 +5892,7 @@ var ChannelsPG = class ChannelsPG extends _mastra_core_storage.ChannelsStorage {
 		};
 	}
 };
-//#endregion
-//#region src/storage/domains/datasets/index.ts
+// src/storage/domains/datasets/index.ts
 /** Serialize a value for a jsonb column. Returns null for null/undefined. */
 function jsonbArg(value) {
 	return value === void 0 || value === null ? null : toPgJson(value);
@@ -7104,8 +7163,7 @@ var DatasetsPG = class DatasetsPG extends _mastra_core_storage.DatasetsStorage {
 		await this.#db.clearTable({ tableName: _mastra_core_storage.TABLE_DATASETS });
 	}
 };
-//#endregion
-//#region src/storage/domains/experiments/index.ts
+// src/storage/domains/experiments/index.ts
 const DEFAULT_PRUNE_BATCH_SIZE = 1e3;
 var ExperimentsPG = class ExperimentsPG extends _mastra_core_storage.ExperimentsStorage {
 	#db;
@@ -8051,8 +8109,7 @@ var ExperimentsPG = class ExperimentsPG extends _mastra_core_storage.Experiments
 		await this.#db.clearTable({ tableName: _mastra_core_storage.TABLE_EXPERIMENTS });
 	}
 };
-//#endregion
-//#region src/storage/domains/favorites/index.ts
+// src/storage/domains/favorites/index.ts
 /**
 * Maps a favorite entity type to its parent entity table.
 */
@@ -8324,8 +8381,7 @@ var FavoritesPG = class FavoritesPG extends _mastra_core_storage.FavoritesStorag
 		}
 	}
 };
-//#endregion
-//#region ../../packages/_internal-core/dist/knowledge-compat/index.js
+// ../../packages/_internal-core/dist/knowledge-compat/index.js
 const KNOWLEDGE_V2_CORE_FEATURE = "knowledge-v2";
 /** Hard cap on scope nodes returned by one `listScopeNodes` read. */
 const MAX_KNOWLEDGE_SCOPE_NODES = 1e3;
@@ -8959,8 +9015,7 @@ function createKnowledgeV2CoreLoader(features, loadStorageModule) {
 		return knowledgeV2Core;
 	};
 }
-//#endregion
-//#region src/storage/domains/knowledge/index.ts
+// src/storage/domains/knowledge/index.ts
 const loadKnowledgeV2Core = createKnowledgeV2CoreLoader(_mastra_core_features.coreFeatures, () => import("@mastra/core/storage"));
 async function assertKnowledgeDescriptionWithinBoundCompat(description) {
 	const { assertKnowledgeDescriptionWithinBound } = await loadKnowledgeV2Core();
@@ -10484,8 +10539,7 @@ var KnowledgePG = class extends _mastra_core_storage.KnowledgeStorage {
 		});
 	}
 };
-//#endregion
-//#region src/storage/domains/mcp-clients/index.ts
+// src/storage/domains/mcp-clients/index.ts
 const SNAPSHOT_FIELDS$5 = [
 	"name",
 	"description",
@@ -11046,8 +11100,7 @@ var MCPClientsPG = class MCPClientsPG extends _mastra_core_storage.MCPClientsSto
 		};
 	}
 };
-//#endregion
-//#region src/storage/domains/mcp-servers/index.ts
+// src/storage/domains/mcp-servers/index.ts
 const SNAPSHOT_FIELDS$4 = [
 	"name",
 	"version",
@@ -11629,8 +11682,7 @@ var MCPServersPG = class MCPServersPG extends _mastra_core_storage.MCPServersSto
 		};
 	}
 };
-//#endregion
-//#region ../../packages/_internal-core/dist/memory/index.js
+// ../../packages/_internal-core/dist/memory/index.js
 /**
 * Shared rules for observational memory lifecycle writes. Every storage adapter applies
 * these inside its own atomic section (lock, transaction, or conditional update), so the
@@ -11715,8 +11767,7 @@ function isAppendOnlySince(storedObservations, snapshotObservations) {
 	const snapshot = snapshotObservations ?? "";
 	return stored === snapshot || stored.startsWith(snapshot);
 }
-//#endregion
-//#region src/storage/db/run-fencing.ts
+// src/storage/db/run-fencing.ts
 /**
 * Epoch milliseconds on the database clock. `clock_timestamp()` rather than
 * `now()`: a statement can wait on a row lock, and lease math must use the
@@ -11748,8 +11799,7 @@ function withRunFence(client, claimsTable, fence, operation, write) {
 		return write(t);
 	});
 }
-//#endregion
-//#region src/storage/domains/memory/index.ts
+// src/storage/domains/memory/index.ts
 /**
 * Local constant for the observational memory table name.
 * Defined locally to avoid a static import that crashes on older @mastra/core
@@ -12030,7 +12080,7 @@ var MemoryPG = class MemoryPG extends _mastra_core_storage.MemoryStorage {
 				indexName: OM_TABLE,
 				schemaName: quotedSchemaName
 			});
-			const idxPrefix = schemaPrefix ? `${schemaPrefix}` : "";
+			const idxPrefix = schemaPrefix ? schemaPrefix : "";
 			statements.push(`CREATE INDEX IF NOT EXISTS "${idxPrefix}idx_om_lookup_key" ON ${fullOmTableName} ("lookupKey");`);
 		}
 		for (const idx of MemoryPG.getDefaultIndexDefs(schemaPrefix)) statements.push(generateIndexSQL(idx, schemaName));
@@ -14581,8 +14631,7 @@ var MemoryPG = class MemoryPG extends _mastra_core_storage.MemoryStorage {
 		}
 	}
 };
-//#endregion
-//#region src/storage/domains/notifications/index.ts
+// src/storage/domains/notifications/index.ts
 const COMPOSITE_PRIMARY_KEY$1 = _mastra_core_storage.TABLE_CONFIGS[_mastra_core_storage.TABLE_NOTIFICATIONS].compositePrimaryKey;
 const statusTimestamp = (status, now) => {
 	if (status === "delivered") return { deliveredAt: now };
@@ -15085,8 +15134,7 @@ var NotificationsPG = class NotificationsPG extends _mastra_core_storage.Notific
 		return row ? rowToNotification(row) : void 0;
 	}
 };
-//#endregion
-//#region src/storage/domains/observability/index.ts
+// src/storage/domains/observability/index.ts
 var ObservabilityPG = class ObservabilityPG extends _mastra_core_storage.ObservabilityStorage {
 	/**
 	* Retention-eligible tables. The observability domain has a single physical
@@ -15706,30 +15754,33 @@ var ObservabilityPG = class ObservabilityPG extends _mastra_core_storage.Observa
 			}, error);
 		}
 	}
+	#toSpanUpdates(records) {
+		return records.map((record) => {
+			const data = { ...record.updates };
+			if (data.endedAt instanceof Date) {
+				const endedAt = data.endedAt.toISOString();
+				data.endedAt = endedAt;
+				data.endedAtZ = endedAt;
+			}
+			if (data.startedAt instanceof Date) {
+				const startedAt = data.startedAt.toISOString();
+				data.startedAt = startedAt;
+				data.startedAtZ = startedAt;
+			}
+			return {
+				keys: {
+					spanId: record.spanId,
+					traceId: record.traceId
+				},
+				data
+			};
+		});
+	}
 	async batchUpdateSpans(args) {
 		try {
 			return this.#db.batchUpdate({
 				tableName: _mastra_core_storage.TABLE_SPANS,
-				updates: args.records.map((record) => {
-					const data = { ...record.updates };
-					if (data.endedAt instanceof Date) {
-						const endedAt = data.endedAt.toISOString();
-						data.endedAt = endedAt;
-						data.endedAtZ = endedAt;
-					}
-					if (data.startedAt instanceof Date) {
-						const startedAt = data.startedAt.toISOString();
-						data.startedAt = startedAt;
-						data.startedAtZ = startedAt;
-					}
-					return {
-						keys: {
-							spanId: record.spanId,
-							traceId: record.traceId
-						},
-						data
-					};
-				})
+				updates: this.#toSpanUpdates(args.records)
 			});
 		} catch (error) {
 			throw new _mastra_core_error.MastraError({
@@ -15739,6 +15790,25 @@ var ObservabilityPG = class ObservabilityPG extends _mastra_core_storage.Observa
 			}, error);
 		}
 	}
+	async batchUpdateUnendedSpans(args) {
+		try {
+			const applied = await this.#db.batchUpdateWhereNull({
+				tableName: _mastra_core_storage.TABLE_SPANS,
+				updates: this.#toSpanUpdates(args.records),
+				nullColumns: ["endedAt"]
+			});
+			return { updated: args.records.filter((_, index) => applied[index]).map(({ traceId, spanId }) => ({
+				traceId,
+				spanId
+			})) };
+		} catch (error) {
+			throw new _mastra_core_error.MastraError({
+				id: (0, _mastra_core_storage.createStorageErrorId)("PG", "BATCH_UPDATE_UNENDED_SPANS", "FAILED"),
+				domain: _mastra_core_error.ErrorDomain.STORAGE,
+				category: _mastra_core_error.ErrorCategory.USER
+			}, error);
+		}
+	}
 	async batchDeleteTraces(args) {
 		this.assertUnscopedBatchDeleteTraces(args);
 		try {
@@ -15757,8 +15827,7 @@ var ObservabilityPG = class ObservabilityPG extends _mastra_core_storage.Observa
 		}
 	}
 };
-//#endregion
-//#region src/storage/domains/observability/v-next/signal-schema.ts
+// src/storage/domains/observability/v-next/signal-schema.ts
 const CURSOR_ID_COLUMN = {
 	name: "cursorId",
 	type: "bigserial"
@@ -16409,8 +16478,7 @@ const TEXT_ARRAY_COLUMNS = new Set(columnNamesByType(ALL_EVENT_COLUMNS, "text[]"
 const METRIC_TYPED_COLUMNS = typedColumnNames(METRIC_EVENT_COLUMNS);
 const SCORE_TYPED_COLUMNS = typedColumnNames(SCORE_EVENT_COLUMNS);
 const FEEDBACK_TYPED_COLUMNS = typedColumnNames(FEEDBACK_EVENT_COLUMNS);
-//#endregion
-//#region src/storage/domains/observability/v-next/ddl.ts
+// src/storage/domains/observability/v-next/ddl.ts
 /**
 * Raw DDL for Postgres v-next observability tables.
 *
@@ -16807,8 +16875,7 @@ function additiveColumns(schema) {
 function allIndexDDL(schema) {
 	return tableIndexes().map((spec) => indexDDL(schema, spec));
 }
-//#endregion
-//#region src/storage/domains/observability/v-next/discovery.ts
+// src/storage/domains/observability/v-next/discovery.ts
 const DEFAULT_TTL_SECONDS = 300;
 const DEFAULT_LOOKBACK_SECONDS = 2592e3;
 /** All signal tables that contain a column. Used by cross-signal discovery. */
@@ -17043,8 +17110,7 @@ async function getMetricLabelValues(client, schema, args, config) {
 	if (args.limit) filtered = filtered.slice(0, args.limit);
 	return { values: filtered };
 }
-//#endregion
-//#region src/storage/domains/observability/v-next/filters.ts
+// src/storage/domains/observability/v-next/filters.ts
 function newFilterAccumulator(startIndex = 1) {
 	return {
 		conditions: [],
@@ -17119,8 +17185,7 @@ function applySingleOrArrayFilter(acc, column, value, prefix = "") {
 function whereOrEmpty(acc) {
 	return acc.conditions.length ? `WHERE ${acc.conditions.join(" AND ")}` : "";
 }
-//#endregion
-//#region src/storage/domains/observability/v-next/preview-compat.ts
+// src/storage/domains/observability/v-next/preview-compat.ts
 const generator = _mastra_core_storage.buildStoredPreview;
 const canGeneratePreviews = typeof generator === "function";
 /** SQL detection only; preview formatting stays in TypeScript. Empty strings are intentional. */
@@ -17177,8 +17242,7 @@ function buildSpanQueryResponse(...args) {
 	}
 	return response;
 }
-//#endregion
-//#region src/storage/domains/observability/v-next/review-status.ts
+// src/storage/domains/observability/v-next/review-status.ts
 const FEEDBACK_REVIEW_STATUSES = ["needs-review", "reviewed"];
 function isFeedbackReviewStatus(value) {
 	return FEEDBACK_REVIEW_STATUSES.some((status) => status === value);
@@ -17202,8 +17266,7 @@ function parseUpdateFeedbackReviewStatusArgs(args) {
 		reviewStatus: args.reviewStatus
 	};
 }
-//#endregion
-//#region src/storage/domains/observability/v-next/sql.ts
+// src/storage/domains/observability/v-next/sql.ts
 /**
 * SQL helpers for the v-next Postgres observability domain.
 *
@@ -17333,8 +17396,7 @@ const SCORE_SELECT_COLUMNS = `
 ${buildSelectColumns(SCORE_EVENT_COLUMNS)}`;
 const FEEDBACK_SELECT_COLUMNS = `
 ${buildSelectColumns(FEEDBACK_EVENT_COLUMNS)}`;
-//#endregion
-//#region src/storage/domains/observability/v-next/helpers.ts
+// src/storage/domains/observability/v-next/helpers.ts
 const PROMOTED_KEYS = /* @__PURE__ */ new Set([
 	"experimentId",
 	"entityType",
@@ -17771,8 +17833,7 @@ function rowToFeedbackRecord(row) {
 		scope: parsedJson(row.scope) ?? void 0
 	};
 }
-//#endregion
-//#region src/storage/domains/observability/v-next/polling.ts
+// src/storage/domains/observability/v-next/polling.ts
 /**
 * Delta-polling helpers for the v-next Postgres observability domain.
 *
@@ -17841,8 +17902,7 @@ function decodeDeltaCursor(cursor) {
 async function readSafeXactHorizon(client) {
 	return validatePgInteger((await client.one(`SELECT pg_snapshot_xmin(pg_current_snapshot())::text AS "xactId"`)).xactId);
 }
-//#endregion
-//#region src/storage/domains/observability/v-next/listing.ts
+// src/storage/domains/observability/v-next/listing.ts
 function responseItems(key, items) {
 	return { [key]: items };
 }
@@ -17929,8 +17989,7 @@ async function listSignalDelta(config) {
 		deltaCursor
 	};
 }
-//#endregion
-//#region src/storage/domains/observability/v-next/olap.ts
+// src/storage/domains/observability/v-next/olap.ts
 /**
 * Shared OLAP helpers for the v-next Postgres observability domain.
 *
@@ -18134,8 +18193,7 @@ const COMPLEX_GROUP_BY_EXCLUDED = /* @__PURE__ */ new Set([
 	"tags",
 	"requestContext"
 ]);
-//#endregion
-//#region src/storage/domains/observability/v-next/feedback.ts
+// src/storage/domains/observability/v-next/feedback.ts
 /**
 * Feedback operations for the v-next Postgres observability domain.
 *
@@ -18373,8 +18431,7 @@ async function getFeedbackPercentiles(client, schema, args) {
   `;
 	return { series: percentileSeriesFromRows(await client.manyOrNone(sql, acc.params), args.percentiles) };
 }
-//#endregion
-//#region src/storage/domains/observability/v-next/logs.ts
+// src/storage/domains/observability/v-next/logs.ts
 /**
 * Log operations for the v-next Postgres observability domain.
 */
@@ -18426,8 +18483,7 @@ async function listLogsDelta(client, table, filters, after, limit) {
 		mapRow: rowToLogRecord
 	});
 }
-//#endregion
-//#region src/storage/domains/observability/v-next/metrics.ts
+// src/storage/domains/observability/v-next/metrics.ts
 /**
 * Metric operations for the v-next Postgres observability domain.
 *
@@ -18664,8 +18720,7 @@ async function getMetricPercentiles(client, schema, args) {
   `;
 	return { series: percentileSeriesFromRows(await client.manyOrNone(sql, acc.params), args.percentiles) };
 }
-//#endregion
-//#region src/storage/domains/observability/v-next/partitioning.ts
+// src/storage/domains/observability/v-next/partitioning.ts
 const DEFAULT_FUTURE_DAYS = 14;
 async function detectTimescale(client) {
 	const row = await client.oneOrNone(`SELECT EXISTS (SELECT 1 FROM pg_extension WHERE extname = 'timescaledb') AS "exists"`);
@@ -18824,8 +18879,7 @@ async function setupPartitioning(client, schema, options = {}) {
 			return "native";
 	}
 }
-//#endregion
-//#region src/storage/domains/observability/v-next/retention.ts
+// src/storage/domains/observability/v-next/retention.ts
 /**
 * Age-based retention for the v-next Postgres observability domain.
 *
@@ -18945,8 +18999,7 @@ async function pruneTimescaleTable({ client, schema, table, cutoff, options }) {
 		done: true
 	};
 }
-//#endregion
-//#region src/storage/domains/observability/v-next/scores.ts
+// src/storage/domains/observability/v-next/scores.ts
 /**
 * Score operations for the v-next Postgres observability domain.
 *
@@ -19225,8 +19278,7 @@ async function getScorePercentiles(client, schema, args) {
   `;
 	return { series: percentileSeriesFromRows(await client.manyOrNone(sql, acc.params), args.percentiles) };
 }
-//#endregion
-//#region src/storage/domains/observability/v-next/trace-query.ts
+// src/storage/domains/observability/v-next/trace-query.ts
 const TRACE_STATUS_SQL = `CASE WHEN r."error" IS NOT NULL THEN 'error' ELSE 'success' END`;
 /** Core versions without the field reject it in strict query results, so it is only returned when core knows it. */
 const timeToFirstChunkSupported = "timeToFirstChunkMs" in _mastra_core_storage.TRACE_QUERY_FIELD_REGISTRY.trace;
@@ -20218,8 +20270,7 @@ function compileSpanQueryPredicate(predicate, offset) {
 function compileThreadQueryPredicate(predicate, offset) {
 	return compileScalarPredicate(predicate, Object.fromEntries(Object.keys(_mastra_core_storage.THREAD_QUERY_FIELD_REGISTRY).map((field) => [field, `s."${field}"`])), offset);
 }
-//#endregion
-//#region src/storage/domains/observability/v-next/span-query.ts
+// src/storage/domains/observability/v-next/span-query.ts
 const identityFields = [
 	"organizationId",
 	"resourceId",
@@ -20432,8 +20483,7 @@ async function querySpans(client, schema, plan, timeoutMs) {
 		return buildSpanQueryResponse(plan, hydrated, payloads, metrics);
 	}, { repeatableRead: true });
 }
-//#endregion
-//#region src/storage/domains/observability/v-next/thread-query.ts
+// src/storage/domains/observability/v-next/thread-query.ts
 const contextFields = [
 	"resourceId",
 	"userId",
@@ -20597,7 +20647,7 @@ async function queryThreadRows(client, schema, plan, timeoutMs, strategy = "auto
 			return `"${field}" ${field === "organizationId" || field === "resourceId" ? "IS NOT DISTINCT FROM" : "="} $${values.length}`;
 		}).join(" AND ")})`;
 	}));
-	const payloads = await run(`SELECT "organizationId", "traceId", "cursorId", "spanType", ${contextFields.map((field) => `"${field}"`).join(", ")},
+	const payloads = await run(`SELECT "organizationId", "traceId", "cursorId", ${contextFields.map((field) => `"${field}"`).join(", ")},
     CASE WHEN "spanType" = 'agent_run' THEN "timeToFirstChunkMs" END AS "timeToFirstChunkMs",
     CASE WHEN error IS NULL THEN 'success' ELSE 'error' END AS status,
     ${[
@@ -20612,30 +20662,10 @@ async function queryThreadRows(client, schema, plan, timeoutMs, strategy = "auto
 		String(version)
 	]);
 	const byRoot = new Map(payloads.map((row) => [key(row.organizationId, row.traceId, row.cursorId), row]));
-	const agents = page.filter((row) => byRoot.get(key(row.organizationId, row.firstTraceId, row.firstCursorId))?.spanType === "agent_run");
-	const models = /* @__PURE__ */ new Map();
-	if (agents.length) {
-		const modelValues = [];
-		const rows = await run(`SELECT DISTINCT ON ("organizationId", "traceId") "organizationId", "traceId",
-        CASE WHEN jsonb_typeof(attributes -> 'model') = 'string' THEN attributes ->> 'model' END AS model,
-        CASE WHEN jsonb_typeof(attributes -> 'provider') = 'string' THEN attributes ->> 'provider' END AS provider
-        FROM ${table} WHERE "spanType" = 'model_generation' AND NOT "isPending" AND (${agents.map((row) => `(${Object.entries({
-			organizationId: row.organizationId,
-			resourceId: row.resourceId,
-			traceId: row.firstTraceId,
-			parentSpanId: row.firstSpanId
-		}).map(([field, value]) => {
-			modelValues.push(value);
-			return `"${field}" ${field === "organizationId" || field === "resourceId" ? "IS NOT DISTINCT FROM" : "="} $${modelValues.length}`;
-		}).join(" AND ")})`).join(" OR ")})
-        ORDER BY "organizationId", "traceId", "startedAt", "spanId" COLLATE "C", "cursorId" DESC`, modelValues);
-		for (const row of rows) models.set(JSON.stringify([row.organizationId, row.traceId]), row);
-	}
 	const threads = page.flatMap((row) => {
 		const first = byRoot.get(key(row.organizationId, row.firstTraceId, row.firstCursorId));
 		const last = byRoot.get(key(row.organizationId, row.lastTraceId, row.lastCursorId));
 		if (!first || !last) return [];
-		const model = models.get(JSON.stringify([row.organizationId, row.firstTraceId]));
 		return [_mastra_core_storage.threadQueryRowSchema.parse({
 			organizationId: row.organizationId,
 			threadId: row.threadId,
@@ -20647,8 +20677,6 @@ async function queryThreadRows(client, schema, plan, timeoutMs, strategy = "auto
 			endedAt: row.endedAt.toISOString(),
 			traceCount: Number(row.traceCount),
 			timeToFirstChunkMs: first.timeToFirstChunkMs,
-			model: model?.model ?? null,
-			provider: model?.provider ?? null,
 			inputPreview: readPreview(first.inputPreview, first.input),
 			outputPreview: readPreview(last.outputPreview, last.output),
 			errorPreview: readPreview(last.errorPreview, last.error)
@@ -20664,8 +20692,7 @@ async function queryThreadRows(client, schema, plan, timeoutMs, strategy = "auto
 		}) : null }
 	};
 }
-//#endregion
-//#region src/storage/domains/observability/v-next/trace-aggregate.ts
+// src/storage/domains/observability/v-next/trace-aggregate.ts
 /** Trace-root column expressions (alias `r`) for each groupable dimension; same values `where` sees. */
 const DIMENSION_SQL = {
 	entityType: "r.\"entityType\"",
@@ -20991,8 +21018,7 @@ async function runAggregate(client, plan, compiled, timeoutMs) {
 		truncated
 	};
 }
-//#endregion
-//#region src/storage/domains/observability/v-next/traces.ts
+// src/storage/domains/observability/v-next/traces.ts
 /**
 * Trace / branch list reads for the v-next Postgres observability domain.
 *
@@ -21606,8 +21632,7 @@ async function listBranchesDelta(client, span, filters, after, limit) {
 async function readBranchesStreamHeadCursor(client, span, filters) {
 	return encodeDeltaCursor(await readSafeXactHorizon(client), 0);
 }
-//#endregion
-//#region src/storage/domains/observability/v-next/tracing.ts
+// src/storage/domains/observability/v-next/tracing.ts
 async function writeSpanRows(client, schema, rows) {
 	const deduped = dedupeSpanRows(rows);
 	const insert = buildInsert(schema, TABLE_SPAN_EVENTS, deduped, spanConflictClause(Object.keys(deduped[0] ?? {})));
@@ -21736,8 +21761,7 @@ async function dangerouslyClearTracing(client, schema) {
 	const span = qualifiedTable(schema, TABLE_SPAN_EVENTS);
 	await client.none(`TRUNCATE TABLE ${span} RESTART IDENTITY`);
 }
-//#endregion
-//#region src/storage/domains/observability/v-next/index.ts
+// src/storage/domains/observability/v-next/index.ts
 /**
 * Postgres v-next observability storage domain.
 *
@@ -21825,7 +21849,7 @@ var ObservabilityStoragePostgresVNext = class ObservabilityStoragePostgresVNext
 			else if (await detectPartman(this.#client)) mode = "partman";
 			else mode = "native";
 			const ddlMode = mode === "timescale" ? "timescale" : "partitioned";
-			try {
+			if (!await this.#client.oneOrNone("SELECT 1 FROM information_schema.schemata WHERE schema_name = $1", [this.#schema])) try {
 				await this.#client.none(schemaDDL(this.#schema));
 			} catch (error) {
 				if (!isDuplicateSchemaError(error)) throw error;
@@ -22176,8 +22200,7 @@ var ObservabilityStoragePostgresVNext = class ObservabilityStoragePostgresVNext
 		}
 	}
 };
-//#endregion
-//#region src/storage/domains/prompt-blocks/index.ts
+// src/storage/domains/prompt-blocks/index.ts
 const SNAPSHOT_FIELDS$3 = [
 	"name",
 	"description",
@@ -22754,8 +22777,7 @@ var PromptBlocksPG = class PromptBlocksPG extends _mastra_core_storage.PromptBlo
 		};
 	}
 };
-//#endregion
-//#region src/storage/domains/schedules/index.ts
+// src/storage/domains/schedules/index.ts
 function getSchemaName$2(schema) {
 	return schema ? `"${schema}"` : "\"public\"";
 }
@@ -23123,8 +23145,7 @@ var SchedulesPG = class SchedulesPG extends _mastra_core_storage.SchedulesStorag
        ${limitClause}`, params)).map(rowToTrigger);
 	}
 };
-//#endregion
-//#region src/storage/domains/scorer-definitions/index.ts
+// src/storage/domains/scorer-definitions/index.ts
 const SNAPSHOT_FIELDS$2 = [
 	"name",
 	"description",
@@ -23724,8 +23745,7 @@ var ScorerDefinitionsPG = class ScorerDefinitionsPG extends _mastra_core_storage
 		};
 	}
 };
-//#endregion
-//#region src/storage/domains/scores/index.ts
+// src/storage/domains/scores/index.ts
 /**
 * Appends multi-tenant scope conditions to a query. Mutates `conditions`/`queryParams`.
 * Returns the next positional parameter index.
@@ -24187,8 +24207,7 @@ var ScoresPG = class ScoresPG extends _mastra_core_storage.ScoresStorage {
 		}
 	}
 };
-//#endregion
-//#region src/storage/domains/skills/index.ts
+// src/storage/domains/skills/index.ts
 const SNAPSHOT_FIELDS$1 = [
 	"name",
 	"description",
@@ -24884,8 +24903,7 @@ var SkillsPG = class SkillsPG extends _mastra_core_storage.SkillsStorage {
 		};
 	}
 };
-//#endregion
-//#region src/storage/domains/thread-state/index.ts
+// src/storage/domains/thread-state/index.ts
 const COMPOSITE_PRIMARY_KEY = ["threadId", "type"];
 /**
 * PostgreSQL implementation of {@link ThreadStateStorage}.
@@ -25050,8 +25068,7 @@ var ThreadStatePG = class ThreadStatePG extends _mastra_core_storage.ThreadState
 		}
 	}
 };
-//#endregion
-//#region src/storage/domains/tool-provider-connections/index.ts
+// src/storage/domains/tool-provider-connections/index.ts
 function normaliseScope(raw) {
 	const value = raw == null ? "per-author" : String(raw);
 	if (value === "shared") return "shared";
@@ -25306,8 +25323,7 @@ var ToolProviderConnectionsPG = class ToolProviderConnectionsPG extends _mastra_
 		}
 	}
 };
-//#endregion
-//#region src/storage/domains/workflow-definitions/index.ts
+// src/storage/domains/workflow-definitions/index.ts
 function rowToDefinition(row) {
 	const inputSchema = parseJsonResilient(row.inputSchema);
 	const outputSchema = parseJsonResilient(row.outputSchema);
@@ -25507,8 +25523,7 @@ var WorkflowDefinitionsPG = class WorkflowDefinitionsPG extends _mastra_core_sto
 		await this.#db.client.none(`DELETE FROM ${tableName} WHERE "id" = $1`, [id]);
 	}
 };
-//#endregion
-//#region src/storage/domains/workflows/index.ts
+// src/storage/domains/workflows/index.ts
 function getSchemaName(schema) {
 	return schema ? `"${schema}"` : "\"public\"";
 }
@@ -25645,6 +25660,13 @@ var WorkflowsPG = class WorkflowsPG extends _mastra_core_storage.WorkflowsStorag
 	supportsConcurrentUpdates() {
 		return true;
 	}
+	supportsGuardedSnapshotWrites() {
+		return true;
+	}
+	/** SQL for a snapshot's status. Legacy json/text columns can hold escapes that fail a jsonb cast (#11563). */
+	async #statusExpression(column) {
+		return await this.#db.getColumnType(_mastra_core_storage.TABLE_WORKFLOW_SNAPSHOT, "snapshot") === "jsonb" ? `${column} ->> 'status'` : `regexp_replace(${column}::text, '\\\\u(0000|[Dd][89A-Fa-f][0-9A-Fa-f]{2})', '', 'g')::jsonb ->> 'status'`;
+	}
 	parseWorkflowRun(row) {
 		let parsedSnapshot = row.snapshot;
 		if (typeof parsedSnapshot === "string") try {
@@ -26040,20 +26062,22 @@ var WorkflowsPG = class WorkflowsPG extends _mastra_core_storage.WorkflowsStorag
 			}, error);
 		}
 	}
-	async persistWorkflowSnapshot({ workflowName, runId, resourceId, snapshot, createdAt, updatedAt, fence }) {
+	async persistWorkflowSnapshot({ workflowName, runId, resourceId, snapshot, createdAt, updatedAt, fence, expectedStatus }) {
 		try {
 			const now = /* @__PURE__ */ new Date();
 			const createdAtValue = createdAt ? createdAt : now;
 			const updatedAtValue = updatedAt ? updatedAt : now;
 			const sanitizedSnapshot = toPgJson(snapshot);
-			await withRunFence(this.#db.client, this.#runOwnersTable(), (0, _mastra_core_storage.resolveRunFence)(this, fence, runId), "persistWorkflowSnapshot", (q) => q.none(`INSERT INTO ${getTableName({
+			const guard = expectedStatus === void 0 ? "" : ` WHERE ${await this.#statusExpression("t.snapshot")} = ANY($9::text[])`;
+			return await withRunFence(this.#db.client, this.#runOwnersTable(), (0, _mastra_core_storage.resolveRunFence)(this, fence, runId), "persistWorkflowSnapshot", (q) => q.oneOrNone(`INSERT INTO ${getTableName({
 				indexName: _mastra_core_storage.TABLE_WORKFLOW_SNAPSHOT,
 				schemaName: getSchemaName(this.#schema)
 			})} AS t
                  (workflow_name, run_id, "resourceId", snapshot, "createdAt", "updatedAt", "createdAtZ", "updatedAtZ")
                  VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
                  ON CONFLICT (workflow_name, run_id) DO UPDATE
-                 SET "resourceId" = COALESCE($3, t."resourceId"), snapshot = $4, "updatedAt" = $6, "updatedAtZ" = $8`, [
+                 SET "resourceId" = COALESCE($3, t."resourceId"), snapshot = $4, "updatedAt" = $6, "updatedAtZ" = $8${guard}
+                 RETURNING 1 AS written`, [
 				workflowName,
 				runId,
 				resourceId,
@@ -26061,8 +26085,9 @@ var WorkflowsPG = class WorkflowsPG extends _mastra_core_storage.WorkflowsStorag
 				createdAtValue,
 				updatedAtValue,
 				createdAtValue,
-				updatedAtValue
-			]));
+				updatedAtValue,
+				...expectedStatus === void 0 ? [] : [Array.isArray(expectedStatus) ? expectedStatus : [expectedStatus]]
+			])) !== null;
 		} catch (error) {
 			if ((0, _mastra_core_storage.isRunFenceConflictError)(error)) throw error;
 			throw new _mastra_core_error.MastraError({
@@ -26072,6 +26097,25 @@ var WorkflowsPG = class WorkflowsPG extends _mastra_core_storage.WorkflowsStorag
 			}, error);
 		}
 	}
+	async loadWorkflowRunStatus({ workflowName, runId }) {
+		try {
+			const statusExpr = await this.#statusExpression("snapshot");
+			return (await this.#db.client.oneOrNone(`SELECT ${statusExpr} AS status FROM ${getTableName({
+				indexName: _mastra_core_storage.TABLE_WORKFLOW_SNAPSHOT,
+				schemaName: getSchemaName(this.#schema)
+			})} WHERE "workflow_name" = $1 AND "run_id" = $2 ORDER BY "createdAt" DESC LIMIT 1`, [workflowName, runId]))?.status ?? null;
+		} catch (error) {
+			throw new _mastra_core_error.MastraError({
+				id: (0, _mastra_core_storage.createStorageErrorId)("PG", "LOAD_WORKFLOW_RUN_STATUS", "FAILED"),
+				domain: _mastra_core_error.ErrorDomain.STORAGE,
+				category: _mastra_core_error.ErrorCategory.THIRD_PARTY,
+				details: {
+					workflowName,
+					runId
+				}
+			}, error);
+		}
+	}
 	async loadWorkflowSnapshot({ workflowName, runId }) {
 		try {
 			const result = await this.#db.load({
@@ -26237,8 +26281,7 @@ var WorkflowsPG = class WorkflowsPG extends _mastra_core_storage.WorkflowsStorag
 		}
 	}
 };
-//#endregion
-//#region src/storage/domains/workspaces/index.ts
+// src/storage/domains/workspaces/index.ts
 const SNAPSHOT_FIELDS = [
 	"name",
 	"description",
@@ -26859,8 +26902,7 @@ var WorkspacesPG = class WorkspacesPG extends _mastra_core_storage.WorkspacesSto
 		};
 	}
 };
-//#endregion
-//#region src/storage/factory-storage.ts
+// src/storage/factory-storage.ts
 const IDENTIFIER_RE = /^[A-Za-z_][A-Za-z0-9_]*$/;
 const PG_UNIQUE_VIOLATION = "23505";
 const COLUMN_DDL = {
@@ -27152,38 +27194,6 @@ var PgFactoryStorageOps = class {
 * Supports serializable app-table transactions for cross-replica invariant
 * enforcement and `authDatabase()` exposing the shared pool.
 */
-/**
-* A pool-level `error` listener only covers *idle* clients: pg hands ownership
-* of a client to the borrower for the duration of a checkout and takes its own
-* listener off. So a backend restart or network blip that lands on a client
-* mid-transaction reaches an emitter with no listener, and Node escalates that
-* to an uncaughtException that kills the process — the pool handler logs the
-* idle siblings and the borrowed one still brings everything down.
-*
-* Attach a listener once per physical connection instead. `connect` fires when
-* the pool establishes a client, so the client stays covered for its whole life
-* and there is nothing to remove on release.
-*
-* That listener outlives the checkout, so it also sees the failures the pool is
-* already reporting through its own idle listener. Follow `acquire`/`release`
-* to tell the two apart and stay quiet while the client is idle — otherwise one
-* dropped connection is announced twice, the second time as the wrong thing.
-*
-* The pool still discards the failed connection; this only keeps the failure
-* reportable instead of fatal.
-*/
-function guardCheckedOutClientErrors(pool, warn = console.warn) {
-	const borrowed = /* @__PURE__ */ new WeakSet();
-	pool.on("connect", (client) => {
-		borrowed.add(client);
-		client.on("error", (err) => {
-			if (!borrowed.has(client)) return;
-			warn(`PgFactoryStorage: client error while checked out (the pool discards this connection): ${err instanceof Error ? err.message : String(err)}`);
-		});
-	});
-	pool.on("acquire", (client) => borrowed.add(client));
-	pool.on("release", (_err, client) => borrowed.delete(client));
-}
 var PgFactoryStorage = class extends _mastra_core_storage.FactoryStorage {
 	ops;
 	#pool;
@@ -27309,8 +27319,7 @@ var PgFactoryStorage = class extends _mastra_core_storage.FactoryStorage {
 		}
 	}
 };
-//#endregion
-//#region src/storage/index.ts
+// src/storage/index.ts
 /** Default maximum number of connections in the pool */
 const DEFAULT_MAX_CONNECTIONS = 20;
 /** Default idle timeout in milliseconds */
@@ -27482,6 +27491,7 @@ var PostgresStore = class extends _mastra_core_storage.MastraCompositeStore {
 		pool.on("error", (err) => {
 			this.logger?.warn?.("PostgresStore: idle pool client error (pool discards the client and reconnects on next checkout)", { err: err instanceof Error ? err.message : err });
 		});
+		guardCheckedOutClientErrors(pool, (message) => this.logger?.warn?.(message));
 		return pool;
 	}
 	#buildPool(config) {
@@ -27621,9 +27631,12 @@ var PostgresStoreVNext = class extends PostgresStore {
 		const observabilityClient = built.client;
 		this.#observabilityPool = built.pool;
 		this.#ownsObservabilityPool = built.owned;
-		if (built.owned) built.pool.on("error", (err) => {
-			this.logger?.warn?.("PostgresStoreVNext: idle observability pool client error (pool discards the client and reconnects on next checkout)", { err: err instanceof Error ? err.message : err });
-		});
+		if (built.owned) {
+			guardCheckedOutClientErrors(built.pool, (message) => this.logger?.warn?.(message));
+			built.pool.on("error", (err) => {
+				this.logger?.warn?.("PostgresStoreVNext: idle observability pool client error (pool discards the client and reconnects on next checkout)", { err: err instanceof Error ? err.message : err });
+			});
+		}
 		const observability = new ObservabilityStoragePostgresVNext({
 			client: observabilityClient,
 			schemaName: obsConfig.schemaName ?? config.schemaName,
@@ -27677,8 +27690,7 @@ var PostgresStoreVNext = class extends PostgresStore {
 		}
 	}
 };
-//#endregion
-//#region src/vector/prompt.ts
+// src/vector/prompt.ts
 /**
 * Vector store specific prompt that details supported operators and examples.
 * This prompt helps users construct valid filters for PG Vector.
@@ -27780,7 +27792,6 @@ Example Complex Query:
     ]}
   ]
 }`;
-//#endregion
 exports.AgentsPG = AgentsPG;
 exports.BackgroundTasksPG = BackgroundTasksPG;
 exports.BlobsPG = BlobsPG;