@mastra/mysql 0.8.6-alpha.0 → 0.8.6-alpha.2

package/dist/docs/SKILL.md

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

package/dist/docs/assets/SOURCE_MAP.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.8.6-alpha.0",
+  "version": "0.8.6-alpha.2",
   "package": "@mastra/mysql",
   "exports": {},
   "modules": {}

package/dist/index.cjs

@@ -1864,17 +1864,17 @@ var ChannelsMySQL = class ChannelsMySQL extends _mastra_core_storage.ChannelsSto
 //#region src/storage/domains/datasets/index.ts
 function parseJSON$3(value) {
 	if (value === null || value === void 0) return void 0;
-	if (typeof value === "string") {
-		if (!value) return void 0;
-		try {
-			return JSON.parse(value);
-		} catch {
-			return value;
-		}
+	if (typeof value === "string") try {
+		return JSON.parse(value);
+	} catch {
+		return value;
 	}
 	if (typeof value === "object") return value;
 	return value;
 }
+function parseOptionalJSON(value, emptyValue) {
+	return value === null || value === void 0 ? emptyValue : parseJSON$3(value);
+}
 function jsonArg(value) {
 	return value === void 0 || value === null ? null : JSON.stringify(value);
 }
@@ -2017,14 +2017,10 @@ var DatasetsMySQL = class DatasetsMySQL extends _mastra_core_storage.DatasetsSto
 		await this.pool.execute(`DELETE FROM ${formatTableName(_mastra_core_storage.TABLE_DATASETS)}`);
 	}
 	async experimentTablesExist() {
-		try {
-			const [rows] = await this.pool.execute(`SELECT COUNT(*) AS c FROM information_schema.tables
-         WHERE table_schema = DATABASE() AND table_name IN (?, ?)`, [_mastra_core_storage.TABLE_EXPERIMENTS, _mastra_core_storage.TABLE_EXPERIMENT_RESULTS]);
-			const row = Array.isArray(rows) ? rows[0] : void 0;
-			return Number(row?.c ?? 0) === 2;
-		} catch {
-			return false;
-		}
+		const [rows] = await this.pool.execute(`SELECT COUNT(*) AS c FROM information_schema.tables
+       WHERE table_schema = DATABASE() AND table_name IN (?, ?)`, [_mastra_core_storage.TABLE_EXPERIMENTS, _mastra_core_storage.TABLE_EXPERIMENT_RESULTS]);
+		const row = Array.isArray(rows) ? rows[0] : void 0;
+		return Number(row?.c ?? 0) === 2;
 	}
 	mapDataset(row) {
 		return {
@@ -2049,6 +2045,8 @@ var DatasetsMySQL = class DatasetsMySQL extends _mastra_core_storage.DatasetsSto
 		};
 	}
 	mapItem(row) {
+		const metadata = row.metadata ? parseJSON$3(row.metadata) : void 0;
+		const emptyValue = metadata?.__purged === true ? null : void 0;
 		return {
 			id: row.id,
 			datasetId: row.datasetId,
@@ -2056,20 +2054,22 @@ var DatasetsMySQL = class DatasetsMySQL extends _mastra_core_storage.DatasetsSto
 			externalId: row.externalId ?? null,
 			organizationId: row.organizationId ?? null,
 			projectId: row.projectId ?? null,
-			input: parseJSON$3(row.input),
-			groundTruth: row.groundTruth ? parseJSON$3(row.groundTruth) : void 0,
-			expectedTrajectory: row.expectedTrajectory ? parseJSON$3(row.expectedTrajectory) : void 0,
-			toolMocks: row.toolMocks ? parseJSON$3(row.toolMocks) : void 0,
-			unmockedToolPolicy: row.unmockedToolPolicy ?? void 0,
-			scorerIds: row.scorerIds ? parseJSON$3(row.scorerIds) : void 0,
-			requestContext: row.requestContext ? parseJSON$3(row.requestContext) : void 0,
-			metadata: row.metadata ? parseJSON$3(row.metadata) : void 0,
-			source: row.source ? parseJSON$3(row.source) : void 0,
+			input: row.input === null ? null : parseJSON$3(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: parseDateTime(row.createdAt) ?? /* @__PURE__ */ new Date(),
 			updatedAt: parseDateTime(row.updatedAt) ?? /* @__PURE__ */ new Date()
 		};
 	}
 	mapItemFull(row) {
+		const metadata = row.metadata ? parseJSON$3(row.metadata) : void 0;
+		const emptyValue = metadata?.__purged === true ? null : void 0;
 		return {
 			id: row.id,
 			datasetId: row.datasetId,
@@ -2079,15 +2079,15 @@ var DatasetsMySQL = class DatasetsMySQL extends _mastra_core_storage.DatasetsSto
 			projectId: row.projectId ?? null,
 			validTo: row.validTo,
 			isDeleted: Boolean(row.isDeleted),
-			input: parseJSON$3(row.input),
-			groundTruth: row.groundTruth ? parseJSON$3(row.groundTruth) : void 0,
-			expectedTrajectory: row.expectedTrajectory ? parseJSON$3(row.expectedTrajectory) : void 0,
-			toolMocks: row.toolMocks ? parseJSON$3(row.toolMocks) : void 0,
-			unmockedToolPolicy: row.unmockedToolPolicy ?? void 0,
-			scorerIds: row.scorerIds ? parseJSON$3(row.scorerIds) : void 0,
-			requestContext: row.requestContext ? parseJSON$3(row.requestContext) : void 0,
-			metadata: row.metadata ? parseJSON$3(row.metadata) : void 0,
-			source: row.source ? parseJSON$3(row.source) : void 0,
+			input: row.input === null ? null : parseJSON$3(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: parseDateTime(row.createdAt) ?? /* @__PURE__ */ new Date(),
 			updatedAt: parseDateTime(row.updatedAt) ?? /* @__PURE__ */ new Date()
 		};
@@ -2576,6 +2576,53 @@ var DatasetsMySQL = class DatasetsMySQL extends _mastra_core_storage.DatasetsSto
 			connection.release();
 		}
 	}
+	async _doPurgeItem({ id, datasetId }) {
+		const experimentTablesExist = await this.experimentTablesExist();
+		const connection = await this.pool.getConnection();
+		try {
+			await connection.beginTransaction();
+			await connection.execute(`SELECT ${quoteIdentifier("id", "column name")} FROM ${formatTableName(_mastra_core_storage.TABLE_DATASETS)} WHERE ${quoteIdentifier("id", "column name")} = ? FOR UPDATE`, [datasetId]);
+			const itemsTable = formatTableName(_mastra_core_storage.TABLE_DATASET_ITEMS);
+			const [rows] = await connection.execute(`SELECT ${quoteIdentifier("id", "column name")} FROM ${itemsTable} WHERE ${quoteIdentifier("id", "column name")} = ? AND ${quoteIdentifier("datasetId", "column name")} = ? LIMIT 1 FOR UPDATE`, [id, datasetId]);
+			if (rows.length === 0) {
+				await connection.commit();
+				return;
+			}
+			const purgedAt = (/* @__PURE__ */ new Date()).toISOString();
+			const purgedMetadata = JSON.stringify({
+				__purged: true,
+				purgedAt
+			});
+			await connection.execute(`UPDATE ${itemsTable} SET ${quoteIdentifier("input", "column name")} = ?, ${quoteIdentifier("groundTruth", "column name")} = NULL, ${quoteIdentifier("expectedTrajectory", "column name")} = NULL, ${quoteIdentifier("toolMocks", "column name")} = NULL, ${quoteIdentifier("unmockedToolPolicy", "column name")} = NULL, ${quoteIdentifier("scorerIds", "column name")} = NULL, ${quoteIdentifier("requestContext", "column name")} = NULL, ${quoteIdentifier("metadata", "column name")} = ?, ${quoteIdentifier("source", "column name")} = NULL WHERE ${quoteIdentifier("id", "column name")} = ? AND ${quoteIdentifier("datasetId", "column name")} = ?`, [
+				"null",
+				purgedMetadata,
+				id,
+				datasetId
+			]);
+			if (experimentTablesExist) await connection.execute(`UPDATE ${formatTableName(_mastra_core_storage.TABLE_EXPERIMENT_RESULTS)} SET ${quoteIdentifier("input", "column name")} = ?, ${quoteIdentifier("output", "column name")} = NULL, ${quoteIdentifier("groundTruth", "column name")} = NULL, ${quoteIdentifier("error", "column name")} = NULL, ${quoteIdentifier("toolMockReport", "column name")} = NULL, ${quoteIdentifier("tags", "column name")} = NULL, ${quoteIdentifier("comment", "column name")} = NULL, ${quoteIdentifier("metadata", "column name")} = ? WHERE ${quoteIdentifier("itemId", "column name")} = ? AND ${quoteIdentifier("experimentId", "column name")} IN (SELECT id FROM ${formatTableName(_mastra_core_storage.TABLE_EXPERIMENTS)} WHERE ${quoteIdentifier("datasetId", "column name")} = ?)`, [
+				"null",
+				purgedMetadata,
+				id,
+				datasetId
+			]);
+			await connection.commit();
+		} catch (error) {
+			let transactionError = error;
+			try {
+				await connection.rollback();
+			} catch (rollbackError) {
+				transactionError = new AggregateError([error, rollbackError], "Transaction and rollback both failed");
+			}
+			if (transactionError instanceof _mastra_core_error.MastraError) throw transactionError;
+			throw new _mastra_core_error.MastraError({
+				id: "MYSQL_PURGE_ITEM_FAILED",
+				domain: _mastra_core_error.ErrorDomain.STORAGE,
+				category: _mastra_core_error.ErrorCategory.THIRD_PARTY
+			}, transactionError);
+		} finally {
+			connection.release();
+		}
+	}
 	async getItemById(args) {
 		try {
 			const tableItemsName = formatTableName(_mastra_core_storage.TABLE_DATASET_ITEMS);
@@ -2980,6 +3027,56 @@ var ExperimentsMySQL = class ExperimentsMySQL extends _mastra_core_storage.Exper
 		this.#skipDefaultIndexes = skipDefaultIndexes;
 		this.#indexes = indexes?.filter((idx) => ExperimentsMySQL.MANAGED_TABLES.includes(idx.table));
 	}
+	async #withPurgeBarrier(experimentId, itemId, fn) {
+		const connection = await this.pool.getConnection();
+		try {
+			await connection.beginTransaction();
+			const [experimentRows] = await connection.execute(`SELECT ${quoteIdentifier("datasetId", "column name")} FROM ${formatTableName(_mastra_core_storage.TABLE_EXPERIMENTS)} WHERE ${quoteIdentifier("id", "column name")} = ?`, [experimentId]);
+			const datasetId = Array.isArray(experimentRows) ? experimentRows[0]?.datasetId ?? null : null;
+			let purgeMetadata = null;
+			if (datasetId) {
+				await connection.execute(`SELECT ${quoteIdentifier("id", "column name")} FROM ${formatTableName(_mastra_core_storage.TABLE_DATASETS)} WHERE ${quoteIdentifier("id", "column name")} = ? FOR UPDATE`, [datasetId]);
+				const [itemRows] = await connection.execute(`SELECT ${quoteIdentifier("metadata", "column name")} FROM ${formatTableName(_mastra_core_storage.TABLE_DATASET_ITEMS)} WHERE ${quoteIdentifier("id", "column name")} = ? AND ${quoteIdentifier("datasetId", "column name")} = ?`, [itemId, datasetId]);
+				if (Array.isArray(itemRows)) {
+					const purgedRow = itemRows.find((row) => parseJSON$2(row.metadata)?.__purged === true);
+					purgeMetadata = purgedRow ? parseJSON$2(purgedRow.metadata) ?? null : null;
+				}
+			}
+			const result = await fn(connection, purgeMetadata);
+			await connection.commit();
+			return result;
+		} catch (error) {
+			let transactionError = error;
+			try {
+				await connection.rollback();
+			} catch (rollbackError) {
+				transactionError = new AggregateError([error, rollbackError], "Transaction and rollback both failed");
+			}
+			throw transactionError;
+		} finally {
+			connection.release();
+		}
+	}
+	async #ensureExperimentResultNaturalKey() {
+		const tableName = formatTableName(_mastra_core_storage.TABLE_EXPERIMENT_RESULTS);
+		const indexName = "idx_experiment_results_exp_item_attempt";
+		const [indexRows] = await this.pool.execute(`SELECT 1 FROM information_schema.STATISTICS
+       WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = ? AND INDEX_NAME = ?
+       LIMIT 1`, [_mastra_core_storage.TABLE_EXPERIMENT_RESULTS, indexName]);
+		if (Array.isArray(indexRows) && indexRows.length > 0) return;
+		try {
+			await this.pool.execute(`CREATE UNIQUE INDEX ${quoteIdentifier(indexName, "index name")} ON ${tableName} (${quoteIdentifier("experimentId", "column name")}(191), ${quoteIdentifier("itemId", "column name")}(191), ((COALESCE(${quoteIdentifier("attempt", "column name")}, 0))))`);
+		} catch (error) {
+			if ((0, _mastra_core_storage.hasErrorCode)(error, /* @__PURE__ */ new Set([1061, "ER_DUP_KEYNAME"]))) return;
+			if (!(0, _mastra_core_storage.hasErrorCode)(error, /* @__PURE__ */ new Set([1062, "ER_DUP_ENTRY"]))) throw error;
+			throw new _mastra_core_error.MastraError({
+				id: "MYSQL_EXPERIMENT_RESULT_NATURAL_KEY_MIGRATION_REQUIRED",
+				domain: _mastra_core_error.ErrorDomain.STORAGE,
+				category: _mastra_core_error.ErrorCategory.USER,
+				text: "Could not enforce experiment-result uniqueness. Resolve duplicate experiment, item, and attempt combinations before restarting the MySQL store."
+			}, error);
+		}
+	}
 	/**
 	* Returns default index definitions for the experiments domain tables.
 	*/
@@ -3036,6 +3133,7 @@ var ExperimentsMySQL = class ExperimentsMySQL extends _mastra_core_storage.Exper
 				"attempt"
 			]
 		});
+		await this.#ensureExperimentResultNaturalKey();
 		await this.createDefaultIndexes();
 		await this.createCustomIndexes();
 	}
@@ -3082,7 +3180,7 @@ var ExperimentsMySQL = class ExperimentsMySQL extends _mastra_core_storage.Exper
 			itemDatasetVersion: row.itemDatasetVersion ?? null,
 			organizationId: row.organizationId ?? null,
 			projectId: row.projectId ?? null,
-			input: parseJSON$2(row.input),
+			input: row.input === null ? null : parseJSON$2(row.input),
 			output: row.output ? parseJSON$2(row.output) : null,
 			groundTruth: row.groundTruth ? parseJSON$2(row.groundTruth) : null,
 			metadata: row.metadata ? parseJSON$2(row.metadata) ?? null : null,
@@ -3377,29 +3475,51 @@ var ExperimentsMySQL = class ExperimentsMySQL extends _mastra_core_storage.Exper
 		try {
 			const id = input.id ?? (0, crypto$1.randomUUID)();
 			const now = /* @__PURE__ */ new Date();
-			await this.operations.insert({
-				tableName: _mastra_core_storage.TABLE_EXPERIMENT_RESULTS,
-				record: {
+			const purgeMetadata = await this.#withPurgeBarrier(input.experimentId, input.itemId, async (connection, marker) => {
+				await connection.execute(`INSERT INTO ${formatTableName(_mastra_core_storage.TABLE_EXPERIMENT_RESULTS)} (
+            ${[
+					"id",
+					"experimentId",
+					"itemId",
+					"itemDatasetVersion",
+					"organizationId",
+					"projectId",
+					"input",
+					"output",
+					"groundTruth",
+					"metadata",
+					"error",
+					"startedAt",
+					"completedAt",
+					"retryCount",
+					"attempt",
+					"traceId",
+					"status",
+					"tags",
+					"createdAt"
+				].map((column) => quoteIdentifier(column, "column name")).join(", ")}
+          ) VALUES (${Array.from({ length: 19 }, () => "?").join(", ")})`, [
 					id,
-					experimentId: input.experimentId,
-					itemId: input.itemId,
-					itemDatasetVersion: input.itemDatasetVersion ?? null,
-					organizationId: input.organizationId ?? null,
-					projectId: input.projectId ?? null,
-					input: JSON.stringify(input.input),
-					output: input.output != null ? JSON.stringify(input.output) : null,
-					groundTruth: input.groundTruth != null ? JSON.stringify(input.groundTruth) : null,
-					metadata: input.metadata != null ? JSON.stringify(input.metadata) : null,
-					error: input.error ? JSON.stringify(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 ? JSON.stringify(input.tags) : null,
-					createdAt: now
-				}
+					input.experimentId,
+					input.itemId,
+					input.itemDatasetVersion ?? null,
+					input.organizationId ?? null,
+					input.projectId ?? null,
+					JSON.stringify(marker ? null : input.input),
+					marker || input.output == null ? null : JSON.stringify(input.output),
+					marker || input.groundTruth == null ? null : JSON.stringify(input.groundTruth),
+					JSON.stringify(marker ?? input.metadata ?? null),
+					marker || input.error == null ? null : JSON.stringify(input.error),
+					input.startedAt,
+					input.completedAt,
+					input.retryCount,
+					input.attempt ?? 0,
+					input.traceId ?? null,
+					input.status ?? null,
+					marker || input.tags == null ? null : JSON.stringify(input.tags),
+					now
+				]);
+				return marker;
 			});
 			return {
 				id,
@@ -3408,18 +3528,18 @@ var ExperimentsMySQL = class ExperimentsMySQL extends _mastra_core_storage.Exper
 				itemDatasetVersion: input.itemDatasetVersion,
 				organizationId: input.organizationId ?? null,
 				projectId: input.projectId ?? null,
-				input: input.input,
-				output: input.output,
-				groundTruth: input.groundTruth,
-				metadata: input.metadata ?? null,
-				error: input.error,
+				input: purgeMetadata ? null : input.input,
+				output: purgeMetadata ? null : input.output,
+				groundTruth: purgeMetadata ? null : input.groundTruth,
+				metadata: purgeMetadata ?? input.metadata ?? null,
+				error: purgeMetadata ? null : input.error,
 				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,
+				tags: purgeMetadata ? null : input.tags ?? null,
 				createdAt: now
 			};
 		} catch (error) {
@@ -3458,49 +3578,77 @@ var ExperimentsMySQL = class ExperimentsMySQL extends _mastra_core_storage.Exper
 		});
 		try {
 			const attempt = input.attempt ?? 0;
-			const existingId = (await this.operations.query(`SELECT ${quoteIdentifier("id", "column name")} FROM ${formatTableName(_mastra_core_storage.TABLE_EXPERIMENT_RESULTS)} WHERE ${quoteIdentifier("experimentId", "column name")} = ? AND ${quoteIdentifier("itemId", "column name")} = ? AND COALESCE(${quoteIdentifier("attempt", "column name")}, 0) = ?`, [
-				input.experimentId,
-				input.itemId,
-				attempt
-			]))[0]?.id;
-			if (!existingId) return await this.addExperimentResult({
-				...input,
-				attempt
-			});
-			await this.operations.update({
-				tableName: _mastra_core_storage.TABLE_EXPERIMENT_RESULTS,
-				keys: { id: existingId },
-				data: {
-					itemDatasetVersion: input.itemDatasetVersion ?? null,
-					organizationId: input.organizationId ?? null,
-					projectId: input.projectId ?? null,
-					input: JSON.stringify(input.input),
-					output: input.output != null ? JSON.stringify(input.output) : null,
-					groundTruth: input.groundTruth != null ? JSON.stringify(input.groundTruth) : null,
-					metadata: input.metadata != null ? JSON.stringify(input.metadata) : null,
-					error: input.error ? JSON.stringify(input.error) : null,
-					startedAt: input.startedAt,
-					completedAt: input.completedAt,
-					retryCount: input.retryCount,
+			return await this.#withPurgeBarrier(input.experimentId, input.itemId, async (connection, marker) => {
+				const tableName = formatTableName(_mastra_core_storage.TABLE_EXPERIMENT_RESULTS);
+				const updateColumns = [
+					"itemDatasetVersion",
+					"organizationId",
+					"projectId",
+					"input",
+					"output",
+					"groundTruth",
+					"metadata",
+					"error",
+					"startedAt",
+					"completedAt",
+					"retryCount",
+					"attempt",
+					"traceId",
+					"status",
+					"tags"
+				];
+				const updateValues = [
+					input.itemDatasetVersion ?? null,
+					input.organizationId ?? null,
+					input.projectId ?? null,
+					JSON.stringify(marker ? null : input.input),
+					marker || input.output == null ? null : JSON.stringify(input.output),
+					marker || input.groundTruth == null ? null : JSON.stringify(input.groundTruth),
+					JSON.stringify(marker ?? input.metadata ?? null),
+					marker || input.error == null ? null : JSON.stringify(input.error),
+					input.startedAt,
+					input.completedAt,
+					input.retryCount,
 					attempt,
-					traceId: input.traceId ?? null,
-					status: input.status ?? null,
-					tags: input.tags ? JSON.stringify(input.tags) : null
-				}
-			});
-			const updated = await this.getExperimentResultById({ id: existingId });
-			if (!updated) throw new _mastra_core_error.MastraError({
-				id: "MYSQL_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: {
-					experimentId: input.experimentId,
-					itemId: input.itemId,
+					input.traceId ?? null,
+					input.status ?? null,
+					marker || input.tags == null ? null : JSON.stringify(input.tags)
+				];
+				const columns = [
+					"id",
+					"experimentId",
+					"itemId",
+					...updateColumns,
+					"createdAt"
+				];
+				await connection.execute(`INSERT INTO ${tableName} (${columns.map((column) => quoteIdentifier(column, "column name")).join(", ")})
+           VALUES (${Array.from({ length: columns.length }, () => "?").join(", ")})
+           ON DUPLICATE KEY UPDATE ${updateColumns.map((column) => `${quoteIdentifier(column, "column name")} = VALUES(${quoteIdentifier(column, "column name")})`).join(", ")}`, [
+					(0, crypto$1.randomUUID)(),
+					input.experimentId,
+					input.itemId,
+					...updateValues,
+					/* @__PURE__ */ new Date()
+				]);
+				const [rows] = await connection.execute(`SELECT * FROM ${tableName} WHERE ${quoteIdentifier("experimentId", "column name")} = ? AND ${quoteIdentifier("itemId", "column name")} = ? AND ${quoteIdentifier("attempt", "column name")} = ?`, [
+					input.experimentId,
+					input.itemId,
 					attempt
-				}
+				]);
+				const row = Array.isArray(rows) ? rows[0] : void 0;
+				if (!row) throw new _mastra_core_error.MastraError({
+					id: "MYSQL_UPSERT_EXPERIMENT_RESULT_NOT_FOUND",
+					domain: _mastra_core_error.ErrorDomain.STORAGE,
+					category: _mastra_core_error.ErrorCategory.USER,
+					text: `Experiment result not found after upsert`,
+					details: {
+						experimentId: input.experimentId,
+						itemId: input.itemId,
+						attempt
+					}
+				});
+				return this.mapExperimentResult(row);
 			});
-			return updated;
 		} catch (error) {
 			if (error instanceof _mastra_core_error.MastraError) throw error;
 			throw new _mastra_core_error.MastraError({
@@ -3518,18 +3666,27 @@ var ExperimentsMySQL = class ExperimentsMySQL extends _mastra_core_storage.Exper
 			});
 			if (!existing) throw new Error(`Experiment result not found: ${input.id}`);
 			if (input.experimentId && existing.experimentId !== input.experimentId) throw new Error(`Experiment result ${input.id} does not belong to experiment ${input.experimentId}`);
-			const updateData = {};
-			if (input.status !== void 0) updateData.status = input.status;
-			if (input.tags !== void 0) updateData.tags = input.tags ? JSON.stringify(input.tags) : null;
-			if (input.comment !== void 0) updateData.comment = input.comment;
-			if (Object.keys(updateData).length > 0) await this.operations.update({
-				tableName: _mastra_core_storage.TABLE_EXPERIMENT_RESULTS,
-				keys: { id: input.id },
-				data: updateData
+			return await this.#withPurgeBarrier(existing.experimentId, existing.itemId, async (connection, marker) => {
+				await connection.execute(`UPDATE ${formatTableName(_mastra_core_storage.TABLE_EXPERIMENT_RESULTS)}
+           SET ${quoteIdentifier("status", "column name")} = CASE WHEN ? THEN ? ELSE ${quoteIdentifier("status", "column name")} END,
+               ${quoteIdentifier("tags", "column name")} = CASE WHEN ? THEN NULL WHEN ? THEN ? ELSE ${quoteIdentifier("tags", "column name")} END,
+               ${quoteIdentifier("comment", "column name")} = CASE WHEN ? THEN NULL WHEN ? THEN ? ELSE ${quoteIdentifier("comment", "column name")} END
+           WHERE ${quoteIdentifier("id", "column name")} = ?`, [
+					input.status !== void 0,
+					input.status ?? null,
+					Boolean(marker),
+					input.tags !== void 0,
+					input.tags === void 0 ? null : JSON.stringify(input.tags),
+					Boolean(marker),
+					input.comment !== void 0,
+					input.comment ?? null,
+					input.id
+				]);
+				const [rows] = await connection.execute(`SELECT * FROM ${formatTableName(_mastra_core_storage.TABLE_EXPERIMENT_RESULTS)} WHERE ${quoteIdentifier("id", "column name")} = ?`, [input.id]);
+				const row = Array.isArray(rows) ? rows[0] : void 0;
+				if (!row) throw new Error(`Experiment result ${input.id} not found after update`);
+				return this.mapExperimentResult(row);
 			});
-			const updated = await this.getExperimentResultById({ id: input.id });
-			if (!updated) throw new Error(`Experiment result ${input.id} not found after update`);
-			return updated;
 		} catch (error) {
 			if (error instanceof _mastra_core_error.MastraError) throw error;
 			throw new _mastra_core_error.MastraError({
@@ -7297,6 +7454,10 @@ var MemoryMySQL = class MemoryMySQL extends _mastra_core_storage.MemoryStorage {
 				const [currentRows] = await connection.execute(`SELECT ${omCol("bufferedObservationChunks")} FROM ${OM_TABLE_QUOTED} WHERE ${omCol("id")} = ? FOR UPDATE`, [input.id]);
 				if (!currentRows || currentRows.length === 0) throwOMNotFound(input.id, "UPDATE_BUFFERED_OBSERVATIONS");
 				const existingChunks = parseBufferedChunks(currentRows[0].bufferedObservationChunks);
+				if (existingChunks.some((existing) => existing.cycleId === input.chunk.cycleId)) {
+					await connection.commit();
+					return;
+				}
 				const newChunk = {
 					id: `ombuf-${(0, crypto$1.randomUUID)()}`,
 					cycleId: input.chunk.cycleId,
@@ -8053,6 +8214,7 @@ var ObservabilityMySQL = class ObservabilityMySQL extends _mastra_core_storage.O
 		}
 	}
 	async batchDeleteTraces(args) {
+		this.assertUnscopedBatchDeleteTraces(args);
 		try {
 			if (!args.traceIds.length) return;
 			const keys = args.traceIds.map((traceId) => ({ traceId }));