@mastra/clickhouse 1.22.0 → 1.22.1-alpha.1

package/dist/index.js

@@ -4,7 +4,6 @@ import * as coreStorage from "@mastra/core/storage";
 import { BRANCH_SPAN_TYPES, EntityType, METRIC_DISTINCT_COLUMNS, MastraCompositeStore, MemoryStorage, ObservabilityStorage, SCORERS_SCHEMA, SPAN_SCHEMA, ScoresStorage, TABLE_AGENT_VERSIONS, TABLE_DATASETS, TABLE_DATASET_ITEMS, TABLE_DATASET_VERSIONS, TABLE_EXPERIMENTS, TABLE_EXPERIMENT_RESULTS, TABLE_FAVORITES, TABLE_HARNESS_SESSIONS, TABLE_KNOWLEDGE_ACTIVITY, TABLE_KNOWLEDGE_CURSORS, TABLE_KNOWLEDGE_MENTIONS, TABLE_KNOWLEDGE_NODES, TABLE_KNOWLEDGE_RECORDS, TABLE_KNOWLEDGE_SEMANTIC_OUTBOX, TABLE_MCP_CLIENTS, TABLE_MCP_CLIENT_VERSIONS, TABLE_MCP_SERVERS, TABLE_MCP_SERVER_VERSIONS, TABLE_MESSAGES, TABLE_NOTIFICATIONS, TABLE_PROMPT_BLOCKS, TABLE_PROMPT_BLOCK_VERSIONS, TABLE_RESOURCES, TABLE_SCHEDULES, TABLE_SCHEDULE_TRIGGERS, TABLE_SCHEMAS, TABLE_SCORERS, TABLE_SCORER_DEFINITIONS, TABLE_SCORER_DEFINITION_VERSIONS, TABLE_SKILLS, TABLE_SKILL_BLOBS, TABLE_SKILL_VERSIONS, TABLE_SPANS, TABLE_THREADS, TABLE_THREAD_STATE, TABLE_TOOL_PROVIDER_CONNECTIONS, TABLE_TRACES, TABLE_WORKFLOW_DEFINITIONS, TABLE_WORKFLOW_SNAPSHOT, TABLE_WORKSPACES, TABLE_WORKSPACE_VERSIONS, TraceStatus, WorkflowsStorage, buildInputPreview, calculatePagination, computeTraceStatus, createStorageErrorId, getDefaultValue, getSqlType, listBranchesArgsSchema, listFeedbackArgsSchema, listLogsArgsSchema, listMetricsArgsSchema, listScoresArgsSchema, listTracesArgsSchema, normalizePerPage, safelyParseJSON, toTraceSpans, transformScoreRow, validateStorageMetadataFilter } from "@mastra/core/storage";
 import { MessageList } from "@mastra/core/agent";
 import { MastraBase } from "@mastra/core/base";
-import { randomUUID } from "crypto";
 import { parseFieldKey } from "@mastra/core/utils";
 import { coreFeatures } from "@mastra/core/features";
 import { z } from "zod/v4";
@@ -3867,6 +3866,8 @@ function rowToLightSpanRecord(row) {
 		entityType: nullableEntityType(row.entityType),
 		entityId: nullableString(row.entityId),
 		entityName: nullableString(row.entityName),
+		threadId: nullableString(row.threadId),
+		resourceId: nullableString(row.resourceId),
 		error,
 		status: computeTraceStatus({
 			error,
@@ -4702,6 +4703,7 @@ function getAggregationSql$2(aggregation, measure = "valueNumber") {
 		case "max": return `max(${measure})`;
 		case "count": return `toFloat64(count(${measure}))`;
 		case "last": return `argMax(${measure}, timestamp)`;
+		case "count_distinct": return `toFloat64(uniq(${measure}))`;
 		default: return `sum(${measure})`;
 	}
 }
@@ -4815,7 +4817,7 @@ async function batchCreateFeedback(client, args) {
 async function deleteFeedback(client, args, replication) {
 	if (args.feedbackIds.length === 0) return;
 	const request = await recordDeletionRequest(client, {
-		requestId: randomUUID(),
+		requestId: globalThis.crypto.randomUUID(),
 		organizationId: args.organizationId,
 		resourceId: args.resourceId,
 		signal: "feedback",
@@ -6155,6 +6157,7 @@ function getAggregationSql(aggregation, measure = "score") {
 		case "max": return `max(${measure})`;
 		case "count": return `toFloat64(count(${measure}))`;
 		case "last": return `argMax(${measure}, timestamp)`;
+		case "count_distinct": return `toFloat64(uniq(${measure}))`;
 		default: return `sum(${measure})`;
 	}
 }
@@ -6270,7 +6273,7 @@ async function batchCreateScores(client, args) {
 async function deleteScores(client, args, replication) {
 	if (args.scoreIds.length === 0) return;
 	const request = await recordDeletionRequest(client, {
-		requestId: randomUUID(),
+		requestId: globalThis.crypto.randomUUID(),
 		organizationId: args.organizationId,
 		resourceId: args.resourceId,
 		signal: "scores",
@@ -6412,7 +6415,7 @@ async function getScoreById(client, scoreId) {
 	return rows[0] ? rowToScoreRecord(rows[0]) : null;
 }
 async function getScoreAggregate(client, args) {
-	const aggSql = getAggregationSql(args.aggregation);
+	const aggSql = `if(count() = 0, NULL, ${getAggregationSql(args.aggregation)})`;
 	const identity = buildScoreIdentityFilter(args);
 	const combined = mergeFilters(identity, buildScoresFilterConditions(args.filters));
 	const whereClause = toWhereClause(combined);
@@ -7445,6 +7448,8 @@ const LIGHT_TRACE_ROOT_FIELDS = [
 	"entityType",
 	"entityId",
 	"entityName",
+	"threadId",
+	"resourceId",
 	"error",
 	"metadataRaw",
 	"input"
@@ -7644,17 +7649,6 @@ function buildTraceCursor(row) {
 }
 //#endregion
 //#region src/storage/domains/observability/v-next/tracing.ts
-/**
-* Tracing operations for ClickHouse v-next observability.
-*
-* Owns: batchCreateSpans, getSpan, getSpans, getTrace, getTraceLight,
-*       listBranches, batchDeleteTraces, dangerouslyClearSpanEvents.
-* Delegates to trace-roots.ts: listTraces, getRootSpan.
-*
-* `listBranches` reads from the MV-fed `mastra_trace_branches` table (one row
-* per branch anchor span). It lives here -- alongside the other read paths
-* over the trace data -- since branches are conceptually a subset of traces.
-*/
 const BRANCH_SPAN_TYPE_SQL_LIST = BRANCH_SPAN_TYPES.map((t) => `'${t}'`).join(", ");
 /** Insert a single completed span. */
 async function createSpan(client, args) {
@@ -7821,7 +7815,7 @@ async function getTraceLight(client, args) {
 async function batchDeleteTraces(client, args, replication) {
 	if (args.traceIds.length === 0) return;
 	const request = await recordDeletionRequest(client, {
-		requestId: randomUUID(),
+		requestId: globalThis.crypto.randomUUID(),
 		organizationId: args.organizationId,
 		resourceId: args.resourceId,
 		signal: "traces",
@@ -8474,11 +8468,11 @@ async function detectDeltaCursorStrategy(client, override, existingStrategy) {
 	if (override) return override;
 	if (existingStrategy && existingStrategy !== "mixed") return existingStrategy;
 	try {
-		await client.query({
+		await (await client.query({
 			query: `SELECT generateSerialID({counterName:String}) AS cursorId`,
 			query_params: { counterName: "mastra_observability_delta_cursor_probe" },
 			format: "JSONEachRow"
-		});
+		})).json();
 		return "serial";
 	} catch {
 		return "fallback";
@@ -8582,11 +8576,11 @@ var ObservabilityStorageClickhouseVNext = class extends ObservabilityStorage {
 			if (this.#deltaCursorStrategy !== null) await reconcileScoreDeltaMv(this.#client, this.#replication, this.#deltaCursorStrategy, this.logger);
 			await backfillCurrentScores(this.#client);
 			if (this.#retention) await this.applyRetention();
-			if (this.#deltaCursorStrategy === "serial") for (const counterName of DELTA_CURSOR_COUNTER_NAMES) await this.#client.query({
+			if (this.#deltaCursorStrategy === "serial") for (const counterName of DELTA_CURSOR_COUNTER_NAMES) await (await this.#client.query({
 				query: `SELECT generateSerialID({counterName:String}) AS cursorId`,
 				query_params: { counterName },
 				format: "JSONEachRow"
-			});
+			})).json();
 		} catch (error) {
 			if (error instanceof MastraError) throw error;
 			const causeMessage = error instanceof Error ? error.message : String(error);