@iowarp/clio-coder 0.4.0 → 0.4.1

package/src/domains/dispatch/joint-route-resolver.ts

@@ -76,7 +76,7 @@ export interface JointAgentDimension {
 }
 
 /** A single truthful role-quality label retires task-feature priors for this tuple. */
-export function routePriorForAgentEvidence(
+function routePriorForAgentEvidence(
 	agent: JointAgentDimension,
 	observations: ReadonlyArray<RouteObservation>,
 ): RoutePrior {

package/src/domains/dispatch/path-scope.ts

@@ -64,19 +64,6 @@ export interface DeclaredScopeReplacementNotice {
 	message: string;
 }
 
-export interface LegacyScopeInferenceNotice {
-	code: "legacy_scope_inferred" | "legacy_scope_empty";
-	level: "warning";
-	paths: ReadonlyArray<{
-		path: string;
-		policy: "working-context" | "write-boundary";
-		provenance: DispatchPathProvenanceKind;
-		source: DispatchPathProvenanceSource;
-		confidence: DispatchPathConfidence;
-	}>;
-	message: string;
-}
-
 export type DispatchPathScopeInferenceErrorCode = "legacy_scope_path_absolute" | "legacy_scope_path_malformed";
 
 export class DispatchPathScopeInferenceError extends Error {
@@ -320,51 +307,3 @@ export function declaredScopeReplacementNotice(scope: DispatchPathScope): Declar
 		)}. Those paths did not select project rules or expand worker authority.`,
 	};
 }
-
-function legacyNoticePaths(scope: DispatchPathScope): LegacyScopeInferenceNotice["paths"] {
-	const paths: Array<LegacyScopeInferenceNotice["paths"][number]> = [];
-	for (const [policy, entries] of [
-		["working-context", scope.provenance.workingContextPaths],
-		["write-boundary", scope.provenance.writeBoundaries],
-	] as const) {
-		for (const entry of entries) {
-			for (const evidence of entry.evidence) {
-				paths.push({
-					path: entry.path,
-					policy,
-					provenance: evidence.provenance,
-					source: evidence.source,
-					confidence: evidence.confidence,
-				});
-			}
-		}
-	}
-	return paths;
-}
-
-/** Render the operator-visible warning for a legacy scope resolution. */
-export function legacyScopeInferenceNotice(scope: DispatchPathScope): LegacyScopeInferenceNotice | null {
-	if (scope.source !== "inferred") return null;
-	const paths = legacyNoticePaths(scope);
-	if (paths.length === 0) {
-		return {
-			code: "legacy_scope_empty",
-			level: "warning",
-			paths,
-			message:
-				"[dispatch scope] legacy dispatch has no declared intent and inferred no policy-bearing paths. Path-scoped rules received no inferred match input, and worker authority did not expand.",
-		};
-	}
-	const rendered = paths
-		.map(
-			(entry) =>
-				`${entry.policy} ${entry.path} (provenance=${entry.provenance} source=${entry.source} confidence=${entry.confidence})`,
-		)
-		.join("; ");
-	return {
-		code: "legacy_scope_inferred",
-		level: "warning",
-		paths,
-		message: `[dispatch scope] legacy dispatch resolved policy-bearing scope without declared intent: ${rendered}. Review this scope before execution.`,
-	};
-}

package/src/domains/dispatch/placement.ts

@@ -61,9 +61,9 @@ function completedReroutes(
 
 function requestedNodeId(req: DispatchRequest, settings: Readonly<ClioSettings> | undefined): string | null {
 	if (req.node !== undefined && req.node.trim().length > 0) return req.node.trim();
-	const workers = settings?.workers;
+	const workers = settings?.fleet;
 	if (!workers) return null;
-	const profileName = req.workerProfile ?? workers.agentBindings?.[req.agentId];
+	const profileName = req.workerProfile ?? workers.agentProfiles?.[req.agentId];
 	if (!profileName) return null;
 	const pin = workers.profiles?.[profileName]?.node;
 	return pin !== undefined && pin.trim().length > 0 ? pin.trim() : null;

package/src/domains/dispatch/receipt-findings.ts

@@ -49,7 +49,7 @@ function canonicalJson(value: unknown): string {
 	throw new Error(`response schema digest cannot represent ${typeof value}`);
 }
 
-export function canonicalResponseSchemaDigest(schema: Record<string, unknown>): string {
+function canonicalResponseSchemaDigest(schema: Record<string, unknown>): string {
 	return createHash("sha256").update(canonicalJson(schema), "utf8").digest("hex");
 }
 

package/src/domains/dispatch/receipt-integrity.ts

@@ -123,7 +123,7 @@ export const RECEIPT_INTEGRITY_FIELD_COVERAGE = {
 	dynamicHash: true,
 	promptSignature: true,
 	toolSignature: true,
-	clioVersion: true,
+	clioCoderVersion: true,
 	piMonoVersion: true,
 	platform: true,
 	nodeVersion: true,
@@ -172,8 +172,14 @@ function selectedReceiptFields(
 	return result;
 }
 
-function receiptDigestFields(receipt: RunReceipt | RunReceiptDraft): Record<string, unknown> {
+function receiptDigestFields(receipt: RunReceipt | RunReceiptDraft, legacyNaming = false): Record<string, unknown> {
 	const result = selectedReceiptFields(receipt, RECEIPT_FIELDS);
+	if (legacyNaming) {
+		const source = receipt as unknown as Record<string, unknown>;
+		const version = source.clioVersion ?? source.clioCoderVersion;
+		delete result.clioCoderVersion;
+		if (version !== undefined) result.clioVersion = version;
+	}
 	result.briefing = receipt.briefing ?? null;
 	result.outcomeCode = receipt.outcomeCode ?? null;
 	result.steering = receipt.steering ?? null;
@@ -227,24 +233,29 @@ function ledgerDigestFields(envelope: RunEnvelope): Record<string, unknown> {
 	};
 }
 
-function integrityPayload(receipt: RunReceipt | RunReceiptDraft, envelope: RunEnvelope): Record<string, unknown> {
+function integrityPayload(
+	receipt: RunReceipt | RunReceiptDraft,
+	envelope: RunEnvelope,
+	legacyNaming = false,
+): Record<string, unknown> {
 	return {
-		contract: "clio.runReceipt.integrity",
+		contract: legacyNaming ? "clio.runReceipt.integrity" : "clio-coder.runReceipt.integrity",
 		version: RUN_RECEIPT_INTEGRITY_VERSION,
 		sources: ["receipt", "run-ledger"],
-		receipt: receiptDigestFields(receipt),
+		receipt: receiptDigestFields(receipt, legacyNaming),
 		ledger: ledgerDigestFields(envelope),
 	};
 }
 
-export function computeReceiptIntegrity(
+function computeReceiptIntegrity(
 	receipt: RunReceipt | RunReceiptDraft,
 	envelope: RunEnvelope,
+	legacyNaming = false,
 ): RunReceiptIntegrity {
 	return {
 		version: RUN_RECEIPT_INTEGRITY_VERSION,
 		algorithm: RUN_RECEIPT_INTEGRITY_ALGORITHM,
-		digest: sha256(canonicalJson(integrityPayload(receipt, envelope))),
+		digest: sha256(canonicalJson(integrityPayload(receipt, envelope, legacyNaming))),
 	};
 }
 
@@ -385,7 +396,8 @@ export function verifyReceiptIntegrity(receipt: RunReceipt, envelope: RunEnvelop
 		return { ok: false, reason: `ledger mismatch: ${mismatch}` };
 	}
 	const expected = computeReceiptIntegrity(receipt, envelope);
-	if (expected.digest !== receipt.integrity.digest) {
+	const legacyExpected = computeReceiptIntegrity(receipt, envelope, true);
+	if (expected.digest !== receipt.integrity.digest && legacyExpected.digest !== receipt.integrity.digest) {
 		return { ok: false, reason: "integrity mismatch" };
 	}
 	return { ok: true };

package/src/domains/dispatch/reservation-store.ts

@@ -599,31 +599,8 @@ export function getDispatchReservation(ownerId: string): DispatchReservationReco
 	return record ? copyRecord(record) : null;
 }
 
-export function listDispatchReservations(): ReadonlyArray<DispatchReservationRecord> {
-	return readStore();
-}
-
 export function reservedBudgetUsd(): number {
 	return readStore()
 		.filter((record) => record.status === "active")
 		.reduce((sum, record) => sum + outstandingBudget(record), 0);
 }
-
-export function reservedCapacity(): {
-	globalSlots: number;
-	nodeSlots: Readonly<Record<string, number>>;
-	endpointSlots: Readonly<Record<string, number>>;
-} {
-	let globalSlots = 0;
-	const nodeSlots: Record<string, number> = {};
-	const endpointSlots: Record<string, number> = {};
-	for (const record of readStore().filter((entry) => entry.status === "active")) {
-		const allocation = reservationAllocation(outstandingTasks(record));
-		globalSlots += allocation.globalSlots;
-		for (const [nodeId, count] of Object.entries(allocation.nodeSlots))
-			nodeSlots[nodeId] = (nodeSlots[nodeId] ?? 0) + count;
-		for (const [endpointKey, count] of Object.entries(allocation.endpointSlots))
-			endpointSlots[endpointKey] = (endpointSlots[endpointKey] ?? 0) + count;
-	}
-	return { globalSlots, nodeSlots, endpointSlots };
-}

package/src/domains/dispatch/route-decision.ts

@@ -597,7 +597,7 @@ function readinessHashProjection(report: RouteReadinessReport): readonly [boolea
  * `decisionDurationMs`, which is a measurement of the decision rather than an
  * input to it, so a replay on a faster machine still reproduces the hash.
  */
-export function routeDecisionHash(input: RouteDecisionInput): string {
+function routeDecisionHash(input: RouteDecisionInput): string {
 	// Arrays give every field an explicit position, so native JSON serialization
 	// is deterministic without recursively sorting hundreds of short-lived
 	// objects at the maximum universe bound. Candidate identity uses the same

package/src/domains/dispatch/route-history.ts

@@ -137,7 +137,7 @@ function retireHistory(path: string, version: unknown): void {
 	const retired = `${path}.v${String(version)}.${stamp}.retired`;
 	renameSync(path, retired);
 	process.stderr.write(
-		`[clio:dispatch] route history v${String(version)} is retired; starting empty at v${ROUTE_HISTORY_VERSION}. Prior observations: ${retired}\n`,
+		`[clio-coder:dispatch] route history v${String(version)} is retired; starting empty at v${ROUTE_HISTORY_VERSION}. Prior observations: ${retired}\n`,
 	);
 }
 

package/src/domains/dispatch/route-policy.ts

@@ -146,7 +146,7 @@ function rate(values: ReadonlyArray<boolean>, fallback = 0): number {
 }
 
 /** Conservative 95% Wilson lower confidence bound for a Bernoulli success rate. */
-export function wilsonLowerBound(successes: number, observations: number, z = 1.96): number {
+function wilsonLowerBound(successes: number, observations: number, z = 1.96): number {
 	if (observations <= 0) return 0;
 	const proportion = successes / observations;
 	const z2 = z * z;

package/src/domains/dispatch/route-readiness.ts

@@ -90,31 +90,3 @@ export function evaluateRouteReadiness(input: RouteReadinessInput): RouteReadine
 		labelsNeeded: Math.max(0, MINIMUM_ACTIVE_QUALITY_LABELS - estimate.qualityLabeledCount),
 	};
 }
-
-/**
- * Human-readable one-liners for a refusal message. The wording names the
- * missing evidence, so an operator who sees an active refusal can tell whether
- * to wait for measurements or to fix a stale fact.
- */
-export function describeReadinessGap(gap: ReadinessGap): string {
-	switch (gap) {
-		case "hard-constraint-validity-below-one":
-			return "hard-constraint evaluation was not consistently valid over the retained window";
-		case "integrity-failures-in-window":
-			return "the retained window contains receipt or source integrity failures";
-		case "insufficient-quality-labels":
-			return `fewer than ${MINIMUM_ACTIVE_QUALITY_LABELS} quality-labeled outcomes for this route and role`;
-		case "quality-lower-bound-below-posture-floor":
-			return "the conservative quality lower bound is below the posture floor";
-		case "quality-lower-bound-below-requested-minimum":
-			return "the conservative quality lower bound is below the request's minimumQuality";
-		case "reliability-below-posture-floor":
-			return "route-attributable reliability is below the posture floor";
-		case "cost-upper-bound-unknown":
-			return "the route has no conservative cost upper bound";
-		case "route-facts-stale":
-			return "node, endpoint, resource, capacity, or settings facts are stale";
-		case "decision-latency-above-budget":
-			return `shadow decision p95 exceeds ${DECISION_LATENCY_BUDGET_MS} ms at the configured universe bound`;
-	}
-}

package/src/domains/dispatch/run-event-journal.ts

@@ -40,6 +40,7 @@
 
 import { appendFileSync, mkdirSync, readdirSync, readFileSync, rmSync, statSync } from "node:fs";
 import { join } from "node:path";
+import { normalizeClioCoderEventType } from "../../core/naming-events.js";
 import { clioStateDir, stateRootRemoved } from "../../core/xdg.js";
 
 /** Directory name under the state root holding one subdirectory per run. */
@@ -136,7 +137,7 @@ function parseEnvFlag(raw: string | undefined): boolean | undefined {
 }
 
 /** env override > configured settings > on. */
-export function runEventJournalEnabled(env: NodeJS.ProcessEnv = process.env): boolean {
+function runEventJournalEnabled(env: NodeJS.ProcessEnv = process.env): boolean {
 	return parseEnvFlag(env[RUN_EVENT_JOURNAL_ENV_VAR]) ?? configuredEnabled ?? true;
 }
 
@@ -150,7 +151,7 @@ export function runEventJournalRoot(): string {
 }
 
 /** One run's journal directory. */
-export function runEventJournalDir(runId: string, root?: string): string {
+function runEventJournalDir(runId: string, root?: string): string {
 	return join(root ?? runEventJournalRoot(), runId);
 }
 
@@ -247,10 +248,10 @@ export interface CreateRunEventJournalOptions {
 	isEnabled?: () => boolean;
 }
 
-export function createRunEventJournal(options: CreateRunEventJournalOptions = {}): RunEventJournal {
+function createRunEventJournal(options: CreateRunEventJournalOptions = {}): RunEventJournal {
 	const capBytes = options.capBytes ?? RUN_EVENT_JOURNAL_CAP_BYTES;
 	const flushBytes = options.flushBytes ?? RUN_EVENT_JOURNAL_FLUSH_BYTES;
-	const warn = options.warn ?? ((message: string) => process.stderr.write(`[clio:journal] ${message}\n`));
+	const warn = options.warn ?? ((message: string) => process.stderr.write(`[clio-coder:journal] ${message}\n`));
 	const now = options.now ?? (() => new Date());
 	const isEnabled = options.isEnabled ?? (() => runEventJournalEnabled());
 	const runs = new Map<string, RunJournalState>();
@@ -494,7 +495,7 @@ function parseJournalLine(raw: string): RunEventJournalLine | null {
 				seq: record.seq,
 				at: record.at,
 				kind: "event",
-				type: record.type,
+				type: normalizeClioCoderEventType(record.type),
 				...(detail === undefined ? {} : { detail }),
 			};
 		}

package/src/domains/dispatch/tool-stats.ts

@@ -1,7 +1,7 @@
 /**
  * Pure aggregation helpers for the per-tool stats folded into a RunReceipt.
  *
- * Sourced from the worker's ToolTelemetry stream (`clio_tool_finish` IPC
+ * Sourced from the worker's ToolTelemetry stream (`clio_coder_tool_finish` IPC
  * events). Kept as a small standalone module so receipts have a single source
  * of truth for the aggregation invariants, and so loops, retries, errors,
  * blocked admissions, and parallel-batch tool calls all flow through one

package/src/domains/dispatch/transport.ts

@@ -26,13 +26,7 @@ import { AI_AGENT_NAME } from "../../core/agent-environment.js";
 import { shellQuote } from "../../core/shell-quote.js";
 import type { WorkerSpec } from "../../worker/spec-contract.js";
 import type { RunNodeIdentity } from "./types.js";
-import {
-	type SpawnedWorker,
-	type SpawnOptions,
-	spawnNativeWorker,
-	spawnWorkerProcess,
-	type WorkerProcessOptions,
-} from "./worker-spawn.js";
+import { type SpawnedWorker, spawnWorkerProcess, type WorkerProcessOptions } from "./worker-spawn.js";
 
 export type WorkerTransportKind = "local" | "ssh";
 
@@ -94,17 +88,6 @@ export function localNodeIdentity(): RunNodeIdentity {
 	return { id: LOCAL_NODE_ID, kind: "local" };
 }
 
-export function createLocalWorkerTransport(opts?: Omit<SpawnOptions, "cwd">): WorkerTransport {
-	return {
-		kind: "local",
-		node: localNodeIdentity(),
-		spawn(spec, spawnOpts) {
-			// The caller's per-spawn options ride over the transport's own defaults.
-			return spawnNativeWorker(spec, { ...opts, ...spawnOpts });
-		},
-	};
-}
-
 const DEFAULT_SSH_CONNECT_TIMEOUT_SEC = 10;
 const DEFAULT_REMOTE_CLIO_ENTRY = "clio-coder worker";
 
@@ -126,7 +109,7 @@ function remoteEnvAssignments(node: SshNodeEndpoint): string {
 	return `AI_AGENT=${AI_AGENT_NAME} CLIO_CODER_RESIDENCY=${residency} CLIO_CODER_WORKER_PGID=$$${labelAssignment}`;
 }
 
-export function buildRemoteWorkerCommand(node: SshNodeEndpoint, cwd: string): string {
+function buildRemoteWorkerCommand(node: SshNodeEndpoint, cwd: string): string {
 	const entry =
 		node.clioCoderEntry !== undefined && node.clioCoderEntry.trim().length > 0
 			? node.clioCoderEntry.trim()

package/src/domains/dispatch/types.ts

@@ -506,7 +506,7 @@ export interface RunEnvelope {
 
 /**
  * Per-tool aggregates folded into a receipt at run completion. Sourced from
- * the worker's ToolTelemetry stream (`clio_tool_finish` IPC events). Sorted
+ * the worker's ToolTelemetry stream (`clio_coder_tool_finish` IPC events). Sorted
  * by tool name on write so digests are deterministic across runs.
  */
 export interface ToolCallStat {
@@ -570,7 +570,7 @@ export interface RunReceiptDelegation {
 	toolCallsRequested: number;
 	toolCallsApproved: number;
 	toolCallsDenied: number;
-	toolGovernance: "clio-policy" | "agent-managed" | "deny-all";
+	toolGovernance: "clio-coder-policy" | "agent-managed" | "deny-all";
 	toolCallLog: DelegationToolCallLogEntry[];
 }
 
@@ -810,7 +810,7 @@ export interface RunReceipt {
 	dynamicHash?: string | null;
 	promptSignature?: string | null;
 	toolSignature?: string | null;
-	clioVersion: string;
+	clioCoderVersion: string;
 	piMonoVersion: string;
 	platform: string;
 	nodeVersion: string;

package/src/domains/dispatch/worker-protocol.ts

@@ -69,7 +69,7 @@ export {
  */
 export function computeSettingsFingerprint(settings: unknown): string {
 	return createHash("sha256")
-		.update(`clio.settings:${canonicalJson(settings)}`, "utf8")
+		.update(`clio-coder.settings:${canonicalJson(settings)}`, "utf8")
 		.digest("hex");
 }
 
@@ -151,7 +151,7 @@ export function approvedIdentityForSpec(spec: {
 
 function workerSpecDigestOf(spec: unknown): string {
 	return createHash("sha256")
-		.update(`clio.workerSpec:${canonicalJson(spec)}`, "utf8")
+		.update(`clio-coder.workerSpec:${canonicalJson(spec)}`, "utf8")
 		.digest("hex");
 }
 

package/src/domains/eval/artifacts/store.ts

@@ -58,14 +58,15 @@ export function parseEvalArtifactV4(value: unknown, source: string): EvalArtifac
 		value.aggregates === undefined
 			? undefined
 			: (readArray(value, source, "aggregates") as NonNullable<EvalArtifactV4["aggregates"]>);
+	const clioCoder = asRecord(value.clioCoder ?? value.clio, `${source}.clioCoder`);
 	return {
 		version: 4,
 		evalId: readString(value, source, "evalId"),
 		suite: { id: readString(suite, `${source}.suite`, "id"), hash: readString(suite, `${source}.suite`, "hash") },
-		clio: {
-			version: readString(asRecord(value.clio, `${source}.clio`), `${source}.clio`, "version"),
-			commit: readNullableString(asRecord(value.clio, `${source}.clio`), `${source}.clio`, "commit"),
-			entry: readString(asRecord(value.clio, `${source}.clio`), `${source}.clio`, "entry"),
+		clioCoder: {
+			version: readString(clioCoder, `${source}.clioCoder`, "version"),
+			commit: readNullableString(clioCoder, `${source}.clioCoder`, "commit"),
+			entry: readString(clioCoder, `${source}.clioCoder`, "entry"),
 		},
 		environment: {
 			platform: readString(asRecord(value.environment, `${source}.environment`), `${source}.environment`, "platform"),

package/src/domains/eval/compare/thresholds.ts

@@ -62,14 +62,6 @@ export function resolveMetricAssertion(
 	return { actual, unresolved: actual === null, holds: comparisonHolds(assertion, actual) };
 }
 
-export function evaluateMetricAssertion(
-	assertion: EvalMetricAssertion,
-	metrics: Readonly<Record<string, unknown>>,
-	artifact?: EvalArtifactV4,
-): boolean {
-	return comparisonHolds(assertion, metricValue(assertion.metric, metrics, artifact));
-}
-
 function comparisonHolds(assertion: EvalMetricAssertion, actual: number | string | boolean | null): boolean {
 	switch (assertion.op) {
 		case "lt":

package/src/domains/eval/execution-provenance.ts

@@ -128,7 +128,7 @@ function promptFragmentIdentities(
 			.sort((left, right) => left.id.localeCompare(right.id));
 	}
 	if (recipe === null) return [];
-	const selected = ["identity.clio-worker", "operating.contract", "operating.worker"];
+	const selected = ["identity.clio-coder-worker", "operating.contract", "operating.worker"];
 	if (autonomy !== null) selected.push(`safety.${autonomy}`);
 	const fragments: EvalPromptFragmentIdentityV1[] = [];
 	try {

package/src/domains/eval/metrics/token-stream.ts

@@ -90,13 +90,6 @@ export function createTokenUsageFold(): EvalTokenUsageFold {
 	};
 }
 
-/** Whole-buffer form of {@link createTokenUsageFold}. */
-export function tokenUsageFromJsonl(stream: string): EvalTokenStreamUsage {
-	const fold = createTokenUsageFold();
-	fold.push(stream);
-	return fold.usage();
-}
-
 export function addTokenStreamUsage(left: EvalTokenStreamUsage, right: EvalTokenStreamUsage): EvalTokenStreamUsage {
 	return {
 		measured: left.measured || right.measured,

package/src/domains/eval/report.ts

@@ -14,7 +14,7 @@ export function renderEvalReport(artifact: EvalRunArtifact, artifactPath?: strin
 	lines.splice(
 		2,
 		0,
-		`clio: ${artifact.clio.version} commit=${artifact.clio.commit ?? "unknown"} entry=${artifact.clio.entry}`,
+		`clioCoder: ${artifact.clioCoder.version} commit=${artifact.clioCoder.commit ?? "unknown"} entry=${artifact.clioCoder.entry}`,
 	);
 	lines.splice(3, 0, `environment: ${artifact.environment.platform} node=${artifact.environment.node}`);
 	const evidenceIds = uniqueEvidenceIds(artifact);

package/src/domains/eval/runner.ts

@@ -43,7 +43,7 @@ export async function runEvalTasks(options: RunEvalOptions): Promise<EvalRunArti
 		evalId: options.evalId,
 		taskFile: options.loadedTaskFile.path,
 		taskFileHash: options.loadedTaskFile.contentHash,
-		clio: evalClioProvenance(options.provenance),
+		clioCoder: evalClioProvenance(options.provenance),
 		environment: evalEnvironmentProvenance(),
 		target: options.provenance?.target ?? null,
 		model: options.provenance?.model ?? null,

package/src/domains/eval/runners/clio-run.ts

@@ -1,4 +1,5 @@
 import { isAbsolute, relative, resolve, sep } from "node:path";
+import { normalizeClioCoderEventRecord } from "../../../core/naming-events.js";
 import { shellQuote } from "../../../core/shell-quote.js";
 import { clioStateDir } from "../../../core/xdg.js";
 import {
@@ -92,7 +93,7 @@ type ToolCallMetrics = {
 type ToolOutcome = "ok" | "error" | "blocked";
 
 /** Fold the terminal tool events emitted by `clio-coder run --json`. */
-export function toolCallMetricsFromJsonl(stdout: string): ToolCallMetrics {
+function toolCallMetricsFromJsonl(stdout: string): ToolCallMetrics {
 	const executionEnds: ToolCallMetrics = { totalCalls: 0, failed: 0, blocked: 0 };
 	const canonicalFinishes: ToolCallMetrics = { totalCalls: 0, failed: 0, blocked: 0 };
 	const seenExecutionEnds = new Set<string>();
@@ -104,7 +105,7 @@ export function toolCallMetricsFromJsonl(stdout: string): ToolCallMetrics {
 		try {
 			const parsed: unknown = JSON.parse(line);
 			if (!isRecord(parsed)) continue;
-			event = parsed;
+			event = normalizeClioCoderEventRecord(parsed);
 		} catch {
 			continue;
 		}
@@ -119,7 +120,7 @@ export function toolCallMetricsFromJsonl(stdout: string): ToolCallMetrics {
 			continue;
 		}
 
-		if (event.type !== "clio_tool_finish" || !isRecord(event.payload)) continue;
+		if (event.type !== "clio_coder_tool_finish" || !isRecord(event.payload)) continue;
 		const outcome = toolOutcome(event.payload);
 		if (outcome === undefined) continue;
 		const callId = stringField(event.payload, "toolCallId") ?? stringField(event, "toolCallId");
@@ -148,7 +149,7 @@ interface BehavioralToolTerminal {
  * bounded counters against the suite's explicit public allowlist and decoy
  * list; they never become behavioral fact values or evidence excerpts.
  */
-export function toolBehaviorMetricEntriesFromJsonl(
+function toolBehaviorMetricEntriesFromJsonl(
 	stdout: string,
 	cwd: string,
 	readObservation?: { allowedPaths: string[]; decoyPaths: string[] },
@@ -166,7 +167,7 @@ export function toolBehaviorMetricEntriesFromJsonl(
 		try {
 			const parsed: unknown = JSON.parse(line);
 			if (!isRecord(parsed)) continue;
-			event = parsed;
+			event = normalizeClioCoderEventRecord(parsed);
 		} catch {
 			continue;
 		}
@@ -188,7 +189,7 @@ export function toolBehaviorMetricEntriesFromJsonl(
 			executionEnds.push({ callId, tool, outcome: toolOutcome(event) ?? (event.isError === true ? "error" : "ok") });
 			continue;
 		}
-		if (event.type !== "clio_tool_finish" || !isRecord(event.payload)) continue;
+		if (event.type !== "clio_coder_tool_finish" || !isRecord(event.payload)) continue;
 		const outcome = toolOutcome(event.payload);
 		const tool = stringField(event.payload, "tool");
 		if (outcome === undefined || tool === undefined) continue;

package/src/domains/eval/runners/external-command.ts

@@ -1,5 +1,6 @@
 import { spawn } from "node:child_process";
 import { performance } from "node:perf_hooks";
+import { normalizeClioCoderEventType } from "../../../core/naming-events.js";
 import type { RunReceipt } from "../../dispatch/types.js";
 import type { SessionEntry } from "../../session/entries.js";
 import { createEvalCallLedgerFold } from "../metrics/call-ledger-stream.js";
@@ -226,7 +227,7 @@ export interface JsonlMetricCapture {
  * split JSON arbitrarily; oversized non-metric lines are discarded without
  * growing memory.
  */
-export function createJsonlMetricCapture(): JsonlMetricCapture {
+function createJsonlMetricCapture(): JsonlMetricCapture {
 	const lines: string[] = [];
 	let storedBytes = 0;
 	let pending = "";
@@ -287,7 +288,7 @@ export function createJsonlMetricCapture(): JsonlMetricCapture {
 }
 
 function compactMetricEvent(event: Record<string, unknown>): Record<string, unknown> | null {
-	const type = event.type;
+	const type = typeof event.type === "string" ? normalizeClioCoderEventType(event.type) : event.type;
 	if (type === "tool_execution_start") {
 		const toolName = stringField(event, "toolName");
 		if (toolName !== "dispatch" && toolName !== "code_nav" && toolName !== "read" && toolName !== "grep") {
@@ -315,7 +316,7 @@ function compactMetricEvent(event: Record<string, unknown>): Record<string, unkn
 			...(stringField(event, "outcome") !== undefined ? { outcome: stringField(event, "outcome") } : {}),
 		};
 	}
-	if (type !== "clio_tool_finish" || !isRecord(event.payload)) return null;
+	if (type !== "clio_coder_tool_finish" || !isRecord(event.payload)) return null;
 	return {
 		type,
 		payload: {

package/src/domains/eval/schema/artifact.ts

@@ -69,7 +69,7 @@ export interface EvalArtifactV4 {
 		id: string;
 		hash: string;
 	};
-	clio: EvalClioProvenance;
+	clioCoder: EvalClioProvenance;
 	environment: EvalEnvironmentProvenance;
 	matrix: {
 		target: string;

package/src/domains/eval/schema/behavioral-metrics.ts

@@ -1,7 +1,8 @@
 import type { EvalArtifactResultV4 } from "./artifact.js";
 import type { EvalBehaviorCategoryV1, EvalBehaviorLabelV1 } from "./behavioral.js";
+import { normalizeEvalSchemaId } from "./naming.js";
 
-export const EVAL_BEHAVIOR_METRICS_SCHEMA_V1 = "clio.eval.behavior.metrics.v1" as const;
+export const EVAL_BEHAVIOR_METRICS_SCHEMA_V1 = "clio-coder.eval.behavior.metrics.v1" as const;
 
 export const EVAL_BEHAVIOR_METRIC_DEFINITIONS_V1 = [
 	{
@@ -136,7 +137,7 @@ export function buildEvalBehaviorMetricsV1(
 
 export function parseEvalBehaviorMetricsV1(value: unknown, source = "behavioral metrics"): EvalBehaviorMetricsV1 {
 	const record = asRecord(value, source);
-	if (record.schema !== EVAL_BEHAVIOR_METRICS_SCHEMA_V1) {
+	if (normalizeEvalSchemaId(record.schema) !== EVAL_BEHAVIOR_METRICS_SCHEMA_V1) {
 		throw new Error(`${source}.schema: expected ${EVAL_BEHAVIOR_METRICS_SCHEMA_V1}`);
 	}
 	const target = asRecord(record.target, `${source}.target`);