@f5xc-salesdemos/xcsh 18.53.1 → 18.55.0

package/CHANGELOG.md

@@ -4,6 +4,11 @@
 
 ## [18.53.0] - 2026-05-09
 
+### Changed
+
+- Autoresearch subsystem code quality: -513 lines (18.8% reduction), ~13% faster type checking. Un-exported internal symbols, relocated types, consolidated duplicate patterns, replaced manual deep copies with `structuredClone`, replaced `while(exec)` with `matchAll`, compressed control flow, extracted shared interfaces ([#734](https://github.com/f5xc-salesdemos/xcsh/pull/734))
+## [18.53.0] - 2026-05-09
+
 ### Fixed
 
 - Replaced `xcsh --version` recommendation in `renderAboutDoc()` with authoritative intrinsic version guidance — the previous guidance misdirected to the installed binary, not the running session ([#722](https://github.com/f5xc-salesdemos/xcsh/pull/722))

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@f5xc-salesdemos/xcsh",
-	"version": "18.53.1",
+	"version": "18.55.0",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://github.com/f5xc-salesdemos/xcsh",
 	"author": "Can Boluk",
@@ -48,12 +48,12 @@
 	"dependencies": {
 		"@agentclientprotocol/sdk": "0.16.1",
 		"@mozilla/readability": "^0.6",
-		"@f5xc-salesdemos/xcsh-stats": "18.53.1",
-		"@f5xc-salesdemos/pi-agent-core": "18.53.1",
-		"@f5xc-salesdemos/pi-ai": "18.53.1",
-		"@f5xc-salesdemos/pi-natives": "18.53.1",
-		"@f5xc-salesdemos/pi-tui": "18.53.1",
-		"@f5xc-salesdemos/pi-utils": "18.53.1",
+		"@f5xc-salesdemos/xcsh-stats": "18.55.0",
+		"@f5xc-salesdemos/pi-agent-core": "18.55.0",
+		"@f5xc-salesdemos/pi-ai": "18.55.0",
+		"@f5xc-salesdemos/pi-natives": "18.55.0",
+		"@f5xc-salesdemos/pi-tui": "18.55.0",
+		"@f5xc-salesdemos/pi-utils": "18.55.0",
 		"@sinclair/typebox": "^0.34",
 		"@xterm/headless": "^6.0",
 		"ajv": "^8.18",

package/src/autoresearch/apply-contract-to-state.ts

@@ -1,24 +1 @@
-import { inferMetricUnitFromName } from "./helpers";
-import type { AutoresearchContract, ExperimentState } from "./types";
-
-/**
- * Updates session fields from a validated `autoresearch.md` parse (same fields as `init_experiment`).
- * Does not touch `name`, `currentSegment`, `results`, `bestMetric`, `confidence`, or `maxExperiments`.
- */
-export function applyAutoresearchContractToExperimentState(
-	contract: AutoresearchContract,
-	state: ExperimentState,
-): void {
-	const benchmarkContract = contract.benchmark;
-	state.metricName = benchmarkContract.primaryMetric ?? state.metricName;
-	state.metricUnit = benchmarkContract.metricUnit;
-	state.bestDirection = benchmarkContract.direction ?? "lower";
-	state.secondaryMetrics = benchmarkContract.secondaryMetrics.map(name => ({
-		name,
-		unit: inferMetricUnitFromName(name),
-	}));
-	state.benchmarkCommand = benchmarkContract.command?.trim() ?? state.benchmarkCommand;
-	state.scopePaths = [...contract.scopePaths];
-	state.offLimits = [...contract.offLimits];
-	state.constraints = [...contract.constraints];
-}
+export { applyAutoresearchContractToExperimentState } from "./contract";

package/src/autoresearch/contract.ts

@@ -1,33 +1,25 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
-import type { AutoresearchBenchmarkContract, AutoresearchContract, MetricDirection } from "./types";
-
-export interface AutoresearchContractLoadResult {
-	contract: AutoresearchContract;
-	errors: string[];
-	path: string;
-}
-
-export interface AutoresearchScriptSnapshot {
-	benchmarkScript: string;
-	benchmarkScriptPath: string;
-	checksScript: string | null;
-	checksScriptPath: string;
-	errors: string[];
-}
+import { inferMetricUnitFromName } from "./helpers";
+import type { AutoresearchContract, ExperimentState, MetricDirection } from "./types";
 
 const HEADING_REGEX = /^##\s+(.+?)\s*$/;
 const LIST_ITEM_REGEX = /^\s*[-*]\s+(.*)$/;
 const KEY_VALUE_REGEX = /^\s*[-*]\s+([^:]+):\s*(.*)$/;
 
-export function readAutoresearchContract(workDir: string): AutoresearchContractLoadResult {
+export function readAutoresearchContract(workDir: string) {
 	const contractPath = path.join(workDir, "autoresearch.md");
 	let content = "";
 	try {
 		content = fs.readFileSync(contractPath, "utf8");
 	} catch {
 		return {
-			contract: createEmptyAutoresearchContract(),
+			contract: {
+				benchmark: { command: null, primaryMetric: null, metricUnit: "", direction: null, secondaryMetrics: [] },
+				scopePaths: [],
+				offLimits: [],
+				constraints: [],
+			},
 			errors: [`${contractPath} does not exist. Create it before initializing autoresearch.`],
 			path: contractPath,
 		};
@@ -48,34 +40,24 @@ export function parseAutoresearchContract(markdown: string): AutoresearchContrac
 	};
 }
 
-export function validateAutoresearchContract(contract: AutoresearchContract): string[] {
+function validateAutoresearchContract(contract: AutoresearchContract): string[] {
 	const errors: string[] = [];
-	if (!contract.benchmark.command) {
-		errors.push("Benchmark.command is required in autoresearch.md.");
-	}
-	if (!contract.benchmark.primaryMetric) {
-		errors.push("Benchmark.primary metric is required in autoresearch.md.");
-	}
-	if (!contract.benchmark.direction) {
+	if (!contract.benchmark.command) errors.push("Benchmark.command is required in autoresearch.md.");
+	if (!contract.benchmark.primaryMetric) errors.push("Benchmark.primary metric is required in autoresearch.md.");
+	if (!contract.benchmark.direction)
 		errors.push("Benchmark.direction must be `lower` or `higher` in autoresearch.md.");
-	}
-	if (contract.scopePaths.length === 0) {
+	if (contract.scopePaths.length === 0)
 		errors.push("Files in Scope must contain at least one path in autoresearch.md.");
+	for (const p of contract.scopePaths) {
+		if (isUnsafeContractPathSpec(p)) errors.push(`Files in Scope contains an invalid path: ${p}`);
 	}
-	for (const scopePath of contract.scopePaths) {
-		if (isUnsafeContractPathSpec(scopePath)) {
-			errors.push(`Files in Scope contains an invalid path: ${scopePath}`);
-		}
-	}
-	for (const offLimitsPath of contract.offLimits) {
-		if (isUnsafeContractPathSpec(offLimitsPath)) {
-			errors.push(`Off Limits contains an invalid path: ${offLimitsPath}`);
-		}
+	for (const p of contract.offLimits) {
+		if (isUnsafeContractPathSpec(p)) errors.push(`Off Limits contains an invalid path: ${p}`);
 	}
 	return errors;
 }
 
-export function loadAutoresearchScriptSnapshot(workDir: string): AutoresearchScriptSnapshot {
+export function loadAutoresearchScriptSnapshot(workDir: string) {
 	const benchmarkScriptPath = path.join(workDir, "autoresearch.sh");
 	const checksScriptPath = path.join(workDir, "autoresearch.checks.sh");
 	const errors: string[] = [];
@@ -104,16 +86,7 @@ export function loadAutoresearchScriptSnapshot(workDir: string): AutoresearchScr
 }
 
 export function normalizeAutoresearchList(values: readonly string[]): string[] {
-	const normalized: string[] = [];
-	const seen = new Set<string>();
-	for (const value of values) {
-		const trimmed = value.trim();
-		if (trimmed.length === 0) continue;
-		if (seen.has(trimmed)) continue;
-		seen.add(trimmed);
-		normalized.push(trimmed);
-	}
-	return normalized;
+	return [...new Set(values.map(v => v.trim()).filter(Boolean))];
 }
 
 export function normalizeContractPathSpec(value: string): string {
@@ -130,34 +103,16 @@ export function pathMatchesContractPath(pathValue: string, specValue: string): b
 }
 
 export function contractListsEqual(left: readonly string[], right: readonly string[]): boolean {
-	const normalizedLeft = normalizeAutoresearchList(left);
-	const normalizedRight = normalizeAutoresearchList(right);
-	if (normalizedLeft.length !== normalizedRight.length) return false;
-	return normalizedLeft.every((value, index) => value === normalizedRight[index]);
+	return arraysEqual(normalizeAutoresearchList(left), normalizeAutoresearchList(right));
 }
 
 export function contractPathListsEqual(left: readonly string[], right: readonly string[]): boolean {
-	const normalizedLeft = normalizeContractPathList(left);
-	const normalizedRight = normalizeContractPathList(right);
-	if (normalizedLeft.length !== normalizedRight.length) return false;
-	return normalizedLeft.every((value, index) => value === normalizedRight[index]);
+	return arraysEqual(normalizeContractPathList(left), normalizeContractPathList(right));
 }
 
-function createEmptyAutoresearchContract(): AutoresearchContract {
-	return {
-		benchmark: {
-			command: null,
-			primaryMetric: null,
-			metricUnit: "",
-			direction: null,
-			secondaryMetrics: [],
-		},
-		scopePaths: [],
-		offLimits: [],
-		constraints: [],
-	};
+function arraysEqual(a: string[], b: string[]): boolean {
+	return a.length === b.length && a.every((v, i) => v === b[i]);
 }
-
 function normalizeContractPathList(values: readonly string[]): string[] {
 	return normalizeAutoresearchList(values.map(normalizeContractPathSpec)).sort((left, right) =>
 		left.localeCompare(right),
@@ -166,39 +121,30 @@ function normalizeContractPathList(values: readonly string[]): string[] {
 
 function extractSections(markdown: string): Map<string, string> {
 	const sections = new Map<string, string>();
-	const lines = markdown.split("\n");
-	let currentHeading: string | null = null;
-	let currentLines: string[] = [];
-
-	for (const line of lines) {
-		const headingMatch = line.match(HEADING_REGEX);
-		if (headingMatch) {
-			if (currentHeading) {
-				sections.set(currentHeading, currentLines.join("\n").trim());
-			}
-			currentHeading = headingMatch[1]?.trim().toLowerCase() ?? null;
-			currentLines = [];
-			continue;
-		}
-		if (currentHeading) {
-			currentLines.push(line);
+	let heading: string | null = null;
+	let content: string[] = [];
+	for (const line of markdown.split("\n")) {
+		const match = line.match(HEADING_REGEX);
+		if (match) {
+			if (heading) sections.set(heading, content.join("\n").trim());
+			heading = match[1]?.trim().toLowerCase() ?? null;
+			content = [];
+		} else if (heading) {
+			content.push(line);
 		}
 	}
-
-	if (currentHeading) {
-		sections.set(currentHeading, currentLines.join("\n").trim());
-	}
+	if (heading) sections.set(heading, content.join("\n").trim());
 	return sections;
 }
 
-function parseBenchmarkSection(section: string): AutoresearchBenchmarkContract {
+function parseBenchmarkSection(section: string): AutoresearchContract["benchmark"] {
 	const entries = new Map<string, string>();
 	const lines = section.split("\n");
 	for (let index = 0; index < lines.length; index += 1) {
 		const rawLine = lines[index] ?? "";
 		const match = rawLine.match(KEY_VALUE_REGEX);
 		if (!match) continue;
-		const key = normalizeKey(match[1] ?? "");
+		const key = (match[1] ?? "").toLowerCase().replace(/[^a-z0-9]+/g, "");
 		let value = (match[2] ?? "").trim();
 		if (key === "secondarymetrics") {
 			const nestedItems: string[] = [];
@@ -206,27 +152,33 @@ function parseBenchmarkSection(section: string): AutoresearchBenchmarkContract {
 				const nestedLine = lines[nestedIndex] ?? "";
 				if (nestedLine.match(KEY_VALUE_REGEX)) break;
 				const nestedMatch = nestedLine.match(/^\s{2,}[-*]\s+(.*)$/);
-				if (!nestedMatch) {
-					if (nestedLine.trim().length > 0) break;
-					continue;
-				}
+				if (!nestedMatch && nestedLine.trim().length > 0) break;
+				if (!nestedMatch) continue;
 				nestedItems.push((nestedMatch[1] ?? "").trim());
 				index = nestedIndex;
 			}
-			if (nestedItems.length > 0) {
-				value = [value, ...nestedItems].filter(Boolean).join(", ");
-			}
+			if (nestedItems.length > 0) value = [value, ...nestedItems].filter(Boolean).join(", ");
 		}
 		entries.set(key, value);
 	}
 
-	const direction = parseDirection(entries.get("direction"));
+	const directionRaw = entries.get("direction");
+	const direction: MetricDirection | null =
+		directionRaw === "lower" || directionRaw === "higher" ? directionRaw : null;
 	return {
-		command: readNullableEntry(entries.get("command")),
-		primaryMetric: readNullableEntry(entries.get("primarymetric")),
+		command: entries.get("command")?.trim() || null,
+		primaryMetric: entries.get("primarymetric")?.trim() || null,
 		metricUnit: entries.get("metricunit")?.trim() ?? "",
 		direction,
-		secondaryMetrics: parseSecondaryMetrics(entries.get("secondarymetrics")),
+		secondaryMetrics: entries.get("secondarymetrics")
+			? normalizeAutoresearchList(
+					entries
+						.get("secondarymetrics")!
+						.split(",")
+						.map(e => e.trim())
+						.filter(Boolean),
+				)
+			: [],
 	};
 }
 
@@ -252,37 +204,32 @@ function parseListSection(section: string, normalizeItem?: (value: string) => st
 		}
 		items.push(line.trim());
 	}
-	if (activeItem) {
-		items.push(activeItem);
-	}
+	if (activeItem) items.push(activeItem);
 	const normalizedItems = normalizeAutoresearchList(items);
 	return normalizeItem ? normalizedItems.map(normalizeItem) : normalizedItems;
 }
-
-function normalizeKey(value: string): string {
-	return value.toLowerCase().replace(/[^a-z0-9]+/g, "");
-}
-
-function parseDirection(value: string | undefined): MetricDirection | null {
-	if (value === "lower" || value === "higher") return value;
-	return null;
-}
-
-function readNullableEntry(value: string | undefined): string | null {
-	const trimmed = value?.trim() ?? "";
-	return trimmed.length > 0 ? trimmed : null;
-}
-
-function parseSecondaryMetrics(value: string | undefined): string[] {
-	if (!value) return [];
-	return normalizeAutoresearchList(
-		value
-			.split(",")
-			.map(entry => entry.trim())
-			.filter(Boolean),
-	);
-}
-
 function isUnsafeContractPathSpec(value: string): boolean {
 	return path.posix.isAbsolute(value) || value === ".." || value.startsWith("../");
 }
+
+/**
+ * Updates session fields from a validated `autoresearch.md` parse (same fields as `init_experiment`).
+ * Does not touch `name`, `currentSegment`, `results`, `bestMetric`, `confidence`, or `maxExperiments`.
+ */
+export function applyAutoresearchContractToExperimentState(
+	contract: AutoresearchContract,
+	state: ExperimentState,
+): void {
+	const benchmarkContract = contract.benchmark;
+	state.metricName = benchmarkContract.primaryMetric ?? state.metricName;
+	state.metricUnit = benchmarkContract.metricUnit;
+	state.bestDirection = benchmarkContract.direction ?? "lower";
+	state.secondaryMetrics = benchmarkContract.secondaryMetrics.map(name => ({
+		name,
+		unit: inferMetricUnitFromName(name),
+	}));
+	state.benchmarkCommand = benchmarkContract.command?.trim() ?? state.benchmarkCommand;
+	state.scopePaths = [...contract.scopePaths];
+	state.offLimits = [...contract.offLimits];
+	state.constraints = [...contract.constraints];
+}

package/src/autoresearch/dashboard.ts

@@ -24,9 +24,7 @@ export function createDashboardController(): DashboardController {
 	return {
 		clear(ctx): void {
 			clear();
-			if (ctx.hasUI) {
-				ctx.ui.setWidget("autoresearch", undefined);
-			}
+			if (ctx.hasUI) ctx.ui.setWidget("autoresearch", undefined);
 		},
 		requestRender,
 		updateWidget(ctx, runtime): void {
@@ -38,9 +36,8 @@ export function createDashboardController(): DashboardController {
 			}
 
 			ctx.ui.setWidget("autoresearch", (_tui, theme) => {
-				if (state.results.length === 0 && runtime.runningExperiment) {
+				if (state.results.length === 0 && runtime.runningExperiment)
 					return new Text(renderRunningOnly(runtime, state, theme), 0, 0);
-				}
 				if (runtime.dashboardExpanded) {
 					const width = process.stdout.columns ?? 120;
 					const lines = [
@@ -70,9 +67,8 @@ export function createDashboardController(): DashboardController {
 							const terminalRows = process.stdout.rows ?? 40;
 							const header = renderExpandedHeader(runtime, width, theme);
 							const body = renderDashboardLines(runtime, width, theme, 0);
-							if (runtime.runningExperiment) {
+							if (runtime.runningExperiment)
 								body.push(renderOverlayRunningLine(runtime, theme, width, spinnerFrame));
-							}
 							const viewportRows = Math.max(4, terminalRows - 4);
 							const maxScroll = Math.max(0, body.length - viewportRows);
 							if (scrollOffset > maxScroll) scrollOffset = maxScroll;
@@ -124,12 +120,8 @@ export function createDashboardController(): DashboardController {
 
 function renderRunningOnly(runtime: AutoresearchRuntime, state: ExperimentState, theme: Theme): string {
 	const parts = [theme.fg("contentAccent", "autoresearch"), theme.fg("warning", " running...")];
-	if (state.name) {
-		parts.push(theme.fg("dim", ` | ${replaceTabs(state.name)}`));
-	}
-	if (runtime.runningExperiment) {
-		parts.push(theme.fg("dim", ` | ${replaceTabs(runtime.runningExperiment.command)}`));
-	}
+	if (state.name) parts.push(theme.fg("dim", ` | ${replaceTabs(state.name)}`));
+	if (runtime.runningExperiment) parts.push(theme.fg("dim", ` | ${replaceTabs(runtime.runningExperiment.command)}`));
 	return parts.join("");
 }
 
@@ -170,20 +162,14 @@ function renderCollapsedLine(runtime: AutoresearchRuntime, state: ExperimentStat
 			);
 		}
 		parts.push(theme.fg("warning", " | log_experiment required"));
-		if (!runtime.autoresearchMode) {
-			parts.push(theme.fg("dim", " | mode off"));
-		}
+		if (!runtime.autoresearchMode) parts.push(theme.fg("dim", " | mode off"));
 		return parts.join("");
 	}
 	if (state.results.length === 0) {
 		const modeStatus = runtime.autoresearchMode ? "baseline pending" : "mode off";
 		const parts = [theme.fg("contentAccent", "autoresearch"), theme.fg("warning", ` ${modeStatus}`)];
-		if (state.name) {
-			parts.push(theme.fg("dim", ` | ${replaceTabs(state.name)}`));
-		}
-		if (runtime.autoresearchMode) {
-			parts.push(theme.fg("dim", " | run the baseline"));
-		}
+		if (state.name) parts.push(theme.fg("dim", ` | ${replaceTabs(state.name)}`));
+		if (runtime.autoresearchMode) parts.push(theme.fg("dim", " | run the baseline"));
 		return parts.join("");
 	}
 	const current = currentResults(state.results, state.currentSegment);
@@ -223,12 +209,7 @@ function renderCollapsedLine(runtime: AutoresearchRuntime, state: ExperimentStat
 	return parts.join("");
 }
 
-export function renderDashboardLines(
-	runtime: AutoresearchRuntime,
-	width: number,
-	theme: Theme,
-	maxRows: number,
-): string[] {
+function renderDashboardLines(runtime: AutoresearchRuntime, width: number, theme: Theme, maxRows: number): string[] {
 	const state = runtime.state;
 	if (state.results.length === 0) {
 		if (runtime.lastRunSummary) {
@@ -240,9 +221,7 @@ export function renderDashboardLines(
 				),
 				truncateToWidth("Next action: finish log_experiment before starting another run.", width),
 			];
-			if (!runtime.autoresearchMode) {
-				lines.push(truncateToWidth("Mode: off", width));
-			}
+			if (!runtime.autoresearchMode) lines.push(truncateToWidth("Mode: off", width));
 			return lines;
 		}
 		if (runtime.autoresearchMode) {
@@ -287,20 +266,13 @@ export function renderDashboardLines(
 			),
 		);
 	}
-	if (!runtime.autoresearchMode) {
-		lines.push(truncateToWidth(`Mode: ${renderModeStatus(runtime, state)}`, width));
-	}
+	if (!runtime.autoresearchMode) lines.push(truncateToWidth(`Mode: ${renderModeStatus(runtime, state)}`, width));
 	if (best) {
 		const bestRunNumber = best.result.runNumber ?? best.index + 1;
 		let progress = `Best: ${formatNum(best.result.metric, state.metricUnit)} (#${bestRunNumber})`;
-		if (baseline !== null && baseline !== 0 && best.result.metric !== baseline) {
-			const delta = ((best.result.metric - baseline) / baseline) * 100;
-			const sign = delta > 0 ? "+" : "";
-			progress += ` ${sign}${delta.toFixed(1)}%`;
-		}
-		if (state.confidence !== null) {
-			progress += `  conf ${state.confidence.toFixed(1)}x`;
-		}
+		if (baseline !== null && baseline !== 0 && best.result.metric !== baseline)
+			progress += ` ${formatDelta(best.result.metric, baseline)}`;
+		if (state.confidence !== null) progress += `  conf ${state.confidence.toFixed(1)}x`;
 		lines.push(truncateToWidth(progress, width));
 		if (state.secondaryMetrics.length > 0) {
 			const details = state.secondaryMetrics
@@ -313,9 +285,7 @@ export function renderDashboardLines(
 					),
 				)
 				.filter((value): value is string => Boolean(value));
-			if (details.length > 0) {
-				lines.push(truncateToWidth(`Secondary: ${details.join("  ")}`, width));
-			}
+			if (details.length > 0) lines.push(truncateToWidth(`Secondary: ${details.join("  ")}`, width));
 		}
 	}
 	lines.push("");
@@ -323,9 +293,8 @@ export function renderDashboardLines(
 	lines.push(theme.fg("borderMuted", "-".repeat(Math.max(0, width - 1))));
 
 	const visible = maxRows > 0 ? current.slice(-maxRows) : current;
-	if (visible.length < current.length) {
+	if (visible.length < current.length)
 		lines.push(theme.fg("dim", `... ${current.length - visible.length} earlier runs hidden ...`));
-	}
 	for (const result of visible) {
 		lines.push(renderResultRow(result, state, baselineSecondary, width, theme));
 	}
@@ -358,12 +327,12 @@ function renderResultRow(
 		.join("");
 	const statusColor = result.status === "keep" ? "success" : result.status === "discard" ? "warning" : "error";
 	const line =
-		`${theme.fg("dim", String(runNumber).padEnd(4))}` +
-		`${theme.fg("contentAccent", (result.commit || "-").padEnd(10))}` +
-		`${theme.fg(statusColor, formatNum(result.metric, state.metricUnit).padEnd(12))}` +
-		`${secondary}` +
-		`${theme.fg(statusColor, result.status.padEnd(14))}` +
-		`${theme.fg("muted", replaceTabs(result.description))}`;
+		theme.fg("dim", String(runNumber).padEnd(4)) +
+		theme.fg("contentAccent", (result.commit || "-").padEnd(10)) +
+		theme.fg(statusColor, formatNum(result.metric, state.metricUnit).padEnd(12)) +
+		secondary +
+		theme.fg(statusColor, result.status.padEnd(14)) +
+		theme.fg("muted", replaceTabs(result.description));
 	return truncateToWidth(line, width);
 }
 
@@ -371,9 +340,7 @@ function renderSecondaryCell(value: number | undefined, unit: string, baseline:
 	if (value === undefined) return "-";
 	const formatted = formatNum(value, unit);
 	if (baseline === undefined || baseline === 0 || baseline === value) return formatted;
-	const delta = ((value - baseline) / baseline) * 100;
-	const sign = delta > 0 ? "+" : "";
-	return `${formatted} ${sign}${delta.toFixed(1)}%`;
+	return `${formatted} ${formatDelta(value, baseline)}`;
 }
 
 function renderSecondarySummary(
@@ -383,12 +350,12 @@ function renderSecondarySummary(
 	unit: string,
 ): string | null {
 	if (value === undefined) return null;
-	if (baseline === undefined || baseline === 0 || baseline === value) {
-		return `${name} ${formatNum(value, unit)}`;
-	}
+	return `${name} ${renderSecondaryCell(value, unit, baseline)}`;
+}
+
+function formatDelta(value: number, baseline: number): string {
 	const delta = ((value - baseline) / baseline) * 100;
-	const sign = delta > 0 ? "+" : "";
-	return `${name} ${formatNum(value, unit)} ${sign}${delta.toFixed(1)}%`;
+	return `${delta > 0 ? "+" : ""}${delta.toFixed(1)}%`;
 }
 
 function renderOverlayRunningLine(
@@ -426,13 +393,9 @@ function renderOverlayFooter(
 }
 
 function renderModeStatus(runtime: AutoresearchRuntime, state: ExperimentState): string {
-	if (runtime.autoresearchMode) {
-		return state.results.length === 0 ? "baseline pending" : "mode on";
-	}
+	if (runtime.autoresearchMode) return state.results.length === 0 ? "baseline pending" : "mode on";
 	const current = currentResults(state.results, state.currentSegment);
-	if (state.maxExperiments !== null && current.length >= state.maxExperiments) {
-		return "segment complete";
-	}
+	if (state.maxExperiments !== null && current.length >= state.maxExperiments) return "segment complete";
 	return "mode off";
 }
 
@@ -441,9 +404,7 @@ function findBestResult(state: ExperimentState): { index: number; result: Experi
 	for (let index = 0; index < state.results.length; index += 1) {
 		const result = state.results[index];
 		if (result.segment !== state.currentSegment || result.status !== "keep" || result.metric <= 0) continue;
-		if (!best || isBetter(result.metric, best.result.metric, state.bestDirection)) {
-			best = { index, result };
-		}
+		if (!best || isBetter(result.metric, best.result.metric, state.bestDirection)) best = { index, result };
 	}
 	return best;
 }