@mastra/clickhouse 1.28.0-alpha.0 → 1.28.0-alpha.2

package/dist/index.js

@@ -759,6 +759,7 @@ var ClickhouseDB = class extends MastraBase {
 			const rawUpdatedAt = filteredRecord.updatedAt || /* @__PURE__ */ new Date();
 			if ("createdAt" in filteredRecord || (await this.getTableColumns(tableName)).has("createdAt")) filteredRecord.createdAt = rawCreatedAt instanceof Date ? rawCreatedAt.toISOString() : rawCreatedAt;
 			if ("updatedAt" in filteredRecord || (await this.getTableColumns(tableName)).has("updatedAt")) filteredRecord.updatedAt = rawUpdatedAt instanceof Date ? rawUpdatedAt.toISOString() : rawUpdatedAt;
+			for (const [key, value] of Object.entries(filteredRecord)) if (TABLE_SCHEMAS[tableName]?.[key]?.type === "timestamp" && typeof value === "number") filteredRecord[key] = new Date(value).toISOString();
 			await this.client.insert({
 				table: tableName,
 				values: [filteredRecord],
@@ -2271,12 +2272,12 @@ var ObservabilityStorageClickhouse = class extends ObservabilityStorage {
 				}
 			});
 			const data = { ...updates };
-			if (data.endedAt instanceof Date) data.endedAt = data.endedAt.getTime();
-			if (data.startedAt instanceof Date) data.startedAt = data.startedAt.getTime();
+			if (data.endedAt instanceof Date) data.endedAt = data.endedAt.toISOString();
+			if (data.startedAt instanceof Date) data.startedAt = data.startedAt.toISOString();
 			const updated = {
 				...existing,
 				...data,
-				updatedAt: Date.now()
+				updatedAt: (/* @__PURE__ */ new Date()).toISOString()
 			};
 			await this.client.insert({
 				table: TABLE_SPANS,
@@ -2514,7 +2515,7 @@ var ObservabilityStorageClickhouse = class extends ObservabilityStorage {
 	}
 	async batchUpdateSpans(args) {
 		try {
-			const now = Date.now();
+			const now = (/* @__PURE__ */ new Date()).toISOString();
 			if (args.records.length === 0) return;
 			const keyParams = {};
 			const keyTuples = args.records.map((record, i) => {
@@ -2547,8 +2548,8 @@ var ObservabilityStorageClickhouse = class extends ObservabilityStorage {
 				const existing = current.get(key);
 				if (!existing) continue;
 				const updates = { ...record.updates };
-				if (updates.startedAt instanceof Date) updates.startedAt = updates.startedAt.getTime();
-				if (updates.endedAt instanceof Date) updates.endedAt = updates.endedAt.getTime();
+				if (updates.startedAt instanceof Date) updates.startedAt = updates.startedAt.toISOString();
+				if (updates.endedAt instanceof Date) updates.endedAt = updates.endedAt.toISOString();
 				current.set(key, {
 					...existing,
 					...updates,
@@ -6915,6 +6916,13 @@ const timingFeatures = [
 	...timeToFirstTokenSupported ? ["trace-query-time-to-first-token"] : [],
 	...timeToFirstTokenSupported && timeToFirstTokenSortSupported ? ["trace-query-time-to-first-token-sort"] : []
 ];
+/**
+* Outcome fields follow the same rule: core before them rejects their predicates and strict rows,
+* so they are only returned and declared when core knows them.
+*/
+const spanQueryOutcomeFieldsSupported = "outcome" in (coreStorage.SPAN_QUERY_FIELD_REGISTRY ?? {});
+const traceQueryOutcomeFieldsSupported = "outcome" in (coreStorage.TRACE_QUERY_FIELD_REGISTRY?.trace ?? {});
+const outcomeFeatures = [...spanQueryOutcomeFieldsSupported ? ["span-query-outcome-fields"] : [], ...traceQueryOutcomeFieldsSupported ? ["trace-query-outcome-fields"] : []];
 /** Order fields holding numbers that can be empty; the rest are timestamps. */
 const NUMERIC_ORDER_FIELDS = /* @__PURE__ */ new Set(["timeToFirstChunkMs", "timeToFirstTokenMs"]);
 function durationMsSql(startedAt, endedAt) {
@@ -7001,6 +7009,14 @@ const TRACE_FIELDS = {
 		sql: TRACE_STATUS_SQL,
 		parameterType: "String"
 	},
+	outcome: {
+		sql: "r.outcome",
+		parameterType: "String"
+	},
+	stopReason: {
+		sql: "r.stopReason",
+		parameterType: "String"
+	},
 	tags: {
 		sql: "r.tags",
 		parameterType: "String"
@@ -7047,6 +7063,14 @@ const SPAN_FIELDS = {
 		sql: "s.status",
 		parameterType: "String"
 	},
+	outcome: {
+		sql: "s.outcome",
+		parameterType: "String"
+	},
+	stopReason: {
+		sql: "s.stopReason",
+		parameterType: "String"
+	},
 	error: {
 		sql: "s.error",
 		parameterType: "String"
@@ -7256,6 +7280,9 @@ const TRACE_SELECT = `
   r.environment AS environment,
   r.timeToFirstChunkMs AS timeToFirstChunkMs,
   r.timeToFirstTokenMs AS timeToFirstTokenMs,
+  r.outcome AS outcome,
+  r.stopReason AS stopReason,
+  r.stopReasonContext AS stopReasonContext,
   ${TRACE_STATUS_SQL} AS status`;
 var ParameterBuilder = class {
 	params = {};
@@ -7456,14 +7483,16 @@ function compileClickHouseTraceScope(selection, relationCollections, parameters,
       traceId,
       name,
       spanType,
-      if(JSONType(attributes, 'model') = 'String', JSONExtractString(attributes, 'model'), NULL) AS model,
-      if(JSONType(attributes, 'provider') = 'String', JSONExtractString(attributes, 'provider'), NULL) AS provider,
+      coalesce(model, if(JSONType(attributes, 'model') = 'String', JSONExtractString(attributes, 'model'), NULL)) AS model,
+      coalesce(provider, if(JSONType(attributes, 'provider') = 'String', JSONExtractString(attributes, 'provider'), NULL)) AS provider,
       startedAt,
       endedAt,
       ${durationMsSql("startedAt", "endedAt")} AS durationMs,
       timeToFirstChunkMs,
       timeToFirstTokenMs,
       if(isNotNull(error), 'error', 'success') AS status,
+      outcome,
+      stopReason,
       error,
       entityType,
       entityId,
@@ -7567,7 +7596,7 @@ const QUERY_TRACES_SCOPE = {
 	oneRootPerTrace: true,
 	spanExistence: true
 };
-const TRACE_LIST_SELECT = TRACE_SELECT.split("\n").filter((line) => !/ AS (metadata|inputPreview|outputPreview|errorPreview),$/.test(line)).join("\n");
+const TRACE_LIST_SELECT = TRACE_SELECT.split("\n").filter((line) => !/ AS (metadata|inputPreview|outputPreview|errorPreview|stopReasonContext),$/.test(line)).join("\n");
 function traceOrder(plan) {
 	return {
 		field: resolveOrderField(plan.orderBy.field),
@@ -7727,7 +7756,7 @@ function compileClickHouseTraceRootPayloads(keys, scope, columns = "payload") {
 	const tenant = (value) => `${parameters.add(value ?? "", "String")}, ${value === null ? 1 : 0}`;
 	const tuples = keys.map((key) => `(${parameters.add(key.startedAt, "DateTime64(3, 'UTC')")}, ${parameters.add(key.traceId, "String")}, ${parameters.add(key.dedupeKey, "String")}, ${parameters.add(key.endedAt, "DateTime64(3, 'UTC')")}, ${tenant(key.organizationId)}, ${tenant(key.resourceId)})`);
 	return {
-		query: `SELECT traceId, spanId AS rootSpanId, dedupeKey, organizationId, resourceId, ${columns === "payload" ? `metadataRaw AS metadata, ${PREVIEW_COLUMNS.join(", ")}` : "input, output, error"}
+		query: `SELECT traceId, spanId AS rootSpanId, dedupeKey, organizationId, resourceId, ${columns === "payload" ? `metadataRaw AS metadata, stopReasonContext, ${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}
@@ -7994,7 +8023,12 @@ async function queryTraces(client, plan, timeoutMs, strategy = null) {
 		environment: row.environment == null ? null : String(row.environment),
 		status: row.status,
 		...timeToFirstChunkSupported && { timeToFirstChunkMs: row.timeToFirstChunkMs == null ? null : Number(row.timeToFirstChunkMs) },
-		...timeToFirstTokenSupported && { timeToFirstTokenMs: row.timeToFirstTokenMs == null ? null : Number(row.timeToFirstTokenMs) }
+		...timeToFirstTokenSupported && { timeToFirstTokenMs: row.timeToFirstTokenMs == null ? null : Number(row.timeToFirstTokenMs) },
+		...traceQueryOutcomeFieldsSupported && {
+			outcome: row.outcome == null ? null : String(row.outcome),
+			stopReason: row.stopReason == null ? null : String(row.stopReason),
+			stopReasonContext: parseJson(row.stopReasonContext) ?? null
+		}
 	});
 	if (plan.paginationMode === "delta") {
 		const rows = await run(compileClickHouseTraceQuery(plan, deltaHead));
@@ -8121,7 +8155,10 @@ const displayFields = [
 	"durationMs",
 	"timeToFirstChunkMs",
 	"timeToFirstTokenMs",
-	"status"
+	"status",
+	"outcome",
+	"stopReason",
+	"stopReasonContext"
 ];
 var Parameters = class {
 	values = {};
@@ -8173,13 +8210,18 @@ function predicateFields$1(predicate, fields = /* @__PURE__ */ new Set()) {
 	else fields.add(predicate.field);
 	return fields;
 }
+/** Selection and filter expressions read only columns; `model`/`provider` read their dedicated columns. */
 function fieldExpression(field) {
-	if (field === "model" || field === "provider") return `if(JSONType(e.attributes, '${field}') = 'String', JSONExtractString(e.attributes, '${field}'), NULL)`;
 	if (field === "durationMs") return "dateDiff('millisecond', e.startedAt, e.endedAt)";
 	if (field === "status") return "if(isNull(e.error), 'success', 'error')";
 	if (field === "error") return "if(isNull(e.error), NULL, 'error')";
 	return `e.${field}`;
 }
+/** Returned values fall back to span attributes for rows written before the dedicated columns existed. */
+function displayExpression(field) {
+	if (field === "model" || field === "provider") return `coalesce(e.${field}, if(JSONType(e.attributes, '${field}') = 'String', JSONExtractString(e.attributes, '${field}'), NULL))`;
+	return fieldExpression(field);
+}
 function compileClickHouseSpanQuery(plan) {
 	const parameters = new Parameters();
 	const from = parameters.add(plan.timeRange.from, "DateTime64(3, 'UTC')");
@@ -8266,7 +8308,11 @@ const TRACE_BRANCHES_SPAN_FIELD_COLUMNS = {
 		"rootEntityType",
 		"rootEntityId",
 		"rootEntityName",
-		"rootEntityVersionId"
+		"rootEntityVersionId",
+		"model",
+		"provider",
+		"outcome",
+		"stopReason"
 	].map((field) => [field, sameColumn(field)])),
 	status: ["error"],
 	error: ["error"],
@@ -8379,7 +8425,7 @@ async function querySpans(client, plan, timeoutMs) {
 	const pageParameter = (rows) => rows.map((row) => new TupleParam([...identityValues(row), row.endedAt.replace("T", " ").replace(/Z$/, "")]));
 	const rowsWithPreviews = await run({
 		query: `SELECT ${identities}, ${[...displayFields, ...PREVIEW_COLUMNS].map((field, index) => `data.${index + 1} AS ${field}`).join(", ")}
-    FROM (SELECT ${identities}, any(tuple(${[...displayFields.map(fieldExpression), ...PREVIEW_COLUMNS].join(", ")})) AS data
+    FROM (SELECT ${identities}, any(tuple(${[...displayFields.map(displayExpression), ...PREVIEW_COLUMNS].join(", ")})) AS data
       FROM ${TABLE_SPAN_EVENTS} e WHERE ${payloadWhere} GROUP BY ${identities})`,
 		query_params: { page: pageParameter(page) }
 	});
@@ -8406,13 +8452,18 @@ async function querySpans(client, plan, timeoutMs) {
 	const hydrated = page.flatMap((identity) => {
 		const row = byIdentity.get(coreStorage.spanQueryIdentityKey(identity));
 		if (!row) return [];
-		const { inputPreview: _input, outputPreview: _output, errorPreview: _error, timeToFirstChunkMs, timeToFirstTokenMs, ...metadata } = row;
+		const { inputPreview: _input, outputPreview: _output, errorPreview: _error, timeToFirstChunkMs, timeToFirstTokenMs, outcome, stopReason, stopReasonContext, ...metadata } = row;
 		return [{
 			...metadata,
 			...identity,
 			durationMs: Number(row.durationMs),
 			...timeToFirstChunkSupported && { timeToFirstChunkMs: timeToFirstChunkMs == null ? null : Number(timeToFirstChunkMs) },
-			...timeToFirstTokenSupported && { timeToFirstTokenMs: timeToFirstTokenMs == null ? null : Number(timeToFirstTokenMs) }
+			...timeToFirstTokenSupported && { timeToFirstTokenMs: timeToFirstTokenMs == null ? null : Number(timeToFirstTokenMs) },
+			...spanQueryOutcomeFieldsSupported && {
+				outcome: outcome ?? null,
+				stopReason: stopReason ?? null,
+				stopReasonContext: parseJson(stopReasonContext) ?? null
+			}
 		}];
 	});
 	let metrics = [];
@@ -8727,6 +8778,8 @@ const DIMENSION_SQL = {
 	entityId: "r.entityId",
 	environment: "r.environment",
 	status: TRACE_STATUS_SQL,
+	outcome: "r.outcome",
+	stopReason: "r.stopReason",
 	serviceName: "r.serviceName",
 	executionSource: "r.executionSource",
 	threadId: "r.threadId",
@@ -8749,6 +8802,8 @@ const SPAN_DIMENSION_SQL = Object.fromEntries([
 	"rootEntityName",
 	"environment",
 	"status",
+	"outcome",
+	"stopReason",
 	"serviceName",
 	"executionSource",
 	"threadId",
@@ -8756,7 +8811,9 @@ const SPAN_DIMENSION_SQL = Object.fromEntries([
 	"userId",
 	"sessionId",
 	"organizationId",
-	"experimentId"
+	"experimentId",
+	"model",
+	"provider"
 ].map((field) => [field, `r.${field}`]));
 const PERCENTILES = {
 	"duration.p50": .5,
@@ -9918,8 +9975,12 @@ function buildBranchCursor(row) {
 	return row.cursorId ?? "0";
 }
 // src/storage/domains/observability/v-next/index.ts
-const spanQueryFeatures = typeof coreStorage.planSpanQuery === "function" ? ["span-query", "span-query-context-fields"] : [];
-const spanAggregateFeatures = typeof coreStorage.planSpanAggregate === "function" ? ["span-aggregate"] : [];
+const spanQueryFeatures = typeof coreStorage.planSpanQuery === "function" ? [
+	"span-query",
+	"span-query-context-fields",
+	..."model" in (coreStorage.SPAN_QUERY_FIELD_REGISTRY ?? {}) ? ["span-query-model-fields"] : []
+] : [];
+const spanAggregateFeatures = typeof coreStorage.planSpanAggregate === "function" ? ["span-aggregate", ..."model" in (coreStorage.SPAN_AGGREGATE_DIMENSION_REGISTRY ?? {}) ? ["span-aggregate-model-dimensions"] : []] : [];
 const threadQueryFeatures = typeof coreStorage.planThreadRowsQuery === "function" ? ["thread-query-rows"] : [];
 function buildSignalMigrationRequiredMessage(args) {
 	const tableList = args.tables.map((table) => `  - ${table.table} (${table.engine})`).join("\n");
@@ -10359,6 +10420,7 @@ var ObservabilityStorageClickhouseVNext = class extends ObservabilityStorage {
 			"feedback",
 			"trace-query-context-ids",
 			...timingFeatures,
+			...outcomeFeatures,
 			"trace-query-root-span-fields",
 			"trace-query-root-entity-id",
 			"trace-aggregate",
@@ -10384,6 +10446,7 @@ var ObservabilityStorageClickhouseVNext = class extends ObservabilityStorage {
 			"feedback",
 			"trace-query-context-ids",
 			...timingFeatures,
+			...outcomeFeatures,
 			"trace-query-root-span-fields",
 			"trace-query-root-entity-id",
 			"trace-aggregate",