@selesai/code 0.13.40 → 0.14.3

package/dist/extensions/pi-zentui/extensions/zentui/settings-command.ts

@@ -10,6 +10,14 @@ import {
 	truncateToWidth,
 	visibleWidth,
 } from "@earendil-works/pi-tui";
+import { type ColorOwner, componentColor } from "./component-colors";
+import {
+	type ComponentSettingsDeps,
+	confirmComponentMigration,
+	editComponentColors,
+	editCustomValueColors,
+	editTurnSummaryFormat,
+} from "./component-settings";
 import {
 	type AccentRailEditorStyleConfig,
 	type ColorSource,
@@ -19,6 +27,7 @@ import {
 	type EditorBorderColorMode,
 	type EditorComponentConfig,
 	type EditorStyle,
+	type ExtensionStatusChoice,
 	type ExtensionStatusColorMode,
 	type ExtensionStatusPlacement,
 	type FooterComponentConfig,
@@ -29,7 +38,7 @@ import {
 	type GitCommitConfig,
 	type GitMetricsConfig,
 	getExtensionStatusColorMode,
-	getExtensionStatusPlacement,
+	getHiddenExtensionStatusColorMode,
 	type IconMode,
 	isExtensionStatusColorMode,
 	isExtensionStatusPlacement,
@@ -38,6 +47,8 @@ import {
 	MAX_WORKING_LINE_INTERVAL_MS,
 	MIN_WORKING_LINE_INTERVAL_MS,
 	type MinimalistConfig,
+	type MinimalistEditorSeparator,
+	type MinimalistEditorStylePatch,
 	type ModelLabelSource,
 	type PathDisplayConfig,
 	type PolishedCopyFriendlyEditorStyleConfig,
@@ -50,12 +61,19 @@ import {
 	type UserMessageStyle,
 	type UserMessagesComponentConfig,
 	type WorkingLineComponentPatch,
+	type WorkingLinePlacement,
 	type WorkingLineSpinner,
 	type WorkingLineTextAnimation,
 } from "./config";
 import { prepareEditorTextForCustomUi } from "./editor-transfer";
 import { sanitizeExtensionStatusText } from "./extension-status";
+import {
+	extensionStatusChoice,
+	extensionStatusChoiceLabels,
+	extensionStatusDefaultChoice,
+} from "./extension-status-settings";
 import { isIconMode } from "./icons";
+import { editMinimalistTemplates, editMinimalistVariables } from "./minimalist-settings";
 import {
 	componentPresets,
 	getComponentPreset,
@@ -63,13 +81,15 @@ import {
 	type PresetId,
 } from "./presets";
 import type { SessionLifecycle } from "./session-lifecycle";
+import { settingsKeys } from "./settings-keys";
+import { selectOwnedSetting } from "./settings-list-selection";
 import {
 	renderEditorSettingsPreview,
 	renderThinkingStepsSettingsPreview,
 	renderUserMessageSettingsPreview,
 	SETTINGS_PREVIEW_MAX_WIDTH,
 } from "./settings-previews";
-import { EDITOR_BORDER_STYLE, renderChromeBorder, safeThemeFg } from "./style";
+import { EDITOR_BORDER_FALLBACK, renderStyleForSourceOrFallback, safeThemeFg } from "./style";
 import { formatThinkingStatus, thinkingStatusLabels } from "./thinking-status";
 import {
 	buildWorkingLinePreviewFrames,
@@ -79,13 +99,8 @@ import {
 } from "./working-line";
 
 const colorSourceValues: ColorSource[] = ["theme", "terminal"];
-const extensionStatusPlacementValues: ExtensionStatusPlacement[] = [
-	"off",
-	"left",
-	"middle",
-	"right",
-];
-const extensionStatusColorModeValues: ExtensionStatusColorMode[] = ["zentui", "original"];
+const extensionStatusPlacementValues = ["Left", "Middle", "Right", "Off"];
+const extensionStatusColorModeValues = ["Original", "Zentui"];
 const contextStyleValues: ContextStyle[] = ["text", "gauge", "text+gauge"];
 const separatorStyleValues: SeparatorStyle[] = ["pipe", "dot", "chevron", "none"];
 const pathDisplayModeValues: PathDisplayConfig["mode"][] = ["basename", "repository", "full"];
@@ -117,6 +132,7 @@ const completionMenuValues: CompletionMenuStyle[] = ["palette", "native"];
 const accentRailSurfaceValues = ["filled", "transparent"];
 const minimalistPathDisplayValues = ["compact", "project", "full"];
 const minimalistContextFormatValues = ["percent", "percent-total"];
+const minimalistSeparatorValues: MinimalistEditorSeparator[] = ["dash", "dot"];
 const editorBorderColorModeValues: EditorBorderColorMode[] = ["static", "adaptive"];
 const compactFooterMaxLineValues = ["1", "2", "3", "unlimited"];
 const featureStateValues: FeatureState[] = ["enabled", "disabled"];
@@ -142,6 +158,11 @@ const speedValues = (presets: readonly { label: string }[]) => [
 	...presets.map(({ label }) => label),
 	"Custom…",
 ];
+const workingLinePlacementLabels: Record<WorkingLinePlacement, string> = {
+	above: "Above",
+	border: "Border",
+};
+const workingLinePlacementValues = Object.values(workingLinePlacementLabels);
 const workingLineTextAnimationValues: WorkingLineTextAnimation[] = ["classic", "kitt", "disabled"];
 const thinkingStepsModeLabels: Record<ThinkingStepsMode, string> = {
 	rail: "Rail",
@@ -161,28 +182,53 @@ const settingsSections = [
 	"thinkingSteps",
 	"workingLine",
 	"footer",
-	"segments",
-	"git",
 	"extensions",
 ] as const;
-
+const skinSections: readonly TopLevelSection[] = ["editor", "userMessages", "footer"];
+const footerPages = ["segments", "git"] as const;
+type FooterPage = (typeof footerPages)[number];
+type TopLevelSection = (typeof settingsSections)[number];
 type FeatureState = "enabled" | "disabled";
-type SettingsSection = (typeof settingsSections)[number];
+type SettingsSection = TopLevelSection | FooterPage;
+
+function isFooterPage(section: string): section is FooterPage {
+	return footerPages.some((page) => page === section);
+}
+function topLevelSection(section: SettingsSection): TopLevelSection {
+	return isFooterPage(section) ? "footer" : section;
+}
+function footerPageSettingId(page: FooterPage): string {
+	return `footerPage:${page}`;
+}
 type FooterSegmentSettingId = keyof FooterSegmentsConfig;
 type EditorPatch = Partial<
 	Pick<
 		EditorComponentConfig,
-		"enabled" | "style" | "colorSource" | "borderColorMode" | "modelLabel" | "viewportIndicators"
+		| "enabled"
+		| "style"
+		| "colorSource"
+		| "borderColorMode"
+		| "modelLabel"
+		| "viewportIndicators"
+		| "codexQuota"
 	>
 >;
 type UserMessagesPatch = Partial<
 	Pick<UserMessagesComponentConfig, "enabled" | "style" | "colorSource">
 >;
-type FooterPatch = Partial<Pick<FooterComponentConfig, "style" | "colorSource" | "modelLabel">>;
+type FooterPatch = Partial<
+	Pick<FooterComponentConfig, "style" | "colorSource" | "modelLabel" | "codexQuota">
+>;
 type ApplyResult = { applied: boolean; reason?: string };
 type SettingsOutcome =
 	| "close"
+	| "migrate"
+	| `edit-colors:${ColorOwner}`
+	| `edit-custom-value-colors:${"editor" | "footer"}`
+	| "edit-minimalist-templates"
+	| "edit-minimalist-variables"
 	| "edit-working-line-messages"
+	| "edit-turn-summary-format"
 	| "edit-working-line-spinner-speed"
 	| "edit-working-line-text-speed";
 
@@ -217,7 +263,8 @@ function experimentalThinkingCapability(
 			};
 }
 
-type SettingsCommandDeps = {
+type SettingsCommandDeps = Omit<ComponentSettingsDeps, "getConfig"> & {
+	skinOnly?: boolean;
 	sessionLifecycle: SessionLifecycle;
 	getConfig: () => PolishedTuiConfig;
 	applyPreset: (
@@ -237,7 +284,7 @@ type SettingsCommandDeps = {
 		ctx: ExtensionContext,
 	) => void;
 	setAccentRail: (patch: Partial<AccentRailEditorStyleConfig>, ctx: ExtensionContext) => void;
-	setMinimalist: (patch: Partial<MinimalistConfig>, ctx: ExtensionContext) => void;
+	setMinimalist: (patch: MinimalistEditorStylePatch, ctx: ExtensionContext) => void;
 	setUserMessagesComponent: (patch: UserMessagesPatch, ctx: ExtensionContext) => void;
 	thinkingStepsCapability: ThinkingStepsSettingsCapability;
 	setThinkingStepsComponent: (
@@ -246,7 +293,7 @@ type SettingsCommandDeps = {
 	) => ApplyResult;
 	setWorkingLineComponent: (patch: WorkingLineComponentPatch, ctx: ExtensionContext) => ApplyResult;
 	setSelectorBordersComponent: (
-		patch: Partial<SelectorBordersComponentConfig>,
+		patch: Partial<Omit<SelectorBordersComponentConfig, "colors">>,
 		ctx: ExtensionContext,
 	) => void;
 	setFooterComponent: (patch: FooterPatch, ctx: ExtensionContext) => void;
@@ -267,8 +314,9 @@ type SettingsCommandDeps = {
 	) => void;
 	setGitMetrics: (patch: Partial<GitMetricsConfig>, ctx: ExtensionContext) => void;
 	getActiveExtensionStatuses: () => ReadonlyMap<string, string>;
-	setExtensionStatusDefaultPlacement: (placement: ExtensionStatusPlacement) => void;
-	setExtensionStatusPlacement: (key: string, placement: ExtensionStatusPlacement) => void;
+	setExtensionStatusDefaultChoice: (placement: ExtensionStatusPlacement) => void;
+	setExtensionStatusChoice: (key: string, choice: ExtensionStatusChoice) => void;
+	setHiddenExtensionStatusColorMode: (key: string, colorMode: ExtensionStatusColorMode) => void;
 	setExtensionStatusColorMode: (key: string, colorMode: ExtensionStatusColorMode) => void;
 	requestRender: () => void;
 	settingsListTheme?: SettingsListTheme;
@@ -283,7 +331,7 @@ const sectionLabels: Record<SettingsSection, string> = {
 	footer: "Footer",
 	segments: "Segments",
 	git: "Git",
-	extensions: "Extensions",
+	extensions: "Extension statuses",
 };
 
 const footerSegmentSettingLabels: Record<FooterSegmentSettingId, string> = {
@@ -326,7 +374,32 @@ const footerSegmentSettingDescriptions: Record<FooterSegmentSettingId, string> =
 	gitMetrics: "Show aggregate added/deleted line counts.",
 };
 
+function footerSegmentDescription(key: FooterSegmentSettingId): string {
+	if (key === "gitCounts")
+		return "Show numeric ahead/behind and stash counts in built-in segments and template git-status variables.";
+	return `Built-in layout: ${footerSegmentSettingDescriptions[key]} Explicit wide format and compactFormat templates choose their own segments, independent of these toggles.`;
+}
+
+const sectionRoutes: Record<string, SettingsSection> = {
+	appearance: "appearance",
+	editor: "editor",
+	messages: "userMessages",
+	"user-messages": "userMessages",
+	thinking: "thinkingSteps",
+	"thinking-steps": "thinkingSteps",
+	"working-line": "workingLine",
+	footer: "footer",
+	statusline: "footer",
+	status: "footer",
+	"status-line": "footer",
+	segments: "segments",
+	git: "git",
+	extensions: "extensions",
+};
+
 const directCommandSuggestions = [
+	...Object.keys(sectionRoutes),
+	"migrate",
 	...componentPresets.map(({ id }) => `preset ${id}`),
 	"editor enable",
 	"editor disable",
@@ -340,9 +413,6 @@ const directCommandSuggestions = [
 	"viewport-indicators enable",
 	"viewport-indicators disable",
 	"viewport-indicators toggle",
-	"messages",
-	"user-messages",
-	"working-line",
 	"format clear",
 	"format $cwd on $git_branch $fill $context",
 ];
@@ -468,28 +538,32 @@ function parseFormatCommand(args: string): { value: string | undefined } | undef
 }
 
 function directSection(args: string): SettingsSection | undefined {
-	const normalized = args.trim().toLowerCase().replaceAll("_", "-");
-	if (
-		normalized === "messages" ||
-		normalized === "user-messages" ||
-		normalized === "user messages"
-	) {
-		return "userMessages";
-	}
-	if (normalized === "working-line" || normalized === "working line") return "workingLine";
-	return undefined;
+	return sectionRoutes[args.trim().toLowerCase().replaceAll(/[_ ]+/g, "-")];
 }
 
-function argumentCompletions(prefix: string): AutocompleteItem[] | null {
+function argumentCompletions(prefix: string, skinOnly = false): AutocompleteItem[] | null {
 	const normalized = prefix.trimStart().toLowerCase();
-	const matches = directCommandSuggestions
-		.map((value) => ({ value, label: value }))
+	const suggestions = skinOnly
+		? directCommandSuggestions.filter((value) => {
+				const section = directSection(value);
+				return section
+					? skinSections.includes(topLevelSection(section))
+					: /^(editor|messages|statusline|viewport-indicators|format|preset) /.test(value);
+			})
+		: directCommandSuggestions;
+	const matches = suggestions
+		.map((value) => ({
+			value,
+			label: isFooterPage(value)
+				? `${value} — ${skinOnly ? "Statusline" : "Footer"} > ${sectionLabels[value]}`
+				: value,
+		}))
 		.filter((item) => item.value.startsWith(normalized));
 	return matches.length ? matches : null;
 }
 
 function usageText(): string {
-	return "Usage: /zentui [editor|messages|statusline|viewport-indicators] [enable|disable|toggle], /zentui [messages|user-messages|working-line], /zentui preset <opencode|opencode-copy-friendly|rail|minimalist>, or /zentui format <template>";
+	return "Usage: /zentui [editor|messages|statusline|viewport-indicators] [enable|disable|toggle], /zentui [appearance|editor|user-messages|thinking|working-line|footer|segments|git|extensions], /zentui preset <opencode|opencode-copy-friendly|rail|minimalist>, or /zentui format <template>";
 }
 
 function buildAppearanceItems(config: PolishedTuiConfig): SettingItem[] {
@@ -506,16 +580,15 @@ function buildAppearanceItems(config: PolishedTuiConfig): SettingItem[] {
 		{
 			id: "selectorBordersEnabled",
 			label: "Selector borders",
-			description: "Enable or disable Zentui borders around Pi selectors.",
+			description: "Disable to leave selector borders native or predecessor-controlled.",
 			currentValue: featureValue(component.enabled),
 			values: featureStateValues,
 		},
 		{
 			id: "selectorBordersStyle",
 			label: "Selector border style",
-			description: "Choose the selector-border style.",
+			description: "Zentui is the only selector-border treatment. Informational, not a choice.",
 			currentValue: component.style,
-			values: ["zentui"],
 		},
 		{
 			id: "selectorBordersColorSource",
@@ -527,20 +600,25 @@ function buildAppearanceItems(config: PolishedTuiConfig): SettingItem[] {
 		{
 			id: "iconMode",
 			label: "Icon mode",
-			description: "auto/nerd use Nerd Font glyphs; ascii uses plain fallbacks.",
+			description:
+				"Auto uses conservative signals: TERM_PROGRAM=iTerm.app|WezTerm|ghostty (case-insensitive), nonempty KITTY_WINDOW_ID or ALACRITTY_SOCKET, and exact ZENTUI_NERD_FONTS=1|0; otherwise ASCII. Environment heuristics cannot detect whether a Nerd Font is installed/configured.",
 			currentValue: config.icons.mode,
 			values: iconModeValues,
 		},
 	];
 }
 
+const codexQuotaDescription =
+	"Remaining ChatGPT account quota for active openai-codex. Authenticated background refresh roughly every minute while active. Custom templates require $codex_quota; the toggle always gates access.";
+
 function buildEditorItems(config: PolishedTuiConfig): SettingItem[] {
 	const editor = config.components.editor;
 	return [
 		{
 			id: "editorEnabled",
 			label: "Editor",
-			description: "Enable or disable Zentui's custom editor.",
+			description:
+				"Disable to leave the editor native or predecessor-controlled; saved preferences are retained.",
 			currentValue: featureValue(editor.enabled),
 			values: featureStateValues,
 		},
@@ -551,6 +629,7 @@ function buildEditorItems(config: PolishedTuiConfig): SettingItem[] {
 			currentValue: editorStyleLabel(editor.style),
 			values: editorStyleValues,
 		},
+		...(editor.style === "accent-rail" ? buildAccentRailEditorStyleItems(config) : []),
 		{
 			id: "editorColorSource",
 			label: "Editor colors",
@@ -558,6 +637,13 @@ function buildEditorItems(config: PolishedTuiConfig): SettingItem[] {
 			currentValue: editor.colorSource,
 			values: colorSourceValues,
 		},
+		{
+			id: "editorCodexQuota",
+			label: "Codex quota",
+			description: codexQuotaDescription,
+			currentValue: featureValue(editor.codexQuota),
+			values: featureStateValues,
+		},
 		{
 			id: "editorModelLabel",
 			label: "Editor model label",
@@ -575,7 +661,7 @@ function buildEditorItems(config: PolishedTuiConfig): SettingItem[] {
 		{
 			id: "editorViewportIndicators",
 			label: "Editor viewport indicators",
-			description: "Show Pi's native wrapped-row counts in editor borders.",
+			description: "Show Pi's native wrapped-row counts when editor content is clipped.",
 			currentValue: featureValue(editor.viewportIndicators),
 			values: featureStateValues,
 		},
@@ -604,8 +690,9 @@ function buildAccentRailEditorStyleItems(config: PolishedTuiConfig): SettingItem
 	return [
 		{
 			id: "accentRailSurface",
-			label: "Accent Rail surface",
-			description: "Fill input and autocomplete surfaces or keep them transparent.",
+			label: "Editor background",
+			description:
+				"Filled adds the rail's background; transparent lets the terminal background show through. Native selection highlights are preserved.",
 			currentValue: accentRail.transparent ? "transparent" : "filled",
 			values: accentRailSurfaceValues,
 		},
@@ -657,6 +744,13 @@ function buildMinimalistEditorStyleItems(config: PolishedTuiConfig): SettingItem
 			currentValue: featureValue(minimalist.showCost),
 			values: featureStateValues,
 		},
+		{
+			id: "minimalistShowCacheHit",
+			label: "Cache hit rate",
+			description: "Show the latest prompt cache hit rate.",
+			currentValue: featureValue(minimalist.showCacheHit),
+			values: featureStateValues,
+		},
 		{
 			id: "minimalistShowGit",
 			label: "Git",
@@ -664,6 +758,37 @@ function buildMinimalistEditorStyleItems(config: PolishedTuiConfig): SettingItem
 			currentValue: featureValue(minimalist.showGit),
 			values: featureStateValues,
 		},
+		{
+			id: "minimalistSeparator",
+			label: "Separator",
+			description: "Choose dash (–) or dot (·) between editor metadata items.",
+			currentValue: minimalist.separator,
+			values: minimalistSeparatorValues,
+		},
+		{
+			id: "minimalistExtensionColorMode",
+			label: "Custom value colors",
+			description:
+				"Original preserves safe publisher styling; Zentui uses the Editor's color source.",
+			currentValue: minimalist.extensionColorMode === "zentui" ? "Zentui" : "Original",
+			values: extensionStatusColorModeValues,
+		},
+		{
+			id: "edit-minimalist-templates",
+			label: "Metadata templates",
+			description:
+				"Edit or reset six border slots. Explicit templates override metadata visibility toggles, never quota consent or operational indicators.",
+			currentValue: "Edit…",
+			values: ["Edit…"],
+		},
+		{
+			id: "edit-minimalist-variables",
+			label: "Custom variable aliases",
+			description:
+				"Map template variables to extension publisher keys; edit JSON or reset aliases.",
+			currentValue: "Edit…",
+			values: ["Edit…"],
+		},
 	];
 }
 
@@ -673,7 +798,8 @@ function buildUserMessagesItems(config: PolishedTuiConfig): SettingItem[] {
 		{
 			id: "userMessagesEnabled",
 			label: "User messages",
-			description: "Enable or disable previous user-message styling.",
+			description:
+				"Disable to leave previous messages native or predecessor-controlled; saved preferences are retained.",
 			currentValue: featureValue(messages.enabled),
 			values: featureStateValues,
 		},
@@ -731,6 +857,16 @@ function buildWorkingLineItems(config: PolishedTuiConfig): SettingItem[] {
 			currentValue: featureValue(workingLine.enabled),
 			values: featureStateValues,
 		},
+		...(config.components.editor.enabled && config.components.editor.style !== "accent-rail"
+			? [
+					{
+						id: "workingLinePlacement",
+						label: "Placement",
+						currentValue: workingLinePlacementLabels[workingLine.placement],
+						values: workingLinePlacementValues,
+					},
+				]
+			: []),
 		{
 			id: "workingLineTurnSummary",
 			label: "Turn summary",
@@ -740,6 +876,13 @@ function buildWorkingLineItems(config: PolishedTuiConfig): SettingItem[] {
 			currentValue: featureValue(workingLine.turnSummary),
 			values: featureStateValues,
 		},
+		{
+			id: "workingLineTurnSummaryFormat",
+			label: "Turn summary format",
+			description: "Edit/reset the template for new summaries only.",
+			currentValue: "Edit / Reset…",
+			values: ["Edit / Reset…"],
+		},
 		{
 			id: "workingLineSpinner",
 			label: "Spinner",
@@ -767,7 +910,8 @@ function buildWorkingLineItems(config: PolishedTuiConfig): SettingItem[] {
 		{
 			id: "workingLineTextAnimation",
 			label: "Text animation",
-			description: "Animate the owned row or keep it uniformly static.",
+			description:
+				"Classic/KITT animate every segment, including Token rate; Static uses mid with optional Token rate override.",
 			currentValue: workingLine.textAnimation,
 			values: workingLineTextAnimationValues,
 		},
@@ -814,6 +958,14 @@ function buildWorkingLineItems(config: PolishedTuiConfig): SettingItem[] {
 			currentValue: featureValue(workingLine.segments.thought),
 			values: featureStateValues,
 		},
+		{
+			id: "workingLineTokenRate",
+			label: "Token rate",
+			description:
+				"Recent generated output per second; ~ marks an estimate. Hidden during tools, idle, compaction, or stale/unsupported output.",
+			currentValue: featureValue(workingLine.segments.tokenRate ?? false),
+			values: featureStateValues,
+		},
 		{
 			id: "workingLineTokens",
 			label: "Tokens",
@@ -839,7 +991,8 @@ function buildFooterItems(config: PolishedTuiConfig): SettingItem[] {
 		{
 			id: "footerStyle",
 			label: "Footer style",
-			description: "Use Pi's native footer, Zentui's Starship footer, or no footer rows.",
+			description:
+				"Native leaves Pi or a predecessor unowned; Starship installs Zentui; Hidden keeps only allowed extension statuses.",
 			currentValue: footerStyleLabel(footer.style),
 			values: footerStyleValues,
 		},
@@ -853,10 +1006,18 @@ function buildFooterItems(config: PolishedTuiConfig): SettingItem[] {
 				currentValue: footer.colorSource,
 				values: colorSourceValues,
 			},
+			{
+				id: "footerCodexQuota",
+				label: "Codex quota",
+				description: codexQuotaDescription,
+				currentValue: featureValue(footer.codexQuota),
+				values: featureStateValues,
+			},
 			{
 				id: "footerModelLabel",
 				label: "Footer model label",
-				description: "Show the model id or display name in the footer.",
+				description:
+					"Choose the label when built-in Model info or a template's $model is shown; this does not enable that segment.",
 				currentValue: footer.modelLabel,
 				values: modelLabelValues,
 			},
@@ -870,14 +1031,16 @@ function buildStarshipFooterStyleItems(config: PolishedTuiConfig): SettingItem[]
 		{
 			id: "responsiveFooter",
 			label: "Responsive footer",
-			description: "Use the compact template when space is tight.",
+			description:
+				"Reflow the wide layout, then use compactFormat when it cannot fit. An explicit wide format and the compact template choose segments independently of segment toggles.",
 			currentValue: featureValue(footer.responsive),
 			values: featureStateValues,
 		},
 		{
 			id: "compactFooterMaxLines",
 			label: "Compact footer rows",
-			description: "Maximum compact rows before cropping.",
+			description:
+				"Maximum compactFormat template rows before cropping; does not change template segments.",
 			currentValue: String(footer.compactMaxLines),
 			values: compactFooterMaxLineValues,
 		},
@@ -891,7 +1054,8 @@ function buildStarshipFooterStyleItems(config: PolishedTuiConfig): SettingItem[]
 		{
 			id: "separator",
 			label: "Separator",
-			description: "Choose the separator between default footer segments.",
+			description:
+				"Choose built-in/layout separators, including extension-status joins. Their width can affect when the layout switches to compact. Does not change $sep (fixed pipe) or literal template separators.",
 			currentValue: footer.separator,
 			values: separatorStyleValues,
 		},
@@ -942,7 +1106,7 @@ function buildSegmentsItems(config: PolishedTuiConfig): SettingItem[] {
 	return nonGitSegmentKeys.map((key) => ({
 		id: footerSegmentSettingId(key),
 		label: footerSegmentSettingLabels[key],
-		description: footerSegmentSettingDescriptions[key],
+		description: footerSegmentDescription(key),
 		currentValue: featureValue(segments[key]),
 		values: featureStateValues,
 	}));
@@ -958,7 +1122,7 @@ function buildGitItems(config: PolishedTuiConfig): SettingItem[] {
 	const segment = (key: FooterSegmentSettingId): SettingItem => ({
 		id: footerSegmentSettingId(key),
 		label: footerSegmentSettingLabels[key],
-		description: footerSegmentSettingDescriptions[key],
+		description: footerSegmentDescription(key),
 		currentValue: featureValue(starship.segments[key]),
 		values: featureStateValues,
 	});
@@ -1019,42 +1183,67 @@ function buildExtensionsItems(
 	config: PolishedTuiConfig,
 	active: ReadonlyMap<string, string>,
 ): SettingItem[] {
-	const defaultItem: SettingItem = {
-		id: "extensionStatusDefaultPlacement",
-		label: "Default placement",
-		description: "Placement for active statuses without an override.",
-		currentValue: config.components.footer.styles.starship.extensionStatuses.defaultPlacement,
-		values: extensionStatusPlacementValues,
-	};
-	const statuses = [...active.entries()].sort(([a], [b]) => a.localeCompare(b));
-	if (!statuses.length)
-		return [
-			defaultItem,
-			{
-				id: "noThirdPartyStatuses",
-				label: "No active statuses",
-				description: "Only statuses currently published through ctx.ui.setStatus().",
-				currentValue: "—",
-			},
-		];
+	const local = config.components.footer.styles.starship.extensionStatuses;
+	const visibility = config.components.extensionStatuses;
+	const hidden = config.components.footer.style === "hidden";
+	const hiddenPlacement = visibility.hidden;
+	const keys = [
+		...new Set([
+			...active.keys(),
+			...Object.keys(visibility.visibility),
+			...Object.keys(hiddenPlacement?.placements ?? {}),
+			...Object.keys(hiddenPlacement?.colorModes ?? {}),
+			...Object.keys(local.placements),
+			...Object.keys(local.colorModes),
+		]),
+	].sort((a, b) => a.localeCompare(b));
+	const nativeNote =
+		"Native uses Pi's layout; positioning and color are saved for Starship, not applied to Native.";
+	const placementNote = hidden
+		? "Off hides statuses. Hidden places visible statuses."
+		: config.components.footer.style === "native"
+			? `Off hides statuses. ${nativeNote}`
+			: "Off hides statuses. Starship positions visible statuses.";
 	return [
-		defaultItem,
-		...statuses.flatMap(([key, value]) => {
-			const sanitized = sanitizeExtensionStatusText(value);
-			const description = sanitized ? `Current status: ${sanitized}` : undefined;
+		{
+			id: "extensionStatusDefaultPlacement",
+			label: "Default placement",
+			description: hidden
+				? "Off hides statuses by default; Hidden places visible statuses."
+				: config.components.footer.style === "native"
+					? `Off hides statuses by default. ${nativeNote}`
+					: "Off hides statuses by default; Starship places visible statuses.",
+			currentValue: extensionStatusChoiceLabels[extensionStatusDefaultChoice(config)],
+			values: extensionStatusPlacementValues,
+		},
+		...(!keys.length
+			? [{ id: "noThirdPartyStatuses", label: "No observed statuses", currentValue: "—" }]
+			: []),
+		...keys.flatMap((key) => {
+			const sanitized = sanitizeExtensionStatusText(active.get(key) ?? "");
 			return [
 				{
 					id: thirdPartyStatusSettingId(key, "placement"),
 					label: `${key} placement`,
-					description,
-					currentValue: getExtensionStatusPlacement(config, key),
+					description: `${placementNote}${sanitized ? ` Current status: ${sanitized}` : ""}`,
+					currentValue: extensionStatusChoiceLabels[extensionStatusChoice(config, key)],
 					values: extensionStatusPlacementValues,
 				},
 				{
 					id: thirdPartyStatusSettingId(key, "colorMode"),
 					label: `${key} color`,
-					description,
-					currentValue: getExtensionStatusColorMode(config, key),
+					description: hidden
+						? "Original keeps extension styling; Zentui uses the theme's muted color."
+						: config.components.footer.style === "native"
+							? `Original keeps extension styling in Starship; Zentui uses its palette. ${nativeNote}`
+							: "Original keeps extension styling; Zentui uses Starship's palette.",
+					currentValue: hidden
+						? getHiddenExtensionStatusColorMode(visibility, key) === "zentui"
+							? "Zentui"
+							: "Original"
+						: getExtensionStatusColorMode(config, key) === "zentui"
+							? "Zentui"
+							: "Original",
 					values: extensionStatusColorModeValues,
 				},
 			];
@@ -1078,9 +1267,6 @@ function buildSectionItems(
 				config.components.editor.style === "opencode-copy-friendly"
 					? buildPolishedEditorStyleItems(config)
 					: []),
-				...(config.components.editor.style === "accent-rail"
-					? buildAccentRailEditorStyleItems(config)
-					: []),
 				...(config.components.editor.style === "minimalist"
 					? buildMinimalistEditorStyleItems(config)
 					: []),
@@ -1095,7 +1281,16 @@ function buildSectionItems(
 			return [
 				...buildFooterItems(config),
 				...(config.components.footer.style === "starship"
-					? buildStarshipFooterStyleItems(config)
+					? [
+							...buildStarshipFooterStyleItems(config),
+							...footerPages.map((page) => ({
+								id: footerPageSettingId(page),
+								label: sectionLabels[page],
+								description: `Configure Starship Footer ${sectionLabels[page]}; other components are unchanged.`,
+								currentValue: "->",
+								values: ["->"],
+							})),
+						]
 					: []),
 			];
 		case "segments":
@@ -1107,49 +1302,106 @@ function buildSectionItems(
 	}
 }
 
-function nextSection(section: SettingsSection): SettingsSection {
+function nextSection(
+	section: SettingsSection,
+	sections: readonly TopLevelSection[] = settingsSections,
+): SettingsSection {
 	return (
-		settingsSections[(settingsSections.indexOf(section) + 1) % settingsSections.length] ??
-		"appearance"
+		sections[(sections.indexOf(topLevelSection(section)) + 1) % sections.length] ??
+		sections[0] ??
+		"editor"
 	);
 }
-function previousSection(section: SettingsSection): SettingsSection {
+function previousSection(
+	section: SettingsSection,
+	sections: readonly TopLevelSection[] = settingsSections,
+): SettingsSection {
 	return (
-		settingsSections[
-			(settingsSections.indexOf(section) - 1 + settingsSections.length) % settingsSections.length
-		] ?? "appearance"
+		sections[
+			(sections.indexOf(topLevelSection(section)) - 1 + sections.length) % sections.length
+		] ??
+		sections[0] ??
+		"editor"
 	);
 }
 function formatSectionTabs(
 	active: SettingsSection,
 	theme: ExtensionContext["ui"]["theme"],
 	width: number,
+	sections: readonly TopLevelSection[] = settingsSections,
+	skinOnly = false,
 ): string {
-	const rendered = settingsSections.map((section) =>
-		section === active
-			? theme.bold(sectionLabels[section])
-			: safeThemeFg(theme, "muted", sectionLabels[section]),
+	const label = (section: SettingsSection) =>
+		skinOnly && section === "footer" ? "Statusline" : sectionLabels[section];
+	if (isFooterPage(active)) return `  ${theme.bold(`${label("footer")} > ${label(active)}`)}`;
+	const rendered = sections.map((section) =>
+		section === active ? theme.bold(label(section)) : safeThemeFg(theme, "muted", label(section)),
 	);
 	const full = `  ${rendered.join(safeThemeFg(theme, "muted", " / "))}`;
 	if (visibleWidth(full) <= width) return full;
-	return `  ${theme.bold(sectionLabels[active])} (${settingsSections.indexOf(active) + 1}/${settingsSections.length})`;
+	return `  ${theme.bold(label(active))} (${sections.indexOf(topLevelSection(active)) + 1}/${sections.length})`;
 }
-function withSectionFooter(lines: string[], theme: ExtensionContext["ui"]["theme"]): string[] {
-	const copy = [...lines];
-	for (let index = copy.length - 1; index >= 0; index -= 1) {
-		if (copy[index]?.includes("Enter/Space")) {
-			copy[index] = safeThemeFg(
-				theme,
-				"muted",
-				"  Enter/Space to change · Tab/Shift+Tab to switch sections · Esc to close",
-			);
-			break;
-		}
+function markDormantItems(
+	items: SettingItem[],
+	section: SettingsSection,
+	config: PolishedTuiConfig,
+): void {
+	const editor = config.components.editor;
+	const footer = config.components.footer;
+	for (const item of items) {
+		let reason = "";
+		if (section === "editor" && item.id !== "editorEnabled" && !editor.enabled)
+			reason = "Editor disabled";
+		else if (
+			section === "editor" &&
+			editor.style === "accent-rail" &&
+			["editorModelLabel", "editorBorderColorMode"].includes(item.id)
+		)
+			reason = "other editor styles; Accent Rail has no model label or enclosing border";
+		else if (
+			section === "userMessages" &&
+			item.id !== "userMessagesEnabled" &&
+			!config.components.userMessages.enabled
+		)
+			reason = "User messages disabled";
+		else if (
+			section === "workingLine" &&
+			item.id !== "workingLineEnabled" &&
+			!config.components.workingLine.enabled
+		)
+			reason = "Working line disabled";
+		else if (
+			section === "workingLine" &&
+			config.components.workingLine.textAnimation === "disabled" &&
+			["workingLineTextSpeed", "workingLineAnimateSpinnerColor"].includes(item.id)
+		)
+			reason = "animated modes; Static ignores color motion";
+		else if (
+			["footer", "segments", "git"].includes(section) &&
+			item.id !== "footerStyle" &&
+			footer.style !== "starship"
+		)
+			reason = `Starship; current Footer is ${footerStyleLabel(footer.style)}`;
+		else if (item.id === "compactFooterMaxLines" && !footer.styles.starship.responsive)
+			reason = "responsive mode";
+		else if (item.id === "pathDepth" && footer.styles.starship.pathDisplay.mode === "basename")
+			reason = "Full or Repository paths; Basename ignores depth";
+		else if (
+			["selectorBordersColorSource", "edit-colors:selectorBorders"].includes(item.id) &&
+			!config.components.selectorBorders.enabled
+		)
+			reason = "selector borders disabled";
+		if (reason) item.description = `Saved for ${reason}. Inactive now. ${item.description ?? ""}`;
 	}
-	return copy;
 }
 
 export function registerZentuiSettingsCommand(pi: ExtensionAPI, deps: SettingsCommandDeps): void {
+	const sections = deps.skinOnly ? skinSections : settingsSections;
+	const scopeWarning =
+		"OMP Zentui skins only Editor, User messages, and Statusline. Working, thinking, selectors, and all-owner migration remain host-owned.";
+	const usage = deps.skinOnly
+		? "Usage: /zentui [editor|user-messages|statusline|segments|git], /zentui [editor|messages|statusline|viewport-indicators] [enable|disable|toggle], /zentui preset <opencode|opencode-copy-friendly|rail|minimalist>, or /zentui format <template>"
+		: usageText();
 	const setEditor = (patch: EditorPatch, ctx: ExtensionContext): ApplyResult =>
 		deps.setEditorComponent(patch, ctx);
 	const setMessages = (patch: UserMessagesPatch, ctx: ExtensionContext) => {
@@ -1181,14 +1433,35 @@ export function registerZentuiSettingsCommand(pi: ExtensionAPI, deps: SettingsCo
 
 	pi.registerCommand("zentui", {
 		description: "Configure Zentui",
-		getArgumentCompletions: argumentCompletions,
+		getArgumentCompletions: (prefix) => argumentCompletions(prefix, deps.skinOnly),
 		handler: async (_args, ctx) => {
 			const args = typeof _args === "string" ? _args : "";
 			const words = args.trim().split(/\s+/);
+			if (deps.skinOnly && args.trim().toLowerCase() === "migrate") {
+				if (ctx.hasUI) ctx.ui.notify(scopeWarning, "warning");
+				return;
+			}
+			if (args.trim().toLowerCase() === "migrate") {
+				await confirmComponentMigration(ctx, deps);
+				return;
+			}
 			if (words[0]?.toLowerCase() === "preset") {
 				const preset = words.length === 2 ? getComponentPreset(words[1] ?? "") : undefined;
-				if (preset) applyPreset(preset.id, ctx);
-				else if (ctx.hasUI) ctx.ui.notify(usageText(), "warning");
+				if (
+					preset &&
+					deps.skinOnly &&
+					(Object.keys(preset.components).length !== 3 ||
+						Object.keys(preset.components).some(
+							(owner) => !skinSections.includes(owner as TopLevelSection),
+						))
+				) {
+					if (ctx.hasUI)
+						ctx.ui.notify(
+							"This preset changes owners outside OMP's Editor, User messages, and Statusline skin scope.",
+							"warning",
+						);
+				} else if (preset) applyPreset(preset.id, ctx);
+				else if (ctx.hasUI) ctx.ui.notify(usage, "warning");
 				return;
 			}
 			const format = parseFormatCommand(args);
@@ -1199,7 +1472,7 @@ export function registerZentuiSettingsCommand(pi: ExtensionAPI, deps: SettingsCo
 					if (ctx.hasUI)
 						ctx.ui.notify(
 							format.value === undefined
-								? "Footer format cleared (using default layout)"
+								? "Footer wide format cleared (using built-in segments; compactFormat unchanged)"
 								: `Footer format: ${format.value}`,
 							"info",
 						);
@@ -1253,16 +1526,25 @@ export function registerZentuiSettingsCommand(pi: ExtensionAPI, deps: SettingsCo
 			}
 
 			const initialSection = directSection(args);
+			if (
+				deps.skinOnly &&
+				initialSection &&
+				!skinSections.includes(topLevelSection(initialSection))
+			) {
+				if (ctx.hasUI) ctx.ui.notify(scopeWarning, "warning");
+				return;
+			}
 			if (args.trim() && !initialSection) {
-				if (ctx.hasUI) ctx.ui.notify(usageText(), "warning");
+				if (ctx.hasUI) ctx.ui.notify(usage, "warning");
 				return;
 			}
 			const mode = (ctx as typeof ctx & { mode?: string }).mode;
 			if (!ctx.hasUI || (mode !== undefined && mode !== "tui")) return;
 
-			let requestedSection = initialSection ?? "appearance";
+			let requestedSection = initialSection ?? (deps.skinOnly ? "editor" : "appearance");
 			let requestedFocusId: string | undefined;
 			while (true) {
+				if (!deps.sessionLifecycle.isCurrent()) return;
 				try {
 					prepareEditorTextForCustomUi(ctx.ui);
 				} catch (error) {
@@ -1276,653 +1558,877 @@ export function registerZentuiSettingsCommand(pi: ExtensionAPI, deps: SettingsCo
 				requestedFocusId = undefined;
 				const generation = deps.sessionLifecycle.currentGeneration();
 				let pendingPresetEditor = false;
-				const outcome = await ctx.ui.custom<SettingsOutcome>((tui, theme, _keybindings, done) => {
-					const listTheme = deps.settingsListTheme ?? getSettingsListTheme();
-					let activeSection = requestedSection;
-					let settingsList: SettingsList;
-					let preview: WorkingLineFrames | undefined;
-					let previewFrameIndex = 0;
-					let cancelPreview = () => {};
-					const stopPreview = (reset = true) => {
-						cancelPreview();
-						cancelPreview = () => {};
-						if (reset) {
-							preview = undefined;
-							previewFrameIndex = 0;
-						}
-					};
-					const startPreview = () => {
-						const previous = preview;
-						const previousState = previous?.frameStates[previewFrameIndex];
-						stopPreview(false);
-						if (activeSection !== "workingLine") return;
-						try {
-							const config = deps.getConfig();
-							const spinnerTick = previousState?.spinnerTick ?? 0;
-							let textTick = previousState?.textTick ?? 0;
-							let generated = buildWorkingLinePreviewFrames(
-								config.components.workingLine,
-								config.colors,
-								theme,
-								spinnerTick,
-								textTick,
-							);
-							if (previous && previousState) {
-								textTick = remapWorkingLineTextTick(
-									previous.textAnimation,
-									previous.textWidth,
-									previousState.textTick,
-									generated.textAnimation,
-									generated.textWidth,
-									previous.textOrigin,
-									generated.textOrigin,
-								);
-								generated = buildWorkingLinePreviewFrames(
+				let outcome: SettingsOutcome | undefined;
+				try {
+					outcome = await ctx.ui.custom<SettingsOutcome>((tui, theme, keybindings, done) => {
+						const keys = settingsKeys(keybindings);
+						let selectedIndex = 0;
+						let currentItems: SettingItem[] = [];
+						let listVisible = 8;
+						const listTheme = deps.settingsListTheme ?? getSettingsListTheme();
+						let activeSection = requestedSection;
+						let settingsList: SettingsList;
+						let activateSelectedSetting = () => {};
+						let preview: WorkingLineFrames | undefined;
+						let previewFrameIndex = 0;
+						let cancelPreview = () => {};
+						const stopPreview = (reset = true) => {
+							cancelPreview();
+							cancelPreview = () => {};
+							if (reset) {
+								preview = undefined;
+								previewFrameIndex = 0;
+							}
+						};
+						const startPreview = () => {
+							const previous = preview;
+							const previousState = previous?.frameStates[previewFrameIndex];
+							stopPreview(false);
+							if (activeSection !== "workingLine") return;
+							try {
+								const config = deps.getConfig();
+								const spinnerTick = previousState?.spinnerTick ?? 0;
+								let textTick = previousState?.textTick ?? 0;
+								let generated = buildWorkingLinePreviewFrames(
 									config.components.workingLine,
 									config.colors,
 									theme,
 									spinnerTick,
 									textTick,
 								);
+								if (previous && previousState) {
+									textTick = remapWorkingLineTextTick(
+										previous.textAnimation,
+										previous.textWidth,
+										previousState.textTick,
+										generated.textAnimation,
+										generated.textWidth,
+										previous.textOrigin,
+										generated.textOrigin,
+									);
+									generated = buildWorkingLinePreviewFrames(
+										config.components.workingLine,
+										config.colors,
+										theme,
+										spinnerTick,
+										textTick,
+									);
+								}
+								preview = generated;
+								previewFrameIndex = 0;
+								const advance = () => {
+									if (activeSection !== "workingLine" || !preview || preview.frames.length === 0)
+										return;
+									previewFrameIndex = (previewFrameIndex + 1) % preview.frames.length;
+									tui.requestRender();
+									cancelPreview = deps.sessionLifecycle.defer(advance, preview.intervalMs);
+								};
+								cancelPreview = deps.sessionLifecycle.defer(advance, generated.intervalMs);
+							} catch {
+								stopPreview();
 							}
-							preview = generated;
-							previewFrameIndex = 0;
-							const advance = () => {
-								if (activeSection !== "workingLine" || !preview || preview.frames.length === 0)
-									return;
-								previewFrameIndex = (previewFrameIndex + 1) % preview.frames.length;
-								tui.requestRender();
-								cancelPreview = deps.sessionLifecycle.defer(advance, preview.intervalMs);
-							};
-							cancelPreview = deps.sessionLifecycle.defer(advance, generated.intervalMs);
-						} catch {
+						};
+						const finishSettings = (result: SettingsOutcome) => {
 							stopPreview();
-						}
-					};
-					const finishSettings = (result: SettingsOutcome) => {
-						stopPreview();
-						done(result);
-					};
-					const notifyChange = (label: string, value: string, result?: ApplyResult) => {
-						deps.requestRender();
-						const detail = result?.reason?.trim();
-						ctx.ui.notify(
-							`${label}: ${value}${detail ? ` (${detail})` : result && !result.applied ? " (reload Pi to apply this change)" : ""}`,
-							result && (!result.applied || detail) ? "warning" : "info",
-						);
-						startPreview();
-						tui.requestRender();
-					};
-					const notifyWorkingLineChange = (
-						label: string,
-						value: string,
-						result: ApplyResult,
-						previewChanged = true,
-					) => {
-						ctx.ui.notify(
-							`${label}: ${value}${result.applied ? "" : ` (${result.reason ?? "reload Pi to apply this change"})`}`,
-							"info",
-						);
-						if (previewChanged) startPreview();
-						tui.requestRender();
-					};
-					const makeSettingsList = (focusId?: string): SettingsList => {
-						const items = buildSectionItems(
-							activeSection,
-							deps.getConfig(),
-							deps.getActiveExtensionStatuses(),
-							deps.thinkingStepsCapability,
-						);
-						const list = new SettingsList(
-							items,
-							8,
-							listTheme,
-							(id, newValue) => {
-								try {
-									if (id === "preset") {
-										const preset = componentPresets.find(({ label }) => label === newValue);
-										if (!preset) return;
+							done(result);
+						};
+						const notifyChange = (label: string, value: string, result?: ApplyResult) => {
+							if (
+								["User messages", "Selector borders", "Responsive footer", "Path display"].includes(
+									label,
+								)
+							)
+								settingsList = makeSettingsList(currentItems[selectedIndex]?.id);
+							deps.requestRender();
+							const detail = result?.reason?.trim();
+							ctx.ui.notify(
+								`${label}: ${value}${detail ? ` (${detail})` : result && !result.applied ? " (reload Pi to apply this change)" : ""}`,
+								result && (!result.applied || detail) ? "warning" : "info",
+							);
+							startPreview();
+							tui.requestRender();
+						};
+						const notifyWorkingLineChange = (
+							label: string,
+							value: string,
+							result: ApplyResult,
+							previewChanged = true,
+						) => {
+							if (label === "Working line" || label === "Text animation")
+								settingsList = makeSettingsList(currentItems[selectedIndex]?.id);
+							ctx.ui.notify(
+								`${label}: ${value}${result.applied ? "" : ` (${result.reason ?? "reload Pi to apply this change"})`}`,
+								"info",
+							);
+							if (previewChanged) startPreview();
+							tui.requestRender();
+						};
+						const backOrClose = () => {
+							if (isFooterPage(activeSection) && deps.sessionLifecycle.isCurrent(generation)) {
+								const focusId = footerPageSettingId(activeSection);
+								activeSection = "footer";
+								settingsList = makeSettingsList(focusId);
+								tui.requestRender();
+							} else finishSettings("close");
+						};
+						const makeSettingsList = (focusId?: string): SettingsList => {
+							if (
+								isFooterPage(activeSection) &&
+								deps.getConfig().components.footer.style !== "starship"
+							) {
+								ctx.ui.notify(
+									`Footer > ${sectionLabels[activeSection]} requires Starship. Current Footer is ${footerStyleLabel(deps.getConfig().components.footer.style)}; saved settings are unchanged.`,
+									"info",
+								);
+								activeSection = "footer";
+								focusId = "footerStyle";
+							}
+							const items = buildSectionItems(
+								activeSection,
+								deps.getConfig(),
+								deps.getActiveExtensionStatuses(),
+								deps.thinkingStepsCapability,
+							);
+							if (deps.skinOnly && activeSection === "footer") {
+								for (const item of items) {
+									item.label = item.label.replaceAll("Footer", "Statusline");
+									item.description = item.description?.replaceAll("Pi", "OMP");
+								}
+							}
+							const colorOwner =
+								activeSection === "appearance"
+									? "selectorBorders"
+									: activeSection === "editor" ||
+											activeSection === "userMessages" ||
+											activeSection === "workingLine" ||
+											activeSection === "footer"
+										? activeSection
+										: undefined;
+							if (colorOwner)
+								items.push({
+									id: `edit-colors:${colorOwner}`,
+									label: "Color overrides",
+									description:
+										"Edit only this component's raw styles. Roles unused by the selected style stay saved for other styles; Static Working line uses mid with optional Token rate override; Classic/KITT animate every segment; Turn summaries use high. Reset resumes inheritance; empty means unstyled.",
+									currentValue: "Edit…",
+									values: ["Edit…"],
+								});
+							if (
+								activeSection === "editor" ||
+								(activeSection === "footer" &&
+									deps.getConfig().components.footer.style === "starship")
+							)
+								items.push({
+									id: `edit-custom-value-colors:${activeSection}`,
+									label: "Individual custom value colors",
+									description:
+										"Style one publisher key across aliases in this owner. Original/Zentui remains the fallback; Reset inherits, empty is unstyled.",
+									currentValue: "Edit…",
+									values: ["Edit…"],
+								});
+							if (activeSection === "appearance")
+								items.push({
+									id: "migrate",
+									label: "Migrate component selections",
+									description:
+										"Explicit, confirmed snapshot of all current selections. Shared color fallbacks remain active.",
+									currentValue: "Confirm…",
+									values: ["Confirm…"],
+								});
+							markDormantItems(items, activeSection, deps.getConfig());
+							currentItems = items;
+							selectedIndex = Math.max(
+								0,
+								items.findIndex((item) => item.id === focusId),
+							);
+							const actions = {
+								change(id: string, newValue: string) {
+									try {
 										if (!deps.sessionLifecycle.isCurrent(generation)) return;
-										const result = deps.applyPreset(preset.id, ctx, { deferEditor: true });
-										pendingPresetEditor = true;
-										settingsList = makeSettingsList("preset");
-										notifyChange("Preset saved", preset.label, result);
-										return;
-									}
-									const enabled = isFeatureState(newValue) ? newValue === "enabled" : undefined;
-									if (id === "editorEnabled" && enabled !== undefined) {
-										if (pendingPresetEditor) {
-											const result = deps.setEditorComponent({ enabled }, ctx, {
-												deferEditor: true,
-											});
-											notifyChange("Editor", newValue, result);
+										const footerPage = footerPages.find((page) => footerPageSettingId(page) === id);
+										if (footerPage) {
+											activeSection = footerPage;
+											settingsList = makeSettingsList();
+											tui.requestRender();
+											return;
+										}
+										if (
+											isFooterPage(activeSection) &&
+											deps.getConfig().components.footer.style !== "starship"
+										) {
+											settingsList = makeSettingsList();
+											tui.requestRender();
+											return;
+										}
+										if (
+											id === "migrate" ||
+											id.startsWith("edit-colors:") ||
+											id.startsWith("edit-custom-value-colors:") ||
+											id === "edit-minimalist-templates" ||
+											id === "edit-minimalist-variables"
+										) {
+											requestedSection = activeSection;
+											requestedFocusId = id;
+											finishSettings(id as SettingsOutcome);
+											return;
+										}
+										if (id === "preset") {
+											const preset = componentPresets.find(({ label }) => label === newValue);
+											if (!preset) return;
+											if (!deps.sessionLifecycle.isCurrent(generation)) return;
+											const result = deps.applyPreset(preset.id, ctx, { deferEditor: true });
+											pendingPresetEditor = true;
+											settingsList = makeSettingsList("preset");
+											notifyChange("Preset saved", preset.label, result);
+											return;
+										}
+										const enabled = isFeatureState(newValue) ? newValue === "enabled" : undefined;
+										if (
+											(id === "editorCodexQuota" || id === "footerCodexQuota") &&
+											enabled !== undefined
+										) {
+											if (id === "editorCodexQuota") setEditor({ codexQuota: enabled }, ctx);
+											else setFooter({ codexQuota: enabled }, ctx);
+											settingsList.updateValue(id, newValue);
+											notifyChange("Codex quota", newValue);
+											return;
+										}
+										if (id === "editorEnabled" && enabled !== undefined) {
+											if (pendingPresetEditor) {
+												const result = deps.setEditorComponent({ enabled }, ctx, {
+													deferEditor: true,
+												});
+												notifyChange("Editor", newValue, result);
+												finishSettings("close");
+												return;
+											}
 											finishSettings("close");
+											deps.sessionLifecycle.defer(() => {
+												try {
+													const result = setEditor({ enabled }, ctx);
+													deps.requestRender();
+													ctx.ui.notify(
+														`Editor: ${newValue}${result.applied ? "" : ` (${result.reason ?? "reload Pi to apply this change"})`}`,
+														"info",
+													);
+												} catch (error) {
+													ctx.ui.notify(
+														`Could not update Zentui settings: ${error instanceof Error ? error.message : String(error)}`,
+														"error",
+													);
+												}
+											});
+											return;
+										}
+										const selectedEditorStyle =
+											id === "editorStyle" ? editorStyleId(newValue) : undefined;
+										if (selectedEditorStyle) {
+											setEditor({ style: selectedEditorStyle }, ctx);
+											settingsList = makeSettingsList("editorStyle");
+											notifyChange("Editor style", newValue);
 											return;
 										}
-										finishSettings("close");
-										deps.sessionLifecycle.defer(() => {
-											try {
-												const result = setEditor({ enabled }, ctx);
-												deps.requestRender();
-												ctx.ui.notify(
-													`Editor: ${newValue}${result.applied ? "" : ` (${result.reason ?? "reload Pi to apply this change"})`}`,
-													"info",
+										if (id === "editorColorSource" && isColorSource(newValue)) {
+											setEditor({ colorSource: newValue }, ctx);
+											settingsList.updateValue(id, newValue);
+											notifyChange("Editor colors", newValue);
+											return;
+										}
+										if (id === "editorModelLabel" && (newValue === "id" || newValue === "name")) {
+											setEditor({ modelLabel: newValue }, ctx);
+											settingsList.updateValue(id, newValue);
+											notifyChange("Editor model label", newValue);
+											return;
+										}
+										if (
+											id === "editorBorderColorMode" &&
+											(newValue === "static" || newValue === "adaptive")
+										) {
+											setEditor({ borderColorMode: newValue }, ctx);
+											settingsList.updateValue(id, newValue);
+											notifyChange("Editor border color", newValue);
+											return;
+										}
+										if (id === "editorViewportIndicators" && enabled !== undefined) {
+											setEditor({ viewportIndicators: enabled }, ctx);
+											settingsList.updateValue(id, newValue);
+											notifyChange("Editor viewport indicators", newValue);
+											return;
+										}
+										if (
+											id === "opencodeCompletionMenu" &&
+											(newValue === "native" || newValue === "palette")
+										) {
+											const style = deps.getConfig().components.editor.style;
+											if (style === "opencode") deps.setPolished({ completionMenu: newValue }, ctx);
+											else if (style === "opencode-copy-friendly")
+												deps.setPolishedCopyFriendly({ completionMenu: newValue }, ctx);
+											else return;
+											settingsList.updateValue(id, newValue);
+											notifyChange("Completion menu", newValue);
+											return;
+										}
+										if (
+											id === "accentRailSurface" &&
+											(newValue === "filled" || newValue === "transparent")
+										) {
+											deps.setAccentRail({ transparent: newValue === "transparent" }, ctx);
+											settingsList.updateValue(id, newValue);
+											notifyChange("Editor background", newValue);
+											return;
+										}
+										if (id.startsWith("minimalist")) {
+											if (
+												id === "minimalistExtensionColorMode" &&
+												(newValue === "Original" || newValue === "Zentui")
+											)
+												deps.setMinimalist(
+													{ extensionColorMode: newValue === "Original" ? null : "zentui" },
+													ctx,
 												);
-											} catch (error) {
-												ctx.ui.notify(
-													`Could not update Zentui settings: ${error instanceof Error ? error.message : String(error)}`,
-													"error",
+											else if (
+												id === "minimalistPathDisplay" &&
+												["compact", "project", "full"].includes(newValue)
+											)
+												deps.setMinimalist(
+													{ pathDisplay: newValue as MinimalistConfig["pathDisplay"] },
+													ctx,
 												);
+											else if (
+												id === "minimalistContextFormat" &&
+												["percent", "percent-total"].includes(newValue)
+											)
+												deps.setMinimalist(
+													{ contextFormat: newValue as MinimalistConfig["contextFormat"] },
+													ctx,
+												);
+											else if (
+												id === "minimalistSeparator" &&
+												(newValue === "dash" || newValue === "dot")
+											)
+												deps.setMinimalist(
+													{ separator: newValue as MinimalistEditorSeparator },
+													ctx,
+												);
+											else if (enabled !== undefined) {
+												const key =
+													id === "minimalistContextGauge"
+														? "contextGauge"
+														: id === "minimalistShowSessionName"
+															? "showSessionName"
+															: id === "minimalistShowTimer"
+																? "showTimer"
+																: id === "minimalistShowCost"
+																	? "showCost"
+																	: id === "minimalistShowCacheHit"
+																		? "showCacheHit"
+																		: id === "minimalistShowGit"
+																			? "showGit"
+																			: undefined;
+												if (!key) return;
+												deps.setMinimalist({ [key]: enabled }, ctx);
+											} else return;
+											settingsList.updateValue(id, newValue);
+											notifyChange(id, newValue);
+											return;
+										}
+
+										if (id === "userMessagesEnabled" && enabled !== undefined) {
+											setMessages({ enabled }, ctx);
+											settingsList.updateValue(id, newValue);
+											notifyChange("User messages", newValue);
+											return;
+										}
+										const selectedMessageStyle =
+											id === "userMessagesStyle" ? userMessageStyleId(newValue) : undefined;
+										if (selectedMessageStyle) {
+											setMessages({ style: selectedMessageStyle }, ctx);
+											settingsList = makeSettingsList("userMessagesStyle");
+											notifyChange("Message style", newValue);
+											return;
+										}
+										if (id === "userMessagesColorSource" && isColorSource(newValue)) {
+											setMessages({ colorSource: newValue }, ctx);
+											settingsList.updateValue(id, newValue);
+											notifyChange("Message colors", newValue);
+											return;
+										}
+										if (id === "thinkingStepsEnabled" && enabled !== undefined) {
+											const result = deps.setThinkingStepsComponent({ enabled }, ctx);
+											settingsList = makeSettingsList("thinkingStepsEnabled");
+											notifyChange("Thinking (Experimental)", newValue, result);
+											return;
+										}
+										const selectedThinkingStepsMode =
+											id === "thinkingStepsMode" ? thinkingStepsModeId(newValue) : undefined;
+										if (selectedThinkingStepsMode) {
+											const result = deps.setThinkingStepsComponent(
+												{ mode: selectedThinkingStepsMode },
+												ctx,
+											);
+											settingsList = makeSettingsList("thinkingStepsMode");
+											notifyChange("Thinking (Experimental)", newValue, result);
+											return;
+										}
+										if (id === "workingLineEnabled" && enabled !== undefined) {
+											const result = deps.setWorkingLineComponent({ enabled }, ctx);
+											settingsList.updateValue(id, newValue);
+											notifyWorkingLineChange("Working line", newValue, result);
+											return;
+										}
+										if (id === "workingLineTurnSummary" && enabled !== undefined) {
+											const result = deps.setWorkingLineComponent({ turnSummary: enabled }, ctx);
+											settingsList.updateValue(id, newValue);
+											notifyWorkingLineChange("Turn summary", newValue, result, false);
+											return;
+										}
+										if (id === "workingLinePlacement") {
+											const editor = deps.getConfig().components.editor;
+											if (!editor.enabled || editor.style === "accent-rail") return;
+											const placement = (
+												Object.entries(workingLinePlacementLabels) as Array<
+													[WorkingLinePlacement, string]
+												>
+											).find(([, label]) => label === newValue)?.[0];
+											if (placement) {
+												const result = deps.setWorkingLineComponent({ placement }, ctx);
+												settingsList.updateValue(id, newValue);
+												notifyWorkingLineChange("Placement", newValue, result);
+												return;
 											}
-										});
-										return;
-									}
-									const selectedEditorStyle =
-										id === "editorStyle" ? editorStyleId(newValue) : undefined;
-									if (selectedEditorStyle) {
-										setEditor({ style: selectedEditorStyle }, ctx);
-										settingsList = makeSettingsList("editorStyle");
-										notifyChange("Editor style", newValue);
-										return;
-									}
-									if (id === "editorColorSource" && isColorSource(newValue)) {
-										setEditor({ colorSource: newValue }, ctx);
-										settingsList.updateValue(id, newValue);
-										notifyChange("Editor colors", newValue);
-										return;
-									}
-									if (id === "editorModelLabel" && (newValue === "id" || newValue === "name")) {
-										setEditor({ modelLabel: newValue }, ctx);
-										settingsList.updateValue(id, newValue);
-										notifyChange("Editor model label", newValue);
-										return;
-									}
-									if (
-										id === "editorBorderColorMode" &&
-										(newValue === "static" || newValue === "adaptive")
-									) {
-										setEditor({ borderColorMode: newValue }, ctx);
-										settingsList.updateValue(id, newValue);
-										notifyChange("Editor border color", newValue);
-										return;
-									}
-									if (id === "editorViewportIndicators" && enabled !== undefined) {
-										setEditor({ viewportIndicators: enabled }, ctx);
-										settingsList.updateValue(id, newValue);
-										notifyChange("Editor viewport indicators", newValue);
-										return;
-									}
-									if (
-										id === "opencodeCompletionMenu" &&
-										(newValue === "native" || newValue === "palette")
-									) {
-										const style = deps.getConfig().components.editor.style;
-										if (style === "opencode") deps.setPolished({ completionMenu: newValue }, ctx);
-										else if (style === "opencode-copy-friendly")
-											deps.setPolishedCopyFriendly({ completionMenu: newValue }, ctx);
-										else return;
-										settingsList.updateValue(id, newValue);
-										notifyChange("Completion menu", newValue);
-										return;
-									}
-									if (
-										id === "accentRailSurface" &&
-										(newValue === "filled" || newValue === "transparent")
-									) {
-										deps.setAccentRail({ transparent: newValue === "transparent" }, ctx);
-										settingsList.updateValue(id, newValue);
-										notifyChange("Accent Rail surface", newValue);
-										return;
-									}
-									if (id.startsWith("minimalist")) {
-										if (
-											id === "minimalistPathDisplay" &&
-											["compact", "project", "full"].includes(newValue)
-										)
-											deps.setMinimalist(
-												{ pathDisplay: newValue as MinimalistConfig["pathDisplay"] },
+										}
+										const selectedWorkingLineSpinner =
+											id === "workingLineSpinner" ? workingLineSpinnerId(newValue) : undefined;
+										if (selectedWorkingLineSpinner) {
+											const result = deps.setWorkingLineComponent(
+												{ spinner: selectedWorkingLineSpinner },
 												ctx,
 											);
-										else if (
-											id === "minimalistContextFormat" &&
-											["percent", "percent-total"].includes(newValue)
-										)
-											deps.setMinimalist(
-												{ contextFormat: newValue as MinimalistConfig["contextFormat"] },
+											settingsList.updateValue(id, newValue);
+											notifyWorkingLineChange("Spinner", newValue, result);
+											return;
+										}
+										if (id === "workingLineSpinnerSpeed" || id === "workingLineTextSpeed") {
+											const spinnerSpeed = id === "workingLineSpinnerSpeed";
+											if (newValue === "Custom…") {
+												finishSettings(
+													spinnerSpeed
+														? "edit-working-line-spinner-speed"
+														: "edit-working-line-text-speed",
+												);
+												return;
+											}
+											const presets = spinnerSpeed
+												? workingLineSpinnerSpeedPresets
+												: workingLineTextSpeedPresets;
+											const intervalMs = presets.find(
+												(preset) => preset.label === newValue,
+											)?.intervalMs;
+											if (intervalMs !== undefined) {
+												const result = deps.setWorkingLineComponent(
+													spinnerSpeed
+														? { spinnerIntervalMs: intervalMs }
+														: { textIntervalMs: intervalMs },
+													ctx,
+												);
+												settingsList.updateValue(id, newValue);
+												notifyWorkingLineChange(
+													spinnerSpeed ? "Spinner speed" : "Text motion speed",
+													`${intervalMs} ms`,
+													result,
+												);
+											}
+											return;
+										}
+										if (
+											id === "workingLineTextAnimation" &&
+											workingLineTextAnimationValues.includes(newValue as WorkingLineTextAnimation)
+										) {
+											const result = deps.setWorkingLineComponent(
+												{ textAnimation: newValue as WorkingLineTextAnimation },
 												ctx,
 											);
-										else if (enabled !== undefined) {
-											const key =
-												id === "minimalistContextGauge"
-													? "contextGauge"
-													: id === "minimalistShowSessionName"
-														? "showSessionName"
-														: id === "minimalistShowTimer"
-															? "showTimer"
-															: id === "minimalistShowCost"
-																? "showCost"
-																: id === "minimalistShowGit"
-																	? "showGit"
-																	: undefined;
-											if (!key) return;
-											deps.setMinimalist({ [key]: enabled }, ctx);
-										} else return;
-										settingsList.updateValue(id, newValue);
-										notifyChange(id, newValue);
-										return;
-									}
-
-									if (id === "userMessagesEnabled" && enabled !== undefined) {
-										setMessages({ enabled }, ctx);
-										settingsList.updateValue(id, newValue);
-										notifyChange("User messages", newValue);
-										return;
-									}
-									const selectedMessageStyle =
-										id === "userMessagesStyle" ? userMessageStyleId(newValue) : undefined;
-									if (selectedMessageStyle) {
-										setMessages({ style: selectedMessageStyle }, ctx);
-										settingsList = makeSettingsList("userMessagesStyle");
-										notifyChange("Message style", newValue);
-										return;
-									}
-									if (id === "userMessagesColorSource" && isColorSource(newValue)) {
-										setMessages({ colorSource: newValue }, ctx);
-										settingsList.updateValue(id, newValue);
-										notifyChange("Message colors", newValue);
-										return;
-									}
-									if (id === "thinkingStepsEnabled" && enabled !== undefined) {
-										const result = deps.setThinkingStepsComponent({ enabled }, ctx);
-										settingsList = makeSettingsList("thinkingStepsEnabled");
-										notifyChange("Thinking (Experimental)", newValue, result);
-										return;
-									}
-									const selectedThinkingStepsMode =
-										id === "thinkingStepsMode" ? thinkingStepsModeId(newValue) : undefined;
-									if (selectedThinkingStepsMode) {
-										const result = deps.setThinkingStepsComponent(
-											{ mode: selectedThinkingStepsMode },
-											ctx,
-										);
-										settingsList = makeSettingsList("thinkingStepsMode");
-										notifyChange("Thinking (Experimental)", newValue, result);
-										return;
-									}
-									if (id === "workingLineEnabled" && enabled !== undefined) {
-										const result = deps.setWorkingLineComponent({ enabled }, ctx);
-										settingsList.updateValue(id, newValue);
-										notifyWorkingLineChange("Working line", newValue, result);
-										return;
-									}
-									if (id === "workingLineTurnSummary" && enabled !== undefined) {
-										const result = deps.setWorkingLineComponent({ turnSummary: enabled }, ctx);
-										settingsList.updateValue(id, newValue);
-										notifyWorkingLineChange("Turn summary", newValue, result, false);
-										return;
-									}
-									const selectedWorkingLineSpinner =
-										id === "workingLineSpinner" ? workingLineSpinnerId(newValue) : undefined;
-									if (selectedWorkingLineSpinner) {
-										const result = deps.setWorkingLineComponent(
-											{ spinner: selectedWorkingLineSpinner },
-											ctx,
-										);
-										settingsList.updateValue(id, newValue);
-										notifyWorkingLineChange("Spinner", newValue, result);
-										return;
-									}
-									if (id === "workingLineSpinnerSpeed" || id === "workingLineTextSpeed") {
-										const spinnerSpeed = id === "workingLineSpinnerSpeed";
-										if (newValue === "Custom…") {
-											finishSettings(
-												spinnerSpeed
-													? "edit-working-line-spinner-speed"
-													: "edit-working-line-text-speed",
+											settingsList.updateValue(id, newValue);
+											notifyWorkingLineChange("Text animation", newValue, result);
+											return;
+										}
+										if (id === "workingLineColorSource" && isColorSource(newValue)) {
+											const result = deps.setWorkingLineComponent({ colorSource: newValue }, ctx);
+											settingsList.updateValue(id, newValue);
+											notifyWorkingLineChange("Color source", newValue, result);
+											return;
+										}
+										if (id === "workingLineAnimateSpinnerColor" && enabled !== undefined) {
+											const result = deps.setWorkingLineComponent(
+												{ animateSpinnerColor: enabled },
+												ctx,
 											);
+											settingsList.updateValue(id, newValue);
+											notifyWorkingLineChange("Animate spinner color", newValue, result);
 											return;
 										}
-										const presets = spinnerSpeed
-											? workingLineSpinnerSpeedPresets
-											: workingLineTextSpeedPresets;
-										const intervalMs = presets.find(
-											(preset) => preset.label === newValue,
-										)?.intervalMs;
-										if (intervalMs !== undefined) {
+										if (id === "workingLineCustomMessages" && enabled !== undefined) {
 											const result = deps.setWorkingLineComponent(
-												spinnerSpeed
-													? { spinnerIntervalMs: intervalMs }
-													: { textIntervalMs: intervalMs },
+												{ messages: { custom: enabled } },
 												ctx,
 											);
 											settingsList.updateValue(id, newValue);
-											notifyWorkingLineChange(
-												spinnerSpeed ? "Spinner speed" : "Text motion speed",
-												`${intervalMs} ms`,
-												result,
+											notifyWorkingLineChange("Custom messages", newValue, result);
+											return;
+										}
+										if (
+											(id === "workingLineTool" ||
+												id === "workingLineElapsed" ||
+												id === "workingLineThought" ||
+												id === "workingLineTokens" ||
+												id === "workingLineTokenRate") &&
+											enabled !== undefined
+										) {
+											const key =
+												id === "workingLineTool"
+													? "tool"
+													: id === "workingLineElapsed"
+														? "elapsed"
+														: id === "workingLineThought"
+															? "thought"
+															: id === "workingLineTokenRate"
+																? "tokenRate"
+																: "tokens";
+											const result = deps.setWorkingLineComponent(
+												{ segments: { [key]: enabled } },
+												ctx,
 											);
+											settingsList.updateValue(id, newValue);
+											notifyWorkingLineChange(id.slice("workingLine".length), newValue, result);
+											return;
+										}
+										if (id === "workingLineTurnSummaryFormat") {
+											finishSettings("edit-turn-summary-format");
+											return;
+										}
+										if (id === "workingLineMessageList") {
+											finishSettings("edit-working-line-messages");
+											return;
+										}
+										if (id === "selectorBordersEnabled" && enabled !== undefined) {
+											deps.setSelectorBordersComponent({ enabled }, ctx);
+											settingsList.updateValue(id, newValue);
+											notifyChange("Selector borders", newValue);
+											return;
+										}
+										if (id === "selectorBordersStyle" && newValue === "zentui") {
+											deps.setSelectorBordersComponent({ style: newValue }, ctx);
+											settingsList.updateValue(id, newValue);
+											notifyChange("Selector border style", newValue);
+											return;
+										}
+										if (id === "selectorBordersColorSource" && isColorSource(newValue)) {
+											deps.setSelectorBordersComponent({ colorSource: newValue }, ctx);
+											settingsList.updateValue(id, newValue);
+											notifyChange("Selector border colors", newValue);
+											return;
+										}
+										if (id === "iconMode" && isIconMode(newValue)) {
+											deps.setIconMode(newValue);
+											settingsList.updateValue(id, newValue);
+											notifyChange("Icon mode", newValue);
+											return;
 										}
-										return;
-									}
-									if (
-										id === "workingLineTextAnimation" &&
-										workingLineTextAnimationValues.includes(newValue as WorkingLineTextAnimation)
-									) {
-										const result = deps.setWorkingLineComponent(
-											{ textAnimation: newValue as WorkingLineTextAnimation },
-											ctx,
-										);
-										settingsList.updateValue(id, newValue);
-										notifyWorkingLineChange("Text animation", newValue, result);
-										return;
-									}
-									if (id === "workingLineColorSource" && isColorSource(newValue)) {
-										const result = deps.setWorkingLineComponent({ colorSource: newValue }, ctx);
-										settingsList.updateValue(id, newValue);
-										notifyWorkingLineChange("Color source", newValue, result);
-										return;
-									}
-									if (id === "workingLineAnimateSpinnerColor" && enabled !== undefined) {
-										const result = deps.setWorkingLineComponent(
-											{ animateSpinnerColor: enabled },
-											ctx,
-										);
-										settingsList.updateValue(id, newValue);
-										notifyWorkingLineChange("Animate spinner color", newValue, result);
-										return;
-									}
-									if (id === "workingLineCustomMessages" && enabled !== undefined) {
-										const result = deps.setWorkingLineComponent(
-											{ messages: { custom: enabled } },
-											ctx,
-										);
-										settingsList.updateValue(id, newValue);
-										notifyWorkingLineChange("Custom messages", newValue, result);
-										return;
-									}
-									if (
-										(id === "workingLineTool" ||
-											id === "workingLineElapsed" ||
-											id === "workingLineThought" ||
-											id === "workingLineTokens") &&
-										enabled !== undefined
-									) {
-										const key =
-											id === "workingLineTool"
-												? "tool"
-												: id === "workingLineElapsed"
-													? "elapsed"
-													: id === "workingLineThought"
-														? "thought"
-														: "tokens";
-										const result = deps.setWorkingLineComponent(
-											{ segments: { [key]: enabled } },
-											ctx,
-										);
-										settingsList.updateValue(id, newValue);
-										notifyWorkingLineChange(id.slice("workingLine".length), newValue, result);
-										return;
-									}
-									if (id === "workingLineMessageList") {
-										finishSettings("edit-working-line-messages");
-										return;
-									}
-									if (id === "selectorBordersEnabled" && enabled !== undefined) {
-										deps.setSelectorBordersComponent({ enabled }, ctx);
-										settingsList.updateValue(id, newValue);
-										notifyChange("Selector borders", newValue);
-										return;
-									}
-									if (id === "selectorBordersStyle" && newValue === "zentui") {
-										deps.setSelectorBordersComponent({ style: newValue }, ctx);
-										settingsList.updateValue(id, newValue);
-										notifyChange("Selector border style", newValue);
-										return;
-									}
-									if (id === "selectorBordersColorSource" && isColorSource(newValue)) {
-										deps.setSelectorBordersComponent({ colorSource: newValue }, ctx);
-										settingsList.updateValue(id, newValue);
-										notifyChange("Selector border colors", newValue);
-										return;
-									}
-									if (id === "iconMode" && isIconMode(newValue)) {
-										deps.setIconMode(newValue);
-										settingsList.updateValue(id, newValue);
-										notifyChange("Icon mode", newValue);
-										return;
-									}
 
-									const selectedFooterStyle =
-										id === "footerStyle" ? footerStyleId(newValue) : undefined;
-									if (selectedFooterStyle) {
-										setFooter({ style: selectedFooterStyle }, ctx);
-										settingsList = makeSettingsList("footerStyle");
-										notifyChange("Footer style", newValue);
-										return;
-									}
-									if (id === "footerColorSource" && isColorSource(newValue)) {
-										setFooter({ colorSource: newValue }, ctx);
-										settingsList.updateValue(id, newValue);
-										notifyChange("Footer colors", newValue);
-										return;
-									}
-									if (id === "footerModelLabel" && (newValue === "id" || newValue === "name")) {
-										setFooter({ modelLabel: newValue }, ctx);
-										settingsList.updateValue(id, newValue);
-										notifyChange("Footer model label", newValue);
-										return;
-									}
+										const selectedFooterStyle =
+											id === "footerStyle" ? footerStyleId(newValue) : undefined;
+										if (selectedFooterStyle) {
+											setFooter({ style: selectedFooterStyle }, ctx);
+											settingsList = makeSettingsList("footerStyle");
+											notifyChange("Footer style", newValue);
+											return;
+										}
+										if (id === "footerColorSource" && isColorSource(newValue)) {
+											setFooter({ colorSource: newValue }, ctx);
+											settingsList.updateValue(id, newValue);
+											notifyChange("Footer colors", newValue);
+											return;
+										}
+										if (id === "footerModelLabel" && (newValue === "id" || newValue === "name")) {
+											setFooter({ modelLabel: newValue }, ctx);
+											settingsList.updateValue(id, newValue);
+											notifyChange("Footer model label", newValue);
+											return;
+										}
 
-									if (id === "responsiveFooter" && enabled !== undefined) {
-										deps.setResponsiveFooter({ responsiveFooter: enabled }, ctx);
-										settingsList.updateValue(id, newValue);
-										notifyChange("Responsive footer", newValue);
-										return;
-									}
-									if (
-										id === "compactFooterMaxLines" &&
-										compactFooterMaxLineValues.includes(newValue as never)
-									) {
-										const value: CompactFooterMaxLines =
-											newValue === "unlimited" ? "unlimited" : (Number(newValue) as 1 | 2 | 3);
-										deps.setResponsiveFooter({ compactFooterMaxLines: value }, ctx);
-										settingsList.updateValue(id, newValue);
-										notifyChange("Compact footer rows", newValue);
-										return;
-									}
-									if (
-										id === "contextStyle" &&
-										contextStyleValues.includes(newValue as ContextStyle)
-									) {
-										deps.setContextStyle(newValue as ContextStyle);
-										settingsList.updateValue(id, newValue);
-										notifyChange("Context style", newValue);
-										return;
-									}
-									if (id === "separator" && isSeparatorStyle(newValue)) {
-										deps.setSeparator(newValue);
-										settingsList.updateValue(id, newValue);
-										notifyChange("Separator", newValue);
-										return;
-									}
-									if (
-										id === "pathDisplay" &&
-										pathDisplayModeValues.includes(newValue as PathDisplayConfig["mode"])
-									) {
-										deps.setPathDisplay({ mode: newValue as PathDisplayConfig["mode"] });
-										settingsList.updateValue(id, newValue);
-										notifyChange("Path display", newValue);
-										return;
-									}
-									if (id === "pathDepth" && pathDepthValues.includes(newValue as never)) {
-										deps.setPathDisplay({ depth: Number(newValue) });
-										settingsList.updateValue(id, newValue);
-										notifyChange("Path depth", newValue);
-										return;
-									}
+										if (id === "responsiveFooter" && enabled !== undefined) {
+											deps.setResponsiveFooter({ responsiveFooter: enabled }, ctx);
+											settingsList.updateValue(id, newValue);
+											notifyChange("Responsive footer", newValue);
+											return;
+										}
+										if (
+											id === "compactFooterMaxLines" &&
+											compactFooterMaxLineValues.includes(newValue as never)
+										) {
+											const value: CompactFooterMaxLines =
+												newValue === "unlimited" ? "unlimited" : (Number(newValue) as 1 | 2 | 3);
+											deps.setResponsiveFooter({ compactFooterMaxLines: value }, ctx);
+											settingsList.updateValue(id, newValue);
+											notifyChange("Compact footer rows", newValue);
+											return;
+										}
+										if (
+											id === "contextStyle" &&
+											contextStyleValues.includes(newValue as ContextStyle)
+										) {
+											deps.setContextStyle(newValue as ContextStyle);
+											settingsList.updateValue(id, newValue);
+											notifyChange("Context style", newValue);
+											return;
+										}
+										if (id === "separator" && isSeparatorStyle(newValue)) {
+											deps.setSeparator(newValue);
+											settingsList.updateValue(id, newValue);
+											notifyChange("Separator", newValue);
+											return;
+										}
+										if (
+											id === "pathDisplay" &&
+											pathDisplayModeValues.includes(newValue as PathDisplayConfig["mode"])
+										) {
+											deps.setPathDisplay({ mode: newValue as PathDisplayConfig["mode"] });
+											settingsList.updateValue(id, newValue);
+											notifyChange("Path display", newValue);
+											return;
+										}
+										if (id === "pathDepth" && pathDepthValues.includes(newValue as never)) {
+											deps.setPathDisplay({ depth: Number(newValue) });
+											settingsList.updateValue(id, newValue);
+											notifyChange("Path depth", newValue);
+											return;
+										}
 
-									const segment = footerSegmentSettingFromId(id);
-									if (segment && enabled !== undefined) {
-										deps.setFooterSegments({ [segment]: enabled }, ctx);
-										settingsList.updateValue(id, newValue);
-										notifyChange(footerSegmentSettingLabels[segment], newValue);
-										return;
-									}
-									if (id === "branchLength") {
-										const value = newValue === "full" ? "full" : Number(newValue);
-										if (value !== "full" && (!Number.isInteger(value) || value <= 0)) return;
-										deps.setGitBranch({ maxLength: value });
-										settingsList.updateValue(id, newValue);
-										notifyChange("Branch length", newValue);
-										return;
-									}
-									if (id === "gitCommitOnlyDetached" && enabled !== undefined) {
-										deps.setGitCommit({ onlyDetached: enabled }, ctx);
-										settingsList.updateValue(id, newValue);
-										notifyChange("Commit only on detached HEAD", newValue);
-										return;
-									}
-									if (id === "gitCommitShowTag" && enabled !== undefined) {
-										deps.setGitCommit({ showTag: enabled }, ctx);
-										settingsList.updateValue(id, newValue);
-										notifyChange("Show exact-match tag", newValue);
-										return;
-									}
-									if (id === "gitMetricsOnlyNonzero" && enabled !== undefined) {
-										deps.setGitMetrics({ onlyNonzero: enabled }, ctx);
-										settingsList.updateValue(id, newValue);
-										notifyChange("Hide zero metrics", newValue);
-										return;
-									}
-									if (id === "gitMetricsIgnoreSubmodules" && enabled !== undefined) {
-										deps.setGitMetrics({ ignoreSubmodules: enabled }, ctx);
-										settingsList.updateValue(id, newValue);
-										notifyChange("Ignore submodules", newValue);
-										return;
-									}
+										const segment = footerSegmentSettingFromId(id);
+										if (segment && enabled !== undefined) {
+											deps.setFooterSegments({ [segment]: enabled }, ctx);
+											settingsList.updateValue(id, newValue);
+											notifyChange(footerSegmentSettingLabels[segment], newValue);
+											return;
+										}
+										if (id === "branchLength") {
+											const value = newValue === "full" ? "full" : Number(newValue);
+											if (value !== "full" && (!Number.isInteger(value) || value <= 0)) return;
+											deps.setGitBranch({ maxLength: value });
+											settingsList.updateValue(id, newValue);
+											notifyChange("Branch length", newValue);
+											return;
+										}
+										if (id === "gitCommitOnlyDetached" && enabled !== undefined) {
+											deps.setGitCommit({ onlyDetached: enabled }, ctx);
+											settingsList.updateValue(id, newValue);
+											notifyChange("Commit only on detached HEAD", newValue);
+											return;
+										}
+										if (id === "gitCommitShowTag" && enabled !== undefined) {
+											deps.setGitCommit({ showTag: enabled }, ctx);
+											settingsList.updateValue(id, newValue);
+											notifyChange("Show exact-match tag", newValue);
+											return;
+										}
+										if (id === "gitMetricsOnlyNonzero" && enabled !== undefined) {
+											deps.setGitMetrics({ onlyNonzero: enabled }, ctx);
+											settingsList.updateValue(id, newValue);
+											notifyChange("Hide zero metrics", newValue);
+											return;
+										}
+										if (id === "gitMetricsIgnoreSubmodules" && enabled !== undefined) {
+											deps.setGitMetrics({ ignoreSubmodules: enabled }, ctx);
+											settingsList.updateValue(id, newValue);
+											notifyChange("Ignore submodules", newValue);
+											return;
+										}
 
-									if (
-										id === "extensionStatusDefaultPlacement" &&
-										isExtensionStatusPlacement(newValue)
-									) {
-										deps.setExtensionStatusDefaultPlacement(newValue);
-										settingsList = makeSettingsList("extensionStatusDefaultPlacement");
-										notifyChange("Default extension status placement", newValue);
-										return;
-									}
-									const thirdParty = thirdPartyStatusSettingFromId(id);
-									if (thirdParty?.kind === "placement" && isExtensionStatusPlacement(newValue)) {
-										deps.setExtensionStatusPlacement(thirdParty.key, newValue);
-										settingsList.updateValue(id, newValue);
-										notifyChange(`Third-party status ${thirdParty.key} placement`, newValue);
-										return;
-									}
-									if (thirdParty?.kind === "colorMode" && isExtensionStatusColorMode(newValue)) {
-										deps.setExtensionStatusColorMode(thirdParty.key, newValue);
-										settingsList.updateValue(id, newValue);
-										notifyChange(`Third-party status ${thirdParty.key} color`, newValue);
+										const choice = newValue.toLowerCase();
+										if (
+											id === "extensionStatusDefaultPlacement" &&
+											isExtensionStatusPlacement(choice)
+										) {
+											deps.setExtensionStatusDefaultChoice(choice);
+											settingsList = makeSettingsList(id);
+											notifyChange("Default placement", newValue);
+											return;
+										}
+										const thirdParty = thirdPartyStatusSettingFromId(id);
+										if (
+											thirdParty?.kind === "placement" &&
+											(choice === "default" || isExtensionStatusPlacement(choice))
+										) {
+											deps.setExtensionStatusChoice(thirdParty.key, choice);
+											settingsList = makeSettingsList(id);
+											notifyChange(`${thirdParty.key} placement`, newValue);
+											return;
+										}
+										if (thirdParty?.kind === "colorMode" && isExtensionStatusColorMode(choice)) {
+											if (deps.getConfig().components.footer.style === "hidden")
+												deps.setHiddenExtensionStatusColorMode(thirdParty.key, choice);
+											else deps.setExtensionStatusColorMode(thirdParty.key, choice);
+											settingsList = makeSettingsList(id);
+											notifyChange(`${thirdParty.key} color`, newValue);
+										}
+									} catch (error) {
+										stopPreview();
+										settingsList = makeSettingsList(id);
+										tui.requestRender();
+										ctx.ui.notify(
+											`Could not update Zentui settings: ${error instanceof Error ? error.message : String(error)}`,
+											"error",
+										);
 									}
-								} catch (error) {
+								},
+								activate() {
+									// Panel rows use value cycles (including one-value dialog actions).
+									// Share the native onChange route, not a synthetic key that native
+									// navigation bindings could consume before activation.
+									const item = items[selectedIndex];
+									if (!item?.values?.length) return;
+									const next = (item.values.indexOf(item.currentValue) + 1) % item.values.length;
+									actions.change(item.id, item.values[next]);
+								},
+							};
+							const list = new SettingsList(
+								items,
+								listVisible,
+								// Native hint text is not binding-aware. Own the hint surface via its supported theme callback.
+								{ ...listTheme, hint: () => "" },
+								actions.change,
+								backOrClose,
+							);
+							activateSelectedSetting = actions.activate;
+							if (focusId && !selectOwnedSetting(list, items, focusId)) selectedIndex = 0;
+							return list;
+						};
+						settingsList = makeSettingsList(initialFocusId);
+						startPreview();
+						const renderPreviewRows = (previewWidth: number): string[] => {
+							if (previewWidth <= 0) return [];
+							if (activeSection === "editor")
+								return renderEditorSettingsPreview(deps.getConfig(), theme, previewWidth);
+							if (activeSection === "userMessages")
+								return renderUserMessageSettingsPreview(deps.getConfig(), theme, previewWidth);
+							if (activeSection === "thinkingSteps")
+								return renderThinkingStepsSettingsPreview(
+									deps.getConfig(),
+									theme,
+									previewWidth,
+									deps.thinkingStepsCapability,
+								);
+							if (activeSection === "workingLine" && preview && preview.frames.length > 0)
+								return [
+									truncateToWidth(
+										preview.frames[previewFrameIndex] ?? preview.frames[0],
+										Math.min(SETTINGS_PREVIEW_MAX_WIDTH, previewWidth),
+										"",
+									),
+								];
+							return [];
+						};
+						return {
+							render(width: number) {
+								if (width <= 0) return [];
+								const border = renderStyleForSourceOrFallback(
+									theme,
+									deps.getConfig().components.selectorBorders.colorSource,
+									componentColor(deps.getConfig(), "selectorBorders", "border"),
+									EDITOR_BORDER_FALLBACK,
+									"─".repeat(Math.max(0, width)),
+								);
+								const height = tui.terminal?.rows ?? 80;
+								const help = keys
+									.help(width, isFooterPage(activeSection) ? "Back" : "Close")
+									.map((line) => safeThemeFg(theme, "muted", line));
+								const nextVisible = Math.max(1, Math.min(8, height - help.length - 8));
+								if (nextVisible !== listVisible) {
+									listVisible = nextVisible;
+									settingsList = makeSettingsList(currentItems[selectedIndex]?.id);
+								}
+								const settingsRows = settingsList
+									.render(Math.max(5, width))
+									.map((line) => truncateToWidth(line, width, ""));
+								while (settingsRows.length && visibleWidth(settingsRows.at(-1) ?? "") === 0)
+									settingsRows.pop();
+								const bodyBudget = Math.max(1, height - 4 - help.length);
+								const previewRows = renderPreviewRows(Math.max(0, width - 4));
+								while (previewRows.length > 0 && visibleWidth(previewRows.at(-1) ?? "") === 0)
+									previewRows.pop();
+								const indentedPreviewRows = previewRows.map((line) =>
+									truncateToWidth(`  ${line}`, width, ""),
+								);
+								const showPreview =
+									indentedPreviewRows.length + 2 + settingsRows.length <= bodyBudget;
+								const bodyRows =
+									showPreview && indentedPreviewRows.some((line) => visibleWidth(line) > 0)
+										? ["", ...indentedPreviewRows, "", ...settingsRows]
+										: settingsRows.slice(0, bodyBudget);
+								bodyRows.push(...help);
+								return [
+									truncateToWidth(border, width, ""),
+									truncateToWidth(
+										formatSectionTabs(activeSection, theme, width, sections, deps.skinOnly),
+										width,
+										"",
+									),
+									truncateToWidth(border, width, ""),
+									...bodyRows,
+									truncateToWidth(border, width, ""),
+								];
+							},
+							invalidate() {
+								settingsList.invalidate();
+							},
+							handleInput(data: string) {
+								// Closing is safe even after shutdown: let Pi restore its saved editor draft.
+								if (keys.matches(data, "cancel")) {
+									backOrClose();
+									return;
+								}
+								if (!deps.sessionLifecycle.isCurrent(generation)) return;
+								if (matchesKey(data, Key.tab)) {
 									stopPreview();
-									settingsList = makeSettingsList(id);
+									activeSection = nextSection(activeSection, sections);
+									settingsList = makeSettingsList();
+									startPreview();
 									tui.requestRender();
-									ctx.ui.notify(
-										`Could not update Zentui settings: ${error instanceof Error ? error.message : String(error)}`,
-										"error",
-									);
+									return;
 								}
-							},
-							() => finishSettings("close"),
-						);
-						if (focusId) {
-							const target = items.findIndex((item) => item.id === focusId);
-							for (let index = 0; index < target; index += 1) list.handleInput("\x1b[B");
-						}
-						return list;
-					};
-					settingsList = makeSettingsList(initialFocusId);
-					startPreview();
-					const renderPreviewRows = (previewWidth: number): string[] => {
-						if (previewWidth <= 0) return [];
-						if (activeSection === "editor")
-							return renderEditorSettingsPreview(deps.getConfig(), theme, previewWidth);
-						if (activeSection === "userMessages")
-							return renderUserMessageSettingsPreview(deps.getConfig(), theme, previewWidth);
-						if (activeSection === "thinkingSteps")
-							return renderThinkingStepsSettingsPreview(
-								deps.getConfig(),
-								theme,
-								previewWidth,
-								deps.thinkingStepsCapability,
-							);
-						if (activeSection === "workingLine" && preview && preview.frames.length > 0)
-							return [
-								truncateToWidth(
-									preview.frames[previewFrameIndex] ?? preview.frames[0],
-									Math.min(SETTINGS_PREVIEW_MAX_WIDTH, previewWidth),
-									"",
-								),
-							];
-						return [];
-					};
-					return {
-						render(width: number) {
-							const border = renderChromeBorder(
-								theme,
-								deps.getConfig().components.selectorBorders.colorSource,
-								EDITOR_BORDER_STYLE,
-								"─".repeat(Math.max(0, width)),
-							);
-							const settingsRows = withSectionFooter(settingsList.render(width), theme).map(
-								(line) => truncateToWidth(line, width, ""),
-							);
-							const previewRows = renderPreviewRows(Math.max(0, width - 4));
-							while (previewRows.length > 0 && visibleWidth(previewRows.at(-1) ?? "") === 0)
-								previewRows.pop();
-							const indentedPreviewRows = previewRows.map((line) =>
-								truncateToWidth(`  ${line}`, width, ""),
-							);
-							const bodyRows = indentedPreviewRows.some((line) => visibleWidth(line) > 0)
-								? ["", ...indentedPreviewRows, "", ...settingsRows]
-								: settingsRows;
-							return [
-								truncateToWidth(border, width, ""),
-								truncateToWidth(formatSectionTabs(activeSection, theme, width), width, ""),
-								truncateToWidth(border, width, ""),
-								...bodyRows,
-								truncateToWidth(border, width, ""),
-							];
-						},
-						invalidate() {
-							settingsList.invalidate();
-						},
-						handleInput(data: string) {
-							if (matchesKey(data, Key.tab)) {
-								stopPreview();
-								activeSection = nextSection(activeSection);
-								settingsList = makeSettingsList();
-								startPreview();
+								if (matchesKey(data, Key.shift("tab"))) {
+									stopPreview();
+									activeSection = previousSection(activeSection, sections);
+									settingsList = makeSettingsList();
+									startPreview();
+									tui.requestRender();
+									return;
+								}
+								if (keys.matches(data, "up") || keys.matches(data, "down")) {
+									const delta = keys.matches(data, "up") ? -1 : 1;
+									const next = (selectedIndex + delta + currentItems.length) % currentItems.length;
+									const id = currentItems[next]?.id;
+									if (id && selectOwnedSetting(settingsList, currentItems, id))
+										selectedIndex = next;
+								} else if (keys.matches(data, "confirm") || data === " ") activateSelectedSetting();
 								tui.requestRender();
-								return;
-							}
-							if (matchesKey(data, Key.shift("tab"))) {
+							},
+							dispose() {
 								stopPreview();
-								activeSection = previousSection(activeSection);
-								settingsList = makeSettingsList();
-								startPreview();
-								tui.requestRender();
-								return;
-							}
-							settingsList.handleInput(data);
-						},
-						dispose() {
-							stopPreview();
-						},
-					};
-				});
+							},
+						};
+					});
+				} catch (error) {
+					if (deps.sessionLifecycle.isCurrent(generation))
+						ctx.ui.notify(
+							`Could not open Zentui settings: ${error instanceof Error ? error.message : String(error)}`,
+							"error",
+						);
+					return;
+				}
 				// Pi restores its saved editor text before custom() resolves. Reconcile only
 				// now, using the latest config and observed factory, never a captured factory.
-				if (pendingPresetEditor && !deps.sessionLifecycle.isCurrent(generation)) return;
+				if (!deps.sessionLifecycle.isCurrent(generation)) return;
 				if (pendingPresetEditor) {
 					try {
 						const result = deps.reconcilePresetEditor(ctx);
@@ -1933,6 +2439,7 @@ export function registerZentuiSettingsCommand(pi: ExtensionAPI, deps: SettingsCo
 							);
 						}
 					} catch (error) {
+						if (!deps.sessionLifecycle.isCurrent(generation)) return;
 						ctx.ui.notify(
 							`Could not apply preset editor; reload Pi: ${error instanceof Error ? error.message : String(error)}`,
 							"error",
@@ -1940,6 +2447,37 @@ export function registerZentuiSettingsCommand(pi: ExtensionAPI, deps: SettingsCo
 					}
 				}
 				if (outcome === "close" || outcome === undefined) return;
+				if (outcome.startsWith("edit-custom-value-colors:")) {
+					await editCustomValueColors(
+						ctx,
+						deps,
+						outcome.slice("edit-custom-value-colors:".length) as "editor" | "footer",
+					);
+					if (!deps.sessionLifecycle.isCurrent(generation)) return;
+					continue;
+				}
+				if (outcome === "edit-turn-summary-format") {
+					await editTurnSummaryFormat(ctx, deps);
+					if (!deps.sessionLifecycle.isCurrent(generation)) return;
+					continue;
+				}
+				if (outcome === "migrate" || outcome.startsWith("edit-colors:")) {
+					if (outcome === "migrate") await confirmComponentMigration(ctx, deps);
+					else
+						await editComponentColors(
+							ctx,
+							deps,
+							outcome.slice("edit-colors:".length) as ColorOwner,
+						);
+					if (!deps.sessionLifecycle.isCurrent(generation)) return;
+					continue;
+				}
+				if (outcome === "edit-minimalist-templates" || outcome === "edit-minimalist-variables") {
+					if (outcome === "edit-minimalist-templates") await editMinimalistTemplates(ctx, deps);
+					else await editMinimalistVariables(ctx, deps);
+					if (!deps.sessionLifecycle.isCurrent(generation)) return;
+					continue;
+				}
 				if (
 					outcome === "edit-working-line-spinner-speed" ||
 					outcome === "edit-working-line-text-speed"
@@ -1949,10 +2487,12 @@ export function registerZentuiSettingsCommand(pi: ExtensionAPI, deps: SettingsCo
 					const before = spinnerSpeed ? workingLine.spinnerIntervalMs : workingLine.textIntervalMs;
 					const label = spinnerSpeed ? "Spinner speed" : "Text motion speed";
 					try {
+						prepareEditorTextForCustomUi(ctx.ui);
 						const edited = await ctx.ui.input(
 							`${label} (${MIN_WORKING_LINE_INTERVAL_MS}–${MAX_WORKING_LINE_INTERVAL_MS} ms)`,
 							String(before),
 						);
+						if (!deps.sessionLifecycle.isCurrent(generation)) return;
 						if (edited === undefined) {
 							ctx.ui.notify(`${label} unchanged (input canceled)`, "info");
 						} else {
@@ -1975,18 +2515,22 @@ export function registerZentuiSettingsCommand(pi: ExtensionAPI, deps: SettingsCo
 							}
 						}
 					} catch (error) {
+						if (!deps.sessionLifecycle.isCurrent(generation)) return;
 						ctx.ui.notify(
 							`Could not update Zentui settings: ${error instanceof Error ? error.message : String(error)}`,
 							"error",
 						);
 					}
+					if (!deps.sessionLifecycle.isCurrent(generation)) return;
 					requestedSection = "workingLine";
 					requestedFocusId = spinnerSpeed ? "workingLineSpinnerSpeed" : "workingLineTextSpeed";
 					continue;
 				}
 				try {
 					const before = deps.getConfig().components.workingLine.messages.values.join("\n");
+					prepareEditorTextForCustomUi(ctx.ui);
 					const edited = await ctx.ui.editor("Working line message list", before);
+					if (!deps.sessionLifecycle.isCurrent(generation)) return;
 					if (edited !== undefined) {
 						const values = normalizeWorkingLineMessages(edited.split(/\r?\n/));
 						const result = deps.setWorkingLineComponent({ messages: { values } }, ctx);
@@ -1996,11 +2540,13 @@ export function registerZentuiSettingsCommand(pi: ExtensionAPI, deps: SettingsCo
 						);
 					}
 				} catch (error) {
+					if (!deps.sessionLifecycle.isCurrent(generation)) return;
 					ctx.ui.notify(
 						`Could not update Zentui settings: ${error instanceof Error ? error.message : String(error)}`,
 						"error",
 					);
 				}
+				if (!deps.sessionLifecycle.isCurrent(generation)) return;
 				requestedSection = "workingLine";
 				requestedFocusId = "workingLineMessageList";
 			}