@mastra/clickhouse 1.26.0-alpha.3 → 1.26.0-alpha.5

package/dist/docs/SKILL.md

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

package/dist/docs/assets/SOURCE_MAP.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.26.0-alpha.3",
+  "version": "1.26.0-alpha.5",
   "package": "@mastra/clickhouse",
   "exports": {},
   "modules": {}

package/dist/docs/references/integrations-databases-clickhouse.md

@@ -290,7 +290,7 @@ Don't set `replication` on ClickHouse Cloud. Cloud rewrites `MergeTree` to `Shar
 
 ### Observability domain options
 
-`ObservabilityStorageClickhouse` and `ObservabilityStorageClickhouseVNext` accept the same connection options as `ClickhouseStore` (`url`, `username`, `password`, or a pre-configured `client`). `ObservabilityStorageClickhouseVNext` also accepts `retention`, the per-signal TTL in days described in [ClickHouse native TTL](https://mastra.ai/reference/storage/retention), and `traceQuery`, the execution limits for [trace queries](https://mastra.ai/reference/observability/tracing/trace-query).
+`ObservabilityStorageClickhouse` and `ObservabilityStorageClickhouseVNext` accept the same connection options as `ClickhouseStore` (`url`, `username`, `password`, or a pre-configured `client`). `ObservabilityStorageClickhouseVNext` also accepts `retention`, the per-signal TTL in days described in [ClickHouse native TTL](https://mastra.ai/reference/storage/retention), and `traceQuery`, the execution limits for [trace queries](https://mastra.ai/reference/observability/tracing/advanced-queries).
 
 ## Hosting options
 

package/dist/index.cjs

@@ -6869,7 +6869,9 @@ const TRACE_STATUS_SQL = `if(isNotNull(r.error), 'error', 'success')`;
 * Core before 1.68 has no field registry at all.
 */
 const timeToFirstChunkSupported = "timeToFirstChunkMs" in (_mastra_core_storage.TRACE_QUERY_FIELD_REGISTRY?.trace ?? {});
-const timeToFirstChunkFeatures = timeToFirstChunkSupported ? ["trace-query-time-to-first-chunk"] : [];
+/** Core before the sort rejects `orderBy` on the field, so the sort is only declared when core plans it. */
+const timeToFirstChunkSortSupported = _mastra_core_storage.TRACE_QUERY_ORDER_FIELDS?.includes("timeToFirstChunkMs") === true;
+const timeToFirstChunkFeatures = timeToFirstChunkSupported ? timeToFirstChunkSortSupported ? ["trace-query-time-to-first-chunk", "trace-query-time-to-first-chunk-sort"] : ["trace-query-time-to-first-chunk"] : [];
 function durationMsSql(startedAt, endedAt) {
 	return `dateDiff('millisecond', ${startedAt}, ${endedAt})`;
 }
@@ -6922,6 +6924,10 @@ const TRACE_FIELDS = {
 		sql: "r.timeToFirstChunkMs",
 		parameterType: "Float64"
 	},
+	entityId: {
+		sql: "r.entityId",
+		parameterType: "String"
+	},
 	entityName: {
 		sql: "r.entityName",
 		parameterType: "String"
@@ -7212,7 +7218,7 @@ function fieldDefinition(registry, field) {
 	return definition;
 }
 function resolveOrderField(field) {
-	if (field === "startedAt" || field === "endedAt") return field;
+	if (field === "startedAt" || field === "endedAt" || field === "timeToFirstChunkMs") return field;
 	throw new Error(`Unsupported trusted trace-query field: ${field}`);
 }
 function isMetadataField(field) {
@@ -7320,6 +7326,28 @@ function compileTenantScope(scope, parameters) {
 	if (scope.resourceId !== void 0) sql += `\n      AND resourceId = ${parameters.add(scope.resourceId, "String")}`;
 	return sql;
 }
+/**
+* Order of the versions of one root span, current version first. `mastra_trace_roots` has no
+* version column, so until a background merge runs, every export of a root is its own row with the
+* same sort key, and merges never meet versions that ended on different days (it is partitioned by
+* `endedAt`). The version that ended last is current, as a resumed or completed root is exported
+* again with a later `endedAt`; a pending copy stores `endedAt = startedAt` and can lack `threadId`,
+* so a copy with a thread wins an equal-time tie. Remaining ties are broken by insertion order, last
+* insert first: the part's first block number, then the row's offset in the part. Tied versions
+* share a partition and sort key, so a merge meets them and keeps the last insert too, and reads
+* pick the same version before and after it. Both are virtual columns, so the order reads nothing
+* beyond `endedAt` and `threadId`.
+*
+* Merges don't follow this order across `endedAt`: within one day's partition a merge keeps the last
+* insert, not the version that ended last. If an outdated export of a root is redelivered after its
+* current version, on the same day, reads pick the current version until a merge, and the outdated
+* one afterwards (last write wins, as in the PG and DuckDB stores). Making merges keep the version
+* that ended last needs `ReplacingMergeTree(endedAt)`, a schema change.
+*
+* Every root collapse uses this order: trace rows, aggregates, thread rows and the discovery reads.
+*/
+const ROOT_VERSION_ORDER = `endedAt DESC, isNotNull(threadId) DESC, toUInt64(splitByChar('_', _part)[2]) DESC,
+      _part_offset DESC`;
 function compileClickHouseTraceScope(selection, relationCollections, parameters, scope, seedConjuncts = [], options = {}) {
 	const from = parameters.add(selection.timeRange.from, "DateTime64(3, 'UTC')");
 	const to = parameters.add(selection.timeRange.to, "DateTime64(3, 'UTC')");
@@ -7343,7 +7371,15 @@ function compileClickHouseTraceScope(selection, relationCollections, parameters,
     SELECT *
     FROM ${TABLE_TRACE_ROOTS} r
     WHERE startedAt >= ${from}
-      AND startedAt < ${to}${tenant}${seedFilter}${bound}
+      AND startedAt < ${to}${tenant}${bound}${seedFilter ? `
+      AND traceId IN (
+        SELECT traceId
+        FROM ${TABLE_TRACE_ROOTS} r
+        WHERE startedAt >= ${from}
+          AND startedAt < ${to}${tenant}${seedFilter}
+      )` : ""}
+    ORDER BY startedAt, traceId, spanId, ${ROOT_VERSION_ORDER}
+    LIMIT 1 BY traceId
   )`] : [`current_roots AS (
     SELECT *
     FROM ${TABLE_TRACE_ROOTS}
@@ -7353,7 +7389,7 @@ function compileClickHouseTraceScope(selection, relationCollections, parameters,
       WHERE startedAt >= ${from}
         AND startedAt < ${to}${tenant}${seedFilter}
     )${tenant}
-    ORDER BY traceId, dedupeKey
+    ORDER BY traceId, startedAt, spanId, ${ROOT_VERSION_ORDER}
     LIMIT 1 BY traceId
   )`, `root_scope AS (
     SELECT *
@@ -7483,69 +7519,61 @@ function traceOrder(plan) {
 		direction: plan.orderBy.direction === "asc" ? "ASC" : "DESC"
 	};
 }
-/**
-* Keyset cursor on a trace's sort value. Applied after each trace is reduced to one sort value:
-* filtering root rows first would let a trace with several roots (or unmerged copies with
-* different `endedAt`) come back on a later page under a root that sorts after the cursor.
-*/
+/** Keyset cursor on a trace's sort value (the current root's), with traceId breaking ties. */
 function keysetCursorCondition(plan, order, parameters) {
 	if (plan.paginationMode !== "keyset" || !plan.cursor) return "";
+	if (plan.cursor.sortValue === null) return `(isNull(sortValue) AND traceId > ${parameters.add(plan.cursor.traceId, "String")})`;
+	const numeric = order.field === "timeToFirstChunkMs";
 	const comparison = order.direction === "ASC" ? ">" : "<";
-	const sortValue = parameters.add(plan.cursor.sortValue, "DateTime64(3, 'UTC')");
-	return `(sortValue ${comparison} ${sortValue} OR (sortValue = ${sortValue} AND traceId > ${parameters.add(plan.cursor.traceId, "String")}))`;
+	const sortValue = parameters.add(plan.cursor.sortValue, numeric ? "Float64" : "DateTime64(3, 'UTC')");
+	return `(sortValue ${comparison} ${sortValue} OR (sortValue = ${sortValue} AND traceId > ${parameters.add(plan.cursor.traceId, "String")})${numeric ? " OR isNull(sortValue)" : ""})`;
 }
 /**
 * First statement of keyset and page mode: the page's traces (after the keyset cursor, `limit + 1`
-* for keyset mode, `perPage` at the page offset for page mode) as root keys, and the
-* number of matching traces on every row. Per trace, the root row that sorts first gives the sort
-* value and the key, so the key always names a row with that sort value. No blob columns are read.
+* for keyset mode, `perPage` at the page offset for page mode) as keys of their current roots, and
+* the number of matching traces on every row. No blob columns are read.
 */
 function compileClickHouseTraceQueryKeys(plan) {
 	if (plan.paginationMode === "delta") throw new Error("Delta trace queries have no keys statement");
 	const parameters = new ParameterBuilder();
 	const order = traceOrder(plan);
-	const ctes = compileClickHouseTraceCandidates(plan, "r.traceId AS traceId, r.dedupeKey AS dedupeKey, r.startedAt AS startedAt, r.endedAt AS endedAt", parameters, QUERY_TRACES_SCOPE);
+	const ctes = compileClickHouseTraceCandidates(plan, "r.traceId AS traceId, r.dedupeKey AS dedupeKey, r.startedAt AS startedAt, r.endedAt AS endedAt, r.timeToFirstChunkMs AS timeToFirstChunkMs", parameters, QUERY_TRACES_SCOPE);
 	const cursor = keysetCursorCondition(plan, order, parameters);
-	const pick = order.direction === "DESC" ? "max" : "min";
 	const limit = plan.paginationMode === "page" ? `LIMIT ${parameters.add(plan.perPage, "UInt64")} OFFSET ${parameters.add(plan.page * plan.perPage, "UInt64")}` : `LIMIT ${parameters.add(plan.limit + 1, "UInt64")}`;
 	return {
-		query: `WITH ${ctes.join(",\n")},
-per_trace AS (
-  SELECT traceId, ${pick}(${order.field}) AS sortValue,
-    ${pick === "max" ? "argMax" : "argMin"}((dedupeKey, startedAt), ${order.field}) AS root
-  FROM candidates
-  GROUP BY traceId${cursor ? `\n  HAVING ${cursor}` : ""}
-)
-SELECT traceId, root.1 AS dedupeKey, sortValue, root.2 AS rootStartedAt, count() OVER () AS __total
-FROM per_trace
-ORDER BY sortValue ${order.direction}, traceId ASC
+		query: `WITH ${ctes.join(",\n")}
+SELECT traceId, dedupeKey, ${order.field} AS sortValue, startedAt AS rootStartedAt, endedAt AS rootEndedAt,
+  count() OVER () AS __total
+FROM candidates${cursor ? `\nWHERE ${cursor}` : ""}
+ORDER BY sortValue ${order.direction} NULLS LAST, traceId ASC
 ${limit}`,
 		query_params: parameters.params,
 		sharedSnapshot: true
 	};
 }
 /**
-* Second statement of keyset and page mode: the rows of the keyed roots, with `metadata`
-* and the stored previews, read by sort-key tuple. Unmerged copies of a root key are redeliveries of one
-* span; the relation-free `where` conjuncts are re-applied so a copy that doesn't match isn't
-* returned, and the copy that sorts first is kept, as in the keys statement.
+* Second statement of keyset and page mode: the rows of the keyed roots, with `metadata` and the
+* stored previews, read by sort key and `endedAt`, so only the keyed version's rows match. Versions
+* that end at the same instant are ordered as in the keys statement (ROOT_VERSION_ORDER). The
+* relation-free `where` conjuncts are re-applied, so a version written between the two statements
+* that doesn't match isn't returned.
+*
+* Trade-off of matching on `endedAt`: if a newer version is written between the two statements and
+* a same-day merge then drops the keyed version, the trace has no row and drops off the page. Without
+* `endedAt` the lookup would find the replacement, but could also return a version other than the
+* keyed one whenever both are unmerged. The window is the gap between the two statements.
 */
 function compileClickHouseTraceRowsByKey(plan, keys) {
 	const parameters = new ParameterBuilder();
 	const order = traceOrder(plan);
 	const ts = (value) => parameters.add(value, "DateTime64(3, 'UTC')");
-	const byEnd = order.field === "endedAt";
-	const tuples = keys.map((key) => {
-		const started = ts(byEnd ? key.rootStartedAt : key.sortValue);
-		const id = `${parameters.add(key.traceId, "String")}, ${parameters.add(key.dedupeKey, "String")}`;
-		return byEnd ? `(${started}, ${id}, ${ts(key.sortValue)})` : `(${started}, ${id})`;
-	});
+	const tuples = keys.map((key) => `(${ts(key.rootStartedAt)}, ${parameters.add(key.traceId, "String")}, ${parameters.add(key.dedupeKey, "String")}, ${ts(key.rootEndedAt)})`);
 	const predicate = (plan.where ? (plan.where.type === "boolean" && plan.where.operator === "and" ? plan.where.args : [plan.where]).filter((conjunct) => collectRelationCollections(conjunct).size === 0) : []).map((conjunct) => `\n  AND (${compilePredicate(conjunct, parameters)})`).join("");
 	return {
 		query: `SELECT ${TRACE_SELECT}
 FROM ${TABLE_TRACE_ROOTS} r
-WHERE (r.startedAt, r.traceId, r.dedupeKey${byEnd ? ", r.endedAt" : ""}) IN (${tuples.join(", ")})${compileTenantScope(plan.scope, parameters)}${predicate}
-ORDER BY ${order.field} ${order.direction}, traceId ASC
+WHERE (r.startedAt, r.traceId, r.dedupeKey, r.endedAt) IN (${tuples.join(", ")})${compileTenantScope(plan.scope, parameters)}${predicate}
+ORDER BY ${order.field} ${order.direction} NULLS LAST, traceId ASC, ${ROOT_VERSION_ORDER}
 LIMIT 1 BY traceId`,
 		query_params: parameters.params
 	};
@@ -7564,9 +7592,7 @@ FROM candidates`,
 /**
 * The list statement of groups and delta mode (rows without `metadata` and the previews). Keyset
 * and page mode list with compileClickHouseTraceQueryKeys and compileClickHouseTraceRowsByKey.
-* A trace with several candidate rows (several roots, or unmerged copies of one) is listed in delta
-* mode under the row that sorts first in the list order, as in the keys statement; ties go to the
-* lowest dedupeKey, then the latest endedAt, so every poll picks the same row.
+* Candidates hold one current root per trace, as in the keys statement.
 */
 function compileClickHouseTraceQuery(plan, deltaHead) {
 	const parameters = new ParameterBuilder();
@@ -7587,7 +7613,6 @@ LIMIT ${limit}`,
 		};
 	}
 	if (plan.paginationMode !== "delta") throw new Error("Keyset and page trace queries use compileClickHouseTraceQueryKeys and compileClickHouseTraceRowsByKey");
-	const order = traceOrder(plan);
 	const watermark = _mastra_core_storage.getTraceQueryDeltaWatermark(plan, "clickhouse");
 	const after = watermark ? parseDeltaWatermark(watermark) : {
 		cursorId: "0",
@@ -7606,8 +7631,7 @@ LIMIT ${limit}`,
 SELECT c.*, toString(d.latestCursorId) AS __delta_cursor
 FROM candidates c
 INNER JOIN delta_candidates d ON c.traceId = d.traceId
-ORDER BY d.latestCursorId ASC, c.traceId ASC, c.${order.field} ${order.direction}, c.dedupeKey ASC, c.endedAt DESC
-LIMIT 1 BY c.traceId
+ORDER BY d.latestCursorId ASC, c.traceId ASC
 LIMIT ${limit}`,
 		query_params: parameters.params,
 		sharedSnapshot: true
@@ -7651,6 +7675,7 @@ function compileClickHouseTraceRootPayloads(keys, scope, columns = "payload") {
 		query: `SELECT traceId, spanId AS rootSpanId, dedupeKey, organizationId, resourceId, ${columns === "payload" ? `metadataRaw AS metadata, ${PREVIEW_COLUMNS.join(", ")}` : "input, output, error"}
 FROM ${TABLE_TRACE_ROOTS}
 WHERE (startedAt, traceId, dedupeKey, endedAt, ifNull(organizationId, ''), isNull(organizationId), ifNull(resourceId, ''), isNull(resourceId)) IN (${tuples.join(", ")})${compileTenantScope(scope, parameters)}
+ORDER BY ${ROOT_VERSION_ORDER}
 LIMIT 1 BY traceId, dedupeKey, organizationId, resourceId`,
 		query_params: parameters.params
 	};
@@ -7936,6 +7961,7 @@ async function queryTraces(client, plan, timeoutMs, strategy = null) {
 		});
 	}
 	const keys = await run(compileClickHouseTraceQueryKeys(plan));
+	const sortValue = (value) => plan.orderBy.field !== "timeToFirstChunkMs" ? asIsoTimestamp(value) : value == null ? null : Number(value);
 	let total = Number(keys[0]?.__total ?? 0);
 	if (plan.paginationMode === "page" && keys.length === 0 && plan.page > 0) {
 		const [stats] = await run(compileClickHouseTraceQueryTotal(plan));
@@ -7945,8 +7971,9 @@ async function queryTraces(client, plan, timeoutMs, strategy = null) {
 	const rows = visible.length > 0 ? await run(compileClickHouseTraceRowsByKey(plan, visible.map((key) => ({
 		traceId: String(key.traceId),
 		dedupeKey: String(key.dedupeKey),
-		sortValue: asIsoTimestamp(key.sortValue),
-		rootStartedAt: asIsoTimestamp(key.rootStartedAt)
+		sortValue: sortValue(key.sortValue),
+		rootStartedAt: asIsoTimestamp(key.rootStartedAt),
+		rootEndedAt: asIsoTimestamp(key.rootEndedAt)
 	})))) : [];
 	if (plan.paginationMode === "page") return _mastra_core_storage.traceQueryResponseSchema.parse({
 		traces: await toTraceRecords(rows),
@@ -7963,7 +7990,7 @@ async function queryTraces(client, plan, timeoutMs, strategy = null) {
 		traces: await toTraceRecords(rows),
 		page: { next: keys.length > plan.limit && lastKey ? _mastra_core_storage.encodeTraceQueryCursor(plan, {
 			result: "traces",
-			sortValue: asIsoTimestamp(lastKey.sortValue),
+			sortValue: sortValue(lastKey.sortValue),
 			traceId: String(lastKey.traceId)
 		}) : null }
 	});
@@ -8043,10 +8070,10 @@ const displayFields = [
 ];
 var Parameters = class {
 	values = {};
-	add(value, timestamp = false) {
+	add(value, type = typeof value === "number" ? "UInt64" : "String") {
 		const name = `span_${Object.keys(this.values).length}`;
-		this.values[name] = timestamp ? new Date(value).toISOString().replace("T", " ").replace(/Z$/, "") : value;
-		return `{${name}:${timestamp ? "DateTime64(3, 'UTC')" : typeof value === "number" ? "UInt64" : "String"}}`;
+		this.values[name] = type === "DateTime64(3, 'UTC')" ? new Date(value).toISOString().replace("T", " ").replace(/Z$/, "") : value;
+		return `{${name}:${type}}`;
 	}
 };
 function identityValues(row) {
@@ -8062,10 +8089,17 @@ function identityValues(row) {
 function afterCursor$1(plan, parameters) {
 	if (!plan.cursor) return "1";
 	const cursor = plan.cursor;
-	const timestamp = parameters.add(cursor.sortValue, true);
 	const field = `s.${plan.orderBy.field}`;
-	const terms = [`${field} ${plan.orderBy.direction === "asc" ? ">" : "<"} ${timestamp}`];
-	const equal = [`${field} = ${timestamp}`];
+	const terms = [];
+	const equal = [];
+	if (cursor.sortValue === null) equal.push(`isNull(${field})`);
+	else {
+		const numeric = plan.orderBy.field === "timeToFirstChunkMs";
+		const value = parameters.add(cursor.sortValue, numeric ? "Float64" : "DateTime64(3, 'UTC')");
+		terms.push(`${field} ${plan.orderBy.direction === "asc" ? ">" : "<"} ${value}`);
+		if (numeric) terms.push(`isNull(${field})`);
+		equal.push(`${field} = ${value}`);
+	}
 	for (const key of identityFields) {
 		const value = cursor[key];
 		if (value === null) equal.push(`isNull(s.${key})`);
@@ -8093,8 +8127,8 @@ function fieldExpression(field) {
 }
 function compileClickHouseSpanQuery(plan) {
 	const parameters = new Parameters();
-	const from = parameters.add(plan.timeRange.from, true);
-	const to = parameters.add(plan.timeRange.to, true);
+	const from = parameters.add(plan.timeRange.from, "DateTime64(3, 'UTC')");
+	const to = parameters.add(plan.timeRange.to, "DateTime64(3, 'UTC')");
 	const scope = [];
 	if (plan.scope) {
 		scope.push(`organizationId = ${parameters.add(plan.scope.organizationId)}`);
@@ -8107,6 +8141,7 @@ function compileClickHouseSpanQuery(plan) {
 	const selectionFields = [.../* @__PURE__ */ new Set([
 		"startedAt",
 		"endedAt",
+		plan.orderBy.field,
 		...predicateFields$1(plan.where)
 	])].filter((field) => !new Set(identityFields).has(field));
 	const expressions = selectionFields.map(fieldExpression);
@@ -8120,13 +8155,14 @@ function compileClickHouseSpanQuery(plan) {
     ORDER BY ${identities}, e.endedAt DESC
     LIMIT 1 BY ${identities}
   )
-  SELECT ${[
+  SELECT ${[.../* @__PURE__ */ new Set([
 			...identityFields,
 			"startedAt",
-			"endedAt"
-		].map((field) => `s.${field}`).join(", ")}
+			"endedAt",
+			plan.orderBy.field
+		])].map((field) => `s.${field}`).join(", ")}
   FROM candidates s WHERE s.startedAt >= ${from} AND s.startedAt < ${to} AND (${predicate.sql}) AND ${after}
-  ORDER BY s.${plan.orderBy.field} ${plan.orderBy.direction === "asc" ? "ASC" : "DESC"}, ${identityFields.map((field) => `s.${field} ASC NULLS LAST`).join(", ")}
+  ORDER BY s.${plan.orderBy.field} ${plan.orderBy.direction === "asc" ? "ASC" : "DESC"} NULLS LAST, ${identityFields.map((field) => `s.${field} ASC NULLS LAST`).join(", ")}
   LIMIT ${parameters.add(plan.limit + 1)}`,
 		query_params: {
 			...parameters.values,
@@ -8218,7 +8254,7 @@ async function querySpans(client, plan, timeoutMs) {
 		resourceId: last.resourceId,
 		traceId: last.traceId,
 		spanId: last.spanId,
-		sortValue: last[plan.orderBy.field]
+		sortValue: last[plan.orderBy.field] ?? null
 	}) : null;
 	return result;
 }
@@ -8346,7 +8382,7 @@ function compileClickHouseThreadRowsQuery(plan, strategy = "full") {
 	const sortedRoots = `roots AS (
     SELECT organizationId, traceId, ${rootDataFields.map((field) => `${rootExpression(field)} AS ${field}`).join(", ")}
     FROM ${TABLE_TRACE_ROOTS} ${scope.length || strategy === "candidates" ? `WHERE ${[...scope, ...strategy === "candidates" ? [candidateTracesFilter] : []].join(" AND ")}` : ""}
-    ORDER BY organizationId, traceId, startedAt ASC, spanId, endedAt DESC, isNotNull(threadId) DESC, dedupeKey
+    ORDER BY organizationId, traceId, startedAt ASC, spanId, ${ROOT_VERSION_ORDER}
     LIMIT 1 BY organizationId, traceId
   )`;
 	return {
@@ -8448,7 +8484,7 @@ async function queryThreadRows(client, plan, timeoutMs, strategy = "auto") {
       ${contextFields.join(", ")}, if(spanType = 'agent_run', timeToFirstChunkMs, NULL) AS timeToFirstChunkMs,
       if(isNull(error), 'success', 'error') AS status, ${PREVIEW_COLUMNS.join(", ")}
       FROM ${TABLE_TRACE_ROOTS} WHERE ${rootWhere}
-      ORDER BY isNotNull(threadId) DESC LIMIT 1 BY organizationId, traceId, spanId`,
+      ORDER BY ${ROOT_VERSION_ORDER} LIMIT 1 BY organizationId, traceId, spanId`,
 		query_params: { roots: keys(batch) }
 	}));
 	const byRoot = new Map(stored.map((row) => [rootKey(row), row]));
@@ -8456,7 +8492,7 @@ async function queryThreadRows(client, plan, timeoutMs, strategy = "auto") {
 	for (const batch of batches(missing, 32)) {
 		const payloads = await run({
 			query: `SELECT organizationId, traceId, spanId, input, output, error FROM ${TABLE_TRACE_ROOTS}
-        WHERE ${rootWhere} ORDER BY isNotNull(threadId) DESC LIMIT 1 BY organizationId, traceId, spanId`,
+        WHERE ${rootWhere} ORDER BY ${ROOT_VERSION_ORDER} LIMIT 1 BY organizationId, traceId, spanId`,
 			query_params: { roots: keys(batch) }
 		});
 		for (const payload of payloads) {
@@ -8525,6 +8561,7 @@ const DIMENSION_SQL = {
 	entityName: "r.entityName",
 	name: "r.name",
 	spanType: "r.spanType",
+	entityId: "r.entityId",
 	environment: "r.environment",
 	status: TRACE_STATUS_SQL,
 	serviceName: "r.serviceName",
@@ -8563,12 +8600,6 @@ const COMPARISON_SQL = {
 function compileClickHouseTraceAggregate(plan) {
 	const parameters = new ParameterBuilder();
 	const ctes = compileClickHouseTraceCandidates(plan, "*", parameters, { oneRootPerTrace: true });
-	ctes.push(`trace_roots AS (
-    SELECT *
-    FROM candidates
-    ORDER BY traceId, dedupeKey
-    LIMIT 1 BY traceId
-  )`);
 	const dimensionSql = (field) => {
 		if (field.startsWith("metadata.")) return traceMetadataValueSql(parameters.add(field.slice(9), "String"));
 		const sql = Object.hasOwn(DIMENSION_SQL, field) ? DIMENSION_SQL[field] : void 0;
@@ -8602,7 +8633,7 @@ function compileClickHouseTraceAggregate(plan) {
 	}
 	ctes.push(`facts AS (
     SELECT ${factColumns.join(",\n      ")}
-    FROM trace_roots r${usageJoin}
+    FROM candidates r${usageJoin}
   )`);
 	const mixedUnitsSql = "minOrNull(unitMin) != maxOrNull(unitMax)";
 	const measureSql = (name) => {
@@ -10108,6 +10139,7 @@ var ObservabilityStorageClickhouseVNext = class extends _mastra_core_storage.Obs
 			"trace-query-context-ids",
 			...timeToFirstChunkFeatures,
 			"trace-query-root-span-fields",
+			"trace-query-root-entity-id",
 			"trace-aggregate",
 			...spanQueryFeatures,
 			...threadQueryFeatures
@@ -10131,6 +10163,7 @@ var ObservabilityStorageClickhouseVNext = class extends _mastra_core_storage.Obs
 			"trace-query-context-ids",
 			...timeToFirstChunkFeatures,
 			"trace-query-root-span-fields",
+			"trace-query-root-entity-id",
 			"trace-aggregate",
 			...spanQueryFeatures,
 			...threadQueryFeatures