@iowarp/clio-coder 0.4.0 → 0.4.1

package/src/cli/doctor-panes.ts

@@ -1,6 +1,7 @@
-import { accessSync, constants, mkdirSync } from "node:fs";
+import { accessSync, constants } from "node:fs";
+import { join } from "node:path";
 import { readSettings } from "../core/config.js";
-import { runEventJournalRoot } from "../domains/dispatch/run-event-journal.js";
+import { resolveClioDirs } from "../core/xdg.js";
 import type { DoctorFinding } from "../domains/lifecycle/doctor.js";
 import { detectMux, MUX_METHOD_MIN_PROTOCOL, resolveSocketCandidates } from "../domains/mux/index.js";
 import { describeResolution, findPinnedTool, toolStatus } from "../domains/toolchain/index.js";
@@ -8,10 +9,11 @@ import { describeResolution, findPinnedTool, toolStatus } from "../domains/toolc
 /**
  * The panes section of `clio-coder doctor`.
  *
- * Five rows, in the order an operator debugs them: what mode the pane layer
+ * Six rows, in the order an operator debugs them: what mode the pane layer
  * resolved to, whether the socket answered, whether the server is new enough
- * for the methods phase 3 uses, where the pane host binary resolves, and
- * whether the journal directory the viewer reads is writable.
+ * for the methods phase 3 uses, where the pane host binary resolves, what the
+ * boot layout composes, and whether the journal directory the viewer reads is
+ * writable.
  *
  * No row is an error. Panes are optional: an operator who never wanted them has
  * a healthy install without them, and doctor's exit code answers "is this
@@ -24,11 +26,8 @@ const PANE_HOST_TOOL_ID = "herdr";
 /** Highest protocol any method Clio drives requires, for the version row. */
 const REQUIRED_PROTOCOL = Math.max(...Object.values(MUX_METHOD_MIN_PROTOCOL));
 
-function journalWritabilityFinding(root = runEventJournalRoot()): DoctorFinding {
+function journalWritabilityFinding(root = join(resolveClioDirs().state, "runs")): DoctorFinding {
 	try {
-		// The viewer reads this tree and the journal writes it, so the useful
-		// question is whether it can exist and be written, not whether it does.
-		mkdirSync(root, { recursive: true });
 		accessSync(root, constants.W_OK);
 		return { ok: true, name: "panes journal dir", detail: `${root} is writable` };
 	} catch (error) {
@@ -36,15 +35,28 @@ function journalWritabilityFinding(root = runEventJournalRoot()): DoctorFinding
 			ok: true,
 			level: "warn",
 			name: "panes journal dir",
-			detail: `${root} is not writable (${error instanceof Error ? error.message : String(error)}); \`clio-coder fleet view\` will have no transcript to follow`,
+			detail: `${root} is absent or not writable (${error instanceof Error ? error.message : String(error)}); \`clio-coder fleet view\` will have no transcript to follow`,
 		};
 	}
 }
 
 export async function panesFindings(env: NodeJS.ProcessEnv = process.env): Promise<DoctorFinding[]> {
 	let enabled: "auto" | "embedded" | "off" = "off";
+	let layoutRow: DoctorFinding = {
+		ok: true,
+		name: "panes layout",
+		detail: "off",
+	};
 	try {
-		enabled = readSettings().panes.enabled;
+		const panes = readSettings().interface.panes;
+		enabled = panes.enabled;
+		if (panes.layout !== "off") {
+			layoutRow = {
+				ok: true,
+				name: "panes layout",
+				detail: `${panes.layout} at boot (workers dock ${(panes.workers.ratio * 100).toFixed(0)}%, files dock ${(panes.files.ratio * 100).toFixed(0)}%)`,
+			};
+		}
 	} catch {
 		// An unreadable settings file is already reported by the settings row;
 		// this section answers on the shipped default (off) rather than throwing.
@@ -59,10 +71,9 @@ export async function panesFindings(env: NodeJS.ProcessEnv = process.env): Promi
 			{
 				ok: true,
 				name: "panes mode",
-				detail:
-					"off by choice (panes.enabled=off); start `clio-coder --with-panes` for one session, or set panes.enabled=auto",
+				detail: "off by choice",
 			},
-			journalWritabilityFinding(),
+			layoutRow,
 		];
 	}
 
@@ -70,6 +81,7 @@ export async function panesFindings(env: NodeJS.ProcessEnv = process.env): Promi
 	// answer that boot would get. It opens a socket and nothing else: no file is
 	// created and no pane is touched.
 	const { detection, client } = await detectMux({ enabled, env });
+	const snapshot = client ? await client.snapshot().catch(() => null) : null;
 	await client?.close().catch(() => undefined);
 
 	const candidates = detection.candidates.length > 0 ? detection.candidates : resolveSocketCandidates(env);
@@ -119,6 +131,26 @@ export async function panesFindings(env: NodeJS.ProcessEnv = process.env): Promi
 				},
 	);
 
+	findings.push(layoutRow);
+	const legacyOwnedPanes =
+		snapshot?.panes.filter(
+			(pane) => pane.tokens.clio_owner === "clio:mux" && pane.tokens.clio_coder_owner !== "clio-coder:mux",
+		).length ?? 0;
+	const staleWatchTitles =
+		snapshot?.panes.filter(
+			(pane) =>
+				(pane.title === "clio watch" || pane.label === "clio watch") &&
+				(pane.tokens.clio_coder_owner === "clio-coder:mux" || pane.tokens.clio_owner === "clio:mux"),
+		).length ?? 0;
+	findings.push({
+		ok: true,
+		level: legacyOwnedPanes > 0 || staleWatchTitles > 0 ? "warn" : "ok",
+		name: "naming panes",
+		detail:
+			legacyOwnedPanes > 0 || staleWatchTitles > 0
+				? `${legacyOwnedPanes} panes carry only the legacy clio_owner=clio:mux token; ${staleWatchTitles} owned panes retain the stale 'clio watch' title; quit/cleanup recognizes both token schemes`
+				: "no legacy Clio Coder pane ownership tokens or watch titles found",
+	});
 	findings.push(journalWritabilityFinding());
 	return findings;
 }

package/src/cli/doctor-toolchain.ts

@@ -7,7 +7,19 @@ import {
 } from "../domains/mux/index.js";
 import { describeResolution, toolStatuses } from "../domains/toolchain/index.js";
 
-function yaziProfileFinding(): DoctorFinding {
+export interface ToolchainFindingOptions {
+	panesEnabled?: boolean;
+	filesEnabled?: boolean;
+}
+
+function yaziProfileFinding(enabled: boolean): DoctorFinding {
+	if (!enabled) {
+		return {
+			ok: true,
+			name: "yazi managed profile",
+			detail: "disabled by settings",
+		};
+	}
 	try {
 		const profile = inspectCurrentYaziProfile();
 		return {
@@ -43,15 +55,24 @@ function yaziProfileFinding(): DoctorFinding {
  * being used, and a row that only said "not found" would send them looking for
  * a binary that is right there on their PATH.
  */
-export function toolchainFindings(): DoctorFinding[] {
+export function toolchainFindings(options: ToolchainFindingOptions = {}): DoctorFinding[] {
+	const panesEnabled = options.panesEnabled ?? true;
+	const filesEnabled = options.filesEnabled ?? true;
 	const tools = toolStatuses().map((status) => ({
 		ok: true,
 		name: `external tool ${status.id}`,
-		// The rejection and the remedy both live inside the shared resolution
-		// sentence, so this row and `clio-coder tools status` cannot describe the
-		// same machine differently.
-		detail: describeResolution(status),
-		level: status.resolution.source === "none" ? ("warn" as const) : ("ok" as const),
+		// Active integrations share the tools-status resolution sentence. Disabled
+		// experimental integrations stay neutral and do not advertise setup work.
+		detail:
+			(status.id === "herdr" && !panesEnabled) || (status.id === "yazi" && !filesEnabled)
+				? "experimental integration disabled by settings"
+				: describeResolution(status),
+		level:
+			(status.id === "herdr" && !panesEnabled) || (status.id === "yazi" && !filesEnabled)
+				? ("ok" as const)
+				: status.resolution.source === "none"
+					? ("warn" as const)
+					: ("ok" as const),
 	}));
-	return [...tools, yaziProfileFinding()];
+	return [...tools, yaziProfileFinding(filesEnabled)];
 }

package/src/cli/doctor.ts

@@ -1,3 +1,4 @@
+import { readSettings } from "../core/config.js";
 import {
 	formatDoctorReport,
 	isUninitializedHome,
@@ -7,6 +8,7 @@ import {
 	runDoctorModelChecks,
 	runDoctorRuntimeChecks,
 } from "../domains/lifecycle/doctor.js";
+import { namingFootprintFindings } from "./doctor-naming.js";
 import { panesFindings } from "./doctor-panes.js";
 import { stateStorageFinding } from "./doctor-state-size.js";
 import { toolchainFindings } from "./doctor-toolchain.js";
@@ -38,6 +40,16 @@ export async function runDoctorCommand(args: ReadonlyArray<string> = []): Promis
 	// gets every check on the home it just built.
 	const untouched = !fix && isUninitializedHome();
 	const findings = runDoctor({ fix });
+	let panesEnabled = false;
+	let filesEnabled = false;
+	try {
+		const panes = readSettings().interface.panes;
+		panesEnabled = panes.enabled !== "off";
+		filesEnabled = panesEnabled && panes.files.enabled;
+	} catch {
+		// The settings finding already reports an unreadable document. Optional
+		// integrations stay inactive rather than adding secondary warnings.
+	}
 	const storageChecks = untouched ? [] : [stateStorageFinding()];
 	const runtimeChecks = await runDoctorRuntimeChecks();
 	// Every model pointer is checked against what its target advertises, so a
@@ -54,11 +66,12 @@ export async function runDoctorCommand(args: ReadonlyArray<string> = []): Promis
 	// Resolution reads PATH and the vendor root and creates nothing, but on an
 	// untouched home there is no vendor root to look at and the answer would be
 	// "none" for every row regardless, so the sweep stays with the others.
-	const toolChecks = untouched ? [] : toolchainFindings();
+	const toolChecks = untouched ? [] : toolchainFindings({ panesEnabled, filesEnabled });
 	// The pane sweep pings a socket and reads PATH; it creates nothing except the
 	// journal directory it is asked about, which is inside the state root doctor
 	// has already agreed not to build on an untouched home.
 	const paneChecks = untouched ? [] : await panesFindings();
+	const namingChecks = namingFootprintFindings({ fix, yaziEnabled: filesEnabled });
 	const all = [
 		...findings,
 		...storageChecks,
@@ -68,6 +81,7 @@ export async function runDoctorCommand(args: ReadonlyArray<string> = []): Promis
 		...fleetChecks,
 		...toolChecks,
 		...paneChecks,
+		...namingChecks,
 	];
 	const ok = all.every((f) => f.ok);
 	if (json) {

package/src/cli/eval-inventory.ts

@@ -10,7 +10,7 @@
  *
  * An eval artifact is the largest single host-only payload in this harness, and
  * the reason is worth stating rather than discovering. `results[].artifacts`
- * holds whatever the runner attached, which for the `clio-run` runner is the
+ * holds whatever the runner attached, which for the `clio-coder-run` runner is the
  * entire session transcript: the operator's task text, every tool argument and
  * result, the model's replies, provider endpoint URLs, error prose, and the
  * prepared workspace path. There is no width at which a projection of that is
@@ -107,8 +107,8 @@ export interface EvalInventoryReport {
 	 * needs, and the ordinal reveals nothing about the values behind it.
 	 */
 	readonly servingGroup: number;
-	readonly clioVersion: string | null;
-	readonly clioCommit: string | null;
+	readonly clioCoderVersion: string | null;
+	readonly clioCoderCommit: string | null;
 	readonly platform: string | null;
 	readonly node: string | null;
 	readonly matrix: {
@@ -348,15 +348,15 @@ function projectReport(
 	const serving = evalServingConfigurationOf(artifact);
 	const { counts, failureClasses, behaviorOutcomes } = countResults(artifact.results);
 	const { scenarios, truncated, dropped } = projectScenarios(artifact);
-	const version = artifact.clio.version;
-	const commit = artifact.clio.commit;
+	const version = artifact.clioCoder.version;
+	const commit = artifact.clioCoder.commit;
 	return {
 		evalId,
 		startedAt,
 		suiteId: identifier(artifact.suite.id) ?? "unavailable",
 		servingGroup,
-		clioVersion: VERSION_PATTERN.test(version) ? version : null,
-		clioCommit: commit !== null && COMMIT_PATTERN.test(commit) ? commit : null,
+		clioCoderVersion: VERSION_PATTERN.test(version) ? version : null,
+		clioCoderCommit: commit !== null && COMMIT_PATTERN.test(commit) ? commit : null,
 		platform: identifier(artifact.environment.platform),
 		node: identifier(artifact.environment.node),
 		matrix: {
@@ -394,7 +394,7 @@ function projectReport(
 	};
 }
 
-export async function evalInventorySnapshot(
+async function evalInventorySnapshot(
 	now: () => number = Date.now,
 	dataDir: string = clioDataDir(),
 ): Promise<EvalInventorySnapshot> {

package/src/cli/evidence-detail.ts

@@ -46,7 +46,7 @@ export interface EvidenceDetailSnapshot {
 	readonly runsTruncated: boolean;
 }
 
-export async function evidenceDetailSnapshot(
+async function evidenceDetailSnapshot(
 	evidenceId: string,
 	now: () => number = Date.now,
 	dataDir: string = clioDataDir(),

package/src/cli/evidence-inventory.ts

@@ -110,7 +110,7 @@ function byNewest(a: EvidenceOverview, b: EvidenceOverview): number {
 	return (Date.parse(b.generatedAt) || 0) - (Date.parse(a.generatedAt) || 0);
 }
 
-export async function evidenceInventorySnapshot(
+async function evidenceInventorySnapshot(
 	now: () => number = Date.now,
 	dataDir: string = clioDataDir(),
 ): Promise<EvidenceInventorySnapshot> {

package/src/cli/fleet-decisions.ts

@@ -47,7 +47,7 @@ export type { GateDecisionReason, GateTopologyDecision };
  * different operator states, so the flag is reported rather than inferred from
  * an empty list.
  */
-export function fleetDecisionsSnapshot(now: () => number = Date.now): FleetDecisionsSnapshot {
+function fleetDecisionsSnapshot(now: () => number = Date.now): FleetDecisionsSnapshot {
 	const topology = gateTopology();
 	return {
 		version: 1,

package/src/cli/fleet-inspect.ts

@@ -204,7 +204,7 @@ function evidenceProjection(text: string): FleetInspectRun["evidence"] {
 }
 
 /** Pure command payload builder, exported so the fixed CLI contract is testable without subprocess output capture. */
-export function fleetInspectSnapshot(now: () => number = Date.now): FleetInspectSnapshot {
+function fleetInspectSnapshot(now: () => number = Date.now): FleetInspectSnapshot {
 	const ledgerRows = openLedger().list();
 	const selected = ledgerRows.slice(0, FLEET_INSPECT_MAX_RUNS);
 	// The council window is deliberately wider than the run window. A single

package/src/cli/fleet-preflight.ts

@@ -33,7 +33,7 @@ export function inspectFleet(name: string, vars?: Readonly<Record<string, string
 	const resolved = new Set<string>();
 	const settings = readSettings();
 	const targetIds = new Set(settings.targets.map((target) => target.id));
-	const profileIds = new Set(Object.keys(settings.workers?.profiles ?? {}));
+	const profileIds = new Set(Object.keys(settings.fleet?.profiles ?? {}));
 	for (const step of contract.steps) {
 		const positions =
 			step.kind === "loop"

package/src/cli/fleet-verify.ts

@@ -83,7 +83,7 @@ function loadReceipt(envelope: RunEnvelope): RunReceipt | null {
 }
 
 /** Pure payload builder, exported so the fixed contract is testable without subprocess capture. */
-export function fleetVerifySnapshot(runId: string, now: () => number = Date.now): FleetVerifySnapshot {
+function fleetVerifySnapshot(runId: string, now: () => number = Date.now): FleetVerifySnapshot {
 	const envelope = openLedger().get(runId);
 	if (envelope === null) throw new FleetVerifyUnknownRunError(`unknown run '${runId}'`);
 	const verifiedAt = new Date(now()).toISOString();

package/src/cli/fleet-view.ts

@@ -47,7 +47,7 @@ import { WRITE_BOUNDARY_VIOLATION_REASON } from "../domains/dispatch/write-bound
 import { formatTrustSummaryLine } from "../domains/evidence/trust-projection.js";
 import { inspectRunReceiptTrustStatus } from "../domains/evidence/trust-status.js";
 import { sanitizeCallTargetText } from "../domains/safety/call-target.js";
-import { truncateToWidth } from "../engine/tui-primitives.js";
+import { truncateToWidth, visibleWidth, wrapTextWithAnsi } from "../engine/tui-primitives.js";
 
 const HELP = `clio-coder fleet view <runId|fleetRootId> [--follow]
 clio-coder fleet view --watch <selection-file>
@@ -62,7 +62,7 @@ run event journal, and the sealed receipt once it exists.
 
 Without --follow the current snapshot is printed and the command exits.
 The transcript comes from <state>/runs/<runId>/events.ndjson, which the
-orchestrator writes when panes.journal is on (the default). A run dispatched
+orchestrator writes when fleet.history.journal is on (the default). A run dispatched
 with the journal off shows its ledger and receipt but no transcript.
 
 Given the fleet root id that \`fleet run\` prints (fleet-<hex>), this prints the
@@ -126,6 +126,11 @@ function sanitizeBounded(value: string, maxWidth: number): string {
 	return sanitizeCallTargetText(truncateToWidth(sanitized, maxWidth, "…", false));
 }
 
+/** The ANSI-aware TUI truncator appends reset codes; stdout snapshots are plain text. */
+function truncatePlain(value: string, width: number): string {
+	return truncateToWidth(value, width, "…", false).replaceAll("\u001B[0m", "");
+}
+
 function receiptPathFor(run: RunEnvelope): string {
 	return run.receiptPath ?? join(clioStateDir(), "receipts", `${run.id}.json`);
 }
@@ -199,7 +204,7 @@ export interface LoadRunViewOptions {
  * first, then a unique prefix. An ambiguous prefix resolves to nothing so the
  * caller can say which ids it matched.
  */
-export function resolveRunId(runId: string): { runId: string } | { candidates: string[] } {
+function resolveRunId(runId: string): { runId: string } | { candidates: string[] } {
 	const ledger = openLedger();
 	if (ledger.get(runId) !== null) return { runId };
 	const candidates = ledger
@@ -268,44 +273,58 @@ function clockOf(iso: string): string {
 	return time.length === 8 ? time : iso.slice(0, 8);
 }
 
+/** Wrap a viewer value inside the columns left by its one-time field label. */
+function wrapViewerValue(prefix: string, value: string, columns: number): string[] {
+	const prefixWidth = visibleWidth(prefix);
+	const valueWidth = Math.max(1, columns - prefixWidth);
+	return wrapTextWithAnsi(value, valueWidth).map(
+		(line, index) => `${index === 0 ? prefix : " ".repeat(prefixWidth)}${line}`,
+	);
+}
+
 /**
  * The whole viewer surface as lines. Pure: given the same model and width it
  * returns the same strings, which is what lets the data-source test assert the
  * header and outcome without a PTY.
  */
-export function renderRunView(model: RunViewModel, width: number = DEFAULT_WIDTH): string[] {
+function renderRunView(model: RunViewModel, width: number = DEFAULT_WIDTH): string[] {
 	const columns = Math.max(MIN_WIDTH, width);
 	const rule = "─".repeat(columns);
 	const lines: string[] = [];
-	lines.push(truncateToWidth(`run ${model.runId}  ${model.agentId}`, columns, "…", false));
+	lines.push(truncatePlain(`run ${model.runId}  ${model.agentId}`, columns));
 	lines.push(
-		truncateToWidth(
+		truncatePlain(
 			`model ${model.model}  target ${model.target}  node ${model.node}  phase ${model.phase}  elapsed ${formatElapsed(model.elapsedMs)}`,
 			columns,
-			"…",
-			false,
 		),
 	);
 	if (model.task !== undefined) {
-		lines.push(truncateToWidth(`task ${model.task}`, columns, "…", false));
+		lines.push(...wrapViewerValue("task ", model.task, columns));
 	}
 	lines.push(rule);
 	if (!model.journalPresent) {
 		lines.push("no event journal for this run.");
-		lines.push(`expected ${model.journalPath} (panes.journal may have been off when it ran)`);
+		lines.push(
+			...wrapViewerValue(
+				"expected ",
+				`${model.journalPath} (fleet.history.journal may have been off when it ran)`,
+				columns,
+			),
+		);
 	} else if (model.transcript.length === 0) {
 		lines.push("journal is empty; no events recorded yet.");
 	} else {
 		if (model.transcriptTruncated) lines.push("… earlier events dropped (journal truncated)");
 		for (const entry of model.transcript) {
 			const head = `${clockOf(entry.at)} ${entry.label}`;
-			lines.push(truncateToWidth(entry.detail === undefined ? head : `${head}: ${entry.detail}`, columns, "…", false));
+			if (entry.detail === undefined) lines.push(truncatePlain(head, columns));
+			else lines.push(...wrapViewerValue(`${head}: `, entry.detail, columns));
 		}
 	}
 	lines.push(rule);
-	lines.push(truncateToWidth(`evidence  ${model.evidence}`, columns, "…", false));
+	lines.push(...wrapViewerValue("evidence  ", model.evidence, columns));
 	if (model.receiptPath !== null) {
-		lines.push(truncateToWidth(`receipt   ${model.receiptPath}`, columns, "…", false));
+		lines.push(truncatePlain(`receipt   ${model.receiptPath}`, columns));
 	}
 	const outcome =
 		model.outcome === null
@@ -315,7 +334,7 @@ export function renderRunView(model: RunViewModel, width: number = DEFAULT_WIDTH
 			: model.outcomeDetail === null || model.outcomeDetail.length === 0
 				? model.outcome
 				: `${model.outcome} (${sanitizeBounded(model.outcomeDetail, DETAIL_MAX_WIDTH)})`;
-	lines.push(truncateToWidth(`outcome   ${outcome}`, columns, "…", false));
+	lines.push(...wrapViewerValue("outcome   ", outcome, columns));
 	return lines;
 }
 
@@ -326,7 +345,7 @@ export function renderRunView(model: RunViewModel, width: number = DEFAULT_WIDTH
  * the first is the pane before any worker was entered, the second is a queued
  * run the operator selected before its ledger row landed.
  */
-export function renderWatchView(
+function renderWatchView(
 	runId: string | null,
 	model: RunViewModel | null,
 	width: number = DEFAULT_WIDTH,
@@ -415,7 +434,7 @@ function fleetRunsDir(): string {
  * first, then a unique prefix over the durable fleet-run records. An ambiguous
  * prefix resolves to nothing so the caller can name what it matched.
  */
-export function resolveFleetRootId(token: string): { rootId: string } | { candidates: string[] } {
+function resolveFleetRootId(token: string): { rootId: string } | { candidates: string[] } {
 	if (readFleetRun(token) !== null) return { rootId: token };
 	let entries: string[];
 	try {
@@ -488,18 +507,16 @@ export function loadFleetRunViewModel(rootId: string, options: { now?: () => num
  * The step index as lines. Pure, for the same reason {@link renderRunView} is:
  * asserting the strings is asserting what an operator sees.
  */
-export function renderFleetRunView(model: FleetRunViewModel, width: number = DEFAULT_WIDTH): string[] {
+function renderFleetRunView(model: FleetRunViewModel, width: number = DEFAULT_WIDTH): string[] {
 	const columns = Math.max(MIN_WIDTH, width);
 	const rule = "─".repeat(columns);
 	const lines: string[] = [];
-	lines.push(truncateToWidth(`fleet ${sanitizeBounded(model.fleet, 64)}  root ${model.rootId}`, columns, "…", false));
+	lines.push(truncatePlain(`fleet ${sanitizeBounded(model.fleet, 64)}  root ${model.rootId}`, columns));
 	const resumed = model.resumedFrom === null ? "" : `  resumed from ${sanitizeBounded(model.resumedFrom, 64)}`;
 	lines.push(
-		truncateToWidth(
+		truncatePlain(
 			`started ${model.startedAt}  elapsed ${formatElapsed(model.elapsedMs)}  ${model.recordedSteps} of ${model.plannedSteps} steps recorded${model.running ? "  (running)" : ""}${resumed}`,
 			columns,
-			"…",
-			false,
 		),
 	);
 	lines.push(rule);
@@ -518,7 +535,7 @@ export function renderFleetRunView(model: FleetRunViewModel, width: number = DEF
 		for (const row of rows) {
 			const head = `${row.step.padEnd(stepWidth)}  ${row.runId.padEnd(runWidth)}  ${row.outcome.padEnd(outcomeWidth)}`;
 			const text = row.tail.length === 0 ? head : `${head}  ${sanitizeBounded(row.tail, DETAIL_MAX_WIDTH)}`;
-			lines.push(truncateToWidth(text.trimEnd(), columns, "…", false));
+			lines.push(truncatePlain(text.trimEnd(), columns));
 		}
 	}
 	lines.push(rule);
@@ -620,7 +637,7 @@ function applyViewDirs(dirs: ParsedViewArgs["dirs"]): void {
  * interval, never a crash; the writer (src/interactive/watch-pane.ts) replaces
  * the file atomically.
  */
-export function readWatchSelection(path: string): string | null {
+function readWatchSelection(path: string): string | null {
 	let raw: string;
 	try {
 		raw = readFileSync(path, "utf8");

package/src/cli/fleet.ts

@@ -117,7 +117,7 @@ Notes:
   only available inside the process that owns the run.
   view is read-only and shares no memory with the orchestrator, so it follows a
   run from a second terminal or over SSH. Its transcript comes from the run
-  event journal, written when panes.journal is on (the default). Handed the
+  event journal, written when fleet.history.journal is on (the default). Handed the
   fleet-<hex> root id that run prints, it lists that run's steps instead.
   drain preserves running work. Repeat it to renew the one-hour expiry; resume
   clears it early. The expiry prevents an abandoned drain from wedging Clio.
@@ -268,7 +268,7 @@ function contractAgents(
 
 function preflightFleet(contract: FleetContract, deps: FleetPreflightDeps): string | null {
 	const targets = new Set(deps.settings.targets.map((target) => target.id));
-	const profiles = new Set(Object.keys(deps.settings.workers?.profiles ?? {}));
+	const profiles = new Set(Object.keys(deps.settings.fleet?.profiles ?? {}));
 	const checkRoute = (id: string, route: { target?: string; profile?: string }): string | null => {
 		if (route.target !== undefined && !targets.has(route.target)) {
 			return `unknown target '${route.target}' at step '${id}'`;
@@ -376,7 +376,7 @@ async function runFleet(args: ReadonlyArray<string>): Promise<number> {
 	// Install `panes.journal` the same way the interactive composition root
 	// does, so a fleet run honours the setting without the journal ever reading
 	// settings.yaml from the dispatch event path.
-	configureRunEventJournal(fleetSettings.panes.journal);
+	configureRunEventJournal(fleetSettings.fleet.history.journal);
 	const roleFacts = agentRoleFactsResolver((id) => agents.getSpec(id));
 	const preflightError = preflightFleet(contract, {
 		agents,
@@ -504,7 +504,7 @@ async function runFleet(args: ReadonlyArray<string>): Promise<number> {
 			fleetRootId,
 			dispatch,
 			agents: { getSpec: (agentId) => agents.getSpec(agentId) },
-			attributionEnabled: config?.get().attribution.gitCommits ?? true,
+			attributionEnabled: config?.get().integrations.git.commitAttribution ?? true,
 			vars,
 			...(resume !== undefined ? { resume } : {}),
 			onStepSettled(step) {
@@ -675,7 +675,7 @@ function admissionStatus(drain: CapacityDrain | null): FleetAdmissionStatus {
 	return { state: "draining", ...drain };
 }
 
-export function statusSnapshot(): {
+function statusSnapshot(): {
 	generatedAt: string;
 	admission: FleetAdmissionStatus;
 	running: Array<Record<string, unknown>>;
@@ -813,6 +813,9 @@ function runAdmissionControl(command: "drain" | "resume", args: ReadonlyArray<st
 
 export async function runFleetCommand(args: ReadonlyArray<string>): Promise<number> {
 	const sub = args[0];
+	if (sub === "view" && (args.includes("--help") || args.includes("-h"))) {
+		return (await import("./fleet-view.js")).runFleetView(args.slice(1));
+	}
 	// Asking for help is not a usage error, and it is not an argument either.
 	// `status|drain|resume --help` answered `unknown flag: --help` on stderr with
 	// status 2, `run --help` answered its usage the same way, and `list --help`

package/src/cli/interop-inspect.ts

@@ -79,10 +79,10 @@ export interface InteropInspectSnapshot {
  * have already loaded, and this command loads neither. Reporting the structural
  * zero that would result would state a fact this read did not establish.
  */
-export async function interopInspectSnapshot(now: () => number = Date.now): Promise<InteropInspectSnapshot> {
+async function interopInspectSnapshot(now: () => number = Date.now): Promise<InteropInspectSnapshot> {
 	const report = await detectInteropAgents({ cwd: process.cwd(), probeVersion: false });
 	const settings = readSettings();
-	const configured = new Set(settings.delegation.agents.map((agent) => agent.id));
+	const configured = new Set(settings.integrations.externalAgents.entries.map((agent) => agent.id));
 	const agents: InteropInspectAgent[] = [];
 	for (const record of report.agents) {
 		const kind = interopAgentKind(record.kind);

package/src/cli/models.ts

@@ -117,7 +117,7 @@ export async function runModelsCommand(args: ReadonlyArray<string>): Promise<num
 	return 0;
 }
 
-export function collectRows(entries: ReadonlyArray<TargetStatus>, providers: ProvidersContract): ModelRow[] {
+function collectRows(entries: ReadonlyArray<TargetStatus>, providers: ProvidersContract): ModelRow[] {
 	const rows: ModelRow[] = [];
 	for (const status of entries) {
 		const runtimeId = status.runtime?.id ?? status.target.runtime;
@@ -188,7 +188,7 @@ function compactTokenCount(value: number): string {
 	return String(value);
 }
 
-export function emptyModelsMessage(
+function emptyModelsMessage(
 	args: Pick<ModelArgs, "search" | "target">,
 	configuredTargets: number,
 	matchedTargets: number,
@@ -217,7 +217,7 @@ function truncateModelId(id: string): string {
 	return `${id.slice(0, MODEL_ID_WIDTH_CAP - 3)}...`;
 }
 
-export function modelTableLines(rows: ReadonlyArray<ModelRow>): string[] {
+function modelTableLines(rows: ReadonlyArray<ModelRow>): string[] {
 	const includeState = rows.some((row) => row.state && row.state !== "-");
 	const headers = includeState
 		? ["target", "runtime", "model", "state", "caps", "ctx", "max"]

package/src/cli/modes/print.ts

@@ -365,7 +365,7 @@ async function recordHeadlessMainAgentReceipt(input: {
 		staticCompositionHash: snapshot.staticCompositionHash,
 		promptSignature: snapshot.promptSignature,
 		toolSignature: snapshot.toolSignature,
-		clioVersion: readClioVersion(),
+		clioCoderVersion: readClioVersion(),
 		piMonoVersion: readPiMonoVersion(),
 		platform: process.platform,
 		nodeVersion: process.version,

package/src/cli/reset.ts

@@ -131,7 +131,7 @@ function report(label: string, path: string): void {
  * `scratch/`, and every dispatch artifact written since that sentence was
  * typed. A list nobody has to maintain cannot drift from what the removal takes.
  */
-export function rootContents(path: string): string[] {
+function rootContents(path: string): string[] {
 	let entries: Dirent[];
 	try {
 		entries = readdirSync(path, { withFileTypes: true });