@mastra/pg 1.23.0-alpha.5 → 1.23.0-alpha.7

package/dist/index.js

@@ -560,6 +560,8 @@ var PgVector = class extends MastraVector {
 	indexMetadataCache = /* @__PURE__ */ new Map();
 	createdIndexes = /* @__PURE__ */ new Map();
 	namespaceReadyIndexes = /* @__PURE__ */ new Set();
+	/** In-flight lazy namespace migrations, keyed by index name (see {@link ensureNamespaceReady}). */
+	namespaceReadyCache = /* @__PURE__ */ new Map();
 	indexVectorTypes = /* @__PURE__ */ new Map();
 	mutexesByName = /* @__PURE__ */ new Map();
 	schema;
@@ -804,8 +806,10 @@ var PgVector = class extends MastraVector {
          AND attnum > 0
          AND NOT attisdropped`, [tableName])).rowCount === 0) return;
 		await client.query(`ALTER TABLE ${tableName} ADD COLUMN IF NOT EXISTS namespace VARCHAR(255) NOT NULL DEFAULT '${DEFAULT_NAMESPACE}'`);
-		const namespaceIndexName = this.getNamespaceIndexName(parsedIndexName);
-		await client.query(`CREATE UNIQUE INDEX IF NOT EXISTS "${namespaceIndexName}" ON ${tableName} (namespace, vector_id)`);
+		if (!(await this.getNamespaceSchemaState(tableName, client)).composite_index) {
+			const namespaceIndexName = this.getNamespaceIndexName(parsedIndexName);
+			await client.query(`CREATE UNIQUE INDEX IF NOT EXISTS "${namespaceIndexName}" ON ${tableName} (namespace, vector_id)`);
+		}
 		const legacyConstraints = await client.query(`SELECT c.conname
        FROM pg_constraint c
        WHERE c.conrelid = to_regclass($1)
@@ -816,21 +820,84 @@ var PgVector = class extends MastraVector {
 			await client.query(`ALTER TABLE ${tableName} DROP CONSTRAINT "${parsedConstraintName}"`);
 		}
 	}
-	/**
-	* Name of the unique (namespace, vector_id) index for a table.
-	*
-	* The full `<index>_namespace_vector_id_idx` name is kept whenever it fits so tables that
-	* were already migrated keep matching `IF NOT EXISTS`. Longer index names would exceed
-	* Postgres' 63-char identifier limit, so those fall back to a truncated prefix plus a hash
-	* of the index name to distinguish tables that
-	* share a long prefix.
-	*/
 	getNamespaceIndexName(parsedIndexName) {
 		const fullName = `${parsedIndexName}_namespace_vector_id_idx`;
 		if (fullName.length <= 63) return fullName;
 		const suffix = `_ns_${createHash("sha256").update(parsedIndexName).digest("hex").slice(0, 32)}_idx`;
 		return `${parsedIndexName.slice(0, 63 - suffix.length)}${suffix}`;
 	}
+	async getNamespaceSchemaState(tableName, client) {
+		return (await client.query(`SELECT
+         EXISTS (SELECT 1 FROM pg_attribute WHERE attrelid = to_regclass($1)
+           AND attname = 'vector_id' AND attnum > 0 AND NOT attisdropped) AS vector_id,
+         EXISTS (SELECT 1 FROM pg_attribute WHERE attrelid = to_regclass($1)
+           AND attname = 'namespace' AND attnum > 0 AND NOT attisdropped) AS namespace,
+         EXISTS (
+           SELECT 1 FROM pg_index i
+           WHERE i.indrelid = to_regclass($1)
+             AND i.indisunique AND i.indisvalid AND i.indisready AND i.indimmediate
+             AND i.indpred IS NULL AND i.indexprs IS NULL AND i.indnkeyatts = 2
+             AND (SELECT array_agg(a.attname::text ORDER BY a.attname)
+                  FROM unnest(i.indkey) WITH ORDINALITY AS k(attnum, position)
+                  JOIN pg_attribute a ON a.attrelid = i.indrelid AND a.attnum = k.attnum
+                  WHERE k.position <= i.indnkeyatts) = ARRAY['namespace', 'vector_id']
+         ) AS composite_index,
+         EXISTS (SELECT 1 FROM pg_constraint WHERE conrelid = to_regclass($1)
+           AND contype = 'u' AND pg_get_constraintdef(oid) = 'UNIQUE (vector_id)') AS legacy_constraint`, [tableName])).rows[0];
+	}
+	async reconcileNamespace(indexName, client) {
+		const { tableName } = this.getTableName(indexName);
+		await client.query("BEGIN");
+		try {
+			await client.query("SELECT pg_advisory_xact_lock((1936876916::bigint << 32) | to_regclass($1)::oid::bigint)", [tableName]);
+			const state = await this.getNamespaceSchemaState(tableName, client);
+			if (!state.vector_id) {
+				await client.query("ROLLBACK");
+				return false;
+			}
+			if (!state.namespace || !state.composite_index || state.legacy_constraint) {
+				if (this.disableInit || process.env.MASTRA_DISABLE_STORAGE_INIT === "true") throw new MastraError({
+					id: createVectorErrorId("PG", "ENSURE_NAMESPACE", "MIGRATION_REQUIRED"),
+					domain: ErrorDomain.MASTRA_VECTOR,
+					category: ErrorCategory.USER,
+					text: `Vector index "${indexName}" requires namespace migration and schema changes are disabled. Call createIndex({ indexName: "${indexName}", dimension }) with init enabled, or apply the namespace migration SQL from the @mastra/pg changelog.`,
+					details: { indexName }
+				});
+				await this.ensureNamespaceSchema(indexName, client);
+				const migrated = await this.getNamespaceSchemaState(tableName, client);
+				if (!migrated.namespace || !migrated.composite_index || migrated.legacy_constraint) throw new MastraError({
+					id: createVectorErrorId("PG", "ENSURE_NAMESPACE", "MIGRATION_REQUIRED"),
+					domain: ErrorDomain.MASTRA_VECTOR,
+					category: ErrorCategory.USER,
+					text: `Vector index "${indexName}" requires a valid unique (namespace, vector_id) index. Resolve conflicting index names and retry the namespace migration.`,
+					details: { indexName }
+				});
+			}
+			await client.query("COMMIT");
+			return true;
+		} catch (error) {
+			await client.query("ROLLBACK");
+			throw error;
+		}
+	}
+	/**
+	* Every data path filters on `namespace`, but tables created before that column existed are
+	* only migrated by `createIndex()`, which callers are not required to invoke before reading.
+	* Run the migration lazily instead, once per index per process.
+	*/
+	ensureNamespaceReady(indexName) {
+		if (this.namespaceReadyIndexes.has(indexName)) return Promise.resolve();
+		return this.memoize(this.namespaceReadyCache, indexName, () => this.getMutexByName(`create-${indexName}`).runExclusive(async () => {
+			if (this.namespaceReadyIndexes.has(indexName)) return;
+			const client = await this.pool.connect();
+			try {
+				if (await this.reconcileNamespace(indexName, client)) this.namespaceReadyIndexes.add(indexName);
+				else this.namespaceReadyCache.delete(indexName);
+			} finally {
+				client.release();
+			}
+		}));
+	}
 	transformFilter(filter) {
 		return new PGFilterTranslator().translate(filter);
 	}
@@ -888,8 +955,10 @@ var PgVector = class extends MastraVector {
 			throw mastraError;
 		}
 		if (queryVector === void 0) {
-			const client = await this.pool.connect();
+			let client;
 			try {
+				await this.ensureNamespaceReady(indexName);
+				client = await this.pool.connect();
 				const { sql: filterQuery, values: filterValues } = buildDeleteFilterQuery(this.transformFilter(filter));
 				const { tableName } = this.getTableName(indexName);
 				const filterClause = filterQuery.trim().replace(/^WHERE\s+/i, "");
@@ -915,6 +984,10 @@ var PgVector = class extends MastraVector {
 					...includeVector && embedding && { vector: JSON.parse(embedding) }
 				}));
 			} catch (error) {
+				if (error instanceof MastraError) {
+					this.logger?.trackException(error);
+					throw error;
+				}
 				const mastraError = new MastraError({
 					id: createVectorErrorId("PG", "QUERY", "FAILED"),
 					domain: ErrorDomain.MASTRA_VECTOR,
@@ -924,12 +997,14 @@ var PgVector = class extends MastraVector {
 				this.logger?.trackException(mastraError);
 				throw mastraError;
 			} finally {
-				client.release();
+				client?.release();
 			}
 		}
-		const indexInfo = await this.getIndexMetadata({ indexName });
-		const client = await this.pool.connect();
+		let client;
 		try {
+			await this.ensureNamespaceReady(indexName);
+			const indexInfo = await this.getIndexMetadata({ indexName });
+			client = await this.pool.connect();
 			await this.ensureSearchPath(client);
 			await client.query("BEGIN");
 			const { sql: filterQuery, values: filterValues } = buildFilterQuery(this.transformFilter(filter), minScore, topK);
@@ -991,7 +1066,11 @@ var PgVector = class extends MastraVector {
 				...includeVector && embedding && { vector: ops.parseEmbedding(embedding) }
 			}));
 		} catch (error) {
-			await client.query("ROLLBACK");
+			await client?.query("ROLLBACK");
+			if (error instanceof MastraError) {
+				this.logger?.trackException(error);
+				throw error;
+			}
 			const mastraError = new MastraError({
 				id: createVectorErrorId("PG", "QUERY", "FAILED"),
 				domain: ErrorDomain.MASTRA_VECTOR,
@@ -1001,15 +1080,17 @@ var PgVector = class extends MastraVector {
 			this.logger?.trackException(mastraError);
 			throw mastraError;
 		} finally {
-			client.release();
+			client?.release();
 		}
 	}
 	async upsert({ indexName, vectors, metadata, ids, deleteFilter, namespace = DEFAULT_NAMESPACE }) {
 		validateUpsertInput("PG", vectors, metadata, ids);
 		const { tableName } = this.getTableName(indexName);
-		const indexInfo = await this.getIndexMetadata({ indexName });
-		const client = await this.pool.connect();
+		let client;
 		try {
+			const indexInfo = await this.getIndexMetadata({ indexName });
+			await this.ensureNamespaceReady(indexName);
+			client = await this.pool.connect();
 			await this.ensureSearchPath(client);
 			await client.query("BEGIN");
 			if (deleteFilter) {
@@ -1075,7 +1156,11 @@ var PgVector = class extends MastraVector {
 			});
 			return vectorIds;
 		} catch (error) {
-			await client.query("ROLLBACK");
+			await client?.query("ROLLBACK");
+			if (error instanceof MastraError) {
+				this.logger?.trackException(error);
+				throw error;
+			}
 			if (error instanceof Error && error.message?.includes("expected") && error.message?.includes("dimensions")) {
 				const match = error.message.match(/expected (\d+) dimensions, not (\d+)/);
 				if (match) {
@@ -1104,7 +1189,7 @@ var PgVector = class extends MastraVector {
 			this.logger?.trackException(mastraError);
 			throw mastraError;
 		} finally {
-			client.release();
+			client?.release();
 		}
 	}
 	hasher = xxhash();
@@ -1232,9 +1317,8 @@ var PgVector = class extends MastraVector {
             namespace VARCHAR(255) NOT NULL DEFAULT '${DEFAULT_NAMESPACE}'
           );
         `);
-				await this.ensureNamespaceSchema(indexName, client);
+				if (await this.reconcileNamespace(indexName, client)) this.namespaceReadyIndexes.add(indexName);
 				this.createdIndexes.set(indexName, indexCacheKey);
-				this.namespaceReadyIndexes.add(indexName);
 				this.indexVectorTypes.set(indexName, vectorType);
 				if (buildIndex) await this.setupIndex({
 					indexName,
@@ -1246,6 +1330,7 @@ var PgVector = class extends MastraVector {
 			} catch (error) {
 				this.createdIndexes.delete(indexName);
 				this.namespaceReadyIndexes.delete(indexName);
+				this.namespaceReadyCache.delete(indexName);
 				this.indexVectorTypes.delete(indexName);
 				throw error;
 			} finally {
@@ -1620,27 +1705,30 @@ var PgVector = class extends MastraVector {
 		}
 	}
 	async deleteIndex({ indexName }) {
-		const client = await this.pool.connect();
-		try {
-			const { tableName } = this.getTableName(indexName);
-			await client.query(`DROP TABLE IF EXISTS ${tableName} CASCADE`);
-			this.createdIndexes.delete(indexName);
-			this.namespaceReadyIndexes.delete(indexName);
-			this.indexVectorTypes.delete(indexName);
-			this.invalidateIndexCaches(indexName);
-		} catch (error) {
-			await client.query("ROLLBACK");
-			const mastraError = new MastraError({
-				id: createVectorErrorId("PG", "DELETE_INDEX", "FAILED"),
-				domain: ErrorDomain.MASTRA_VECTOR,
-				category: ErrorCategory.THIRD_PARTY,
-				details: { indexName }
-			}, error);
-			this.logger?.trackException(mastraError);
-			throw mastraError;
-		} finally {
-			client.release();
-		}
+		await this.getMutexByName(`create-${indexName}`).runExclusive(async () => {
+			const client = await this.pool.connect();
+			try {
+				const { tableName } = this.getTableName(indexName);
+				await client.query(`DROP TABLE IF EXISTS ${tableName} CASCADE`);
+				this.createdIndexes.delete(indexName);
+				this.namespaceReadyIndexes.delete(indexName);
+				this.namespaceReadyCache.delete(indexName);
+				this.indexVectorTypes.delete(indexName);
+				this.invalidateIndexCaches(indexName);
+			} catch (error) {
+				await client.query("ROLLBACK");
+				const mastraError = new MastraError({
+					id: createVectorErrorId("PG", "DELETE_INDEX", "FAILED"),
+					domain: ErrorDomain.MASTRA_VECTOR,
+					category: ErrorCategory.THIRD_PARTY,
+					details: { indexName }
+				}, error);
+				this.logger?.trackException(mastraError);
+				throw mastraError;
+			} finally {
+				client.release();
+			}
+		});
 	}
 	async truncateIndex({ indexName }) {
 		const client = await this.pool.connect();
@@ -1696,6 +1784,7 @@ var PgVector = class extends MastraVector {
 				details: { indexName }
 			});
 			const indexInfo = await this.getIndexMetadata({ indexName });
+			await this.ensureNamespaceReady(indexName);
 			client = await this.pool.connect();
 			await this.ensureSearchPath(client);
 			const { tableName } = this.getTableName(indexName);
@@ -1789,6 +1878,7 @@ var PgVector = class extends MastraVector {
 	async deleteVector({ indexName, id, namespace = DEFAULT_NAMESPACE }) {
 		let client;
 		try {
+			await this.ensureNamespaceReady(indexName);
 			client = await this.pool.connect();
 			const { tableName } = this.getTableName(indexName);
 			const query = `
@@ -1797,6 +1887,7 @@ var PgVector = class extends MastraVector {
       `;
 			await client.query(query, [id, namespace]);
 		} catch (error) {
+			if (error instanceof MastraError) throw error;
 			const mastraError = new MastraError({
 				id: createVectorErrorId("PG", "DELETE_VECTOR", "FAILED"),
 				domain: ErrorDomain.MASTRA_VECTOR,
@@ -1823,6 +1914,7 @@ var PgVector = class extends MastraVector {
 		let client;
 		const effectiveNamespace = namespace ?? DEFAULT_NAMESPACE;
 		try {
+			await this.ensureNamespaceReady(indexName);
 			client = await this.pool.connect();
 			const { tableName } = this.getTableName(indexName);
 			if (!filter && !ids && namespace === void 0) throw new MastraError({
@@ -5553,6 +5645,17 @@ var ChannelsPG = class ChannelsPG extends ChannelsStorage {
 function jsonbArg(value) {
 	return value === void 0 || value === null ? null : JSON.stringify(value);
 }
+function parseStoredJSON(value) {
+	if (typeof value === "string") try {
+		return JSON.parse(value);
+	} catch {
+		return value;
+	}
+	return value;
+}
+function parseOptionalJSON(value, emptyValue) {
+	return value === null || value === void 0 ? emptyValue : parseStoredJSON(value);
+}
 var DatasetsPG = class DatasetsPG extends DatasetsStorage {
 	#db;
 	#schema;
@@ -5729,6 +5832,8 @@ var DatasetsPG = class DatasetsPG extends DatasetsStorage {
 		};
 	}
 	transformItemRow(row) {
+		const metadata = parseOptionalJSON(row.metadata, void 0);
+		const emptyValue = metadata?.__purged === true ? null : void 0;
 		return {
 			id: row.id,
 			datasetId: row.datasetId,
@@ -5736,20 +5841,22 @@ var DatasetsPG = class DatasetsPG extends DatasetsStorage {
 			externalId: row.externalId ?? null,
 			organizationId: row.organizationId ?? null,
 			projectId: row.projectId ?? null,
-			input: safelyParseJSON(row.input),
-			groundTruth: row.groundTruth ? safelyParseJSON(row.groundTruth) : void 0,
-			expectedTrajectory: row.expectedTrajectory ? safelyParseJSON(row.expectedTrajectory) : void 0,
-			toolMocks: row.toolMocks ? safelyParseJSON(row.toolMocks) : void 0,
-			unmockedToolPolicy: row.unmockedToolPolicy ?? void 0,
-			scorerIds: row.scorerIds ? safelyParseJSON(row.scorerIds) : void 0,
-			requestContext: row.requestContext ? safelyParseJSON(row.requestContext) : void 0,
-			metadata: row.metadata ? safelyParseJSON(row.metadata) : void 0,
-			source: row.source ? safelyParseJSON(row.source) : void 0,
+			input: row.input === null ? null : parseStoredJSON(row.input),
+			groundTruth: parseOptionalJSON(row.groundTruth, emptyValue),
+			expectedTrajectory: parseOptionalJSON(row.expectedTrajectory, emptyValue),
+			toolMocks: parseOptionalJSON(row.toolMocks, emptyValue),
+			unmockedToolPolicy: row.unmockedToolPolicy ?? emptyValue,
+			scorerIds: parseOptionalJSON(row.scorerIds, emptyValue),
+			requestContext: parseOptionalJSON(row.requestContext, emptyValue),
+			metadata,
+			source: parseOptionalJSON(row.source, emptyValue),
 			createdAt: ensureDate(row.createdAtZ || row.createdAt),
 			updatedAt: ensureDate(row.updatedAtZ || row.updatedAt)
 		};
 	}
 	transformItemRowFull(row) {
+		const metadata = parseOptionalJSON(row.metadata, void 0);
+		const emptyValue = metadata?.__purged === true ? null : void 0;
 		return {
 			id: row.id,
 			datasetId: row.datasetId,
@@ -5759,15 +5866,15 @@ var DatasetsPG = class DatasetsPG extends DatasetsStorage {
 			projectId: row.projectId ?? null,
 			validTo: row.validTo,
 			isDeleted: Boolean(row.isDeleted),
-			input: safelyParseJSON(row.input),
-			groundTruth: row.groundTruth ? safelyParseJSON(row.groundTruth) : void 0,
-			expectedTrajectory: row.expectedTrajectory ? safelyParseJSON(row.expectedTrajectory) : void 0,
-			toolMocks: row.toolMocks ? safelyParseJSON(row.toolMocks) : void 0,
-			unmockedToolPolicy: row.unmockedToolPolicy ?? void 0,
-			scorerIds: row.scorerIds ? safelyParseJSON(row.scorerIds) : void 0,
-			requestContext: row.requestContext ? safelyParseJSON(row.requestContext) : void 0,
-			metadata: row.metadata ? safelyParseJSON(row.metadata) : void 0,
-			source: row.source ? safelyParseJSON(row.source) : void 0,
+			input: row.input === null ? null : parseStoredJSON(row.input),
+			groundTruth: parseOptionalJSON(row.groundTruth, emptyValue),
+			expectedTrajectory: parseOptionalJSON(row.expectedTrajectory, emptyValue),
+			toolMocks: parseOptionalJSON(row.toolMocks, emptyValue),
+			unmockedToolPolicy: row.unmockedToolPolicy ?? emptyValue,
+			scorerIds: parseOptionalJSON(row.scorerIds, emptyValue),
+			requestContext: parseOptionalJSON(row.requestContext, emptyValue),
+			metadata,
+			source: parseOptionalJSON(row.source, emptyValue),
 			createdAt: ensureDate(row.createdAtZ || row.createdAt),
 			updatedAt: ensureDate(row.updatedAtZ || row.updatedAt)
 		};
@@ -6343,6 +6450,52 @@ var DatasetsPG = class DatasetsPG extends DatasetsStorage {
 			}, error);
 		}
 	}
+	async _doPurgeItem({ id, datasetId }) {
+		try {
+			const datasetsTable = getTableName$5({
+				indexName: TABLE_DATASETS,
+				schemaName: getSchemaName$5(this.#schema)
+			});
+			const itemsTable = getTableName$5({
+				indexName: TABLE_DATASET_ITEMS,
+				schemaName: getSchemaName$5(this.#schema)
+			});
+			const experimentsTable = getTableName$5({
+				indexName: TABLE_EXPERIMENTS,
+				schemaName: getSchemaName$5(this.#schema)
+			});
+			const experimentResultsTable = getTableName$5({
+				indexName: TABLE_EXPERIMENT_RESULTS,
+				schemaName: getSchemaName$5(this.#schema)
+			});
+			const purgedAt = (/* @__PURE__ */ new Date()).toISOString();
+			const purgedMetadata = JSON.stringify({
+				__purged: true,
+				purgedAt
+			});
+			await this.#db.client.tx(async (t) => {
+				if (!await t.oneOrNone(`SELECT "id" FROM ${datasetsTable} WHERE "id" = $1 FOR UPDATE`, [datasetId])) return;
+				if (!await t.oneOrNone(`SELECT "id" FROM ${itemsTable} WHERE "id" = $1 AND "datasetId" = $2 LIMIT 1 FOR UPDATE`, [id, datasetId])) return;
+				await t.none(`UPDATE ${itemsTable} SET "input" = 'null'::jsonb, "groundTruth" = NULL, "expectedTrajectory" = NULL, "toolMocks" = NULL, "unmockedToolPolicy" = NULL, "scorerIds" = NULL, "requestContext" = NULL, "metadata" = $2::jsonb, "source" = NULL WHERE "id" = $1 AND "datasetId" = $3`, [
+					id,
+					purgedMetadata,
+					datasetId
+				]);
+				if ((await t.one(`SELECT to_regclass($1) IS NOT NULL AND to_regclass($2) IS NOT NULL AS exists`, [experimentResultsTable, experimentsTable])).exists) await t.none(`UPDATE ${experimentResultsTable} SET "input" = 'null'::jsonb, "output" = NULL, "groundTruth" = NULL, "error" = NULL, "toolMockReport" = NULL, "tags" = NULL, "comment" = NULL, "metadata" = $2::jsonb WHERE "itemId" = $1 AND "experimentId" IN (SELECT "id" FROM ${experimentsTable} WHERE "datasetId" = $3)`, [
+					id,
+					purgedMetadata,
+					datasetId
+				]);
+			});
+		} catch (error) {
+			if (error instanceof MastraError) throw error;
+			throw new MastraError({
+				id: createStorageErrorId("PG", "PURGE_ITEM", "FAILED"),
+				domain: ErrorDomain.STORAGE,
+				category: ErrorCategory.THIRD_PARTY
+			}, error);
+		}
+	}
 	async _doBatchInsertItems(input) {
 		try {
 			if (input.items.length === 0) return [];
@@ -6994,7 +7147,7 @@ var ExperimentsPG = class ExperimentsPG extends ExperimentsStorage {
 			itemDatasetVersion: row.itemDatasetVersion != null ? row.itemDatasetVersion : null,
 			organizationId: row.organizationId ?? null,
 			projectId: row.projectId ?? null,
-			input: safelyParseJSON(row.input),
+			input: row.input === null ? null : safelyParseJSON(row.input),
 			output: row.output ? safelyParseJSON(row.output) : null,
 			groundTruth: row.groundTruth ? safelyParseJSON(row.groundTruth) : null,
 			metadata: row.metadata ? safelyParseJSON(row.metadata) : null,
@@ -7296,58 +7449,65 @@ var ExperimentsPG = class ExperimentsPG extends ExperimentsStorage {
 			}, error);
 		}
 	}
+	async #resolvePurgeMetadata(t, datasetId, itemId) {
+		if (!datasetId) return null;
+		const datasetsTable = getTableName$5({
+			indexName: TABLE_DATASETS,
+			schemaName: getSchemaName$5(this.#schema)
+		});
+		const itemsTable = getTableName$5({
+			indexName: TABLE_DATASET_ITEMS,
+			schemaName: getSchemaName$5(this.#schema)
+		});
+		if (!await t.oneOrNone(`SELECT "id" FROM ${datasetsTable} WHERE "id" = $1 FOR UPDATE`, [datasetId])) return null;
+		return (await t.oneOrNone(`SELECT "metadata" FROM ${itemsTable}
+       WHERE "id" = $1 AND "datasetId" = $2 AND "metadata"->>'__purged' = 'true'
+       LIMIT 1`, [itemId, datasetId]))?.metadata ?? null;
+	}
 	async addExperimentResult(input) {
 		try {
 			const id = input.id ?? crypto.randomUUID();
-			const now = /* @__PURE__ */ new Date();
-			const nowIso = now.toISOString();
-			await this.#db.insert({
-				tableName: TABLE_EXPERIMENT_RESULTS,
-				record: {
+			const resultsTable = getTableName$5({
+				indexName: TABLE_EXPERIMENT_RESULTS,
+				schemaName: getSchemaName$5(this.#schema)
+			});
+			const experimentsTable = getTableName$5({
+				indexName: TABLE_EXPERIMENTS,
+				schemaName: getSchemaName$5(this.#schema)
+			});
+			const row = await this.#db.client.tx(async (t) => {
+				const owner = await t.oneOrNone(`SELECT "datasetId" FROM ${experimentsTable} WHERE "id" = $1`, [input.experimentId]);
+				const purgeMetadata = await this.#resolvePurgeMetadata(t, owner?.datasetId, input.itemId);
+				const nowIso = (/* @__PURE__ */ new Date()).toISOString();
+				return t.one(`INSERT INTO ${resultsTable} (
+            "id", "experimentId", "itemId", "itemDatasetVersion", "organizationId", "projectId",
+            "input", "output", "groundTruth", "metadata", "error", "startedAt", "completedAt",
+            "retryCount", "attempt", "traceId", "status", "tags", "toolMockReport", "createdAt"
+          ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20)
+          RETURNING *`, [
 					id,
-					experimentId: input.experimentId,
-					itemId: input.itemId,
-					itemDatasetVersion: input.itemDatasetVersion ?? null,
-					organizationId: input.organizationId ?? null,
-					projectId: input.projectId ?? null,
-					input: input.input,
-					output: input.output ?? null,
-					groundTruth: input.groundTruth ?? null,
-					metadata: input.metadata ?? null,
-					error: input.error ?? null,
-					startedAt: input.startedAt.toISOString(),
-					completedAt: input.completedAt.toISOString(),
-					retryCount: input.retryCount,
-					attempt: input.attempt ?? 0,
-					traceId: input.traceId ?? null,
-					status: input.status ?? null,
-					tags: input.tags ?? null,
-					toolMockReport: input.toolMockReport ?? null,
-					createdAt: nowIso
-				}
+					input.experimentId,
+					input.itemId,
+					input.itemDatasetVersion ?? null,
+					input.organizationId ?? null,
+					input.projectId ?? null,
+					JSON.stringify(purgeMetadata ? null : input.input),
+					purgeMetadata || input.output == null ? null : JSON.stringify(input.output),
+					purgeMetadata || input.groundTruth == null ? null : JSON.stringify(input.groundTruth),
+					JSON.stringify(purgeMetadata ?? input.metadata ?? null),
+					purgeMetadata || input.error == null ? null : JSON.stringify(input.error),
+					input.startedAt.toISOString(),
+					input.completedAt.toISOString(),
+					input.retryCount,
+					input.attempt ?? 0,
+					input.traceId ?? null,
+					input.status ?? null,
+					purgeMetadata || input.tags == null ? null : JSON.stringify(input.tags),
+					purgeMetadata || input.toolMockReport == null ? null : JSON.stringify(input.toolMockReport),
+					nowIso
+				]);
 			});
-			return {
-				id,
-				experimentId: input.experimentId,
-				itemId: input.itemId,
-				itemDatasetVersion: input.itemDatasetVersion ?? null,
-				organizationId: input.organizationId ?? null,
-				projectId: input.projectId ?? null,
-				input: input.input,
-				output: input.output ?? null,
-				groundTruth: input.groundTruth ?? null,
-				metadata: input.metadata ?? null,
-				error: input.error ?? null,
-				startedAt: input.startedAt,
-				completedAt: input.completedAt,
-				retryCount: input.retryCount,
-				attempt: input.attempt ?? 0,
-				traceId: input.traceId ?? null,
-				status: input.status ?? null,
-				tags: input.tags ?? null,
-				toolMockReport: input.toolMockReport ?? null,
-				createdAt: now
-			};
+			return this.transformExperimentResultRow(row);
 		} catch (error) {
 			throw new MastraError({
 				id: createStorageErrorId("PG", "ADD_EXPERIMENT_RESULT", "FAILED"),
@@ -7362,8 +7522,14 @@ var ExperimentsPG = class ExperimentsPG extends ExperimentsStorage {
 				indexName: TABLE_EXPERIMENT_RESULTS,
 				schemaName: getSchemaName$5(this.#schema)
 			});
+			const experimentsTable = getTableName$5({
+				indexName: TABLE_EXPERIMENTS,
+				schemaName: getSchemaName$5(this.#schema)
+			});
 			const attempt = input.attempt ?? 0;
 			const row = await this.#db.client.tx(async (t) => {
+				const owner = await t.oneOrNone(`SELECT "datasetId" FROM ${experimentsTable} WHERE "id" = $1`, [input.experimentId]);
+				const purgeMetadata = await this.#resolvePurgeMetadata(t, owner?.datasetId, input.itemId);
 				const existing = await t.oneOrNone(`SELECT "id" FROM ${tableName} WHERE "experimentId" = $1 AND "itemId" = $2 AND COALESCE("attempt", 0) = $3 FOR UPDATE`, [
 					input.experimentId,
 					input.itemId,
@@ -7383,19 +7549,19 @@ var ExperimentsPG = class ExperimentsPG extends ExperimentsStorage {
 						input.itemDatasetVersion ?? null,
 						input.organizationId ?? null,
 						input.projectId ?? null,
-						JSON.stringify(input.input),
-						input.output != null ? JSON.stringify(input.output) : null,
-						input.groundTruth != null ? JSON.stringify(input.groundTruth) : null,
-						input.metadata != null ? JSON.stringify(input.metadata) : null,
-						input.error != null ? JSON.stringify(input.error) : null,
+						JSON.stringify(purgeMetadata ? null : input.input),
+						purgeMetadata || input.output == null ? null : JSON.stringify(input.output),
+						purgeMetadata || input.groundTruth == null ? null : JSON.stringify(input.groundTruth),
+						JSON.stringify(purgeMetadata ?? input.metadata ?? null),
+						purgeMetadata || input.error == null ? null : JSON.stringify(input.error),
 						input.startedAt.toISOString(),
 						input.completedAt.toISOString(),
 						input.retryCount,
 						attempt,
 						input.traceId ?? null,
 						input.status ?? null,
-						input.tags != null ? JSON.stringify(input.tags) : null,
-						input.toolMockReport != null ? JSON.stringify(input.toolMockReport) : null,
+						purgeMetadata || input.tags == null ? null : JSON.stringify(input.tags),
+						purgeMetadata || input.toolMockReport == null ? null : JSON.stringify(input.toolMockReport),
 						(/* @__PURE__ */ new Date()).toISOString()
 					]);
 				}
@@ -7409,19 +7575,19 @@ var ExperimentsPG = class ExperimentsPG extends ExperimentsStorage {
 					input.itemDatasetVersion ?? null,
 					input.organizationId ?? null,
 					input.projectId ?? null,
-					JSON.stringify(input.input),
-					input.output != null ? JSON.stringify(input.output) : null,
-					input.groundTruth != null ? JSON.stringify(input.groundTruth) : null,
-					input.metadata != null ? JSON.stringify(input.metadata) : null,
-					input.error != null ? JSON.stringify(input.error) : null,
+					JSON.stringify(purgeMetadata ? null : input.input),
+					purgeMetadata || input.output == null ? null : JSON.stringify(input.output),
+					purgeMetadata || input.groundTruth == null ? null : JSON.stringify(input.groundTruth),
+					JSON.stringify(purgeMetadata ?? input.metadata ?? null),
+					purgeMetadata || input.error == null ? null : JSON.stringify(input.error),
 					input.startedAt.toISOString(),
 					input.completedAt.toISOString(),
 					input.retryCount,
 					attempt,
 					input.traceId ?? null,
 					input.status ?? null,
-					input.tags != null ? JSON.stringify(input.tags) : null,
-					input.toolMockReport != null ? JSON.stringify(input.toolMockReport) : null
+					purgeMetadata || input.tags == null ? null : JSON.stringify(input.tags),
+					purgeMetadata || input.toolMockReport == null ? null : JSON.stringify(input.toolMockReport)
 				]);
 			});
 			return this.transformExperimentResultRow(row);
@@ -7439,39 +7605,34 @@ var ExperimentsPG = class ExperimentsPG extends ExperimentsStorage {
 				indexName: TABLE_EXPERIMENT_RESULTS,
 				schemaName: getSchemaName$5(this.#schema)
 			});
-			const setClauses = [];
-			const values = [];
-			let paramIndex = 1;
-			if (input.status !== void 0) {
-				setClauses.push(`"status" = $${paramIndex++}`);
-				values.push(input.status);
-			}
-			if (input.tags !== void 0) {
-				setClauses.push(`"tags" = $${paramIndex++}`);
-				values.push(JSON.stringify(input.tags));
-			}
-			if (input.comment !== void 0) {
-				setClauses.push(`"comment" = $${paramIndex++}`);
-				values.push(input.comment);
-			}
-			if (setClauses.length === 0) {
-				const existing = await this.#getExperimentResultById(this.#db.client, { id: input.id });
-				if (!existing) throw new MastraError({
-					id: createStorageErrorId("PG", "UPDATE_EXPERIMENT_RESULT", "NOT_FOUND"),
-					domain: ErrorDomain.STORAGE,
-					category: ErrorCategory.USER,
-					details: { resultId: input.id }
-				});
-				return existing;
-			}
-			values.push(input.id);
-			let whereClause = `"id" = $${paramIndex}`;
-			if (input.experimentId) {
-				paramIndex++;
-				values.push(input.experimentId);
-				whereClause += ` AND "experimentId" = $${paramIndex}`;
-			}
-			const row = await this.#db.client.oneOrNone(`UPDATE ${tableName} SET ${setClauses.join(", ")} WHERE ${whereClause} RETURNING *`, values);
+			const experimentsTable = getTableName$5({
+				indexName: TABLE_EXPERIMENTS,
+				schemaName: getSchemaName$5(this.#schema)
+			});
+			const row = await this.#db.client.tx(async (t) => {
+				const owner = await t.oneOrNone(`SELECT e."datasetId", r."itemId"
+           FROM ${tableName} r
+           JOIN ${experimentsTable} e ON e."id" = r."experimentId"
+           WHERE r."id" = $1${input.experimentId !== void 0 ? " AND r.\"experimentId\" = $2" : ""}`, input.experimentId !== void 0 ? [input.id, input.experimentId] : [input.id]);
+				if (!owner) return null;
+				const purgeMetadata = await this.#resolvePurgeMetadata(t, owner.datasetId, owner.itemId);
+				return t.oneOrNone(`UPDATE ${tableName}
+           SET "status" = CASE WHEN $2 THEN $3 ELSE "status" END,
+               "tags" = CASE WHEN $4 THEN NULL WHEN $5 THEN $6::jsonb ELSE "tags" END,
+               "comment" = CASE WHEN $4 THEN NULL WHEN $7 THEN $8 ELSE "comment" END
+           WHERE "id" = $1${input.experimentId !== void 0 ? " AND \"experimentId\" = $9" : ""}
+           RETURNING *`, [
+					input.id,
+					input.status !== void 0,
+					input.status ?? null,
+					Boolean(purgeMetadata),
+					input.tags !== void 0,
+					input.tags === void 0 ? null : JSON.stringify(input.tags),
+					input.comment !== void 0,
+					input.comment ?? null,
+					...input.experimentId !== void 0 ? [input.experimentId] : []
+				]);
+			});
 			if (!row) throw new MastraError({
 				id: createStorageErrorId("PG", "UPDATE_EXPERIMENT_RESULT", "NOT_FOUND"),
 				domain: ErrorDomain.STORAGE,
@@ -10871,12 +11032,13 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 	/**
 	* 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.
+	* Every page query carries a skinny scalar `(SELECT COUNT(*) ...)` subquery that
+	* reports the total 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 as a fallback when the page is empty and the caller
+	* asked for a page after the last row, because there is then 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}`;
@@ -10885,7 +11047,7 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 			perPage,
 			offset
 		];
-		const rows = await this.#db.readClient.manyOrNone(`${selectStatement}, COUNT(*) OVER () AS "__total" FROM ${tableName} ${whereClause} ${orderByStatement}${limitClause}`, dataParams) || [];
+		const rows = await this.#db.readClient.manyOrNone(`${selectStatement}, (SELECT COUNT(*) FROM ${tableName} ${whereClause}) AS "__total" FROM ${tableName} ${whereClause} ${orderByStatement}${limitClause}`, dataParams) || [];
 		if (rows.length > 0) return {
 			total: Number(rows[0].__total),
 			messages: rows
@@ -10924,7 +11086,7 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 		const metadataFilter = validateStorageMetadataFilter(filter?.metadata);
 		try {
 			const { field, direction } = this.parseOrderBy(orderBy, "ASC");
-			const orderByStatement = `ORDER BY COALESCE("${field}Z", "${field}") ${direction}`;
+			const orderByStatement = `ORDER BY "${field}" ${direction}`;
 			const selectStatement = `SELECT id, content, role, type, "createdAt", "createdAtZ", thread_id AS "threadId", "resourceId"`;
 			const tableName = getTableName$3({
 				indexName: TABLE_MESSAGES,
@@ -11072,7 +11234,7 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 		const metadataFilter = validateStorageMetadataFilter(filter?.metadata);
 		try {
 			const { field, direction } = this.parseOrderBy(orderBy, "ASC");
-			const orderByStatement = `ORDER BY COALESCE("${field}Z", "${field}") ${direction}`;
+			const orderByStatement = `ORDER BY "${field}" ${direction}`;
 			const selectStatement = `SELECT id, content, role, type, "createdAt", "createdAtZ", thread_id AS "threadId", "resourceId"`;
 			const tableName = getTableName$3({
 				indexName: TABLE_MESSAGES,