@selesai/code 0.13.40 → 0.14.3

package/dist/extensions/pi-zentui/extensions/zentui/config.ts

@@ -15,17 +15,39 @@ import {
 } from "node:fs";
 import { basename, dirname, join } from "node:path";
 import { getAgentDir } from "@earendil-works/pi-coding-agent";
+import {
+	type ColorOwner,
+	type ComponentColorKey,
+	type ComponentColors,
+	componentColorKeys,
+	normalizeComponentColors,
+} from "./component-colors";
+import {
+	type CustomValueColors,
+	customValueColor,
+	normalizeCustomValueColors,
+} from "./custom-value-colors";
+import { normalizeTemplateVariables } from "./custom-variable-format";
+import { MAX_CUSTOM_VARIABLES } from "./custom-variables";
+import { HOST_TEMPLATE_VARIABLES } from "./host-template-values";
 import {
 	ICON_GLYPH_KEYS,
+	type IconEnvironment,
 	type IconGlyphs,
 	type IconMode,
-	NERD_DEFAULT_ICONS,
 	normalizeIconMode,
 	type ResolvedIcons,
 	resolveConfiguredIcons,
 } from "./icons";
+import {
+	MINIMALIST_FORMAT_SLOTS,
+	type MinimalistFormats,
+	normalizeMinimalistFormats,
+	normalizeMinimalistVariables,
+} from "./minimalist-template";
 import type { ComponentPreset } from "./presets";
 import { isSupportedColorSpec } from "./style";
+import { DEFAULT_TURN_SUMMARY_FORMAT, normalizeTurnSummaryFormat } from "./turn-summary-format";
 import { normalizeWorkingLineMessages } from "./working-line";
 import { PI_WORKING_LINE_MESSAGES } from "./working-line-messages";
 
@@ -47,16 +69,18 @@ export type WorkingLineSpinner =
 	| "claude-inspired"
 	| "pulse";
 export type WorkingLineTextAnimation = "classic" | "kitt" | "disabled";
+export type WorkingLinePlacement = "above" | "border";
 export type ThinkingStepsMode = "rail" | "tree" | "streaming";
 export type ComponentStyleOwner = "editor" | "userMessages" | "selectorBorders" | "footer";
 export type MinimalistPathDisplayMode = "compact" | "project" | "full";
 export type MinimalistContextFormat = "percent" | "percent-total";
+export type MinimalistEditorSeparator = "dash" | "dot";
 export type EditorBorderColorMode = "static" | "adaptive";
 export type CompletionMenuStyle = "native" | "palette";
 export type CompactFooterMaxLines = 1 | 2 | 3 | "unlimited";
 
 export const DEFAULT_COMPACT_FOOTER_FORMAT =
-	"$cwd$wrap(in $session_name)$wrap(on $git_branch) $git_status$wrap$context$wrap_sep$tokens";
+	"$cwd$wrap(in $session_name)$wrap(on $git_branch) $git_status$wrap$context$wrap_sep$tokens$wrap_sep($codex_quota)";
 
 export type ContextThresholds = {
 	warning: number;
@@ -109,12 +133,34 @@ export type FooterSegmentsConfig = {
 	packageVersion: boolean;
 };
 
-export type PolishedEditorStyleConfig = {
+export type TemplateVariableConfig = {
+	variables?: Record<string, string>;
+	extensionColorMode?: ExtensionStatusColorMode;
+};
+export const OPENCODE_FORMAT_VARIABLES = [
+	"model",
+	"model_id",
+	"model_name",
+	"provider",
+	"thinking",
+	"fast_mode",
+	"session_name",
+	"context",
+	"tokens",
+	"cache_hit",
+	"codex_quota",
+	"sep",
+	"join_sep",
+	"separator",
+	...HOST_TEMPLATE_VARIABLES,
+] as const;
+
+export type PolishedEditorStyleConfig = TemplateVariableConfig & {
 	metadataFormat: string;
 	completionMenu: CompletionMenuStyle;
 };
 
-export type PolishedCopyFriendlyEditorStyleConfig = {
+export type PolishedCopyFriendlyEditorStyleConfig = TemplateVariableConfig & {
 	metadataFormat: string;
 	completionMenu: CompletionMenuStyle;
 };
@@ -126,14 +172,20 @@ export type AccentRailEditorStyleConfig = {
 };
 
 export type MinimalistEditorStyleConfig = {
+	formats?: MinimalistFormats;
+	variables?: Record<string, string>;
+	/** Missing means Original, keeping publisher SGR rather than recoloring it. */
+	extensionColorMode?: ExtensionStatusColorMode;
 	pathDisplay: MinimalistPathDisplayMode;
 	contextFormat: MinimalistContextFormat;
 	contextGauge: boolean;
 	showSessionName: boolean;
 	showTimer: boolean;
 	showCost: boolean;
+	showCacheHit: boolean;
 	showGit: boolean;
 	contextThresholds: ContextThresholds;
+	separator: MinimalistEditorSeparator;
 };
 
 /** Temporary name retained for existing settings consumers. */
@@ -144,6 +196,9 @@ export type EditorStylesConfig = {
 };
 
 export type EditorComponentConfig = {
+	codexQuota: boolean;
+	colors?: ComponentColors<"editor">;
+	customValueColors?: CustomValueColors;
 	enabled: boolean;
 	style: EditorStyle;
 	colorSource: ColorSource;
@@ -164,6 +219,7 @@ export type CompactUserMessageStyleConfig = Record<string, never>;
 export type LabeledUserMessageStyleConfig = Record<string, never>;
 
 export type UserMessagesComponentConfig = {
+	colors?: ComponentColors<"userMessages">;
 	enabled: boolean;
 	style: UserMessageStyle;
 	colorSource: ColorSource;
@@ -176,12 +232,13 @@ export type UserMessagesComponentConfig = {
 };
 
 export type SelectorBordersComponentConfig = {
+	colors?: ComponentColors<"selectorBorders">;
 	enabled: boolean;
 	style: SelectorBorderStyle;
 	colorSource: ColorSource;
 };
 
-export type StarshipFooterStyleConfig = {
+export type StarshipFooterStyleConfig = TemplateVariableConfig & {
 	format: string;
 	responsive: boolean;
 	compactFormat: string;
@@ -198,6 +255,9 @@ export type StarshipFooterStyleConfig = {
 };
 
 export type FooterComponentConfig = {
+	codexQuota: boolean;
+	colors?: ComponentColors<"footer">;
+	customValueColors?: CustomValueColors;
 	style: FooterStyle;
 	colorSource: ColorSource;
 	modelLabel: ModelLabelSource;
@@ -216,6 +276,7 @@ export type WorkingLineSegmentsConfig = {
 	elapsed: boolean;
 	thought: boolean;
 	tokens: boolean;
+	tokenRate?: boolean;
 };
 
 export const DEFAULT_WORKING_LINE_SPINNER_INTERVAL_MS = 100;
@@ -233,8 +294,10 @@ export function isValidWorkingLineIntervalMs(value: unknown): value is number {
 }
 
 export type WorkingLineComponentConfig = {
+	colors?: ComponentColors<"workingLine">;
 	enabled: boolean;
 	turnSummary: boolean;
+	turnSummaryFormat: string;
 	spinner: WorkingLineSpinner;
 	spinnerIntervalMs: number;
 	animateSpinnerColor: boolean;
@@ -243,10 +306,11 @@ export type WorkingLineComponentConfig = {
 	colorSource: ColorSource;
 	messages: WorkingLineMessagesConfig;
 	segments: WorkingLineSegmentsConfig;
+	placement: WorkingLinePlacement;
 };
 
 export type WorkingLineComponentPatch = Partial<
-	Omit<WorkingLineComponentConfig, "messages" | "segments">
+	Omit<WorkingLineComponentConfig, "messages" | "segments" | "colors">
 > & {
 	messages?: Partial<WorkingLineMessagesConfig>;
 	segments?: Partial<WorkingLineSegmentsConfig>;
@@ -257,7 +321,23 @@ export type ThinkingStepsComponentConfig = {
 	mode: ThinkingStepsMode;
 };
 
+export type ExtensionStatusVisibility = "show" | "hide";
+export type ExtensionStatusVisibilityConfig = {
+	defaultVisibility: ExtensionStatusVisibility;
+	visibility: Record<string, ExtensionStatusVisibility>;
+};
+
+export type HiddenExtensionStatusPlacement = "left" | "middle" | "right";
+export type ExtensionStatusComponentConfig = ExtensionStatusVisibilityConfig & {
+	hidden?: {
+		defaultPlacement?: HiddenExtensionStatusPlacement;
+		placements?: Record<string, HiddenExtensionStatusPlacement>;
+		colorModes?: Record<string, ExtensionStatusColorMode>;
+	};
+};
+
 export type ComponentsConfig = {
+	extensionStatuses: ExtensionStatusComponentConfig;
 	editor: EditorComponentConfig;
 	userMessages: UserMessagesComponentConfig;
 	thinkingSteps: ThinkingStepsComponentConfig;
@@ -299,7 +379,8 @@ export type ExtensionStatusesConfig = {
 
 const DEFAULT_PROJECT_REFRESH_INTERVAL_MS = 30_000;
 const MIN_PROJECT_REFRESH_INTERVAL_MS = 5_000;
-export const DEFAULT_EDITOR_METADATA_FORMAT = "$model  $provider(  $thinking)";
+export const DEFAULT_EDITOR_METADATA_FORMAT =
+	"$model  $provider(  $thinking)(  $fast_mode)(  $codex_quota)";
 
 export type ZentuiConfig = {
 	projectRefreshIntervalMs: number;
@@ -317,6 +398,7 @@ export type PolishedTuiColors = {
 	contextWarning: ColorSpec;
 	contextError: ColorSpec;
 	tokens: ColorSpec;
+	cacheHit?: ColorSpec;
 	cost: ColorSpec;
 	separator: ColorSpec;
 	runtimePrefix: ColorSpec;
@@ -330,6 +412,7 @@ export type PolishedTuiColors = {
 	time: ColorSpec;
 	os: ColorSpec;
 	editorAccent?: ColorSpec;
+	editorShellRail?: ColorSpec;
 	editorRail?: ColorSpec;
 	editorPrompt?: ColorSpec;
 	editorBorder?: ColorSpec;
@@ -388,11 +471,14 @@ export const FOOTER_FORMAT_VARIABLES = [
 	"runtime",
 	"model",
 	"provider",
+	"thinkingLevel",
+	"fast_mode",
 	"session_duration",
 	"username",
 	"os",
 	"time",
 	"context",
+	"codex_quota",
 	"tokens",
 	"cache_read",
 	"cache_write",
@@ -407,6 +493,8 @@ export const FOOTER_FORMAT_VARIABLES = [
 	"git_added",
 	"git_deleted",
 	"sep",
+	"join_sep",
+	...HOST_TEMPLATE_VARIABLES,
 ] as const;
 
 /**
@@ -460,6 +548,8 @@ const defaultMinimalistStyle: MinimalistEditorStyleConfig = {
 	showTimer: false,
 	showCost: false,
 	showGit: false,
+	showCacheHit: false,
+	separator: "dash",
 	contextThresholds: { warning: 50, error: 80 },
 };
 
@@ -480,7 +570,9 @@ const defaultStarshipStyle: StarshipFooterStyleConfig = {
 };
 
 const defaultComponents: ComponentsConfig = {
+	extensionStatuses: { defaultVisibility: "show", visibility: {} },
 	editor: {
+		codexQuota: false,
 		enabled: true,
 		style: "minimalist",
 		colorSource: "theme",
@@ -510,6 +602,7 @@ const defaultComponents: ComponentsConfig = {
 	workingLine: {
 		enabled: true,
 		turnSummary: true,
+		turnSummaryFormat: DEFAULT_TURN_SUMMARY_FORMAT,
 		spinner: "claude-inspired",
 		spinnerIntervalMs: 160,
 		animateSpinnerColor: false,
@@ -517,10 +610,12 @@ const defaultComponents: ComponentsConfig = {
 		textAnimation: "classic",
 		colorSource: "theme",
 		messages: { custom: true, values: [...PI_WORKING_LINE_MESSAGES] },
-		segments: { tool: true, elapsed: true, thought: true, tokens: true },
+		segments: { tool: true, elapsed: true, thought: true, tokens: true, tokenRate: false },
+		placement: "above",
 	},
 	selectorBorders: { enabled: true, style: "zentui", colorSource: "theme" },
 	footer: {
+		codexQuota: false,
 		style: "starship",
 		colorSource: "theme",
 		modelLabel: "name",
@@ -530,7 +625,7 @@ const defaultComponents: ComponentsConfig = {
 
 export const defaultConfig: PolishedTuiConfig = {
 	projectRefreshIntervalMs: DEFAULT_PROJECT_REFRESH_INTERVAL_MS,
-	icons: { mode: "ascii", ...NERD_DEFAULT_ICONS },
+	icons: resolveConfiguredIcons("ascii"),
 	colors: {
 		cwd: "bold cyan",
 		sessionName: "bold green",
@@ -745,6 +840,7 @@ function normalizeColors(record: Record<string, unknown>): Partial<PolishedTuiCo
 		contextWarning: colorValue(record, "contextWarning"),
 		contextError: colorValue(record, "contextError"),
 		tokens: colorValue(record, "tokens"),
+		cacheHit: colorValue(record, "cacheHit"),
 		cost: colorValue(record, "cost"),
 		separator: colorValue(record, "separator"),
 		runtimePrefix: colorValue(record, "runtimePrefix"),
@@ -758,6 +854,7 @@ function normalizeColors(record: Record<string, unknown>): Partial<PolishedTuiCo
 		time: colorValue(record, "time"),
 		os: colorValue(record, "os"),
 		editorAccent: colorValue(record, "editorAccent"),
+		editorShellRail: colorValue(record, "editorShellRail"),
 		editorRail: colorValue(record, "editorRail"),
 		editorPrompt: colorValue(record, "editorPrompt"),
 		editorBorder: colorValue(record, "editorBorder"),
@@ -996,6 +1093,20 @@ function recordValue(value: unknown): ConfigRecord {
 	return isRecord(value) ? value : {};
 }
 
+function templateVariableOptions(
+	record: ConfigRecord,
+	reserved: readonly string[],
+): TemplateVariableConfig {
+	return {
+		...(isRecord(record.variables)
+			? { variables: normalizeTemplateVariables(record.variables, reserved) }
+			: {}),
+		...(isExtensionStatusColorMode(record.extensionColorMode)
+			? { extensionColorMode: record.extensionColorMode }
+			: {}),
+	};
+}
+
 function resolvedValue(
 	canonical: ConfigRecord,
 	canonicalKey: string,
@@ -1163,7 +1274,9 @@ function resolveUserMessagesSelection(
 		};
 	}
 	return {
-		style: legacyCopyFriendly(features) ? "framed-copy-friendly" : defaultComponents.userMessages.style,
+		style: legacyCopyFriendly(features)
+			? "framed-copy-friendly"
+			: defaultComponents.userMessages.style,
 		enabled: normalEnabled,
 	};
 }
@@ -1190,6 +1303,75 @@ function resolveWorkingLineMessages(messages: ConfigRecord): WorkingLineMessages
 	return { custom, values: hasOwn(messages, "values") ? legacyValues : preset() };
 }
 
+export function isHiddenExtensionStatusPlacement(
+	value: unknown,
+): value is HiddenExtensionStatusPlacement {
+	return value === "left" || value === "middle" || value === "right";
+}
+
+export function getHiddenExtensionStatusPlacement(
+	config: ExtensionStatusComponentConfig,
+	key: string,
+): HiddenExtensionStatusPlacement {
+	const placements = config.hidden?.placements;
+	return (
+		(placements && Object.hasOwn(placements, key) ? placements[key] : undefined) ??
+		config.hidden?.defaultPlacement ??
+		"left"
+	);
+}
+
+export function getHiddenExtensionStatusColorMode(
+	config: ExtensionStatusComponentConfig,
+	key: string,
+): ExtensionStatusColorMode {
+	const modes = config.hidden?.colorModes;
+	return modes && Object.hasOwn(modes, key) && modes[key] === "zentui" ? "zentui" : "original";
+}
+
+function resolveExtensionStatusComponent(raw: unknown): ExtensionStatusComponentConfig {
+	const owner = recordValue(raw);
+	const hidden = recordValue(owner.hidden);
+	return {
+		...(isRecord(owner.hidden)
+			? {
+					hidden: {
+						...(isHiddenExtensionStatusPlacement(hidden.defaultPlacement)
+							? { defaultPlacement: hidden.defaultPlacement }
+							: {}),
+						...(isRecord(hidden.colorModes)
+							? {
+									colorModes: Object.fromEntries(
+										Object.entries(hidden.colorModes).filter(
+											(entry): entry is [string, ExtensionStatusColorMode] =>
+												isExtensionStatusColorMode(entry[1]),
+										),
+									),
+								}
+							: {}),
+						...(isRecord(hidden.placements)
+							? {
+									placements: Object.fromEntries(
+										Object.entries(hidden.placements).filter(
+											(entry): entry is [string, HiddenExtensionStatusPlacement] =>
+												isHiddenExtensionStatusPlacement(entry[1]),
+										),
+									),
+								}
+							: {}),
+					},
+				}
+			: {}),
+		defaultVisibility: owner.defaultVisibility === "hide" ? "hide" : "show",
+		visibility: Object.fromEntries(
+			Object.entries(recordValue(owner.visibility)).filter(
+				(entry): entry is [string, ExtensionStatusVisibility] =>
+					entry[1] === "show" || entry[1] === "hide",
+			),
+		),
+	};
+}
+
 function resolveComponents(config: ConfigRecord): ComponentsConfig {
 	const components = recordValue(config.components);
 	const editor = recordValue(components.editor);
@@ -1236,7 +1418,15 @@ function resolveComponents(config: ConfigRecord): ComponentsConfig {
 	const userMessagesSelection = resolveUserMessagesSelection(userMessages, framed, features);
 
 	return {
+		extensionStatuses: resolveExtensionStatusComponent(components.extensionStatuses),
 		editor: {
+			codexQuota: parseBoolean(editor.codexQuota, false),
+			...(isRecord(editor.customValueColors)
+				? { customValueColors: normalizeCustomValueColors(editor.customValueColors) }
+				: {}),
+			...(isRecord(editor.colors)
+				? { colors: normalizeComponentColors("editor", editor.colors) }
+				: {}),
 			enabled: parseBoolean(
 				resolvedValue(editor, "enabled", features, "editor"),
 				defaultComponents.editor.enabled,
@@ -1259,10 +1449,12 @@ function resolveComponents(config: ConfigRecord): ComponentsConfig {
 			),
 			styles: {
 				opencode: {
+					...templateVariableOptions(opencode, OPENCODE_FORMAT_VARIABLES),
 					metadataFormat: parseNonEmptyString(metadataFormat, DEFAULT_EDITOR_METADATA_FORMAT),
 					completionMenu: parseCompletionMenuStyle(opencode.completionMenu),
 				},
 				"opencode-copy-friendly": {
+					...templateVariableOptions(opencodeCopyFriendly, OPENCODE_FORMAT_VARIABLES),
 					metadataFormat: parseNonEmptyString(
 						lowRailMetadataFormat,
 						DEFAULT_EDITOR_METADATA_FORMAT,
@@ -1275,6 +1467,15 @@ function resolveComponents(config: ConfigRecord): ComponentsConfig {
 					transparent: parseBoolean(accentRail.transparent, defaultAccentRailStyle.transparent),
 				},
 				minimalist: {
+					...(isRecord(minimalist.formats)
+						? { formats: normalizeMinimalistFormats(minimalist.formats) }
+						: {}),
+					...(isRecord(minimalist.variables)
+						? { variables: normalizeMinimalistVariables(minimalist.variables) }
+						: {}),
+					...(isExtensionStatusColorMode(minimalist.extensionColorMode)
+						? { extensionColorMode: minimalist.extensionColorMode }
+						: {}),
 					pathDisplay:
 						minimalist.pathDisplay === "compact" ||
 						minimalist.pathDisplay === "project" ||
@@ -1292,12 +1493,20 @@ function resolveComponents(config: ConfigRecord): ComponentsConfig {
 					),
 					showTimer: parseBoolean(minimalist.showTimer, defaultMinimalistStyle.showTimer),
 					showCost: parseBoolean(minimalist.showCost, defaultMinimalistStyle.showCost),
+					showCacheHit: parseBoolean(minimalist.showCacheHit, defaultMinimalistStyle.showCacheHit),
 					showGit: parseBoolean(minimalist.showGit, defaultMinimalistStyle.showGit),
 					contextThresholds: minimalistThresholds,
+					separator:
+						minimalist.separator === "dash" || minimalist.separator === "dot"
+							? minimalist.separator
+							: defaultMinimalistStyle.separator,
 				},
 			},
 		},
 		userMessages: {
+			...(isRecord(userMessages.colors)
+				? { colors: normalizeComponentColors("userMessages", userMessages.colors) }
+				: {}),
 			enabled: userMessagesSelection.enabled,
 			style: userMessagesSelection.style,
 			colorSource: parseColorSource(
@@ -1321,8 +1530,12 @@ function resolveComponents(config: ConfigRecord): ComponentsConfig {
 						: defaultComponents.thinkingSteps.mode,
 		},
 		workingLine: {
+			...(isRecord(workingLine.colors)
+				? { colors: normalizeComponentColors("workingLine", workingLine.colors) }
+				: {}),
 			enabled: parseBoolean(workingLine.enabled, defaultComponents.workingLine.enabled),
 			turnSummary: parseBoolean(workingLine.turnSummary, defaultComponents.workingLine.turnSummary),
+			turnSummaryFormat: normalizeTurnSummaryFormat(workingLine.turnSummaryFormat),
 			spinner:
 				workingLine.spinner === "braille" ||
 				workingLine.spinner === "star-bloom" ||
@@ -1349,12 +1562,17 @@ function resolveComponents(config: ConfigRecord): ComponentsConfig {
 				workingLine.textAnimation === "disabled"
 					? workingLine.textAnimation
 					: defaultComponents.workingLine.textAnimation,
+			placement:
+				workingLine.placement === "border"
+					? workingLine.placement
+					: defaultComponents.workingLine.placement,
 			colorSource: parseColorSource(
 				workingLine.colorSource,
 				defaultComponents.workingLine.colorSource,
 			),
 			messages: resolveWorkingLineMessages(workingLineMessages),
 			segments: {
+				tokenRate: parseBoolean(workingLineSegments.tokenRate, false),
 				tool: parseBoolean(workingLineSegments.tool, defaultComponents.workingLine.segments.tool),
 				elapsed: parseBoolean(
 					workingLineSegments.elapsed,
@@ -1371,6 +1589,9 @@ function resolveComponents(config: ConfigRecord): ComponentsConfig {
 			},
 		},
 		selectorBorders: {
+			...(isRecord(selectorBorders.colors)
+				? { colors: normalizeComponentColors("selectorBorders", selectorBorders.colors) }
+				: {}),
 			enabled: parseBoolean(
 				resolvedValue(selectorBorders, "enabled", features, "editor"),
 				defaultComponents.selectorBorders.enabled,
@@ -1382,6 +1603,13 @@ function resolveComponents(config: ConfigRecord): ComponentsConfig {
 			),
 		},
 		footer: {
+			codexQuota: parseBoolean(footer.codexQuota, false),
+			...(isRecord(footer.customValueColors)
+				? { customValueColors: normalizeCustomValueColors(footer.customValueColors) }
+				: {}),
+			...(isRecord(footer.colors)
+				? { colors: normalizeComponentColors("footer", footer.colors) }
+				: {}),
 			style: resolveFooterStyle(footer, features),
 			colorSource: parseColorSource(
 				resolvedValue(footer, "colorSource", colorSources, "starship"),
@@ -1393,6 +1621,10 @@ function resolveComponents(config: ConfigRecord): ComponentsConfig {
 			),
 			styles: {
 				starship: {
+					...templateVariableOptions(starship, [
+						...FOOTER_FORMAT_VARIABLES,
+						...Object.keys(FOOTER_FORMAT_ALIASES),
+					]),
 					format:
 						typeof resolvedValue(starship, "format", config, "footerFormat") === "string"
 							? (resolvedValue(starship, "format", config, "footerFormat") as string)
@@ -1502,7 +1734,10 @@ export function parseIconMode(value: unknown): IconMode {
 		: defaultConfig.icons.mode;
 }
 
-export function mergeConfig(parsed: unknown): PolishedTuiConfig {
+export function mergeConfig(
+	parsed: unknown,
+	iconEnvironment: IconEnvironment = process.env,
+): PolishedTuiConfig {
 	const config = isRecord(parsed) ? parsed : {};
 	const iconsRecord = recordValue(config.icons);
 	const colorsRecord = recordValue(config.colors);
@@ -1512,6 +1747,7 @@ export function mergeConfig(parsed: unknown): PolishedTuiConfig {
 		icons: resolveConfiguredIcons(
 			parseIconMode(iconsRecord.mode),
 			normalizeIconOverrides(iconsRecord),
+			iconEnvironment,
 		),
 		colors: {
 			...defaultConfig.colors,
@@ -1607,6 +1843,7 @@ function restoreUnknownSelectedStyleIds(
 }
 
 function saveComponentsMutation(
+	owners: readonly (keyof ComponentsConfig)[],
 	update: (components: ComponentsConfig) => void,
 	path: string,
 	cleanupRaw?: (record: ConfigRecord) => void,
@@ -1617,8 +1854,23 @@ function saveComponentsMutation(
 		const components = mergeConfig(record).components;
 		update(components);
 		const normalized = resolveComponents({ components });
-		record.components = overlayKnown(record.components, normalized);
+		const rawComponents = { ...recordValue(record.components) };
+		for (const owner of owners) {
+			const {
+				colors: _colors,
+				customValueColors: _customValueColors,
+				...selection
+			} = normalized[owner] as (typeof normalized)[typeof owner] & {
+				colors?: unknown;
+				customValueColors?: unknown;
+			};
+			rawComponents[owner] = overlayKnown(rawComponents[owner], selection);
+		}
+		record.components = rawComponents;
 		restoreUnknownSelectedStyleIds(record, preservedStyles, replacedStyle);
+		if (owners.includes("editor")) deleteLegacyEditorCopyFriendly(record);
+		if (owners.includes("userMessages")) deleteLegacyMessageCopyFriendly(record);
+		if (owners.includes("footer")) deleteLegacyFooterEnabled(record);
 		cleanupRaw?.(record);
 	});
 }
@@ -1667,10 +1919,17 @@ function applyEditorComponentPatch(
 	patch: Partial<
 		Pick<
 			EditorComponentConfig,
-			"enabled" | "style" | "colorSource" | "borderColorMode" | "modelLabel" | "viewportIndicators"
+			| "enabled"
+			| "style"
+			| "colorSource"
+			| "borderColorMode"
+			| "modelLabel"
+			| "viewportIndicators"
+			| "codexQuota"
 		>
 	>,
 ): void {
+	if (patch.codexQuota !== undefined) component.codexQuota = patch.codexQuota;
 	if (patch.enabled !== undefined) component.enabled = patch.enabled;
 	if (patch.style !== undefined) component.style = patch.style;
 	if (patch.colorSource !== undefined) component.colorSource = patch.colorSource;
@@ -1685,12 +1944,19 @@ export function saveEditorComponentPatch(
 	patch: Partial<
 		Pick<
 			EditorComponentConfig,
-			"enabled" | "style" | "colorSource" | "borderColorMode" | "modelLabel" | "viewportIndicators"
+			| "enabled"
+			| "style"
+			| "colorSource"
+			| "borderColorMode"
+			| "modelLabel"
+			| "viewportIndicators"
+			| "codexQuota"
 		>
 	>,
 	path = configPath,
 ): PolishedTuiConfig {
 	return saveComponentsMutation(
+		["editor"],
 		(components) => applyEditorComponentPatch(components.editor, patch),
 		path,
 		patch.style !== undefined ? deleteLegacyEditorCopyFriendly : undefined,
@@ -1698,43 +1964,111 @@ export function saveEditorComponentPatch(
 	);
 }
 
+export type TemplateVariablePatch = {
+	variables?: Record<string, string | null>;
+	extensionColorMode?: ExtensionStatusColorMode | null;
+};
+export type PolishedEditorStylePatch = Partial<
+	Omit<PolishedEditorStyleConfig, keyof TemplateVariableConfig>
+> &
+	TemplateVariablePatch;
+export type PolishedCopyFriendlyEditorStylePatch = Partial<
+	Omit<PolishedCopyFriendlyEditorStyleConfig, keyof TemplateVariableConfig>
+> &
+	TemplateVariablePatch;
+export type StarshipFooterStylePatch = Partial<
+	Omit<StarshipFooterStyleConfig, keyof TemplateVariableConfig>
+> &
+	TemplateVariablePatch;
+
+function applyTemplateVariablePatch(
+	record: ConfigRecord,
+	owner: "editor" | "footer",
+	id: string,
+	patch: TemplateVariablePatch,
+	reserved: readonly string[],
+): void {
+	const style = recordValue(
+		recordValue(recordValue(recordValue(record.components)[owner]).styles)[id],
+	);
+	if (patch.variables !== undefined) {
+		const saved = { ...recordValue(style.variables) };
+		for (const [name, key] of Object.entries(patch.variables)) {
+			if (key === null) delete saved[name];
+			else if (
+				Object.hasOwn(normalizeTemplateVariables({ [name]: key }, reserved), name) &&
+				(Object.hasOwn(saved, name) ||
+					Object.keys(normalizeTemplateVariables(saved, reserved)).length < MAX_CUSTOM_VARIABLES)
+			)
+				saved[name] = key;
+		}
+		if (Object.keys(saved).length) style.variables = saved;
+		else delete style.variables;
+	}
+	if (patch.extensionColorMode === null) delete style.extensionColorMode;
+	else if (isExtensionStatusColorMode(patch.extensionColorMode))
+		style.extensionColorMode = patch.extensionColorMode;
+}
+
 export function savePolishedEditorStylePatch(
-	patch: Partial<PolishedEditorStyleConfig>,
+	patch: PolishedEditorStylePatch,
 	path = configPath,
 ): PolishedTuiConfig {
-	return saveComponentsMutation((components) => {
-		const style = components.editor.styles.opencode;
-		if (patch.metadataFormat !== undefined) style.metadataFormat = patch.metadataFormat;
-		if (patch.completionMenu !== undefined) style.completionMenu = patch.completionMenu;
-	}, path);
+	return saveComponentsMutation(
+		["editor"],
+		(components) => {
+			const style = components.editor.styles.opencode;
+			if (patch.metadataFormat !== undefined) style.metadataFormat = patch.metadataFormat;
+			if (patch.completionMenu !== undefined) style.completionMenu = patch.completionMenu;
+		},
+		path,
+		(record) =>
+			applyTemplateVariablePatch(record, "editor", "opencode", patch, OPENCODE_FORMAT_VARIABLES),
+	);
 }
 
 export function savePolishedCopyFriendlyEditorStylePatch(
-	patch: Partial<PolishedCopyFriendlyEditorStyleConfig>,
+	patch: PolishedCopyFriendlyEditorStylePatch,
 	path = configPath,
 ): PolishedTuiConfig {
-	return saveComponentsMutation((components) => {
-		const style = components.editor.styles["opencode-copy-friendly"];
-		if (patch.metadataFormat !== undefined) style.metadataFormat = patch.metadataFormat;
-		if (patch.completionMenu !== undefined) style.completionMenu = patch.completionMenu;
-	}, path);
+	return saveComponentsMutation(
+		["editor"],
+		(components) => {
+			const style = components.editor.styles["opencode-copy-friendly"];
+			if (patch.metadataFormat !== undefined) style.metadataFormat = patch.metadataFormat;
+			if (patch.completionMenu !== undefined) style.completionMenu = patch.completionMenu;
+		},
+		path,
+		(record) =>
+			applyTemplateVariablePatch(
+				record,
+				"editor",
+				"opencode-copy-friendly",
+				patch,
+				OPENCODE_FORMAT_VARIABLES,
+			),
+	);
 }
 
 export function saveAccentRailEditorStylePatch(
 	patch: Partial<AccentRailEditorStyleConfig>,
 	path = configPath,
 ): PolishedTuiConfig {
-	return saveComponentsMutation((components) => {
-		const style = components.editor.styles["accent-rail"];
-		if (patch.rail !== undefined) style.rail = patch.rail;
-		if (patch.asciiRail !== undefined) style.asciiRail = patch.asciiRail;
-		if (patch.transparent !== undefined) style.transparent = patch.transparent;
-	}, path);
+	return saveComponentsMutation(
+		["editor"],
+		(components) => {
+			const style = components.editor.styles["accent-rail"];
+			if (patch.rail !== undefined) style.rail = patch.rail;
+			if (patch.asciiRail !== undefined) style.asciiRail = patch.asciiRail;
+			if (patch.transparent !== undefined) style.transparent = patch.transparent;
+		},
+		path,
+	);
 }
 
 function applyMinimalistStylePatch(
 	style: MinimalistEditorStyleConfig,
-	patch: Partial<MinimalistEditorStyleConfig>,
+	patch: Partial<Omit<MinimalistEditorStyleConfig, "formats" | "variables" | "extensionColorMode">>,
 ): void {
 	if (patch.pathDisplay !== undefined) style.pathDisplay = patch.pathDisplay;
 	if (patch.contextFormat !== undefined) style.contextFormat = patch.contextFormat;
@@ -1742,17 +2076,90 @@ function applyMinimalistStylePatch(
 	if (patch.showSessionName !== undefined) style.showSessionName = patch.showSessionName;
 	if (patch.showTimer !== undefined) style.showTimer = patch.showTimer;
 	if (patch.showCost !== undefined) style.showCost = patch.showCost;
+	if (patch.showCacheHit !== undefined) style.showCacheHit = patch.showCacheHit;
 	if (patch.showGit !== undefined) style.showGit = patch.showGit;
+	if (patch.separator !== undefined) style.separator = patch.separator;
 	if (patch.contextThresholds !== undefined) {
 		style.contextThresholds = { ...style.contextThresholds, ...patch.contextThresholds };
 	}
 }
 
+export type MinimalistEditorStylePatch = Partial<
+	Omit<MinimalistEditorStyleConfig, "formats" | "variables" | "extensionColorMode">
+> & {
+	/** null removes an override; empty strings deliberately hide a slot. */
+	formats?: Partial<Record<keyof MinimalistFormats, string | null>>;
+	variables?: Record<string, string | null>;
+	extensionColorMode?: ExtensionStatusColorMode | null;
+};
+
+/** Sparse template transaction: never snapshot another style or component. */
+export function saveMinimalistTemplatePatch(
+	patch: MinimalistEditorStylePatch,
+	path = configPath,
+): PolishedTuiConfig {
+	return mutateConfig(path, (record) => {
+		const rawStyle = recordValue(
+			recordValue(recordValue(recordValue(record.components).editor).styles).minimalist,
+		);
+		const style = { ...rawStyle };
+		const { formats, variables, extensionColorMode, ...ordinary } = patch;
+		const updated = mergeConfig(record).components.editor.styles.minimalist;
+		applyMinimalistStylePatch(updated, ordinary);
+		const normalized = mergeConfig({ components: { editor: { styles: { minimalist: updated } } } })
+			.components.editor.styles.minimalist;
+		for (const key of Object.keys(ordinary) as Array<keyof typeof ordinary>) {
+			if (ordinary[key] !== undefined)
+				style[key] =
+					key === "contextThresholds"
+						? { ...recordValue(style[key]), ...normalized.contextThresholds }
+						: normalized[key];
+		}
+		if (formats !== undefined) {
+			const saved = { ...recordValue(style.formats) };
+			for (const slot of MINIMALIST_FORMAT_SLOTS) {
+				if (formats[slot] === null) delete saved[slot];
+				else if (typeof formats[slot] === "string") saved[slot] = formats[slot];
+			}
+			if (Object.keys(saved).length) style.formats = saved;
+			else delete style.formats;
+		}
+		if (variables !== undefined) {
+			const saved = { ...recordValue(style.variables) };
+			for (const [name, key] of Object.entries(variables)) {
+				if (key === null) delete saved[name];
+				else if (Object.hasOwn(normalizeMinimalistVariables({ [name]: key }), name)) {
+					if (
+						Object.hasOwn(saved, name) ||
+						Object.keys(normalizeMinimalistVariables(saved)).length < MAX_CUSTOM_VARIABLES
+					)
+						saved[name] = key;
+				}
+			}
+			if (Object.keys(saved).length) style.variables = saved;
+			else delete style.variables;
+		}
+		if (extensionColorMode === null) delete style.extensionColorMode;
+		else if (isExtensionStatusColorMode(extensionColorMode))
+			style.extensionColorMode = extensionColorMode;
+		record.components = overlayKnown(record.components, { editor: { styles: { minimalist: {} } } });
+		const styles = recordValue(recordValue(recordValue(record.components).editor).styles);
+		styles.minimalist = style;
+	});
+}
+
 export function saveMinimalistEditorStylePatch(
-	patch: Partial<MinimalistEditorStyleConfig>,
+	patch: MinimalistEditorStylePatch,
 	path = configPath,
 ): PolishedTuiConfig {
+	if (
+		patch.formats !== undefined ||
+		patch.variables !== undefined ||
+		patch.extensionColorMode !== undefined
+	)
+		return saveMinimalistTemplatePatch(patch, path);
 	return saveComponentsMutation(
+		["editor"],
 		(components) => applyMinimalistStylePatch(components.editor.styles.minimalist, patch),
 		path,
 	);
@@ -1763,6 +2170,7 @@ export function saveUserMessagesComponentPatch(
 	path = configPath,
 ): PolishedTuiConfig {
 	return saveComponentsMutation(
+		["userMessages"],
 		(components) => {
 			const component = components.userMessages;
 			if (patch.enabled !== undefined) component.enabled = patch.enabled;
@@ -1779,11 +2187,15 @@ export function saveThinkingStepsComponentPatch(
 	patch: Partial<ThinkingStepsComponentConfig>,
 	path = configPath,
 ): PolishedTuiConfig {
-	return saveComponentsMutation((components) => {
-		const component = components.thinkingSteps;
-		if (patch.enabled !== undefined) component.enabled = patch.enabled;
-		if (patch.mode !== undefined) component.mode = patch.mode;
-	}, path);
+	return saveComponentsMutation(
+		["thinkingSteps"],
+		(components) => {
+			const component = components.thinkingSteps;
+			if (patch.enabled !== undefined) component.enabled = patch.enabled;
+			if (patch.mode !== undefined) component.mode = patch.mode;
+		},
+		path,
+	);
 }
 
 export function saveWorkingLineComponentPatch(
@@ -1791,10 +2203,13 @@ export function saveWorkingLineComponentPatch(
 	path = configPath,
 ): PolishedTuiConfig {
 	return saveComponentsMutation(
+		["workingLine"],
 		(components) => {
 			const component = components.workingLine;
 			if (patch.enabled !== undefined) component.enabled = patch.enabled;
 			if (patch.turnSummary !== undefined) component.turnSummary = patch.turnSummary;
+			if (patch.turnSummaryFormat !== undefined)
+				component.turnSummaryFormat = normalizeTurnSummaryFormat(patch.turnSummaryFormat);
 			if (patch.spinner !== undefined) component.spinner = patch.spinner;
 			if (patch.spinnerIntervalMs !== undefined)
 				component.spinnerIntervalMs = patch.spinnerIntervalMs;
@@ -1803,6 +2218,7 @@ export function saveWorkingLineComponentPatch(
 			if (patch.textIntervalMs !== undefined) component.textIntervalMs = patch.textIntervalMs;
 			if (patch.textAnimation !== undefined) component.textAnimation = patch.textAnimation;
 			if (patch.colorSource !== undefined) component.colorSource = patch.colorSource;
+			if (patch.placement !== undefined) component.placement = patch.placement;
 			if (patch.messages?.custom !== undefined) component.messages.custom = patch.messages.custom;
 			if (patch.messages?.values !== undefined) {
 				component.messages.values = normalizeWorkingLineMessages([...patch.messages.values]);
@@ -1813,11 +2229,15 @@ export function saveWorkingLineComponentPatch(
 			if (patch.segments?.thought !== undefined)
 				component.segments.thought = patch.segments.thought;
 			if (patch.segments?.tokens !== undefined) component.segments.tokens = patch.segments.tokens;
+			if (patch.segments?.tokenRate !== undefined)
+				component.segments.tokenRate = patch.segments.tokenRate;
 		},
 		path,
 		(record) => {
 			const workingLine = recordValue(recordValue(record.components).workingLine);
 			delete workingLine.intervalMs;
+			if (typeof patch.turnSummaryFormat === "string" && !patch.turnSummaryFormat.trim())
+				delete workingLine.turnSummaryFormat;
 			const messages = recordValue(workingLine.messages);
 			delete messages.mode;
 		},
@@ -1825,10 +2245,11 @@ export function saveWorkingLineComponentPatch(
 }
 
 export function saveSelectorBordersComponentPatch(
-	patch: Partial<SelectorBordersComponentConfig>,
+	patch: Partial<Omit<SelectorBordersComponentConfig, "colors">>,
 	path = configPath,
 ): PolishedTuiConfig {
 	return saveComponentsMutation(
+		["selectorBorders"],
 		(components) => {
 			const component = components.selectorBorders;
 			if (patch.enabled !== undefined) component.enabled = patch.enabled;
@@ -1842,12 +2263,16 @@ export function saveSelectorBordersComponentPatch(
 }
 
 export function saveFooterComponentPatch(
-	patch: Partial<Pick<FooterComponentConfig, "style" | "colorSource" | "modelLabel">>,
+	patch: Partial<
+		Pick<FooterComponentConfig, "style" | "colorSource" | "modelLabel" | "codexQuota">
+	>,
 	path = configPath,
 ): PolishedTuiConfig {
 	return saveComponentsMutation(
+		["footer"],
 		(components) => {
 			const component = components.footer;
+			if (patch.codexQuota !== undefined) component.codexQuota = patch.codexQuota;
 			if (patch.style !== undefined) component.style = patch.style;
 			if (patch.colorSource !== undefined) component.colorSource = patch.colorSource;
 			if (patch.modelLabel !== undefined) component.modelLabel = patch.modelLabel;
@@ -1860,7 +2285,7 @@ export function saveFooterComponentPatch(
 
 function applyStarshipStylePatch(
 	style: StarshipFooterStyleConfig,
-	patch: Partial<StarshipFooterStyleConfig>,
+	patch: StarshipFooterStylePatch,
 ): void {
 	if (patch.format !== undefined) style.format = patch.format;
 	if (patch.responsive !== undefined) style.responsive = patch.responsive;
@@ -1896,12 +2321,18 @@ function applyStarshipStylePatch(
 }
 
 export function saveStarshipFooterStylePatch(
-	patch: Partial<StarshipFooterStyleConfig>,
+	patch: StarshipFooterStylePatch,
 	path = configPath,
 ): PolishedTuiConfig {
 	return saveComponentsMutation(
+		["footer"],
 		(components) => applyStarshipStylePatch(components.footer.styles.starship, patch),
 		path,
+		(record) =>
+			applyTemplateVariablePatch(record, "footer", "starship", patch, [
+				...FOOTER_FORMAT_VARIABLES,
+				...Object.keys(FOOTER_FORMAT_ALIASES),
+			]),
 	);
 }
 
@@ -1910,16 +2341,24 @@ export function saveColorSourcesPatch(
 	path = configPath,
 ): PolishedTuiConfig {
 	const valid = validColorSourceEntries(patch);
-	return saveComponentsMutation((components) => {
-		if (valid.starship !== undefined) components.footer.colorSource = valid.starship;
-		if (valid.editor !== undefined) {
-			components.editor.colorSource = valid.editor;
-			components.selectorBorders.colorSource = valid.editor;
-		}
-		if (valid.userMessages !== undefined) {
-			components.userMessages.colorSource = valid.userMessages;
-		}
-	}, path);
+	return saveComponentsMutation(
+		[
+			...(valid.editor !== undefined ? (["editor", "selectorBorders"] as const) : []),
+			...(valid.userMessages !== undefined ? (["userMessages"] as const) : []),
+			...(valid.starship !== undefined ? (["footer"] as const) : []),
+		],
+		(components) => {
+			if (valid.starship !== undefined) components.footer.colorSource = valid.starship;
+			if (valid.editor !== undefined) {
+				components.editor.colorSource = valid.editor;
+				components.selectorBorders.colorSource = valid.editor;
+			}
+			if (valid.userMessages !== undefined) {
+				components.userMessages.colorSource = valid.userMessages;
+			}
+		},
+		path,
+	);
 }
 
 export function saveUiFeaturesPatch(
@@ -1928,6 +2367,14 @@ export function saveUiFeaturesPatch(
 ): PolishedTuiConfig {
 	const valid = validUiFeatureEntries(patch);
 	return saveComponentsMutation(
+		[
+			...(valid.editor !== undefined
+				? (["editor", "userMessages", "selectorBorders"] as const)
+				: valid.viewportIndicators !== undefined
+					? (["editor"] as const)
+					: []),
+			...(valid.statusLine !== undefined ? (["footer"] as const) : []),
+		],
 		(components) => {
 			if (valid.editor !== undefined) {
 				components.editor.enabled = valid.editor;
@@ -2002,51 +2449,67 @@ export function saveContextThresholdsPatch(
 	if (typeof thresholds.warning === "bigint" || typeof thresholds.error === "bigint") {
 		throw new TypeError("Context thresholds must be JSON-serializable numbers");
 	}
-	return saveComponentsMutation((components) => {
-		components.editor.styles.minimalist.contextThresholds = {
-			...components.editor.styles.minimalist.contextThresholds,
-			...thresholds,
-		};
-		components.footer.styles.starship.contextThresholds = {
-			...components.footer.styles.starship.contextThresholds,
-			...thresholds,
-		};
-	}, path);
+	return saveComponentsMutation(
+		["editor", "footer"],
+		(components) => {
+			components.editor.styles.minimalist.contextThresholds = {
+				...components.editor.styles.minimalist.contextThresholds,
+				...thresholds,
+			};
+			components.footer.styles.starship.contextThresholds = {
+				...components.footer.styles.starship.contextThresholds,
+				...thresholds,
+			};
+		},
+		path,
+	);
 }
 
 export function savePathDisplayPatch(
 	patch: Partial<PathDisplayConfig>,
 	path = configPath,
 ): PolishedTuiConfig {
-	return saveComponentsMutation((components) => {
-		components.footer.styles.starship.pathDisplay = {
-			...components.footer.styles.starship.pathDisplay,
-			...patch,
-		};
-	}, path);
+	return saveComponentsMutation(
+		["footer"],
+		(components) => {
+			components.footer.styles.starship.pathDisplay = {
+				...components.footer.styles.starship.pathDisplay,
+				...patch,
+			};
+		},
+		path,
+	);
 }
 
 export function saveGitBranchPatch(
 	patch: Partial<GitBranchConfig>,
 	path = configPath,
 ): PolishedTuiConfig {
-	return saveComponentsMutation((components) => {
-		components.footer.styles.starship.gitBranch = {
-			...components.footer.styles.starship.gitBranch,
-			...patch,
-		};
-	}, path);
+	return saveComponentsMutation(
+		["footer"],
+		(components) => {
+			components.footer.styles.starship.gitBranch = {
+				...components.footer.styles.starship.gitBranch,
+				...patch,
+			};
+		},
+		path,
+	);
 }
 
 export function saveEditorModelLabel(
 	value: ModelLabelSource,
 	path = configPath,
 ): PolishedTuiConfig {
-	return saveComponentsMutation((components) => {
-		const normalized = parseEditorModelLabel(value);
-		components.editor.modelLabel = normalized;
-		components.footer.modelLabel = normalized;
-	}, path);
+	return saveComponentsMutation(
+		["editor", "footer"],
+		(components) => {
+			const normalized = parseEditorModelLabel(value);
+			components.editor.modelLabel = normalized;
+			components.footer.modelLabel = normalized;
+		},
+		path,
+	);
 }
 
 export function saveEditorStyle(value: EditorStyle, path = configPath): PolishedTuiConfig {
@@ -2054,7 +2517,7 @@ export function saveEditorStyle(value: EditorStyle, path = configPath): Polished
 }
 
 export function saveMinimalistPatch(
-	patch: Partial<MinimalistConfig>,
+	patch: MinimalistEditorStylePatch,
 	path = configPath,
 ): PolishedTuiConfig {
 	return saveMinimalistEditorStylePatch(patch, path);
@@ -2074,12 +2537,16 @@ export function saveGitCommitPatch(
 	const valid: Partial<GitCommitConfig> = {};
 	if (typeof patch.onlyDetached === "boolean") valid.onlyDetached = patch.onlyDetached;
 	if (typeof patch.showTag === "boolean") valid.showTag = patch.showTag;
-	return saveComponentsMutation((components) => {
-		components.footer.styles.starship.gitCommit = {
-			...components.footer.styles.starship.gitCommit,
-			...valid,
-		};
-	}, path);
+	return saveComponentsMutation(
+		["footer"],
+		(components) => {
+			components.footer.styles.starship.gitCommit = {
+				...components.footer.styles.starship.gitCommit,
+				...valid,
+			};
+		},
+		path,
+	);
 }
 
 export function saveGitMetricsPatch(
@@ -2089,24 +2556,32 @@ export function saveGitMetricsPatch(
 	const valid: Partial<GitMetricsConfig> = {};
 	if (typeof patch.onlyNonzero === "boolean") valid.onlyNonzero = patch.onlyNonzero;
 	if (typeof patch.ignoreSubmodules === "boolean") valid.ignoreSubmodules = patch.ignoreSubmodules;
-	return saveComponentsMutation((components) => {
-		components.footer.styles.starship.gitMetrics = {
-			...components.footer.styles.starship.gitMetrics,
-			...valid,
-		};
-	}, path);
+	return saveComponentsMutation(
+		["footer"],
+		(components) => {
+			components.footer.styles.starship.gitMetrics = {
+				...components.footer.styles.starship.gitMetrics,
+				...valid,
+			};
+		},
+		path,
+	);
 }
 
 export function saveExtensionStatusDefaultPlacement(
 	placement: ExtensionStatusPlacement,
 	path = configPath,
 ): PolishedTuiConfig {
-	return saveComponentsMutation((components) => {
-		components.footer.styles.starship.extensionStatuses.defaultPlacement =
-			isExtensionStatusPlacement(placement)
-				? placement
-				: defaultConfig.extensionStatuses.defaultPlacement;
-	}, path);
+	return saveComponentsMutation(
+		["footer"],
+		(components) => {
+			components.footer.styles.starship.extensionStatuses.defaultPlacement =
+				isExtensionStatusPlacement(placement)
+					? placement
+					: defaultConfig.extensionStatuses.defaultPlacement;
+		},
+		path,
+	);
 }
 
 export function saveExtensionStatusPlacement(
@@ -2114,14 +2589,18 @@ export function saveExtensionStatusPlacement(
 	placement: ExtensionStatusPlacement,
 	path = configPath,
 ): PolishedTuiConfig {
-	return saveComponentsMutation((components) => {
-		Object.defineProperty(components.footer.styles.starship.extensionStatuses.placements, key, {
-			value: placement,
-			enumerable: true,
-			configurable: true,
-			writable: true,
-		});
-	}, path);
+	return saveComponentsMutation(
+		["footer"],
+		(components) => {
+			Object.defineProperty(components.footer.styles.starship.extensionStatuses.placements, key, {
+				value: placement,
+				enumerable: true,
+				configurable: true,
+				writable: true,
+			});
+		},
+		path,
+	);
 }
 
 export function saveExtensionStatusColorMode(
@@ -2129,12 +2608,270 @@ export function saveExtensionStatusColorMode(
 	colorMode: ExtensionStatusColorMode,
 	path = configPath,
 ): PolishedTuiConfig {
-	return saveComponentsMutation((components) => {
-		Object.defineProperty(components.footer.styles.starship.extensionStatuses.colorModes, key, {
-			value: colorMode,
-			enumerable: true,
-			configurable: true,
-			writable: true,
+	return mutateConfig(path, (record) => {
+		const footer = recordValue(recordValue(record.components).footer);
+		const starship = recordValue(recordValue(footer.styles).starship);
+		const statuses = recordValue(starship.extensionStatuses);
+		const colorModes = Object.hasOwn(statuses, "colorModes")
+			? recordValue(statuses.colorModes)
+			: recordValue(recordValue(record.extensionStatuses).colorModes);
+		record.components = overlayKnown(record.components, {
+			footer: {
+				styles: {
+					starship: { extensionStatuses: { colorModes: { ...colorModes, [key]: colorMode } } },
+				},
+			},
+		});
+	});
+}
+
+/** Hidden placement edits remain sparse and never snapshot another owner's preferences. */
+export function saveHiddenExtensionStatusDefaultPlacement(
+	placement: HiddenExtensionStatusPlacement,
+	path = configPath,
+): PolishedTuiConfig {
+	return mutateConfig(path, (record) => {
+		record.components = overlayKnown(record.components, {
+			extensionStatuses: { hidden: { defaultPlacement: placement } },
 		});
-	}, path);
+	});
+}
+
+export function saveHiddenExtensionStatusPlacement(
+	key: string,
+	placement: HiddenExtensionStatusPlacement | undefined,
+	path = configPath,
+): PolishedTuiConfig {
+	return mutateConfig(path, (record) => {
+		if (placement === undefined) {
+			const owner = recordValue(recordValue(record.components).extensionStatuses);
+			delete recordValue(recordValue(owner.hidden).placements)[key];
+		} else {
+			record.components = overlayKnown(record.components, {
+				extensionStatuses: { hidden: { placements: { [key]: placement } } },
+			});
+		}
+	});
+}
+
+/** Original is Hidden's default; choosing it removes only this color override. */
+export function saveHiddenExtensionStatusColorMode(
+	key: string,
+	colorMode: ExtensionStatusColorMode,
+	path = configPath,
+): PolishedTuiConfig {
+	return mutateConfig(path, (record) => {
+		if (colorMode === "original") {
+			const owner = recordValue(recordValue(record.components).extensionStatuses);
+			delete recordValue(recordValue(owner.hidden).colorModes)[key];
+		} else {
+			record.components = overlayKnown(record.components, {
+				extensionStatuses: { hidden: { colorModes: { [key]: colorMode } } },
+			});
+		}
+	});
+}
+
+export function saveExtensionStatusDefaultVisibility(
+	visibility: ExtensionStatusVisibility,
+	path = configPath,
+): PolishedTuiConfig {
+	return saveComponentsMutation(
+		["extensionStatuses"],
+		(components) => {
+			components.extensionStatuses.defaultVisibility = visibility;
+		},
+		path,
+	);
+}
+
+/** Undefined resumes the independent default, without changing Starship presentation. */
+export function saveExtensionStatusVisibility(
+	key: string,
+	visibility: ExtensionStatusVisibility | undefined,
+	path = configPath,
+): PolishedTuiConfig {
+	return saveComponentsMutation(
+		["extensionStatuses"],
+		(components) => {
+			if (visibility === undefined) delete components.extensionStatuses.visibility[key];
+			else
+				Object.defineProperty(components.extensionStatuses.visibility, key, {
+					value: visibility,
+					enumerable: true,
+					configurable: true,
+					writable: true,
+				});
+		},
+		path,
+		(record) => {
+			// overlayKnown preserves unknown leaves; explicitly remove a reset override.
+			if (visibility === undefined) {
+				const owner = recordValue(recordValue(record.components).extensionStatuses);
+				delete recordValue(owner.visibility)[key];
+			}
+		},
+	);
+}
+
+export type ExtensionStatusChoice = "default" | ExtensionStatusPlacement;
+
+/** Save one menu choice in a single atomic write, without snapshotting other components. */
+export function saveExtensionStatusDefaultChoice(
+	placement: ExtensionStatusPlacement,
+	style: FooterStyle,
+	path = configPath,
+): PolishedTuiConfig {
+	return mutateConfig(path, (record) => {
+		record.components = overlayKnown(record.components, {
+			extensionStatuses: { defaultVisibility: placement === "off" ? "hide" : "show" },
+		});
+		if (placement === "off") return;
+		if (style === "hidden") {
+			record.components = overlayKnown(record.components, {
+				extensionStatuses: { hidden: { defaultPlacement: placement } },
+			});
+		} else {
+			// Native retains Starship positioning as a dormant preference; Pi owns its layout.
+			record.components = overlayKnown(record.components, {
+				footer: { styles: { starship: { extensionStatuses: { defaultPlacement: placement } } } },
+			});
+		}
+	});
+}
+
+/** Default removes both visibility and current-mode placement, shadowing legacy Starship maps. */
+export function saveExtensionStatusChoice(
+	key: string,
+	choice: ExtensionStatusChoice,
+	style: FooterStyle,
+	path = configPath,
+): PolishedTuiConfig {
+	return mutateConfig(path, (record) => {
+		const components = recordValue(record.components);
+		const owner = recordValue(components.extensionStatuses);
+		const hidden = recordValue(owner.hidden);
+		const starship = recordValue(recordValue(recordValue(components.footer).styles).starship);
+		const canonicalStatuses = recordValue(starship.extensionStatuses);
+		if (choice === "default") {
+			delete recordValue(owner.visibility)[key];
+			if (style === "hidden") {
+				delete recordValue(hidden.placements)[key];
+			} else {
+				// An empty canonical map must remain to prevent top-level legacy fallback.
+				const placements = {
+					...recordValue(
+						Object.hasOwn(canonicalStatuses, "placements")
+							? canonicalStatuses.placements
+							: recordValue(record.extensionStatuses).placements,
+					),
+				};
+				delete placements[key];
+				record.components = overlayKnown(record.components, {
+					footer: { styles: { starship: { extensionStatuses: { placements: {} } } } },
+				});
+				const footer = recordValue(recordValue(record.components).footer);
+				const savedStarship = recordValue(recordValue(footer.styles).starship);
+				recordValue(savedStarship.extensionStatuses).placements = placements;
+			}
+			return;
+		}
+		record.components = overlayKnown(record.components, {
+			extensionStatuses: { visibility: { [key]: choice === "off" ? "hide" : "show" } },
+		});
+		if (choice === "off") return;
+		if (style === "hidden") {
+			record.components = overlayKnown(record.components, {
+				extensionStatuses: { hidden: { placements: { [key]: choice } } },
+			});
+		} else {
+			const placements = Object.hasOwn(canonicalStatuses, "placements")
+				? recordValue(canonicalStatuses.placements)
+				: recordValue(recordValue(record.extensionStatuses).placements);
+			record.components = overlayKnown(record.components, {
+				footer: {
+					styles: {
+						starship: { extensionStatuses: { placements: { ...placements, [key]: choice } } },
+					},
+				},
+			});
+		}
+	});
+}
+
+/** Explicit all-owner migration; callers must obtain confirmation before invoking. */
+export function migrateComponentSelections(path = configPath): PolishedTuiConfig {
+	return saveComponentsMutation(
+		[
+			"editor",
+			"userMessages",
+			"thinkingSteps",
+			"workingLine",
+			"selectorBorders",
+			"footer",
+			"extensionStatuses",
+		],
+		() => {},
+		path,
+	);
+}
+
+/** Undefined deletes the local key: empty and whitespace strings are deliberate unstyled overrides. */
+export function saveComponentColor<O extends ColorOwner>(
+	owner: O,
+	key: ComponentColorKey<O>,
+	value: string | undefined,
+	path = configPath,
+): PolishedTuiConfig {
+	if (!(componentColorKeys[owner] as readonly string[]).includes(key))
+		throw new Error("Unknown component color role");
+	if (value !== undefined && !isSupportedColorSpec(value))
+		throw new Error("Unsupported color style");
+	return saveComponentsMutation(
+		[owner],
+		() => {},
+		path,
+		(record) => {
+			const component = recordValue(recordValue(record.components)[owner]);
+			const colors = { ...recordValue(component.colors) };
+			if (value === undefined) delete colors[key];
+			else
+				Object.defineProperty(colors, key, {
+					value,
+					enumerable: true,
+					configurable: true,
+					writable: true,
+				});
+			component.colors = colors;
+		},
+	);
+}
+
+/** One sparse publisher leaf; selection snapshots exclude the entire map. */
+export function saveCustomValueColor(
+	owner: "editor" | "footer",
+	key: string,
+	value: string | undefined,
+	path = configPath,
+): PolishedTuiConfig {
+	if (customValueColor({ [key]: value ?? "" }, key) === undefined)
+		throw new Error("Unsupported publisher key or color style");
+	return saveComponentsMutation(
+		[owner],
+		() => {},
+		path,
+		(record) => {
+			const component = recordValue(recordValue(record.components)[owner]);
+			const colors = { ...recordValue(component.customValueColors) };
+			if (value === undefined) delete colors[key];
+			else
+				Object.defineProperty(colors, key, {
+					value,
+					enumerable: true,
+					configurable: true,
+					writable: true,
+				});
+			component.customValueColors = colors;
+		},
+	);
 }