@mastra/clickhouse 1.21.0 → 1.21.1

package/dist/index.js

@@ -4856,29 +4856,16 @@ function feedbackNotFoundError(feedbackId) {
 		details: { feedbackId }
 	});
 }
-function feedbackConflictError(feedbackId) {
-	return new MastraError({
-		id: "OBSERVABILITY_UPDATE_FEEDBACK_REVIEW_STATUS_CONFLICT",
-		domain: ErrorDomain.MASTRA_OBSERVABILITY,
-		category: ErrorCategory.USER,
-		text: "Feedback record changed while its review status was being updated; retry the update",
-		details: { feedbackId }
-	});
-}
-/** Re-reads before giving up when ingestion keeps superseding the observed row. */
-const REVIEW_UPDATE_ATTEMPTS = 3;
 /**
-* Only applied requests block a review update. The guard decides the reply,
-* not data safety: the update mutates the row in place and preserves the
-* delete mask, so a replica that has not received a marker yet can only
-* mis-report a status, never bring deleted feedback back.
+* Finds a deletion request covering this feedback. With `appliedOnly`, only
+* requests whose DELETE succeeded count; otherwise pending requests count too,
+* including a delete that is still running or one that failed.
 */
-async function hasFeedbackDeletionRequest(client, feedbackId, organizationId, resourceId) {
+async function hasFeedbackDeletionRequest(client, feedbackId, organizationId, resourceId, { appliedOnly }) {
 	return (await queryJson$2(client, `SELECT 1 AS found FROM ${TABLE_DELETION_REQUESTS} FINAL
      WHERE signal = 'feedback'
        AND predicateType = 'itemIds'
-       AND has(predicateValues, {feedbackId:String})
-       AND lastAppliedAt > toDateTime64(0, 3)
+       AND has(predicateValues, {feedbackId:String})${appliedOnly ? "\n       AND lastAppliedAt > toDateTime64(0, 3)" : ""}
        AND (organizationId = '' OR organizationId = {organizationId:String})
        AND (resourceId = '' OR resourceId = {resourceId:String})
      LIMIT 1`, {
@@ -4887,63 +4874,44 @@ async function hasFeedbackDeletionRequest(client, feedbackId, organizationId, re
 		resourceId: resourceId ?? ""
 	})).length > 0;
 }
-async function updateFeedbackReviewStatus(client, args, strategy = null) {
-	const { feedbackId, reviewStatus } = parseUpdateFeedbackReviewStatusArgs(args);
-	for (let attempt = 1;; attempt++) {
-		const updated = await applyReviewStatus(client, feedbackId, reviewStatus, strategy);
-		if (updated) return updated;
-		if (attempt >= REVIEW_UPDATE_ATTEMPTS) throw feedbackConflictError(feedbackId);
-	}
-}
 /**
-* One read-guard-mutate-verify pass. Returns `null` when the read-back does not
-* show the new status: a newer version superseded the observed row, a delete
-* hid it after the guard read (the next pass then reports not found), or the
-* mutation left the row untouched.
+* Review updates insert a replacement row, so they need only `INSERT` and the
+* insert materialized view publishes the delta cursor.
+*
+* A replacement written after a concurrent DELETE is not covered by that
+* DELETE. The post-write check therefore looks for any request, pending or
+* applied, and re-runs the delete when it finds one. Only applied requests
+* block the update up front, so feedback whose delete failed stays editable.
+*
+* If the post-write check reads a replica that has not received the request
+* yet, or the check or its delete fails, the replacement stays visible. A row
+* that is still visible under an applied request can only be such a leftover,
+* so the next update deletes it again.
 */
-async function applyReviewStatus(client, feedbackId, reviewStatus, strategy) {
-	const existingRow = (await queryJson$2(client, `SELECT *, toString(writeVersion) AS reviewWriteVersion FROM ${TABLE_FEEDBACK_EVENTS} FINAL
+async function updateFeedbackReviewStatus(client, args, replication) {
+	const { feedbackId, reviewStatus } = parseUpdateFeedbackReviewStatusArgs(args);
+	const existingRow = (await queryJson$2(client, `SELECT * FROM ${TABLE_FEEDBACK_EVENTS} FINAL
      WHERE feedbackId = {feedbackId:String}
      ORDER BY writeVersion DESC, timestamp DESC
      LIMIT 1`, { feedbackId }))[0];
 	if (!existingRow) throw feedbackNotFoundError(feedbackId);
-	if (await hasFeedbackDeletionRequest(client, feedbackId, existingRow.organizationId, existingRow.resourceId)) throw feedbackNotFoundError(feedbackId);
-	const identity = `feedbackId = {feedbackId:String}
-    AND timestamp = parseDateTime64BestEffort({timestamp:String}, 3, 'UTC')
-    AND (traceId = {traceId:Nullable(String)} OR (isNull(traceId) AND isNull({traceId:Nullable(String)})))
-    AND writeVersion = {writeVersion:UInt64}`;
-	const params = {
-		feedbackId,
-		timestamp: existingRow.timestamp,
-		traceId: existingRow.traceId,
-		writeVersion: existingRow.reviewWriteVersion,
-		reviewStatus
+	const { organizationId, resourceId } = existingRow;
+	const redelete = async () => {
+		await deleteFeedback(client, {
+			feedbackIds: [feedbackId],
+			organizationId: organizationId ?? void 0,
+			resourceId: resourceId ?? void 0
+		}, replication);
+		throw feedbackNotFoundError(feedbackId);
 	};
-	await client.command({
-		query: `ALTER TABLE ${TABLE_FEEDBACK_EVENTS} UPDATE reviewStatus = {reviewStatus:String} WHERE ${identity}`,
-		query_params: params,
-		clickhouse_settings: {
-			...CH_SETTINGS,
-			mutations_sync: "1"
-		}
-	});
-	if (strategy !== null) await client.command({
-		query: `INSERT INTO ${TABLE_FEEDBACK_EVENTS_DELTA}
-        SELECT ${buildDeltaCursorExpr(strategy, "mastra_feedback_events_delta_cursor", "feedbackId")} AS cursorId,
-          ingestedAt, traceId, timestamp, feedbackId
-        FROM (
-          SELECT now64(9, 'UTC') AS ingestedAt, traceId, timestamp, feedbackId
-          FROM ${TABLE_FEEDBACK_EVENTS} FINAL WHERE ${identity}
-        )`,
-		query_params: params,
-		clickhouse_settings: {
-			...CH_INSERT_SETTINGS,
-			async_insert: 0
-		}
+	if (await hasFeedbackDeletionRequest(client, feedbackId, organizationId, resourceId, { appliedOnly: true })) return redelete();
+	const updated = rowToFeedbackRecord({
+		...existingRow,
+		reviewStatus
 	});
-	if (await hasFeedbackDeletionRequest(client, feedbackId, existingRow.organizationId, existingRow.resourceId)) throw feedbackNotFoundError(feedbackId);
-	const current = await queryJson$2(client, `SELECT * FROM ${TABLE_FEEDBACK_EVENTS} FINAL WHERE ${identity} LIMIT 1`, params);
-	return current[0]?.reviewStatus === reviewStatus ? rowToFeedbackRecord(current[0]) : null;
+	await batchCreateFeedback(client, { feedbacks: [updated] });
+	if (await hasFeedbackDeletionRequest(client, feedbackId, organizationId, resourceId, { appliedOnly: false })) return redelete();
+	return updated;
 }
 async function listFeedback(client, args, strategy) {
 	const parsed = listFeedbackArgsSchema.parse(args);
@@ -8642,21 +8610,35 @@ var ObservabilityStorageClickhouseVNext = class extends ObservabilityStorage {
 		if (!deltaPollingSupported(this.#deltaCursorStrategy)) return [
 			"metrics",
 			"logs",
+			"entity-type-discovery",
+			"entity-name-discovery",
+			"service-name-discovery",
+			"environment-discovery",
+			"tag-discovery",
+			"metric-discovery",
 			"trace-query",
 			"trace-query-root-duration",
 			"trace-query-discovery",
 			"thread-query",
-			"trace-query-tenant-scope"
+			"trace-query-tenant-scope",
+			"feedback"
 		];
 		return [
 			"metrics",
 			"logs",
+			"entity-type-discovery",
+			"entity-name-discovery",
+			"service-name-discovery",
+			"environment-discovery",
+			"tag-discovery",
+			"metric-discovery",
 			"delta-polling",
 			"trace-query",
 			"trace-query-root-duration",
 			"trace-query-discovery",
 			"thread-query",
-			"trace-query-tenant-scope"
+			"trace-query-tenant-scope",
+			"feedback"
 		];
 	}
 	async createSpan(args) {
@@ -8996,7 +8978,7 @@ var ObservabilityStorageClickhouseVNext = class extends ObservabilityStorage {
 	}
 	async updateFeedbackReviewStatus(args) {
 		try {
-			return await updateFeedbackReviewStatus(this.#client, args, deltaPollingSupported(this.#deltaCursorStrategy) ? this.#deltaCursorStrategy : null);
+			return await updateFeedbackReviewStatus(this.#client, args, this.#replication);
 		} catch (error) {
 			if (error instanceof MastraError) throw error;
 			throw new MastraError({