@mastra/spanner 1.6.4 → 1.6.5-alpha.1

package/dist/index.cjs

@@ -2786,6 +2786,7 @@ function rowToItem(row) {
 		tableName: _mastra_core_storage.TABLE_DATASET_ITEMS,
 		row
 	});
+	const emptyValue = t.metadata?.__purged === true ? null : void 0;
 	return {
 		id: String(t.id),
 		datasetId: String(t.datasetId),
@@ -2794,14 +2795,14 @@ function rowToItem(row) {
 		organizationId: t.organizationId ?? null,
 		projectId: t.projectId ?? null,
 		input: t.input,
-		groundTruth: t.groundTruth ?? void 0,
-		expectedTrajectory: t.expectedTrajectory ?? void 0,
-		toolMocks: t.toolMocks ?? void 0,
-		unmockedToolPolicy: t.unmockedToolPolicy ?? void 0,
-		scorerIds: t.scorerIds ?? void 0,
-		requestContext: t.requestContext ?? void 0,
+		groundTruth: t.groundTruth ?? emptyValue,
+		expectedTrajectory: t.expectedTrajectory ?? emptyValue,
+		toolMocks: t.toolMocks ?? emptyValue,
+		unmockedToolPolicy: t.unmockedToolPolicy ?? emptyValue,
+		scorerIds: t.scorerIds ?? emptyValue,
+		requestContext: t.requestContext ?? emptyValue,
 		metadata: t.metadata ?? void 0,
-		source: t.source ?? void 0,
+		source: t.source ?? emptyValue,
 		createdAt: toDate$1(t.createdAt),
 		updatedAt: toDate$1(t.updatedAt)
 	};
@@ -2947,21 +2948,17 @@ var DatasetsSpanner = class DatasetsSpanner extends _mastra_core_storage.Dataset
 		await this.db.clearTable({ tableName: _mastra_core_storage.TABLE_DATASETS });
 	}
 	async experimentTablesExist() {
-		try {
-			const [rows] = await this.database.run({
-				sql: `SELECT COUNT(*) AS c FROM INFORMATION_SCHEMA.TABLES
-              WHERE TABLE_SCHEMA = "" AND TABLE_NAME IN (@a, @b)`,
-				params: {
-					a: _mastra_core_storage.TABLE_EXPERIMENTS,
-					b: _mastra_core_storage.TABLE_EXPERIMENT_RESULTS
-				},
-				json: true
-			});
-			const row = rows?.[0];
-			return Number(row?.c ?? 0) === 2;
-		} catch {
-			return false;
-		}
+		const [rows] = await this.database.run({
+			sql: `SELECT COUNT(*) AS c FROM INFORMATION_SCHEMA.TABLES
+            WHERE TABLE_SCHEMA = "" AND TABLE_NAME IN (@a, @b)`,
+			params: {
+				a: _mastra_core_storage.TABLE_EXPERIMENTS,
+				b: _mastra_core_storage.TABLE_EXPERIMENT_RESULTS
+			},
+			json: true
+		});
+		const row = rows?.[0];
+		return Number(row?.c ?? 0) === 2;
 	}
 	async createDataset(input) {
 		try {
@@ -3575,6 +3572,91 @@ var DatasetsSpanner = class DatasetsSpanner extends _mastra_core_storage.Dataset
 			}, error);
 		}
 	}
+	async _doPurgeItem({ id, datasetId }) {
+		try {
+			const experimentTablesExist = await this.experimentTablesExist();
+			const purgedAt = (/* @__PURE__ */ new Date()).toISOString();
+			await this.db.runWithAbortRetry(() => this.database.runTransactionAsync(async (tx) => {
+				try {
+					const [datasetRowCount] = await tx.runUpdate({
+						sql: `UPDATE ${quoteIdent(_mastra_core_storage.TABLE_DATASETS, "table name")}
+                    SET ${quoteIdent("version", "column name")} = ${quoteIdent("version", "column name")}
+                    WHERE ${quoteIdent("id", "column name")} = @datasetId`,
+						params: { datasetId }
+					});
+					if (Number(datasetRowCount) === 0) {
+						await tx.commit();
+						return;
+					}
+					const [rows] = await tx.run({
+						sql: `SELECT ${quoteIdent("id", "column name")} FROM ${quoteIdent(_mastra_core_storage.TABLE_DATASET_ITEMS, "table name")} WHERE ${quoteIdent("id", "column name")} = @id AND ${quoteIdent("datasetId", "column name")} = @datasetId LIMIT 1`,
+						params: {
+							id,
+							datasetId
+						},
+						json: true
+					});
+					if (!rows?.[0]) {
+						await tx.commit();
+						return;
+					}
+					await tx.runUpdate({
+						sql: `UPDATE ${quoteIdent(_mastra_core_storage.TABLE_DATASET_ITEMS, "table name")} SET
+                    ${quoteIdent("input", "column name")} = JSON 'null',
+                    ${quoteIdent("groundTruth", "column name")} = NULL,
+                    ${quoteIdent("expectedTrajectory", "column name")} = NULL,
+                    ${quoteIdent("toolMocks", "column name")} = NULL,
+                    ${quoteIdent("unmockedToolPolicy", "column name")} = NULL,
+                    ${quoteIdent("scorerIds", "column name")} = NULL,
+                    ${quoteIdent("requestContext", "column name")} = NULL,
+                    ${quoteIdent("metadata", "column name")} = JSON_OBJECT('__purged', TRUE, 'purgedAt', @purgedAt),
+                    ${quoteIdent("source", "column name")} = NULL
+                    WHERE ${quoteIdent("id", "column name")} = @id AND ${quoteIdent("datasetId", "column name")} = @datasetId`,
+						params: {
+							id,
+							datasetId,
+							purgedAt
+						}
+					});
+					if (experimentTablesExist) await tx.runUpdate({
+						sql: `UPDATE ${quoteIdent(_mastra_core_storage.TABLE_EXPERIMENT_RESULTS, "table name")} SET
+                      ${quoteIdent("input", "column name")} = JSON 'null',
+                      ${quoteIdent("output", "column name")} = NULL,
+                      ${quoteIdent("groundTruth", "column name")} = NULL,
+                      ${quoteIdent("error", "column name")} = NULL,
+                      ${quoteIdent("toolMockReport", "column name")} = NULL,
+                      ${quoteIdent("tags", "column name")} = NULL,
+                      ${quoteIdent("comment", "column name")} = NULL,
+                      ${quoteIdent("metadata", "column name")} = JSON_OBJECT('__purged', TRUE, 'purgedAt', @purgedAt)
+                      WHERE ${quoteIdent("itemId", "column name")} = @id
+                        AND ${quoteIdent("experimentId", "column name")} IN (
+                          SELECT ${quoteIdent("id", "column name")} FROM ${quoteIdent(_mastra_core_storage.TABLE_EXPERIMENTS, "table name")}
+                          WHERE ${quoteIdent("datasetId", "column name")} = @datasetId
+                        )`,
+						params: {
+							id,
+							datasetId,
+							purgedAt
+						}
+					});
+					await tx.commit();
+				} catch (err) {
+					await tx.rollback().catch((rollbackErr) => {
+						throw new AggregateError([err, rollbackErr], "Transaction and rollback both failed");
+					});
+					throw err;
+				}
+			}));
+		} catch (error) {
+			if (error instanceof _mastra_core_error.MastraError) throw error;
+			throw new _mastra_core_error.MastraError({
+				id: (0, _mastra_core_storage.createStorageErrorId)("SPANNER", "PURGE_ITEM", "FAILED"),
+				domain: _mastra_core_error.ErrorDomain.STORAGE,
+				category: _mastra_core_error.ErrorCategory.THIRD_PARTY,
+				details: { id }
+			}, error);
+		}
+	}
 	async listItems(args) {
 		const { page = 0, perPage: perPageInput } = args.pagination;
 		const perPage = (0, _mastra_core_storage.normalizePerPage)(perPageInput, 100);
@@ -4060,6 +4142,48 @@ var ExperimentsSpanner = class ExperimentsSpanner extends _mastra_core_storage.E
 		this.skipDefaultIndexes = skipDefaultIndexes;
 		this.indexes = indexes?.filter((idx) => ExperimentsSpanner.MANAGED_TABLES.includes(idx.table));
 	}
+	async #withPurgeBarrier(experimentId, itemId, fn) {
+		return this.db.runWithAbortRetry(() => this.database.runTransactionAsync(async (tx) => {
+			try {
+				const [experimentRows] = await tx.run({
+					sql: `SELECT ${quoteIdent("datasetId", "column name")} FROM ${quoteIdent(_mastra_core_storage.TABLE_EXPERIMENTS, "table name")}
+                  WHERE ${quoteIdent("id", "column name")} = @experimentId`,
+					params: { experimentId },
+					json: true
+				});
+				const datasetId = (experimentRows[0]?.toJSON?.() ?? experimentRows[0])?.datasetId;
+				let purgeMetadata = null;
+				if (datasetId) {
+					await tx.runUpdate({
+						sql: `UPDATE ${quoteIdent(_mastra_core_storage.TABLE_DATASETS, "table name")}
+                    SET ${quoteIdent("version", "column name")} = ${quoteIdent("version", "column name")}
+                    WHERE ${quoteIdent("id", "column name")} = @datasetId`,
+						params: { datasetId }
+					});
+					const [itemRows] = await tx.run({
+						sql: `SELECT ${quoteIdent("metadata", "column name")} FROM ${quoteIdent(_mastra_core_storage.TABLE_DATASET_ITEMS, "table name")}
+                    WHERE ${quoteIdent("id", "column name")} = @itemId AND ${quoteIdent("datasetId", "column name")} = @datasetId
+                      AND JSON_VALUE(${quoteIdent("metadata", "column name")}, '$.__purged') = 'true'
+                    LIMIT 1`,
+						params: {
+							itemId,
+							datasetId
+						},
+						json: true
+					});
+					purgeMetadata = (itemRows[0]?.toJSON?.() ?? itemRows[0])?.metadata ?? null;
+				}
+				const result = await fn(tx, purgeMetadata);
+				await tx.commit();
+				return result;
+			} catch (error) {
+				await tx.rollback().catch((rollbackError) => {
+					throw new AggregateError([error, rollbackError], "Transaction and rollback both failed");
+				});
+				throw error;
+			}
+		}));
+	}
 	async init() {
 		await this.db.createTable({
 			tableName: _mastra_core_storage.TABLE_EXPERIMENTS,
@@ -4474,54 +4598,83 @@ var ExperimentsSpanner = class ExperimentsSpanner extends _mastra_core_storage.E
 		try {
 			const now = /* @__PURE__ */ new Date();
 			const id = input.id ?? (0, crypto.randomUUID)();
-			const result = {
-				id,
-				experimentId: input.experimentId,
-				itemId: input.itemId,
-				itemDatasetVersion: input.itemDatasetVersion ?? null,
-				organizationId: input.organizationId ?? null,
-				projectId: input.projectId ?? null,
-				input: input.input ?? null,
-				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
-			};
-			await this.db.insert({
-				tableName: _mastra_core_storage.TABLE_EXPERIMENT_RESULTS,
-				record: {
+			return await this.#withPurgeBarrier(input.experimentId, input.itemId, async (tx, marker) => {
+				const result = {
 					id,
-					experimentId: result.experimentId,
-					itemId: result.itemId,
-					itemDatasetVersion: result.itemDatasetVersion,
-					organizationId: result.organizationId,
-					projectId: result.projectId,
-					input: result.input,
-					output: result.output,
-					groundTruth: result.groundTruth,
-					metadata: result.metadata,
-					error: result.error,
-					startedAt: result.startedAt,
-					completedAt: result.completedAt,
-					retryCount: result.retryCount,
-					attempt: result.attempt,
-					traceId: result.traceId,
-					status: result.status,
-					tags: result.tags,
-					toolMockReport: result.toolMockReport,
+					experimentId: input.experimentId,
+					itemId: input.itemId,
+					itemDatasetVersion: input.itemDatasetVersion ?? null,
+					organizationId: input.organizationId ?? null,
+					projectId: input.projectId ?? null,
+					input: marker ? null : input.input ?? null,
+					output: marker ? null : input.output ?? null,
+					groundTruth: marker ? null : input.groundTruth ?? null,
+					metadata: marker ?? input.metadata ?? null,
+					error: marker ? null : 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: marker ? null : input.tags ?? null,
+					toolMockReport: marker ? null : input.toolMockReport ?? null,
 					createdAt: now
-				}
+				};
+				await tx.runUpdate({
+					sql: `INSERT INTO ${quoteIdent(_mastra_core_storage.TABLE_EXPERIMENT_RESULTS, "table name")} (
+                  ${[
+						"id",
+						"experimentId",
+						"itemId",
+						"itemDatasetVersion",
+						"organizationId",
+						"projectId",
+						"input",
+						"output",
+						"groundTruth",
+						"metadata",
+						"error",
+						"startedAt",
+						"completedAt",
+						"retryCount",
+						"attempt",
+						"traceId",
+						"status",
+						"tags",
+						"toolMockReport",
+						"createdAt"
+					].map((column) => quoteIdent(column, "column name")).join(", ")}
+                ) VALUES (@id, @experimentId, @itemId, @itemDatasetVersion, @organizationId, @projectId,
+                  @input, @output, @groundTruth, @metadata, @error, @startedAt, @completedAt, @retryCount,
+                  @attempt, @traceId, @status, @tags, @toolMockReport, @createdAt)`,
+					params: {
+						...result,
+						input: JSON.stringify(result.input),
+						output: JSON.stringify(result.output),
+						groundTruth: JSON.stringify(result.groundTruth),
+						metadata: JSON.stringify(result.metadata),
+						error: JSON.stringify(result.error),
+						tags: JSON.stringify(result.tags),
+						toolMockReport: JSON.stringify(result.toolMockReport)
+					},
+					types: {
+						itemDatasetVersion: "int64",
+						organizationId: "string",
+						projectId: "string",
+						input: "json",
+						output: "json",
+						groundTruth: "json",
+						metadata: "json",
+						error: "json",
+						traceId: "string",
+						status: "string",
+						tags: "json",
+						toolMockReport: "json"
+					}
+				});
+				return result;
 			});
-			return result;
 		} catch (error) {
 			throw new _mastra_core_error.MastraError({
 				id: (0, _mastra_core_storage.createStorageErrorId)("SPANNER", "ADD_EXPERIMENT_RESULT", "FAILED"),
@@ -4537,31 +4690,12 @@ var ExperimentsSpanner = class ExperimentsSpanner extends _mastra_core_storage.E
 	async upsertExperimentResult(input) {
 		try {
 			const attempt = input.attempt ?? 0;
-			const [rows] = await this.database.run({
-				sql: `SELECT ${quoteIdent("id", "column name")} FROM ${quoteIdent(_mastra_core_storage.TABLE_EXPERIMENT_RESULTS, "table name")}
-              WHERE ${quoteIdent("experimentId", "column name")} = @experimentId
-                AND ${quoteIdent("itemId", "column name")} = @itemId
-                AND COALESCE(${quoteIdent("attempt", "column name")}, 0) = @attempt`,
-				params: {
-					experimentId: input.experimentId,
-					itemId: input.itemId,
-					attempt
-				},
-				json: true
-			});
-			let existingId = rows[0]?.id;
-			if (!existingId) try {
-				return await this.addExperimentResult({
-					...input,
-					attempt
-				});
-			} catch (insertError) {
-				if (!(0, _mastra_core_storage.hasErrorCode)(insertError, /* @__PURE__ */ new Set([6]))) throw insertError;
-				const [winnerRows] = await this.database.run({
-					sql: `SELECT ${quoteIdent("id", "column name")} FROM ${quoteIdent(_mastra_core_storage.TABLE_EXPERIMENT_RESULTS, "table name")}
-                  WHERE ${quoteIdent("experimentId", "column name")} = @experimentId
-                    AND ${quoteIdent("itemId", "column name")} = @itemId
-                    AND COALESCE(${quoteIdent("attempt", "column name")}, 0) = @attempt`,
+			return await this.#withPurgeBarrier(input.experimentId, input.itemId, async (tx, marker) => {
+				const [rows] = await tx.run({
+					sql: `SELECT * FROM ${quoteIdent(_mastra_core_storage.TABLE_EXPERIMENT_RESULTS, "table name")}
+                WHERE ${quoteIdent("experimentId", "column name")} = @experimentId
+                  AND ${quoteIdent("itemId", "column name")} = @itemId
+                  AND COALESCE(${quoteIdent("attempt", "column name")}, 0) = @attempt`,
 					params: {
 						experimentId: input.experimentId,
 						itemId: input.itemId,
@@ -4569,71 +4703,97 @@ var ExperimentsSpanner = class ExperimentsSpanner extends _mastra_core_storage.E
 					},
 					json: true
 				});
-				existingId = winnerRows[0]?.id;
-				if (!existingId) throw insertError;
-			}
-			await this.db.runDml({
-				sql: `UPDATE ${quoteIdent(_mastra_core_storage.TABLE_EXPERIMENT_RESULTS, "table name")} SET
-                ${quoteIdent("itemDatasetVersion", "column name")} = @itemDatasetVersion,
-                ${quoteIdent("organizationId", "column name")} = @organizationId,
-                ${quoteIdent("projectId", "column name")} = @projectId,
-                ${quoteIdent("input", "column name")} = @input,
-                ${quoteIdent("output", "column name")} = @output,
-                ${quoteIdent("groundTruth", "column name")} = @groundTruth,
-                ${quoteIdent("metadata", "column name")} = @metadata,
-                ${quoteIdent("error", "column name")} = @error,
-                ${quoteIdent("startedAt", "column name")} = @startedAt,
-                ${quoteIdent("completedAt", "column name")} = @completedAt,
-                ${quoteIdent("retryCount", "column name")} = @retryCount,
-                ${quoteIdent("attempt", "column name")} = @attempt,
-                ${quoteIdent("traceId", "column name")} = @traceId,
-                ${quoteIdent("status", "column name")} = @status,
-                ${quoteIdent("tags", "column name")} = @tags,
-                ${quoteIdent("toolMockReport", "column name")} = @toolMockReport
-              WHERE ${quoteIdent("id", "column name")} = @id`,
-				params: {
-					id: existingId,
+				const existingRow = rows[0]?.toJSON?.() ?? rows[0];
+				const values = {
 					itemDatasetVersion: input.itemDatasetVersion ?? null,
 					organizationId: input.organizationId ?? null,
 					projectId: input.projectId ?? null,
-					input: JSON.stringify(input.input),
-					output: input.output == null ? null : JSON.stringify(input.output),
-					groundTruth: input.groundTruth == null ? null : JSON.stringify(input.groundTruth),
-					metadata: input.metadata == null ? null : JSON.stringify(input.metadata),
-					error: input.error == null ? null : JSON.stringify(input.error),
+					input: marker ? null : input.input,
+					output: marker ? null : input.output ?? null,
+					groundTruth: marker ? null : input.groundTruth ?? null,
+					metadata: marker ?? input.metadata ?? null,
+					error: marker ? null : input.error ?? null,
 					startedAt: input.startedAt,
 					completedAt: input.completedAt,
 					retryCount: input.retryCount,
 					attempt,
 					traceId: input.traceId ?? null,
 					status: input.status ?? null,
-					tags: input.tags == null ? null : JSON.stringify(input.tags),
-					toolMockReport: input.toolMockReport == null ? null : JSON.stringify(input.toolMockReport)
-				},
-				types: {
-					itemDatasetVersion: "int64",
-					organizationId: "string",
-					projectId: "string",
-					input: "json",
-					output: "json",
-					groundTruth: "json",
-					metadata: "json",
-					error: "json",
-					traceId: "string",
-					status: "string",
-					tags: "json",
-					toolMockReport: "json"
-				}
-			});
-			const updated = await this.getExperimentResultById({ id: existingId });
-			if (!updated) throw new _mastra_core_error.MastraError({
-				id: (0, _mastra_core_storage.createStorageErrorId)("SPANNER", "UPSERT_EXPERIMENT_RESULT", "NOT_FOUND"),
-				domain: _mastra_core_error.ErrorDomain.STORAGE,
-				category: _mastra_core_error.ErrorCategory.USER,
-				text: `Experiment result ${existingId} not found after upsert`,
-				details: { id: existingId }
+					tags: marker ? null : input.tags ?? null,
+					toolMockReport: marker ? null : input.toolMockReport ?? null
+				};
+				if (!existingRow) {
+					const result = {
+						id: (0, crypto.randomUUID)(),
+						experimentId: input.experimentId,
+						itemId: input.itemId,
+						...values,
+						createdAt: /* @__PURE__ */ new Date()
+					};
+					await this.db.insert({
+						tableName: _mastra_core_storage.TABLE_EXPERIMENT_RESULTS,
+						record: result,
+						transaction: tx
+					});
+					return result;
+				}
+				const existing = rowToExperimentResult(existingRow);
+				await this.db.runDml({
+					sql: `UPDATE ${quoteIdent(_mastra_core_storage.TABLE_EXPERIMENT_RESULTS, "table name")} SET
+                    ${quoteIdent("itemDatasetVersion", "column name")} = @itemDatasetVersion,
+                    ${quoteIdent("organizationId", "column name")} = @organizationId,
+                    ${quoteIdent("projectId", "column name")} = @projectId,
+                    ${quoteIdent("input", "column name")} = @input,
+                    ${quoteIdent("output", "column name")} = @output,
+                    ${quoteIdent("groundTruth", "column name")} = @groundTruth,
+                    ${quoteIdent("metadata", "column name")} = @metadata,
+                    ${quoteIdent("error", "column name")} = @error,
+                    ${quoteIdent("startedAt", "column name")} = @startedAt,
+                    ${quoteIdent("completedAt", "column name")} = @completedAt,
+                    ${quoteIdent("retryCount", "column name")} = @retryCount,
+                    ${quoteIdent("attempt", "column name")} = @attempt,
+                    ${quoteIdent("traceId", "column name")} = @traceId,
+                    ${quoteIdent("status", "column name")} = @status,
+                    ${quoteIdent("tags", "column name")} = @tags,
+                    ${quoteIdent("toolMockReport", "column name")} = @toolMockReport,
+                    ${quoteIdent("comment", "column name")} = @comment
+                  WHERE ${quoteIdent("id", "column name")} = @id`,
+					params: {
+						id: existing.id,
+						...values,
+						input: JSON.stringify(values.input),
+						output: JSON.stringify(values.output),
+						groundTruth: JSON.stringify(values.groundTruth),
+						metadata: JSON.stringify(values.metadata),
+						error: JSON.stringify(values.error),
+						tags: JSON.stringify(values.tags),
+						toolMockReport: JSON.stringify(values.toolMockReport),
+						comment: marker ? null : existing.comment
+					},
+					types: {
+						itemDatasetVersion: "int64",
+						retryCount: "int64",
+						attempt: "int64",
+						organizationId: "string",
+						projectId: "string",
+						input: "json",
+						output: "json",
+						groundTruth: "json",
+						metadata: "json",
+						error: "json",
+						traceId: "string",
+						status: "string",
+						tags: "json",
+						toolMockReport: "json",
+						comment: "string"
+					}
+				}, tx);
+				return {
+					...existing,
+					...values,
+					comment: marker ? null : existing.comment
+				};
 			});
-			return updated;
 		} catch (error) {
 			if (error instanceof _mastra_core_error.MastraError) throw error;
 			throw new _mastra_core_error.MastraError({
@@ -4649,61 +4809,47 @@ var ExperimentsSpanner = class ExperimentsSpanner extends _mastra_core_storage.E
 	}
 	async updateExperimentResult(input) {
 		try {
-			if (input.status === void 0 && input.tags === void 0 && input.comment === void 0) {
-				const existing = await this.getExperimentResultById({ id: input.id });
-				if (!existing || input.experimentId !== void 0 && existing.experimentId !== input.experimentId) throw new _mastra_core_error.MastraError({
-					id: (0, _mastra_core_storage.createStorageErrorId)("SPANNER", "UPDATE_EXPERIMENT_RESULT", "NOT_FOUND"),
-					domain: _mastra_core_error.ErrorDomain.STORAGE,
-					category: _mastra_core_error.ErrorCategory.USER,
-					text: `Experiment result ${input.id} not found`,
-					details: { id: input.id }
-				});
-				return existing;
-			}
-			const setClauses = [];
-			const params = { id: input.id };
-			const types = {};
-			if (input.status !== void 0) {
-				setClauses.push(`${quoteIdent("status", "column name")} = @status`);
-				params.status = input.status;
-				if (input.status === null) types.status = "string";
-			}
-			if (input.tags !== void 0) {
-				setClauses.push(`${quoteIdent("tags", "column name")} = @tags`);
-				params.tags = input.tags === null ? null : JSON.stringify(input.tags);
-				types.tags = "json";
-			}
-			if (input.comment !== void 0) {
-				setClauses.push(`${quoteIdent("comment", "column name")} = @comment`);
-				params.comment = input.comment;
-				if (input.comment === null) types.comment = "string";
-			}
-			const whereClauses = [`${quoteIdent("id", "column name")} = @id`];
-			if (input.experimentId !== void 0) {
-				whereClauses.push(`${quoteIdent("experimentId", "column name")} = @experimentId`);
-				params.experimentId = input.experimentId;
-			}
-			if (await this.db.runDml({
-				sql: `UPDATE ${quoteIdent(_mastra_core_storage.TABLE_EXPERIMENT_RESULTS, "table name")}
-              SET ${setClauses.join(", ")} WHERE ${whereClauses.join(" AND ")}`,
-				params,
-				types
-			}) === 0) throw new _mastra_core_error.MastraError({
+			const existing = await this.getExperimentResultById({ id: input.id });
+			if (!existing || input.experimentId !== void 0 && existing.experimentId !== input.experimentId) throw new _mastra_core_error.MastraError({
 				id: (0, _mastra_core_storage.createStorageErrorId)("SPANNER", "UPDATE_EXPERIMENT_RESULT", "NOT_FOUND"),
 				domain: _mastra_core_error.ErrorDomain.STORAGE,
 				category: _mastra_core_error.ErrorCategory.USER,
 				text: `Experiment result ${input.id} not found`,
 				details: { id: input.id }
 			});
-			const updated = await this.getExperimentResultById({ id: input.id });
-			if (!updated) throw new _mastra_core_error.MastraError({
-				id: (0, _mastra_core_storage.createStorageErrorId)("SPANNER", "UPDATE_EXPERIMENT_RESULT", "NOT_FOUND"),
-				domain: _mastra_core_error.ErrorDomain.STORAGE,
-				category: _mastra_core_error.ErrorCategory.USER,
-				text: `Experiment result ${input.id} not found`,
-				details: { id: input.id }
+			return await this.#withPurgeBarrier(existing.experimentId, existing.itemId, async (tx, marker) => {
+				const updated = {
+					...existing,
+					status: input.status !== void 0 ? input.status : existing.status,
+					tags: marker ? null : input.tags !== void 0 ? input.tags : existing.tags,
+					comment: marker ? null : input.comment !== void 0 ? input.comment : existing.comment
+				};
+				if (await this.db.runDml({
+					sql: `UPDATE ${quoteIdent(_mastra_core_storage.TABLE_EXPERIMENT_RESULTS, "table name")}
+                  SET ${quoteIdent("status", "column name")} = @status,
+                      ${quoteIdent("tags", "column name")} = @tags,
+                      ${quoteIdent("comment", "column name")} = @comment
+                  WHERE ${quoteIdent("id", "column name")} = @id${input.experimentId ? ` AND ${quoteIdent("experimentId", "column name")} = @experimentId` : ""}`,
+					params: {
+						id: input.id,
+						...input.experimentId ? { experimentId: input.experimentId } : {},
+						status: updated.status,
+						tags: updated.tags === null ? null : JSON.stringify(updated.tags),
+						comment: updated.comment
+					},
+					types: {
+						status: "string",
+						tags: "json",
+						comment: "string"
+					}
+				}, tx) === 0) throw new _mastra_core_error.MastraError({
+					id: (0, _mastra_core_storage.createStorageErrorId)("SPANNER", "UPDATE_EXPERIMENT_RESULT", "NOT_FOUND"),
+					domain: _mastra_core_error.ErrorDomain.STORAGE,
+					category: _mastra_core_error.ErrorCategory.USER,
+					details: { id: input.id }
+				});
+				return updated;
 			});
-			return updated;
 		} catch (error) {
 			if (error instanceof _mastra_core_error.MastraError) throw error;
 			throw new _mastra_core_error.MastraError({
@@ -9079,19 +9225,34 @@ var ObservabilitySpanner = class ObservabilitySpanner extends _mastra_core_stora
 		}
 	}
 	async batchDeleteTraces(args) {
+		this.assertUnscopedBatchDeleteTraces(args);
 		try {
 			if (args.traceIds.length === 0) return;
-			const tableName = quoteIdent(_mastra_core_storage.TABLE_SPANS, "table name");
 			const params = {};
 			const placeholders = args.traceIds.map((id, i) => {
 				const name = `t${i}`;
 				params[name] = id;
 				return `@${name}`;
 			});
-			await this.db.runDml({
-				sql: `DELETE FROM ${tableName} WHERE ${quoteIdent("traceId", "column name")} IN (${placeholders.join(", ")})`,
-				params
-			});
+			const traceIdFilter = `${quoteIdent("traceId", "column name")} IN (${placeholders.join(", ")})`;
+			await this.db.runWithAbortRetry(() => this.database.runTransactionAsync(async (tx) => {
+				try {
+					await tx.runUpdate({
+						sql: `DELETE FROM ${quoteIdent(_mastra_core_storage.TABLE_SPANS, "table name")} WHERE ${traceIdFilter}`,
+						params
+					});
+					if (!this.disableMetrics) await tx.runUpdate({
+						sql: `DELETE FROM ${quoteIdent(TABLE_AI_METRICS, "table name")} WHERE ${traceIdFilter}`,
+						params
+					});
+					await tx.commit();
+				} catch (error) {
+					await tx.rollback().catch((rollbackError) => {
+						throw new AggregateError([error, rollbackError], "Transaction and rollback both failed");
+					});
+					throw error;
+				}
+			}));
 		} catch (error) {
 			throw new _mastra_core_error.MastraError({
 				id: (0, _mastra_core_storage.createStorageErrorId)("SPANNER", "BATCH_DELETE_TRACES", "FAILED"),