@mastra/clickhouse 1.27.0-alpha.1 → 1.27.0

package/dist/index.js

@@ -1,7 +1,7 @@
 import { TupleParam, createClient } from "@clickhouse/client";
 import { ErrorCategory, ErrorDomain, MastraError } from "@mastra/core/error";
 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_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, calculatePagination, computeTraceStatus, createStorageErrorId, getDefaultValue, getSqlType, listBranchesArgsSchema, listFeedbackArgsSchema, listLogsArgsSchema, listMetricsArgsSchema, listScoresArgsSchema, listTracesArgsSchema, normalizePerPage, safelyParseJSON, toTraceSpans, transformScoreRow, validateStorageMetadataFilter } 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_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, calculatePagination, computeTraceStatus, createStorageErrorId, getDefaultValue, getSqlType, getStringAttribute, 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 { parseFieldKey } from "@mastra/core/utils";
@@ -301,7 +301,8 @@ const JSON_FIELDS = [
 	"output",
 	"error",
 	"scope",
-	"links"
+	"links",
+	"stopReasonContext"
 ];
 const NULLABLE_STRING_FIELDS = ["parentSpanId", "error"];
 function transformRow(row) {
@@ -2716,6 +2717,17 @@ CREATE TABLE IF NOT EXISTS ${TABLE_SPAN_EVENTS} (
   endedAt            DateTime64(3, 'UTC'),
   timeToFirstChunkMs Nullable(Float64),
 
+  -- Native span fields, stored as supplied (NULL when the producer set none)
+  externalParentSpanId Nullable(String),
+  resumedFromSpanId  Nullable(String),
+  model              LowCardinality(Nullable(String)),
+  provider           LowCardinality(Nullable(String)),
+  outcome            LowCardinality(Nullable(String)),
+  stopReason         LowCardinality(Nullable(String)),
+  stopReasonContext  Nullable(String),
+  timeToFirstTokenMs Nullable(Float64),
+  errorCount         Nullable(UInt32),
+
   -- Query-relevant flexible fields
   tags               Array(LowCardinality(String)) DEFAULT [],
   metadataSearch     Map(LowCardinality(String), String) DEFAULT map(),
@@ -2790,6 +2802,17 @@ CREATE TABLE IF NOT EXISTS ${TABLE_TRACE_ROOTS} (
   endedAt            DateTime64(3, 'UTC'),
   timeToFirstChunkMs Nullable(Float64),
 
+  -- Native span fields, stored as supplied (NULL when the producer set none)
+  externalParentSpanId Nullable(String),
+  resumedFromSpanId  Nullable(String),
+  model              LowCardinality(Nullable(String)),
+  provider           LowCardinality(Nullable(String)),
+  outcome            LowCardinality(Nullable(String)),
+  stopReason         LowCardinality(Nullable(String)),
+  stopReasonContext  Nullable(String),
+  timeToFirstTokenMs Nullable(Float64),
+  errorCount         Nullable(UInt32),
+
   -- Query-relevant flexible fields
   tags               Array(LowCardinality(String)) DEFAULT [],
   metadataSearch     Map(LowCardinality(String), String) DEFAULT map(),
@@ -2876,6 +2899,17 @@ CREATE TABLE IF NOT EXISTS ${TABLE_TRACE_BRANCHES} (
   endedAt            DateTime64(3, 'UTC'),
   timeToFirstChunkMs Nullable(Float64),
 
+  -- Native span fields, stored as supplied (NULL when the producer set none)
+  externalParentSpanId Nullable(String),
+  resumedFromSpanId  Nullable(String),
+  model              LowCardinality(Nullable(String)),
+  provider           LowCardinality(Nullable(String)),
+  outcome            LowCardinality(Nullable(String)),
+  stopReason         LowCardinality(Nullable(String)),
+  stopReasonContext  Nullable(String),
+  timeToFirstTokenMs Nullable(Float64),
+  errorCount         Nullable(UInt32),
+
   -- Query-relevant flexible fields
   tags               Array(LowCardinality(String)) DEFAULT [],
   metadataSearch     Map(LowCardinality(String), String) DEFAULT map(),
@@ -3611,6 +3645,25 @@ function buildAllMvDDL(strategy) {
 }
 /** Discovery-specific refreshable MVs — created separately from core MVs. */
 const DISCOVERY_MV_DDL = [DISCOVERY_VALUES_MV_DDL, DISCOVERY_PAIRS_MV_DDL];
+/**
+* Span columns added after the first span tables shipped, with their types.
+* Present on span events, trace roots and trace branches.
+*/
+const ADDED_SPAN_COLUMNS = [
+	["inputPreview", "Nullable(String)"],
+	["outputPreview", "Nullable(String)"],
+	["errorPreview", "Nullable(String)"],
+	["timeToFirstChunkMs", "Nullable(Float64)"],
+	["externalParentSpanId", "Nullable(String)"],
+	["resumedFromSpanId", "Nullable(String)"],
+	["model", "LowCardinality(Nullable(String))"],
+	["provider", "LowCardinality(Nullable(String))"],
+	["outcome", "LowCardinality(Nullable(String))"],
+	["stopReason", "LowCardinality(Nullable(String))"],
+	["stopReasonContext", "Nullable(String)"],
+	["timeToFirstTokenMs", "Nullable(Float64)"],
+	["errorCount", "Nullable(UInt32)"]
+];
 const addColumn = (table, name, type) => ({
 	kind: "column",
 	table,
@@ -3635,14 +3688,11 @@ const LOG_SKIP_INDEX_COLUMNS = [
 	"requestId"
 ];
 const ALL_MIGRATIONS = [
-	...[
-		"inputPreview",
-		"outputPreview",
-		"errorPreview"
-	].flatMap((column) => [addColumn(TABLE_TRACE_ROOTS, column, "Nullable(String)"), addColumn(TABLE_TRACE_BRANCHES, column, "Nullable(String)")]),
-	addColumn(TABLE_SPAN_EVENTS, "inputPreview", "Nullable(String)"),
-	addColumn(TABLE_SPAN_EVENTS, "outputPreview", "Nullable(String)"),
-	addColumn(TABLE_SPAN_EVENTS, "errorPreview", "Nullable(String)"),
+	...ADDED_SPAN_COLUMNS.flatMap(([column, type]) => [
+		addColumn(TABLE_TRACE_ROOTS, column, type),
+		addColumn(TABLE_TRACE_BRANCHES, column, type),
+		addColumn(TABLE_SPAN_EVENTS, column, type)
+	]),
 	addColumn(TABLE_TRACE_BRANCHES, "entityVersionId", "Nullable(String)"),
 	addColumn(TABLE_TRACE_BRANCHES, "parentEntityVersionId", "Nullable(String)"),
 	addColumn(TABLE_TRACE_BRANCHES, "rootEntityVersionId", "Nullable(String)"),
@@ -3683,10 +3733,7 @@ const ALL_MIGRATIONS = [
 	addBloomIndex(TABLE_METRIC_EVENTS, "idx_sessionId", "sessionId"),
 	addBloomIndex(TABLE_METRIC_EVENTS, "idx_requestId", "requestId"),
 	...LOG_SKIP_INDEX_COLUMNS.map((column) => addBloomIndex(TABLE_LOG_EVENTS, `idx_${column}`, column)),
-	addBloomIndex(TABLE_DELETION_REQUESTS, "idx_predicateValues", "predicateValues"),
-	addColumn(TABLE_TRACE_ROOTS, "timeToFirstChunkMs", "Nullable(Float64)"),
-	addColumn(TABLE_TRACE_BRANCHES, "timeToFirstChunkMs", "Nullable(Float64)"),
-	addColumn(TABLE_SPAN_EVENTS, "timeToFirstChunkMs", "Nullable(Float64)")
+	addBloomIndex(TABLE_DELETION_REQUESTS, "idx_predicateValues", "predicateValues")
 ];
 const ALL_TABLE_NAMES = [
 	TABLE_SPAN_EVENTS,
@@ -3937,6 +3984,11 @@ const PROMOTED_KEYS = /* @__PURE__ */ new Set([
 	"executionSource",
 	"serviceName"
 ]);
+function nullableNumber$1(value) {
+	if (value == null || value === "") return null;
+	const n = Number(value);
+	return Number.isNaN(n) ? null : n;
+}
 function nullableString(value) {
 	return typeof value === "string" ? value === "" ? null : value : value == null ? null : String(value);
 }
@@ -4018,6 +4070,7 @@ function rowToSpanRecord(row) {
 	const startedAt = toDate(row.startedAt);
 	const endedAt = row.isEvent ? startedAt : toDateOrNull(row.endedAt);
 	const error = parseJson(row.error);
+	const attributes = parseJson(row.attributes);
 	return {
 		traceId: row.traceId,
 		spanId: row.spanId,
@@ -4053,12 +4106,21 @@ function rowToSpanRecord(row) {
 		tags: normalizeTags(row.tags),
 		metadata: parseJson(row.metadataRaw) ?? void 0,
 		scope: parseJson(row.scope) ?? void 0,
-		attributes: parseJson(row.attributes) ?? void 0,
+		attributes: attributes ?? void 0,
 		links: parseJson(row.links) ?? void 0,
 		input: parseJson(row.input) ?? void 0,
 		output: parseJson(row.output) ?? void 0,
 		error: error ?? void 0,
 		requestContext: parseJson(row.requestContext) ?? void 0,
+		externalParentSpanId: nullableString(row.externalParentSpanId),
+		resumedFromSpanId: nullableString(row.resumedFromSpanId),
+		model: nullableString(row.model) ?? getStringAttribute(attributes, "model"),
+		provider: nullableString(row.provider) ?? getStringAttribute(attributes, "provider"),
+		outcome: nullableString(row.outcome),
+		stopReason: nullableString(row.stopReason),
+		stopReasonContext: parseJson(row.stopReasonContext) ?? null,
+		timeToFirstTokenMs: nullableNumber$1(row.timeToFirstTokenMs),
+		errorCount: nullableNumber$1(row.errorCount),
 		createdAt: startedAt,
 		updatedAt: null
 	};
@@ -4132,6 +4194,15 @@ function spanRecordToRow(span) {
 		startedAt: toISOString(span.startedAt),
 		endedAt: toISOString(endedAt),
 		timeToFirstChunkMs: span.timeToFirstChunkMs ?? null,
+		externalParentSpanId: span.externalParentSpanId ?? null,
+		resumedFromSpanId: span.resumedFromSpanId ?? null,
+		model: span.model ?? null,
+		provider: span.provider ?? null,
+		outcome: span.outcome ?? null,
+		stopReason: span.stopReason ?? null,
+		stopReasonContext: jsonEncode(span.stopReasonContext),
+		timeToFirstTokenMs: span.timeToFirstTokenMs ?? null,
+		errorCount: span.errorCount ?? null,
 		tags: normalizeTags(span.tags),
 		metadataSearch: buildMetadataSearch(metadata),
 		metadataRaw: jsonEncode(metadata),
@@ -8566,7 +8637,7 @@ async function queryThreadRows(client, plan, timeoutMs, strategy = "auto") {
     traceId, spanId, startedAt, endedAt) IN {roots:Array(Tuple(UInt8, String, UInt8, String, String, String, DateTime64(3, 'UTC'), DateTime64(3, 'UTC')))}`;
 	const stored = [];
 	for (const batch of batches([...roots.values()])) stored.push(...await run({
-		query: `SELECT organizationId, traceId, spanId, startedAt, endedAt, spanType,
+		query: `SELECT organizationId, traceId, spanId, startedAt, endedAt,
       ${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}
@@ -8586,31 +8657,10 @@ async function queryThreadRows(client, plan, timeoutMs, strategy = "auto") {
 			if (row) Object.assign(row, resolveStoredPreviews(row, payload));
 		}
 	}
-	const firstRoots = page.map((row) => representative(row, "first")).filter((root) => byRoot.get(rootKey(root))?.spanType === "agent_run");
-	const models = [];
-	for (const batch of batches(firstRoots)) models.push(...await run({
-		query: `SELECT organizationId, traceId,
-      if(JSONType(attributes, 'model') = 'String', JSONExtractString(attributes, 'model'), NULL) AS model,
-      if(JSONType(attributes, 'provider') = 'String', JSONExtractString(attributes, 'provider'), NULL) AS provider
-      FROM ${TABLE_SPAN_EVENTS} WHERE spanType = 'model_generation' AND
-      tuple(isNull(organizationId), ifNull(organizationId, ''), isNull(resourceId), ifNull(resourceId, ''), traceId, parentSpanId)
-        IN {agents:Array(Tuple(UInt8, String, UInt8, String, String, String))}
-      ORDER BY organizationId, traceId, startedAt, spanId LIMIT 1 BY organizationId, traceId`,
-		query_params: { agents: batch.map((root) => new TupleParam([
-			root.organizationId === null ? 1 : 0,
-			root.organizationId ?? "",
-			root.resourceId === null ? 1 : 0,
-			root.resourceId ?? "",
-			root.traceId,
-			root.spanId
-		])) }
-	}));
-	const byTrace = new Map(models.map((row) => [JSON.stringify([row.organizationId, row.traceId]), row]));
 	const threads = page.flatMap((row) => {
 		const first = byRoot.get(rootKey(representative(row, "first")));
 		const last = byRoot.get(rootKey(representative(row, "last")));
 		if (!first || !last) return [];
-		const model = byTrace.get(JSON.stringify([row.organizationId, row.firstTraceId]));
 		return [coreStorage.threadQueryRowSchema.parse({
 			organizationId: row.organizationId,
 			threadId: row.threadId,
@@ -8622,8 +8672,6 @@ async function queryThreadRows(client, plan, timeoutMs, strategy = "auto") {
 			endedAt: iso(row.endedAt),
 			traceCount: Number(row.traceCount),
 			timeToFirstChunkMs: first.timeToFirstChunkMs,
-			model: model?.model ?? null,
-			provider: model?.provider ?? null,
 			inputPreview: resolveStoredPreviews(first).inputPreview,
 			outputPreview: resolveStoredPreviews(last).outputPreview,
 			errorPreview: resolveStoredPreviews(last).errorPreview