@f5xc-salesdemos/xcsh 14.4.0 → 14.5.0

package/package.json

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

package/src/autoresearch/dashboard.ts

@@ -123,7 +123,7 @@ export function createDashboardController(): DashboardController {
 }
 
 function renderRunningOnly(runtime: AutoresearchRuntime, state: ExperimentState, theme: Theme): string {
-	const parts = [theme.fg("accent", "autoresearch"), theme.fg("warning", " running...")];
+	const parts = [theme.fg("contentAccent", "autoresearch"), theme.fg("warning", " running...")];
 	if (state.name) {
 		parts.push(theme.fg("dim", ` | ${replaceTabs(state.name)}`));
 	}
@@ -148,13 +148,16 @@ function renderExpandedHeader(runtime: AutoresearchRuntime, width: number, theme
 	const label = state.name ? ` autoresearch: ${replaceTabs(state.name)} ` : " autoresearch ";
 	const hint = theme.fg("dim", ` ctrl+x collapse  ctrl+shift+x overlay${status ? `  ${status}` : ""} `);
 	const fillWidth = Math.max(0, width - visibleWidth(label) - visibleWidth(hint));
-	return truncateToWidth(theme.fg("accent", label) + theme.fg("borderMuted", "-".repeat(fillWidth)) + hint, width);
+	return truncateToWidth(
+		theme.fg("contentAccent", label) + theme.fg("borderMuted", "-".repeat(fillWidth)) + hint,
+		width,
+	);
 }
 
 function renderCollapsedLine(runtime: AutoresearchRuntime, state: ExperimentState, theme: Theme): string {
 	if (runtime.lastRunSummary) {
 		const parts = [
-			theme.fg("accent", "autoresearch"),
+			theme.fg("contentAccent", "autoresearch"),
 			theme.fg("warning", ` pending run #${runtime.lastRunSummary.runNumber}`),
 			theme.fg("dim", runtime.lastRunSummary.passed ? " pass" : " fail"),
 		];
@@ -174,7 +177,7 @@ function renderCollapsedLine(runtime: AutoresearchRuntime, state: ExperimentStat
 	}
 	if (state.results.length === 0) {
 		const modeStatus = runtime.autoresearchMode ? "baseline pending" : "mode off";
-		const parts = [theme.fg("accent", "autoresearch"), theme.fg("warning", ` ${modeStatus}`)];
+		const parts = [theme.fg("contentAccent", "autoresearch"), theme.fg("warning", ` ${modeStatus}`)];
 		if (state.name) {
 			parts.push(theme.fg("dim", ` | ${replaceTabs(state.name)}`));
 		}
@@ -190,7 +193,7 @@ function renderCollapsedLine(runtime: AutoresearchRuntime, state: ExperimentStat
 	const best = findBestResult(state);
 	const archivedRuns = Math.max(0, state.results.length - current.length);
 	const parts = [
-		theme.fg("accent", "autoresearch"),
+		theme.fg("contentAccent", "autoresearch"),
 		theme.fg("muted", ` ${current.length} runs`),
 		theme.fg("success", ` ${kept} kept`),
 	];
@@ -356,7 +359,7 @@ function renderResultRow(
 	const statusColor = result.status === "keep" ? "success" : result.status === "discard" ? "warning" : "error";
 	const line =
 		`${theme.fg("dim", String(runNumber).padEnd(4))}` +
-		`${theme.fg("accent", (result.commit || "-").padEnd(10))}` +
+		`${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))}` +

package/src/autoresearch/tools/init-experiment.ts

@@ -381,7 +381,7 @@ export function createInitExperimentTool(
 }
 
 function renderInitCall(name: string, theme: Theme): string {
-	return `${theme.fg("toolTitle", theme.bold("init_experiment"))} ${theme.fg("accent", truncateToWidth(replaceTabs(name), 100))}`;
+	return `${theme.fg("toolTitle", theme.bold("init_experiment"))} ${theme.fg("contentAccent", truncateToWidth(replaceTabs(name), 100))}`;
 }
 
 function collectLoggedRunNumbers(results: ExperimentState["results"]): Set<number> {

package/src/autoresearch/tools/log-experiment.ts

@@ -767,7 +767,7 @@ function renderSummary(details: LogDetails, theme: Theme): string {
 	const { experiment, state } = details;
 	const color = experiment.status === "keep" ? "success" : experiment.status === "discard" ? "warning" : "error";
 	let summary = `${theme.fg(color, experiment.status.toUpperCase())} ${theme.fg("muted", truncateToWidth(replaceTabs(experiment.description), 100))}`;
-	summary += ` ${theme.fg("accent", `${state.metricName}=${formatNum(experiment.metric, state.metricUnit)}`)}`;
+	summary += ` ${theme.fg("contentAccent", `${state.metricName}=${formatNum(experiment.metric, state.metricUnit)}`)}`;
 	if (state.bestMetric !== null) {
 		summary += ` ${theme.fg("dim", `baseline ${formatNum(state.bestMetric, state.metricUnit)}`)}`;
 	}

package/src/config/model-registry.ts

@@ -50,7 +50,7 @@ export interface ModelRoleInfo {
 export const MODEL_ROLES: Record<ModelRole, ModelRoleInfo> = {
 	default: { tag: "DEFAULT", name: "Default", color: "success" },
 	smol: { tag: "SMOL", name: "Fast", color: "warning" },
-	slow: { tag: "SLOW", name: "Thinking", color: "accent" },
+	slow: { tag: "SLOW", name: "Thinking", color: "contentAccent" },
 	vision: { tag: "VISION", name: "Vision", color: "error" },
 	plan: { tag: "PLAN", name: "Architect", color: "muted" },
 	commit: { tag: "COMMIT", name: "Commit", color: "dim" },

package/src/config/settings-schema.ts

@@ -55,6 +55,7 @@ export const TAB_METADATA: Record<SettingTab, { label: string; icon: `tab.${stri
 
 /** Status line segment identifiers */
 export type StatusLineSegmentId =
+	| "os_icon"
 	| "pi"
 	| "model"
 	| "plan_mode"
@@ -278,7 +279,7 @@ export const SETTINGS_SCHEMA = {
 	// Status line
 	"statusLine.preset": {
 		type: "enum",
-		values: ["default", "minimal", "compact", "full", "nerd", "ascii", "custom"] as const,
+		values: ["default", "minimal", "compact", "full", "nerd", "ascii", "xcsh", "custom"] as const,
 		default: "default",
 		ui: {
 			tab: "appearance",
@@ -647,6 +648,16 @@ export const SETTINGS_SCHEMA = {
 		},
 	},
 
+	"startup.clearScreen": {
+		type: "boolean",
+		default: false,
+		ui: {
+			tab: "interaction",
+			label: "Clear Screen on Startup",
+			description: "Clear the terminal screen when xcsh starts",
+		},
+	},
+
 	"startup.checkUpdate": {
 		type: "boolean",
 		default: true,

package/src/debug/index.ts

@@ -54,7 +54,7 @@ export class DebugSelectorComponent extends Container {
 
 		// Title
 		this.addChild(new DynamicBorder());
-		this.addChild(new Text(theme.bold(theme.fg("accent", "Debug Tools")), 1, 0));
+		this.addChild(new Text(theme.bold(theme.fg("contentAccent", "Debug Tools")), 1, 0));
 		this.addChild(new Spacer(1));
 
 		// Select list
@@ -121,7 +121,9 @@ export class DebugSelectorComponent extends Container {
 
 		// Show message and wait for keypress
 		this.ctx.chatContainer.addChild(new Spacer(1));
-		this.ctx.chatContainer.addChild(new Text(theme.fg("accent", `${theme.status.info} CPU profiling started`), 1, 0));
+		this.ctx.chatContainer.addChild(
+			new Text(theme.fg("contentAccent", `${theme.status.info} CPU profiling started`), 1, 0),
+		);
 		this.ctx.chatContainer.addChild(new Spacer(1));
 		this.ctx.chatContainer.addChild(
 			new Text(theme.fg("muted", "Reproduce the performance issue, then press Enter to stop profiling."), 1, 0),
@@ -150,7 +152,7 @@ export class DebugSelectorComponent extends Container {
 		// Stop profiling and create report
 		const loader = new Loader(
 			this.ctx.ui,
-			spinner => theme.fg("accent", spinner),
+			spinner => theme.fg("spinnerAccent", spinner),
 			text => theme.fg("muted", text),
 			"Generating report...",
 			getSymbolTheme().spinnerFrames,
@@ -215,7 +217,7 @@ export class DebugSelectorComponent extends Container {
 	async #handleDumpReport(): Promise<void> {
 		const loader = new Loader(
 			this.ctx.ui,
-			spinner => theme.fg("accent", spinner),
+			spinner => theme.fg("spinnerAccent", spinner),
 			text => theme.fg("muted", text),
 			"Creating report bundle...",
 			getSymbolTheme().spinnerFrames,
@@ -250,7 +252,7 @@ export class DebugSelectorComponent extends Container {
 	async #handleMemoryReport(): Promise<void> {
 		const loader = new Loader(
 			this.ctx.ui,
-			spinner => theme.fg("accent", spinner),
+			spinner => theme.fg("spinnerAccent", spinner),
 			text => theme.fg("muted", text),
 			"Generating heap snapshot...",
 			getSymbolTheme().spinnerFrames,
@@ -386,7 +388,7 @@ export class DebugSelectorComponent extends Container {
 		// Clear cache
 		const loader = new Loader(
 			this.ctx.ui,
-			spinner => theme.fg("accent", spinner),
+			spinner => theme.fg("spinnerAccent", spinner),
 			text => theme.fg("muted", text),
 			"Clearing artifact cache...",
 			getSymbolTheme().spinnerFrames,

package/src/debug/log-viewer.ts

@@ -634,7 +634,7 @@ export class DebugLogViewerComponent implements Component {
 
 	#filterText(): string {
 		const sanitized = replaceTabs(sanitizeText(this.#model.filterQuery));
-		const query = sanitized.length === 0 ? "" : theme.fg("accent", sanitized);
+		const query = sanitized.length === 0 ? "" : theme.fg("contentAccent", sanitized);
 		const pidStatus = this.#model.isProcessFilterEnabled()
 			? theme.fg("success", "pid:on")
 			: theme.fg("muted", "pid:off");
@@ -740,7 +740,7 @@ export class DebugLogViewerComponent implements Component {
 
 			if (row.kind === "load-older") {
 				const active = this.#model.cursorRowIndex === rowIndex;
-				const marker = active ? theme.fg("accent", "❯") : " ";
+				const marker = active ? theme.fg("chromeAccent", "❯") : " ";
 				const prefix = `${marker}  `;
 				const contentWidth = Math.max(1, innerWidth - visibleWidth(prefix));
 				const label = truncateToWidth(LOAD_OLDER_LABEL, contentWidth);
@@ -756,8 +756,8 @@ export class DebugLogViewerComponent implements Component {
 			const cursorLogIndex = this.#model.cursorLogIndex;
 			const active = cursorLogIndex !== undefined && cursorLogIndex === logIndex;
 			const expanded = this.#model.isExpanded(logIndex);
-			const marker = active ? theme.fg("accent", "❯") : selected ? theme.fg("accent", "•") : " ";
-			const fold = expanded ? theme.fg("accent", "▾") : theme.fg("muted", "▸");
+			const marker = active ? theme.fg("chromeAccent", "❯") : selected ? theme.fg("chromeAccent", "•") : " ";
+			const fold = expanded ? theme.fg("contentAccent", "▾") : theme.fg("muted", "▸");
 			const prefix = `${marker}${fold} `;
 			const contentWidth = Math.max(1, innerWidth - visibleWidth(prefix));
 

package/src/edit/renderer.ts

@@ -128,14 +128,14 @@ function formatEditPathDisplay(
 	uiTheme: Theme,
 	options?: { rename?: string; firstChangedLine?: number },
 ): string {
-	let pathDisplay = rawPath ? uiTheme.fg("accent", shortenPath(rawPath)) : uiTheme.fg("toolOutput", "…");
+	let pathDisplay = rawPath ? uiTheme.fg("contentAccent", shortenPath(rawPath)) : uiTheme.fg("toolOutput", "…");
 
 	if (options?.firstChangedLine) {
 		pathDisplay += uiTheme.fg("warning", `:${options.firstChangedLine}`);
 	}
 
 	if (options?.rename) {
-		pathDisplay += ` ${uiTheme.fg("dim", "→")} ${uiTheme.fg("accent", shortenPath(options.rename))}`;
+		pathDisplay += ` ${uiTheme.fg("dim", "→")} ${uiTheme.fg("contentAccent", shortenPath(options.rename))}`;
 	}
 
 	return pathDisplay;

package/src/exa/render.ts

@@ -164,7 +164,7 @@ export function renderExaResult(
 		const domain = res.url ? getDomain(res.url) : "";
 		const domainPart = domain ? uiTheme.fg("dim", ` (${domain})`) : "";
 
-		text += `\n ${uiTheme.fg("dim", branch)} ${uiTheme.fg("accent", title)}${domainPart}`;
+		text += `\n ${uiTheme.fg("dim", branch)} ${uiTheme.fg("contentAccent", title)}${domainPart}`;
 
 		if (res.url) {
 			text += `\n ${uiTheme.fg("dim", cont)} ${uiTheme.fg("dim", uiTheme.tree.hook)} ${uiTheme.fg(
@@ -206,7 +206,7 @@ export function renderExaResult(
 
 		if (res.highlights?.length) {
 			text += `\n ${uiTheme.fg("dim", cont)} ${uiTheme.fg("dim", uiTheme.tree.hook)} ${uiTheme.fg(
-				"accent",
+				"contentAccent",
 				"Highlights",
 			)}`;
 			const maxHighlights = Math.min(res.highlights.length, 3);
@@ -235,7 +235,7 @@ export function renderExaCall(args: Record<string, unknown>, toolName: string, u
 	const query = typeof args.query === "string" ? truncateToWidth(args.query, 80) : "?";
 	const numResults = typeof args.num_results === "number" ? args.num_results : undefined;
 
-	let text = `${uiTheme.fg("toolTitle", toolLabel)} ${uiTheme.fg("accent", query)}`;
+	let text = `${uiTheme.fg("toolTitle", toolLabel)} ${uiTheme.fg("contentAccent", query)}`;
 	if (numResults !== undefined) {
 		text += ` ${uiTheme.fg("muted", `results:${numResults}`)}`;
 	}

package/src/exec/bash-executor.ts

@@ -34,6 +34,8 @@ export interface BashResult {
 	outputLines: number;
 	outputBytes: number;
 	artifactId?: string;
+	/** Actual working directory after the command ran (persistent shell only). */
+	newCwd?: string;
 }
 
 const HARD_TIMEOUT_GRACE_MS = 5_000;
@@ -62,7 +64,11 @@ export async function executeBash(command: string, options?: BashExecutorOptions
 
 	// Apply command prefix if configured
 	const prefixedCommand = prefix ? `${prefix} ${command}` : command;
-	const finalCommand = prefixedCommand;
+
+	// CWD capture sentinels — used to detect directory changes from cd commands.
+	// Only appended for persistent shell sessions (one-shot shells don't persist CWD).
+	const CWD_SENTINEL_START = "__XCSH_CWD__:";
+	const CWD_SENTINEL_END = ":__XCSH_CWD_END__";
 
 	// Create output sink for truncation and artifact handling
 	const sink = new OutputSink({
@@ -100,6 +106,11 @@ export async function executeBash(command: string, options?: BashExecutorOptions
 		shellSession = new Shell({ sessionEnv: shellEnv, snapshotPath: snapshotPath ?? undefined });
 		shellSessions.set(sessionKey, shellSession);
 	}
+
+	// Append CWD sentinel only for persistent shell sessions
+	const finalCommand = shellSession
+		? `${prefixedCommand}\nprintf '${CWD_SENTINEL_START}%s${CWD_SENTINEL_END}\\n' "$PWD"`
+		: prefixedCommand;
 	const userSignal = options?.signal;
 	const runAbortController = new AbortController();
 	const abortCurrentExecution = () => {
@@ -204,11 +215,35 @@ export async function executeBash(command: string, options?: BashExecutorOptions
 			};
 		}
 
+		// Parse CWD sentinel from output, strip it from the displayed result.
+		const dumpResult = await sink.dump();
+		let newCwd: string | undefined;
+		if (shellSession) {
+			const sentinelIdx = dumpResult.output.lastIndexOf(CWD_SENTINEL_START);
+			if (sentinelIdx !== -1) {
+				const endIdx = dumpResult.output.indexOf(CWD_SENTINEL_END, sentinelIdx);
+				if (endIdx !== -1) {
+					const captured = dumpResult.output.slice(sentinelIdx + CWD_SENTINEL_START.length, endIdx).trim();
+					if (captured) newCwd = captured;
+					// Strip the sentinel from displayed output (from sentinel start to end of its line)
+					const afterLine = dumpResult.output.indexOf("\n", endIdx + CWD_SENTINEL_END.length);
+					const stripEnd = afterLine === -1 ? dumpResult.output.length : afterLine + 1;
+					const strippedBytes = stripEnd - sentinelIdx;
+					dumpResult.output = dumpResult.output.slice(0, sentinelIdx) + dumpResult.output.slice(stripEnd);
+					dumpResult.totalBytes = Math.max(0, dumpResult.totalBytes - strippedBytes);
+					dumpResult.totalLines = Math.max(0, dumpResult.totalLines - 1);
+					dumpResult.outputBytes = dumpResult.output.length;
+					dumpResult.outputLines = Math.max(0, dumpResult.outputLines - 1);
+				}
+			}
+		}
+
 		// Normal completion
 		return {
 			exitCode: winner.result.exitCode,
 			cancelled: false,
-			...(await sink.dump()),
+			newCwd,
+			...dumpResult,
 		};
 	} catch (err) {
 		resetSession = true;

package/src/extensibility/hooks/types.ts

@@ -86,7 +86,7 @@ export interface HookUIContext {
 	 *
 	 * // Async factory with fire-and-forget work
 	 * const result = await ctx.ui.custom(async (tui, theme, done) => {
-	 *   const loader = new CancellableLoader(tui, theme.fg("accent"), theme.fg("muted"), "Working...");
+	 *   const loader = new CancellableLoader(tui, theme.fg("contentAccent"), theme.fg("muted"), "Working...");
 	 *   loader.onAbort = () => done(null);
 	 *   doWork(loader.signal).then(done);  // Don't await - fire and forget
 	 *   return loader;

package/src/lsp/render.ts

@@ -221,7 +221,7 @@ function renderHover(
 	const afterCode = fullText.slice(fullText.indexOf("```", 3) + 3).trim();
 
 	const codeLines = highlightCode(code, lang, theme);
-	const icon = theme.styledSymbol("status.info", "accent");
+	const icon = theme.styledSymbol("status.info", "contentAccent");
 	const langLabel = lang ? theme.fg("mdCodeBlockBorder", ` ${lang}`) : "";
 
 	if (expanded) {
@@ -438,7 +438,7 @@ function renderReferences(refMatch: RegExpMatchArray, lines: string[], expanded:
 			const fileCont = isLastFile ? "   " : `${theme.tree.vertical}  `;
 
 			const fileMeta = `${locs.length} reference${locs.length !== 1 ? "s" : ""}`;
-			output += `\n ${theme.fg("dim", fileBranch)} ${theme.fg("accent", file)} ${theme.fg("dim", fileMeta)}`;
+			output += `\n ${theme.fg("dim", fileBranch)} ${theme.fg("contentAccent", file)} ${theme.fg("dim", fileMeta)}`;
 
 			if (maxLocsPerFile > 0) {
 				const locsToShow = locs.slice(0, maxLocsPerFile);
@@ -494,7 +494,7 @@ function renderReferences(refMatch: RegExpMatchArray, lines: string[], expanded:
  */
 function renderSymbols(symbolsMatch: RegExpMatchArray, lines: string[], expanded: boolean, theme: Theme): string[] {
 	const fileName = symbolsMatch[1];
-	const icon = theme.styledSymbol("status.info", "accent");
+	const icon = theme.styledSymbol("status.info", "contentAccent");
 
 	interface SymbolInfo {
 		name: string;
@@ -557,7 +557,7 @@ function renderSymbols(symbolsMatch: RegExpMatchArray, lines: string[], expanded
 			const isLast = isLastSibling(i);
 			const branch = isLast ? theme.tree.last : theme.tree.branch;
 			const detailPrefix = isLast ? "   " : `${theme.tree.vertical}  `;
-			output += `\n${prefix}${theme.fg("dim", branch)} ${theme.fg("accent", sym.icon)} ${theme.fg("accent", sym.name)}`;
+			output += `\n${prefix}${theme.fg("dim", branch)} ${theme.fg("contentAccent", sym.icon)} ${theme.fg("contentAccent", sym.name)}`;
 			output += `\n${prefix}${theme.fg("dim", detailPrefix)}${theme.fg("muted", `line ${sym.line}`)}`;
 		}
 		return output.split("\n");
@@ -572,7 +572,7 @@ function renderSymbols(symbolsMatch: RegExpMatchArray, lines: string[], expanded
 		const sym = topLevel[i];
 		const isLast = i === topLevel.length - 1 && topLevelCount <= 3;
 		const branch = isLast ? theme.tree.last : theme.tree.branch;
-		output += `\n ${theme.fg("dim", branch)} ${theme.fg("accent", sym.icon)} ${theme.fg("accent", sym.name)} ${theme.fg(
+		output += `\n ${theme.fg("dim", branch)} ${theme.fg("contentAccent", sym.icon)} ${theme.fg("contentAccent", sym.name)} ${theme.fg(
 			"muted",
 			`line ${sym.line}`,
 		)}`;
@@ -600,7 +600,7 @@ function renderGeneric(text: string, lines: string[], expanded: boolean, theme:
 			? theme.styledSymbol("status.error", "error")
 			: hasSuccess && !hasError
 				? theme.styledSymbol("status.success", "success")
-				: theme.styledSymbol("status.info", "accent");
+				: theme.styledSymbol("status.info", "contentAccent");
 
 	if (expanded) {
 		let output = `${icon} ${theme.fg("dim", "Output")}`;
@@ -662,14 +662,14 @@ function parseDiagnosticLine(line: string): ParsedDiagnostic | null {
 	return { file, line: lineNum, col: colNum, severity: severity.toLowerCase(), message };
 }
 
-function severityToColor(severity: string): "error" | "warning" | "accent" | "dim" {
+function severityToColor(severity: string): "error" | "warning" | "contentAccent" | "dim" {
 	switch (severity) {
 		case "error":
 			return "error";
 		case "warning":
 			return "warning";
 		case "info":
-			return "accent";
+			return "contentAccent";
 		default:
 			return "dim";
 	}

package/src/modes/components/agent-dashboard.ts

@@ -216,7 +216,7 @@ class AgentListPane implements Component {
 			let line = ` ${status} ${replaceTabs(agent.name)} ${source}${override}`;
 
 			if (selected) {
-				line = theme.bg("selectedBg", theme.bold(theme.fg("accent", line)));
+				line = theme.bg("selectedBg", theme.bold(theme.fg("chromeAccent", line)));
 			} else if (agent.disabled) {
 				line = theme.fg("dim", line);
 			}
@@ -253,7 +253,7 @@ class AgentInspectorPane implements Component {
 			? theme.fg("dim", `${theme.status.disabled} Disabled`)
 			: theme.fg("success", `${theme.status.enabled} Enabled`);
 
-		lines.push(theme.bold(theme.fg("accent", replaceTabs(this.agent.name))));
+		lines.push(theme.bold(theme.fg("contentAccent", replaceTabs(this.agent.name))));
 		lines.push("");
 		lines.push(`${theme.fg("muted", "Status:")} ${state}`);
 		lines.push(`${theme.fg("muted", "Source:")} ${SOURCE_LABEL[this.agent.source]}`);
@@ -791,7 +791,7 @@ export class AgentDashboard extends Container {
 	}
 
 	#renderCreateInput(): void {
-		this.addChild(new Text(theme.bold(theme.fg("accent", " Create New Agent")), 0, 0));
+		this.addChild(new Text(theme.bold(theme.fg("contentAccent", " Create New Agent")), 0, 0));
 		this.addChild(new Spacer(1));
 		this.addChild(new Text(theme.fg("muted", "Describe what the new agent should do:"), 0, 0));
 		this.addChild(new Spacer(1));
@@ -802,7 +802,7 @@ export class AgentDashboard extends Container {
 		this.addChild(new Text(theme.fg("muted", `Scope: ${this.#createScope}`), 0, 0));
 		if (this.#createGenerating) {
 			this.addChild(new Spacer(1));
-			this.addChild(new Text(theme.fg("accent", "Generating agent specification..."), 0, 0));
+			this.addChild(new Text(theme.fg("contentAccent", "Generating agent specification..."), 0, 0));
 			if (this.#createStreamingText) {
 				this.addChild(new Spacer(1));
 				const maxPreview = Math.max(3, this.terminalHeight - 18);
@@ -834,7 +834,7 @@ export class AgentDashboard extends Container {
 		const spec = this.#createSpec;
 		if (!spec) return;
 
-		this.addChild(new Text(theme.bold(theme.fg("accent", " Review Generated Agent")), 0, 0));
+		this.addChild(new Text(theme.bold(theme.fg("contentAccent", " Review Generated Agent")), 0, 0));
 		this.addChild(new Spacer(1));
 		this.addChild(new Text(theme.fg("muted", `Identifier: ${spec.identifier}`), 0, 0));
 		this.addChild(new Text(theme.fg("muted", `Scope: ${this.#createScope}`), 0, 0));
@@ -882,7 +882,7 @@ export class AgentDashboard extends Container {
 	#buildLayout(): void {
 		this.clear();
 		this.addChild(new DynamicBorder());
-		this.addChild(new Text(theme.bold(theme.fg("accent", " Agent Control Center")), 0, 0));
+		this.addChild(new Text(theme.bold(theme.fg("contentAccent", " Agent Control Center")), 0, 0));
 		this.addChild(new Text(this.#renderTabBar(), 0, 0));
 		this.addChild(new Spacer(1));
 
@@ -911,7 +911,11 @@ export class AgentDashboard extends Container {
 			const suggestions = this.#getModelSuggestions(draft);
 
 			this.addChild(
-				new Text(theme.bold(theme.fg("accent", `Model override: ${replaceTabs(this.#editingAgentName)}`)), 0, 0),
+				new Text(
+					theme.bold(theme.fg("contentAccent", `Model override: ${replaceTabs(this.#editingAgentName)}`)),
+					0,
+					0,
+				),
 			);
 			this.addChild(new Spacer(1));
 			this.addChild(new Text(theme.fg("muted", "Enter model pattern (empty clears override)"), 0, 0));

package/src/modes/components/bordered-loader.ts

@@ -12,7 +12,7 @@ export class BorderedLoader extends Container {
 		this.addChild(new DynamicBorder(borderColor));
 		this.#loader = new CancellableLoader(
 			tui,
-			s => theme.fg("accent", s),
+			s => theme.fg("spinnerAccent", s),
 			s => theme.fg("muted", s),
 			message,
 		);

package/src/modes/components/btw-panel.ts

@@ -66,7 +66,7 @@ export class BtwPanelComponent extends Container {
 		this.clear();
 		this.addChild(new DynamicBorder(str => theme.fg("dim", str)));
 		this.addChild(new Spacer(1));
-		this.addChild(new Text(theme.fg("accent", replaceTabs(this.#question)), 1, 0));
+		this.addChild(new Text(theme.fg("contentAccent", replaceTabs(this.#question)), 1, 0));
 		this.addChild(new Spacer(1));
 		this.addChild(this.#contentComponent());
 		this.addChild(new Spacer(1));

package/src/modes/components/extensions/extension-dashboard.ts

@@ -105,7 +105,7 @@ export class ExtensionDashboard extends Container {
 		this.addChild(new DynamicBorder());
 
 		// Title
-		this.addChild(new Text(theme.bold(theme.fg("accent", " Extension Control Center")), 0, 0));
+		this.addChild(new Text(theme.bold(theme.fg("contentAccent", " Extension Control Center")), 0, 0));
 
 		// Tab bar
 		this.addChild(new Text(this.#renderTabBar(), 0, 0));

package/src/modes/components/extensions/extension-list.ts

@@ -117,7 +117,7 @@ export class ExtensionList implements Component {
 		// Search bar
 		const searchPrefix = theme.fg("muted", "Search: ");
 		const searchText = this.#searchQuery || (this.#focused ? "" : theme.fg("dim", "type to filter"));
-		const cursor = this.#focused ? theme.fg("accent", "_") : "";
+		const cursor = this.#focused ? theme.fg("chromeAccent", "_") : "";
 		lines.push(searchPrefix + searchText + cursor);
 		lines.push("");
 
@@ -167,7 +167,7 @@ export class ExtensionList implements Component {
 		let line = `${checkbox} ${icon} ${label}  ${badge}`;
 
 		if (isSelected) {
-			line = theme.bold(theme.fg("accent", line));
+			line = theme.bold(theme.fg("contentAccent", line));
 			line = theme.bg("selectedBg", line);
 		} else if (!item.enabled) {
 			line = theme.fg("dim", line);
@@ -181,7 +181,7 @@ export class ExtensionList implements Component {
 		let line = `${item.icon} ${item.label} ${countBadge}`;
 
 		if (isSelected) {
-			line = theme.bold(theme.fg("accent", line));
+			line = theme.bold(theme.fg("contentAccent", line));
 			line = theme.bg("selectedBg", line);
 		} else {
 			line = theme.fg("muted", line);
@@ -205,7 +205,7 @@ export class ExtensionList implements Component {
 		let line = `   ${stateIcon} `;
 
 		if (isSelected && !masterDisabled) {
-			name = theme.bold(theme.fg("accent", name));
+			name = theme.bold(theme.fg("contentAccent", name));
 		} else if (effectivelyDisabled) {
 			name = theme.fg("dim", name);
 		} else if (ext.state === "shadowed") {

package/src/modes/components/extensions/inspector-panel.ts

@@ -27,7 +27,7 @@ export class InspectorPanel implements Component {
 		const lines: string[] = [];
 
 		// Name header
-		lines.push(theme.bold(theme.fg("accent", ext.displayName)));
+		lines.push(theme.bold(theme.fg("contentAccent", ext.displayName)));
 		lines.push("");
 
 		// Kind badge
@@ -143,7 +143,7 @@ export class InspectorPanel implements Component {
 
 		// Headers
 		if (/^#{1,6}\s/.test(highlighted)) {
-			highlighted = theme.bold(theme.fg("accent", highlighted));
+			highlighted = theme.bold(theme.fg("contentAccent", highlighted));
 		}
 		// Code blocks
 		else if (/^```/.test(highlighted)) {
@@ -151,11 +151,11 @@ export class InspectorPanel implements Component {
 		}
 		// Lists
 		else if (/^[\s]*[-*+]\s/.test(highlighted)) {
-			highlighted = highlighted.replace(/^([\s]*[-*+]\s)/, theme.fg("accent", "$1"));
+			highlighted = highlighted.replace(/^([\s]*[-*+]\s)/, theme.fg("contentAccent", "$1"));
 		}
 		// Numbered lists
 		else if (/^[\s]*\d+\.\s/.test(highlighted)) {
-			highlighted = highlighted.replace(/^([\s]*\d+\.\s)/, theme.fg("accent", "$1"));
+			highlighted = highlighted.replace(/^([\s]*\d+\.\s)/, theme.fg("contentAccent", "$1"));
 		}
 
 		return highlighted;
@@ -181,7 +181,7 @@ export class InspectorPanel implements Component {
 					const isRequired = required.has(name);
 					const defaultVal = param.default !== undefined ? `Default: ${param.default}` : null;
 
-					const nameCol = theme.fg("accent", name.padEnd(12));
+					const nameCol = theme.fg("contentAccent", name.padEnd(12));
 					const typeCol = theme.fg("muted", type.padEnd(10));
 					const reqCol = isRequired
 						? theme.fg("warning", "Required")
@@ -240,7 +240,7 @@ export class InspectorPanel implements Component {
 			const command = mcp?.command || mcp?.cmd || "";
 			const args = mcp?.args || mcp?.arguments || [];
 
-			lines.push(`  ${theme.fg("muted", "Transport:")}  ${theme.fg("accent", transport)}`);
+			lines.push(`  ${theme.fg("muted", "Transport:")}  ${theme.fg("contentAccent", transport)}`);
 
 			if (command) {
 				lines.push(`  ${theme.fg("muted", "Command:")}    ${theme.fg("success", command)}`);
@@ -272,7 +272,7 @@ export class InspectorPanel implements Component {
 		if (ext.trigger) {
 			lines.push(theme.fg("muted", "Trigger:"));
 			lines.push(theme.fg("dim", theme.boxSharp.horizontal.repeat(Math.min(width - 2, 40))));
-			lines.push(`  ${theme.fg("accent", ext.trigger)}`);
+			lines.push(`  ${theme.fg("contentAccent", ext.trigger)}`);
 			lines.push("");
 		}
 
@@ -281,16 +281,16 @@ export class InspectorPanel implements Component {
 
 	#getKindBadge(kind: string): string {
 		const kindColors: Record<string, string> = {
-			"extension-module": "accent",
-			skill: "accent",
+			"extension-module": "contentAccent",
+			skill: "contentAccent",
 			rule: "success",
 			tool: "warning",
-			mcp: "accent",
+			mcp: "contentAccent",
 			prompt: "muted",
 			hook: "warning",
 			"context-file": "dim",
 			instruction: "muted",
-			"slash-command": "accent",
+			"slash-command": "contentAccent",
 		};
 
 		const color = kindColors[kind] || "muted";

package/src/modes/components/history-search.ts

@@ -53,7 +53,7 @@ class HistoryResultsList implements Component {
 
 			const cursorSymbol = `${theme.nav.cursor} `;
 			const cursorWidth = visibleWidth(cursorSymbol);
-			const cursor = isSelected ? theme.fg("accent", cursorSymbol) : padding(cursorWidth);
+			const cursor = isSelected ? theme.fg("chromeAccent", cursorSymbol) : padding(cursorWidth);
 			const maxWidth = width - cursorWidth;
 
 			const normalized = entry.prompt.replace(/\s+/g, " ").trim();