@selesai/code 0.13.40 → 0.14.3

package/dist/extensions/pi-zentui/test/extension-compliance.test.ts

@@ -7,9 +7,8 @@ import {
 	rmSync,
 	writeFileSync,
 } from "node:fs";
-import { createRequire } from "node:module";
 import { tmpdir } from "node:os";
-import { dirname, join } from "node:path";
+import { join } from "node:path";
 import type { ExtensionContext, Theme } from "@earendil-works/pi-coding-agent";
 import {
 	AssistantMessageComponent,
@@ -23,18 +22,14 @@ import {
 import { Container, type EditorComponent, visibleWidth } from "@earendil-works/pi-tui";
 import { afterAll, afterEach, describe, expect, it, vi } from "vitest";
 import {
-	discoverAccentRailLayoutPatchTargetFromEntrypoint,
-	ZENTUI_ACCENT_RAIL_LAYOUT_EDITOR,
-} from "../extensions/zentui/accent-rail-layout-patch";
-import {
-	defaultConfig,
 	type ExtensionStatusPlacement,
+	mergeConfig,
 	type PolishedTuiConfig,
 	type SeparatorStyle,
 } from "../extensions/zentui/config";
 import { installFooter as installFooterProduction } from "../extensions/zentui/footer";
 import { emptyGitStatus } from "../extensions/zentui/git";
-import zentui, { activeFooterReferences } from "../extensions/zentui/index";
+import zentui, { activeFooterReferences, type ZentuiHost } from "../extensions/zentui/index";
 import { ZENTUI_PROTOTYPE_PATCH_REGISTRY } from "../extensions/zentui/prototype-patch-registry";
 import {
 	installSelectorBorderStyle as installSelectorBorderStyleProduction,
@@ -50,13 +45,8 @@ import {
 import { installUserMessageStyle as installUserMessageStyleProduction } from "../extensions/zentui/user-message";
 import { sanitizeUserMessageSourceText } from "../extensions/zentui/user-message-osc";
 
-const localPiTuiEntry = createRequire(import.meta.url).resolve("@earendil-works/pi-tui");
-const localPiTuiVersion = (
-	JSON.parse(readFileSync(join(dirname(localPiTuiEntry), "../package.json"), "utf8")) as {
-		version: string;
-	}
-).version;
-const localSupportsAccentRailLayoutPatch = /^0\.84\.\d+$/.test(localPiTuiVersion);
+// These integration fixtures assert the historical Nerd glyphs, independent of the host terminal.
+const defaultConfig = mergeConfig({ icons: { mode: "nerd" } }, {});
 
 const isolatedAgentDir = vi.hoisted(() => {
 	const previous = process.env.SELESAI_CODING_AGENT_DIR;
@@ -103,12 +93,15 @@ function restoreDescriptor(
 	if (descriptor) Object.defineProperty(target, property, descriptor);
 	else delete (target as Record<PropertyKey, unknown>)[property];
 }
-const inactiveSessionLifecycle = new SessionLifecycle();
+const settingsSessionLifecycle = new SessionLifecycle();
+settingsSessionLifecycle.start();
 
 type SettingsCommandDeps = Parameters<typeof registerZentuiSettingsCommand>[1];
 
 const settingsCommandDefaults: SettingsCommandDeps = {
-	sessionLifecycle: inactiveSessionLifecycle,
+	migrateSelections() {},
+	setComponentColor() {},
+	sessionLifecycle: settingsSessionLifecycle,
 	getConfig: () => defaultConfig,
 	applyPreset: () => ({ applied: true }),
 	reconcilePresetEditor: () => ({ applied: true }),
@@ -134,8 +127,9 @@ const settingsCommandDefaults: SettingsCommandDeps = {
 	setGitCommit() {},
 	setGitMetrics() {},
 	getActiveExtensionStatuses: () => new Map<string, string>(),
-	setExtensionStatusDefaultPlacement() {},
-	setExtensionStatusPlacement() {},
+	setHiddenExtensionStatusColorMode() {},
+	setExtensionStatusDefaultChoice() {},
+	setExtensionStatusChoice() {},
 	setExtensionStatusColorMode() {},
 	requestRender() {},
 };
@@ -154,6 +148,7 @@ function canonicalizeTestConfig(config: PolishedTuiConfig): PolishedTuiConfig {
 		// pre-change fixture baseline rather than relying on bundled defaults.
 		icons: { ...config.icons, mode: config.icons.mode === "ascii" ? "nerd" : config.icons.mode },
 		components: {
+			extensionStatuses: { ...config.components.extensionStatuses },
 			editor: {
 				...editor,
 				enabled: flatChanged("features") ? config.features.editor : true,
@@ -537,7 +532,9 @@ function stripTestTags(line: string): string {
 	return stripPromptMarks(line).replaceAll(/\[[^\]]+\]/g, "");
 }
 
-function loadExtension(options: { thinkingLevel?: string; commands?: Map<string, unknown> } = {}) {
+function loadExtension(
+	options: { thinkingLevel?: string; commands?: Map<string, unknown>; host?: ZentuiHost } = {},
+) {
 	const configPath = join(isolatedAgentDir.path, "zentui.json");
 	const persisted = existsSync(configPath)
 		? (JSON.parse(readFileSync(configPath, "utf8")) as Record<string, unknown>)
@@ -578,7 +575,7 @@ function loadExtension(options: { thinkingLevel?: string; commands?: Map<string,
 			return options.thinkingLevel ?? "off";
 		},
 	} as Record<string, unknown>;
-	zentui(api as never);
+	zentui(api as never, options.host);
 	return handlers;
 }
 
@@ -849,6 +846,7 @@ describe("Pi docs compliance", () => {
 		).toEqual(new Set(["cwd"]));
 	});
 	it("installs enabled copy-friendly framed messages while the editor is disabled", async () => {
+		initTheme("dark", false);
 		writeFileSync(
 			join(isolatedAgentDir.path, "zentui.json"),
 			JSON.stringify({
@@ -1096,7 +1094,7 @@ describe("Pi docs compliance", () => {
 		expect(editorInstalled).toBe(false);
 	});
 
-	it("treats missing ctx.mode as legacy TUI for older Pi runtimes", async () => {
+	it("treats missing ctx.mode in incomplete injected contexts as TUI", async () => {
 		const handlers = loadExtension();
 		let editorFactory: unknown;
 		const ctx = makeContext({
@@ -1649,6 +1647,89 @@ describe("Pi docs compliance", () => {
 		},
 	);
 
+	it.each(["disable", "shutdown", "foreign-replacement"] as const)(
+		"restores observed standalone editor state on %s without wrapping input",
+		async (cleanup) => {
+			initTheme(undefined, false);
+			writeFileSync(
+				join(isolatedAgentDir.path, "zentui.json"),
+				JSON.stringify({ projectRefreshIntervalMs: 0, features: { statusLine: false } }),
+			);
+			const commands = new Map<string, unknown>();
+			const handlers = loadExtension({ commands, host: { wrapEditor: false, skinOnly: true } });
+			type StatefulEditor = {
+				render(width: number): string[];
+				invalidate(): void;
+				handleInput(data: string): void;
+				getText(): string;
+				setText(text: string): void;
+			};
+			type Factory = (...args: unknown[]) => StatefulEditor;
+			const foreignFactory =
+				(label: string): Factory =>
+				() => {
+					let text = "";
+					return {
+						render: () => [`${label}:${text}`],
+						invalidate() {},
+						handleInput(data) {
+							text += `foreign-input:${data}`;
+						},
+						getText: () => text,
+						setText(value) {
+							text = value;
+						},
+					};
+				};
+			const predecessor = foreignFactory("predecessor");
+			let factory: Factory | undefined = predecessor;
+			let editor = predecessor();
+			editor.setText("original draft");
+			const ui = {
+				theme: makeTheme(),
+				setFooter() {},
+				notify() {},
+				getEditorComponent: () => factory,
+				getEditorText: () => editor.getText(),
+				setEditorText: (text: string) => editor.setText(text),
+				setEditorComponent(next: Factory | undefined) {
+					const text = editor.getText();
+					factory = next;
+					editor = (next ?? foreignFactory("native"))(
+						{ requestRender() {}, terminal: { rows: 24, cols: 80 } },
+						{ borderColor: (value: string) => value, selectList: {} },
+						{ matches: () => false },
+					);
+					editor.setText(text);
+				},
+			};
+			const ctx = makeContext({ ui });
+			await emit(handlers, "session_start", ctx);
+			expect(editor.render(80).join("\n")).toContain("original draft");
+			expect(editor.render(80).join("\n")).not.toContain("predecessor:");
+			editor.handleInput("x");
+			expect(editor.getText()).toBe("original draftx");
+			const command = commands.get("zentui") as {
+				handler(args: string, ctx: unknown): Promise<void>;
+			};
+			if (cleanup === "foreign-replacement") {
+				ui.setEditorComponent(foreignFactory("replacement"));
+				editor.handleInput("y");
+				await command.handler("editor disable", ctx);
+				await emit(handlers, "session_shutdown", ctx);
+				expect(editor.render(80)).toEqual(["replacement:original draftxforeign-input:y"]);
+			} else {
+				if (cleanup === "disable") await command.handler("editor disable", ctx);
+				else await emit(handlers, "session_shutdown", ctx);
+				expect(editor.render(80)).toEqual(["predecessor:original draftx"]);
+				editor.handleInput("y");
+				expect(editor.render(80)).toEqual(["predecessor:original draftxforeign-input:y"]);
+				await emit(handlers, "session_shutdown", ctx);
+				expect(editor.render(80)).toEqual(["predecessor:original draftxforeign-input:y"]);
+			}
+		},
+	);
+
 	it("restores a wrapped editor component on shutdown", async () => {
 		const handlers = loadExtension();
 		const existingEditorFactory = () => ({
@@ -2208,8 +2289,9 @@ describe("Pi docs compliance", () => {
 		const raw = new UserMessageComponent("hello").render(80).join("\n");
 		expect(raw).toMatch(/\[accent\]│|\u001b\[34m│\u001b\[0m/);
 		expect(raw).toMatch(/\[borderMuted\]────|\u001b\[90m────/);
-		expect(rendered).toContain("[accent]");
-		expect(rendered).toContain("[bold]");
+		expect(raw).toContain("hello");
+		expect(rendered).toContain("zentui");
+		expect(lines.join("\n")).not.toContain("[userMessageText]");
 		expect(rendered).not.toContain("**zentui**");
 		expect(rendered).not.toContain("claude-sonnet");
 		expect(rendered).not.toContain("Anthropic");
@@ -2249,35 +2331,6 @@ describe("Pi docs compliance", () => {
 		expect(raw).not.toContain("│");
 	});
 
-	it("caches rendered user messages across repeated renders", () => {
-		const getChildren = vi.fn(() => [{ text: "hello ".repeat(2000) }]);
-		const fg = vi.fn((color: string, text: string) => `[${color}]${text}`);
-		const theme = { ...makeTaggedTheme(), fg } as unknown as Theme;
-		installUserMessageStyle(
-			() => theme,
-			() => defaultConfig,
-		);
-		const instance = {
-			get children() {
-				return getChildren();
-			},
-		};
-		const renderMessage = (width: number) =>
-			UserMessageComponent.prototype.render.call(instance, width);
-
-		const firstRender = renderMessage(80);
-		const fgCallsAfterFirstRender = fg.mock.calls.length;
-		const secondRender = renderMessage(80);
-
-		expect(secondRender).toEqual(firstRender);
-		expect(getChildren).toHaveBeenCalledTimes(1);
-		expect(fg).toHaveBeenCalledTimes(fgCallsAfterFirstRender);
-
-		renderMessage(79);
-		expect(getChildren).toHaveBeenCalledTimes(1);
-		expect(fg.mock.calls.length).toBeGreaterThan(fgCallsAfterFirstRender);
-	});
-
 	it("restyles cached history when message style or relevant chrome changes", () => {
 		let config = complianceConfig();
 		const fg = vi.fn((color: string, text: string) => `[${color}]${text}`);
@@ -2347,8 +2400,9 @@ describe("Pi docs compliance", () => {
 
 		expect(cachedRender).toBe(firstRender);
 		expect(invalidate).toHaveBeenCalledTimes(1);
-		expect(invalidatedRender).toContain("[second:accent]hello");
-		expect(invalidatedRender).not.toContain("[first:accent]hello");
+		expect(invalidatedRender).toContain("[second:accent]");
+		expect(invalidatedRender).not.toContain("[first:accent]");
+		expect(invalidatedRender).toContain("hello");
 	});
 
 	it("renders selector borders from their independent canonical color source", () => {
@@ -4212,8 +4266,8 @@ describe("Pi docs compliance", () => {
 		const at122 = footer?.render(122) ?? [];
 		const at47 = footer?.render(47) ?? [];
 		expect(at145).toEqual([` ${left}  ${middle}   ${right} `]);
-		expect(at139).toEqual([` ${left} `, ` ${middle} ${right} `]);
-		expect(at122).toEqual([` ${left} `, ` ${middle} ${right} `]);
+		expect(at139).toEqual([` ${left} `, ` ${" ".repeat(68)}${middle} ${right} `]);
+		expect(at122).toEqual([` ${left} `, ` ${" ".repeat(51)}${middle} ${right} `]);
 		expect(at47.length).toBeLessThanOrEqual(2);
 		expect(at47.join("\n")).toContain("project");
 		expect(at47.join("\n")).toContain("responsive");
@@ -5217,7 +5271,7 @@ describe("Pi docs compliance", () => {
 			} as never,
 			{
 				...settingsCommandDefaults,
-				sessionLifecycle: inactiveSessionLifecycle,
+				sessionLifecycle: settingsSessionLifecycle,
 				getConfig: () => defaultConfig,
 				setFooterSegments() {},
 				setFooterFormat() {},
@@ -5227,7 +5281,7 @@ describe("Pi docs compliance", () => {
 				setGitBranch() {},
 				setSeparator() {},
 				getActiveExtensionStatuses: () => new Map<string, string>(),
-				setExtensionStatusPlacement() {},
+				setExtensionStatusChoice() {},
 				setExtensionStatusColorMode() {},
 				requestRender() {},
 			},
@@ -5261,7 +5315,7 @@ describe("Pi docs compliance", () => {
 			} as never,
 			{
 				...settingsCommandDefaults,
-				sessionLifecycle: inactiveSessionLifecycle,
+				sessionLifecycle: settingsSessionLifecycle,
 				getConfig: () => defaultConfig,
 				setFooterSegments() {},
 				setFooterFormat() {},
@@ -5271,7 +5325,7 @@ describe("Pi docs compliance", () => {
 				setGitBranch() {},
 				setSeparator() {},
 				getActiveExtensionStatuses: () => new Map<string, string>(),
-				setExtensionStatusPlacement() {},
+				setExtensionStatusChoice() {},
 				setExtensionStatusColorMode() {},
 				requestRender() {},
 			},
@@ -5305,7 +5359,7 @@ describe("Pi docs compliance", () => {
 			} as never,
 			{
 				...settingsCommandDefaults,
-				sessionLifecycle: inactiveSessionLifecycle,
+				sessionLifecycle: settingsSessionLifecycle,
 				getConfig: () => defaultConfig,
 				setEditorComponent(patch) {
 					featureChanges.push(patch as never);
@@ -5319,7 +5373,7 @@ describe("Pi docs compliance", () => {
 				setGitBranch() {},
 				setSeparator() {},
 				getActiveExtensionStatuses: () => new Map<string, string>(),
-				setExtensionStatusPlacement() {},
+				setExtensionStatusChoice() {},
 				setExtensionStatusColorMode() {},
 				requestRender() {
 					renderRequests += 1;
@@ -5353,7 +5407,7 @@ describe("Pi docs compliance", () => {
 			} as never,
 			{
 				...settingsCommandDefaults,
-				sessionLifecycle: inactiveSessionLifecycle,
+				sessionLifecycle: settingsSessionLifecycle,
 				getConfig: () => defaultConfig,
 				setFooterComponent(patch) {
 					featureChanges.push(patch);
@@ -5366,7 +5420,7 @@ describe("Pi docs compliance", () => {
 				setGitBranch() {},
 				setSeparator() {},
 				getActiveExtensionStatuses: () => new Map<string, string>(),
-				setExtensionStatusPlacement() {},
+				setExtensionStatusChoice() {},
 				setExtensionStatusColorMode() {},
 				requestRender() {},
 			},
@@ -5389,7 +5443,7 @@ describe("Pi docs compliance", () => {
 			} as never,
 			{
 				...settingsCommandDefaults,
-				sessionLifecycle: inactiveSessionLifecycle,
+				sessionLifecycle: settingsSessionLifecycle,
 				getConfig: () => defaultConfig,
 				setFooterSegments() {},
 				setFooterFormat() {},
@@ -5399,7 +5453,7 @@ describe("Pi docs compliance", () => {
 				setGitBranch() {},
 				setSeparator() {},
 				getActiveExtensionStatuses: () => new Map<string, string>(),
-				setExtensionStatusPlacement() {},
+				setExtensionStatusChoice() {},
 				setExtensionStatusColorMode() {},
 				requestRender() {},
 			},
@@ -5432,7 +5486,7 @@ describe("Pi docs compliance", () => {
 			} as never,
 			{
 				...settingsCommandDefaults,
-				sessionLifecycle: inactiveSessionLifecycle,
+				sessionLifecycle: settingsSessionLifecycle,
 				getConfig: () => defaultConfig,
 				setEditorComponent(patch) {
 					featureChanges.push(patch as never);
@@ -5446,7 +5500,7 @@ describe("Pi docs compliance", () => {
 				setGitBranch() {},
 				setSeparator() {},
 				getActiveExtensionStatuses: () => new Map<string, string>(),
-				setExtensionStatusPlacement() {},
+				setExtensionStatusChoice() {},
 				setExtensionStatusColorMode() {},
 				requestRender() {},
 			},
@@ -5479,7 +5533,7 @@ describe("Pi docs compliance", () => {
 			} as never,
 			{
 				...settingsCommandDefaults,
-				sessionLifecycle: inactiveSessionLifecycle,
+				sessionLifecycle: settingsSessionLifecycle,
 				getConfig: () => defaultConfig,
 				setEditorComponent: () => ({
 					applied: false,
@@ -5494,7 +5548,7 @@ describe("Pi docs compliance", () => {
 				setGitBranch() {},
 				setSeparator() {},
 				getActiveExtensionStatuses: () => new Map<string, string>(),
-				setExtensionStatusPlacement() {},
+				setExtensionStatusChoice() {},
 				setExtensionStatusColorMode() {},
 				requestRender() {},
 			},
@@ -5549,7 +5603,7 @@ describe("Pi docs compliance", () => {
 					setGitBranch() {},
 					setSeparator() {},
 					getActiveExtensionStatuses: () => new Map<string, string>(),
-					setExtensionStatusPlacement() {},
+					setExtensionStatusChoice() {},
 					setExtensionStatusColorMode() {},
 					requestRender() {},
 					settingsListTheme: {
@@ -5601,7 +5655,7 @@ describe("Pi docs compliance", () => {
 			} as never,
 			{
 				...settingsCommandDefaults,
-				sessionLifecycle: inactiveSessionLifecycle,
+				sessionLifecycle: settingsSessionLifecycle,
 				getConfig: () => defaultConfig,
 				setUserMessagesComponent(patch) {
 					attemptedPatches.push(patch);
@@ -5615,7 +5669,7 @@ describe("Pi docs compliance", () => {
 				setGitBranch() {},
 				setSeparator() {},
 				getActiveExtensionStatuses: () => new Map<string, string>(),
-				setExtensionStatusPlacement() {},
+				setExtensionStatusChoice() {},
 				setExtensionStatusColorMode() {},
 				requestRender() {},
 				settingsListTheme: {
@@ -5685,7 +5739,7 @@ describe("Pi docs compliance", () => {
 					setGitBranch() {},
 					setSeparator() {},
 					getActiveExtensionStatuses: () => new Map<string, string>(),
-					setExtensionStatusPlacement() {},
+					setExtensionStatusChoice() {},
 					setExtensionStatusColorMode() {},
 					requestRender() {},
 					settingsListTheme: {
@@ -5740,7 +5794,7 @@ describe("Pi docs compliance", () => {
 				} as never,
 				{
 					...settingsCommandDefaults,
-					sessionLifecycle: inactiveSessionLifecycle,
+					sessionLifecycle: settingsSessionLifecycle,
 					getConfig: () => config,
 					setFooterSegments() {},
 					setFooterFormat() {},
@@ -5750,7 +5804,7 @@ describe("Pi docs compliance", () => {
 					setGitBranch() {},
 					setSeparator() {},
 					getActiveExtensionStatuses: () => new Map<string, string>(),
-					setExtensionStatusPlacement() {},
+					setExtensionStatusChoice() {},
 					setExtensionStatusColorMode() {},
 					requestRender() {},
 					settingsListTheme: {
@@ -5784,8 +5838,8 @@ describe("Pi docs compliance", () => {
 		const themeLines = await renderSettings(defaultConfig);
 		expect(themeLines[0]).toContain("[borderMuted]────");
 		expect(themeLines.join("\n")).toContain("Appearance");
-		expect(themeLines.join("\n")).toContain("(1/9)");
-		expect(themeLines.join("\n")).toContain("Tab/Shift+Tab to switch sections");
+		expect(themeLines.join("\n")).toContain("(1/7)");
+		expect(themeLines.join("\n")).toContain("Tab/Shift+Tab Sections");
 		expect(themeLines.at(-1)).toContain("[borderMuted]────");
 		expect(themeLines.every((line) => visibleWidth(stripTestTags(line)) <= settingsWidth)).toBe(
 			true,
@@ -5813,7 +5867,7 @@ describe("Pi docs compliance", () => {
 			} as never,
 			{
 				...settingsCommandDefaults,
-				sessionLifecycle: inactiveSessionLifecycle,
+				sessionLifecycle: settingsSessionLifecycle,
 				getConfig: () => defaultConfig,
 				setFooterSegments() {},
 				setFooterFormat() {},
@@ -5823,7 +5877,7 @@ describe("Pi docs compliance", () => {
 				setGitBranch() {},
 				setSeparator() {},
 				getActiveExtensionStatuses: () => new Map<string, string>(),
-				setExtensionStatusPlacement() {},
+				setExtensionStatusChoice() {},
 				setExtensionStatusColorMode() {},
 				requestRender() {},
 				settingsListTheme: {
@@ -5867,7 +5921,7 @@ describe("Pi docs compliance", () => {
 			} as never,
 			{
 				...settingsCommandDefaults,
-				sessionLifecycle: inactiveSessionLifecycle,
+				sessionLifecycle: settingsSessionLifecycle,
 				getConfig: () => defaultConfig,
 				setFooterSegments() {},
 				setFooterFormat() {},
@@ -5880,7 +5934,7 @@ describe("Pi docs compliance", () => {
 				setGitBranch() {},
 				setSeparator() {},
 				getActiveExtensionStatuses: () => new Map<string, string>(),
-				setExtensionStatusPlacement() {},
+				setExtensionStatusChoice() {},
 				setExtensionStatusColorMode() {},
 				requestRender() {},
 				settingsListTheme: {
@@ -5903,7 +5957,7 @@ describe("Pi docs compliance", () => {
 						handleInput?: (data: string) => void;
 					};
 					for (let index = 0; index < 5; index += 1) component.handleInput?.("\t");
-					for (let index = 0; index < 3; index += 1) component.handleInput?.("\x1b[B");
+					for (let index = 0; index < 4; index += 1) component.handleInput?.("\x1b[B");
 					component.handleInput?.(" ");
 					component.handleInput?.("\x1b[B");
 					component.handleInput?.(" ");
@@ -5928,7 +5982,7 @@ describe("Pi docs compliance", () => {
 			} as never,
 			{
 				...settingsCommandDefaults,
-				sessionLifecycle: inactiveSessionLifecycle,
+				sessionLifecycle: settingsSessionLifecycle,
 				getConfig: () => defaultConfig,
 				setFooterSegments() {},
 				setFooterFormat() {},
@@ -5940,7 +5994,7 @@ describe("Pi docs compliance", () => {
 					changes.push(separator);
 				},
 				getActiveExtensionStatuses: () => new Map<string, string>(),
-				setExtensionStatusPlacement() {},
+				setExtensionStatusChoice() {},
 				setExtensionStatusColorMode() {},
 				requestRender() {
 					dependencyRenderRequests += 1;
@@ -5975,7 +6029,7 @@ describe("Pi docs compliance", () => {
 						() => {},
 					) as { handleInput?: (data: string) => void };
 					for (let index = 0; index < 5; index += 1) component.handleInput?.("\t");
-					for (let index = 0; index < 6; index += 1) component.handleInput?.("\x1b[B");
+					for (let index = 0; index < 7; index += 1) component.handleInput?.("\x1b[B");
 					component.handleInput?.(" ");
 					component.handleInput?.(" ");
 					component.handleInput?.(" ");
@@ -5992,7 +6046,7 @@ describe("Pi docs compliance", () => {
 			"Separator: pipe",
 		]);
 		expect(dependencyRenderRequests).toBe(4);
-		expect(tuiRenderRequests).toBe(9);
+		expect(tuiRenderRequests).toBeGreaterThanOrEqual(9);
 	});
 
 	it("cycles branch length presets and returns custom JSON values to full", async () => {
@@ -6009,7 +6063,7 @@ describe("Pi docs compliance", () => {
 				} as never,
 				{
 					...settingsCommandDefaults,
-					sessionLifecycle: inactiveSessionLifecycle,
+					sessionLifecycle: settingsSessionLifecycle,
 					getConfig: () => config,
 					setFooterSegments() {},
 					setFooterFormat() {},
@@ -6021,7 +6075,7 @@ describe("Pi docs compliance", () => {
 					},
 					setSeparator() {},
 					getActiveExtensionStatuses: () => new Map<string, string>(),
-					setExtensionStatusPlacement() {},
+					setExtensionStatusChoice() {},
 					setExtensionStatusColorMode() {},
 					requestRender() {},
 					settingsListTheme: {
@@ -6033,7 +6087,7 @@ describe("Pi docs compliance", () => {
 					},
 				},
 			);
-			await command?.handler("", {
+			await command?.handler("git", {
 				hasUI: true,
 				mode: "tui",
 				ui: {
@@ -6043,7 +6097,6 @@ describe("Pi docs compliance", () => {
 						const component = factory({ requestRender() {} }, makeTheme(), {}, () => {}) as {
 							handleInput?: (data: string) => void;
 						};
-						for (let index = 0; index < 7; index += 1) component.handleInput?.("\t");
 						component.handleInput?.("\x1b[B");
 						for (let index = 0; index < presses; index += 1) component.handleInput?.(" ");
 					},
@@ -6071,7 +6124,7 @@ describe("Pi docs compliance", () => {
 			} as never,
 			{
 				...settingsCommandDefaults,
-				sessionLifecycle: inactiveSessionLifecycle,
+				sessionLifecycle: settingsSessionLifecycle,
 				getConfig: () => defaultConfig,
 				setSelectorBordersComponent(patch) {
 					changes.push(patch);
@@ -6084,7 +6137,7 @@ describe("Pi docs compliance", () => {
 				setGitBranch() {},
 				setSeparator() {},
 				getActiveExtensionStatuses: () => new Map<string, string>(),
-				setExtensionStatusPlacement() {},
+				setExtensionStatusChoice() {},
 				setExtensionStatusColorMode() {},
 				requestRender() {
 					dependencyRenderRequests += 1;
@@ -6128,7 +6181,7 @@ describe("Pi docs compliance", () => {
 
 		expect(changes).toEqual([{ colorSource: "terminal" }]);
 		expect(dependencyRenderRequests).toBe(1);
-		expect(tuiRenderRequests).toBe(1);
+		expect(tuiRenderRequests).toBeGreaterThanOrEqual(1);
 		expect(doneCalls).toBe(0);
 	});
 
@@ -6145,7 +6198,7 @@ describe("Pi docs compliance", () => {
 			} as never,
 			{
 				...settingsCommandDefaults,
-				sessionLifecycle: inactiveSessionLifecycle,
+				sessionLifecycle: settingsSessionLifecycle,
 				getConfig: () => configWithColorSources({ editor: "theme", userMessages: "terminal" }),
 				setSelectorBordersComponent(patch) {
 					changes.push(patch);
@@ -6158,7 +6211,7 @@ describe("Pi docs compliance", () => {
 				setGitBranch() {},
 				setSeparator() {},
 				getActiveExtensionStatuses: () => new Map<string, string>(),
-				setExtensionStatusPlacement() {},
+				setExtensionStatusChoice() {},
 				setExtensionStatusColorMode() {},
 				requestRender() {},
 				settingsListTheme: {
@@ -6196,36 +6249,14 @@ describe("Pi docs compliance", () => {
 		expect(changes).toEqual([{ colorSource: "terminal" }]);
 	});
 
-	function navigateToSettingsSection(
-		component: { handleInput?: (data: string) => void },
-		section:
-			| "Appearance"
-			| "Editor"
-			| "User messages"
-			| "Thinking"
-			| "Working line"
-			| "Footer"
-			| "Segments"
-			| "Git"
-			| "Extensions",
-	) {
-		const sections = [
-			"Appearance",
-			"Editor",
-			"User messages",
-			"Thinking",
-			"Working line",
-			"Footer",
-			"Segments",
-			"Git",
-			"Extensions",
-		];
-		for (let index = 0; index < sections.indexOf(section); index += 1) {
-			component.handleInput?.("\t");
-		}
+	function openExtensionStatusesSettings(component: {
+		render?: (width: number) => string[];
+		handleInput?: (data: string) => void;
+	}) {
+		for (let index = 0; index < 6; index++) component.handleInput?.("\t");
 	}
 
-	it("cycles extension segments tabs backward with shift+tab", async () => {
+	it("leaves Extension statuses for the previous top-level section with shift+tab", async () => {
 		let command: { handler: (args: string, ctx: unknown) => Promise<void> } | undefined;
 		let rendered = "";
 
@@ -6237,7 +6268,7 @@ describe("Pi docs compliance", () => {
 			} as never,
 			{
 				...settingsCommandDefaults,
-				sessionLifecycle: inactiveSessionLifecycle,
+				sessionLifecycle: settingsSessionLifecycle,
 				getConfig: () => defaultConfig,
 				setFooterSegments() {},
 				setFooterFormat() {},
@@ -6247,7 +6278,7 @@ describe("Pi docs compliance", () => {
 				setGitBranch() {},
 				setSeparator() {},
 				getActiveExtensionStatuses: () => new Map<string, string>(),
-				setExtensionStatusPlacement() {},
+				setExtensionStatusChoice() {},
 				setExtensionStatusColorMode() {},
 				requestRender() {},
 				settingsListTheme: {
@@ -6271,18 +6302,19 @@ describe("Pi docs compliance", () => {
 						render?: (width: number) => string[];
 						handleInput?: (data: string) => void;
 					};
-					navigateToSettingsSection(component, "Extensions");
+					openExtensionStatusesSettings(component);
 					component.handleInput?.("\x1b[Z");
 					rendered = component.render?.(120).join("\n") ?? "";
 				},
 			},
 		});
 
-		expect(rendered).toContain("Git branch");
-		expect(rendered).not.toContain("No active statuses");
+		expect(rendered).toContain("Footer");
+		expect(rendered).toContain("Footer style");
+		expect(rendered).not.toContain("No observed statuses");
 	});
 
-	it("renders active third-party statuses in the extension segments tab", async () => {
+	it("renders active third-party statuses in the Extension statuses page", async () => {
 		let command: { handler: (args: string, ctx: unknown) => Promise<void> } | undefined;
 		let rendered = "";
 
@@ -6294,7 +6326,7 @@ describe("Pi docs compliance", () => {
 			} as never,
 			{
 				...settingsCommandDefaults,
-				sessionLifecycle: inactiveSessionLifecycle,
+				sessionLifecycle: settingsSessionLifecycle,
 				getConfig: () => defaultConfig,
 				setFooterSegments() {},
 				setFooterFormat() {},
@@ -6308,7 +6340,7 @@ describe("Pi docs compliance", () => {
 						["alpha", "A"],
 						["beta", "B"],
 					]),
-				setExtensionStatusPlacement() {},
+				setExtensionStatusChoice() {},
 				setExtensionStatusColorMode() {},
 				requestRender() {},
 				settingsListTheme: {
@@ -6332,7 +6364,7 @@ describe("Pi docs compliance", () => {
 						render?: (width: number) => string[];
 						handleInput?: (data: string) => void;
 					};
-					navigateToSettingsSection(component, "Extensions");
+					openExtensionStatusesSettings(component);
 					rendered = component.render?.(80).join("\n") ?? "";
 				},
 			},
@@ -6340,13 +6372,13 @@ describe("Pi docs compliance", () => {
 
 		expect(rendered).toContain("alpha");
 		expect(rendered).toContain("beta");
-		expect(rendered).toContain("right");
+		expect(rendered).toContain("Right");
 	});
 
-	it("shows a read-only empty extension segments tab", async () => {
+	it("shows an empty Extension statuses page with independent defaults", async () => {
 		let command: { handler: (args: string, ctx: unknown) => Promise<void> } | undefined;
 		let rendered = "";
-		const placements: Array<{ key: string; placement: ExtensionStatusPlacement }> = [];
+		const placements: Array<{ key: string; placement: "default" | ExtensionStatusPlacement }> = [];
 
 		registerZentuiSettingsCommand(
 			{
@@ -6356,7 +6388,7 @@ describe("Pi docs compliance", () => {
 			} as never,
 			{
 				...settingsCommandDefaults,
-				sessionLifecycle: inactiveSessionLifecycle,
+				sessionLifecycle: settingsSessionLifecycle,
 				getConfig: () => defaultConfig,
 				setFooterSegments() {},
 				setFooterFormat() {},
@@ -6366,7 +6398,7 @@ describe("Pi docs compliance", () => {
 				setGitBranch() {},
 				setSeparator() {},
 				getActiveExtensionStatuses: () => new Map<string, string>(),
-				setExtensionStatusPlacement(key, placement) {
+				setExtensionStatusChoice(key, placement) {
 					placements.push({ key, placement });
 				},
 				setExtensionStatusColorMode() {},
@@ -6392,7 +6424,7 @@ describe("Pi docs compliance", () => {
 						render?: (width: number) => string[];
 						handleInput?: (data: string) => void;
 					};
-					navigateToSettingsSection(component, "Extensions");
+					openExtensionStatusesSettings(component);
 					component.handleInput?.("\x1b[B");
 					rendered = component.render?.(120).join("\n") ?? "";
 					component.handleInput?.("\x1b");
@@ -6400,14 +6432,14 @@ describe("Pi docs compliance", () => {
 			},
 		});
 
-		expect(rendered).toContain("No active statuses");
-		expect(rendered).toContain("ctx.ui.setStatus()");
+		expect(rendered).toContain("No observed statuses");
+		expect(rendered).toContain("Default placement");
 		expect(placements).toEqual([]);
 	});
 
-	it("cycles active third-party status placement from the extension segments tab", async () => {
+	it("cycles active third-party status placement from the Extension statuses page", async () => {
 		let command: { handler: (args: string, ctx: unknown) => Promise<void> } | undefined;
-		const placements: Array<{ key: string; placement: ExtensionStatusPlacement }> = [];
+		const placements: Array<{ key: string; placement: "default" | ExtensionStatusPlacement }> = [];
 		let dependencyRenderRequests = 0;
 		let tuiRenderRequests = 0;
 
@@ -6419,7 +6451,7 @@ describe("Pi docs compliance", () => {
 			} as never,
 			{
 				...settingsCommandDefaults,
-				sessionLifecycle: inactiveSessionLifecycle,
+				sessionLifecycle: settingsSessionLifecycle,
 				getConfig: () => defaultConfig,
 				setFooterSegments() {},
 				setFooterFormat() {},
@@ -6429,7 +6461,7 @@ describe("Pi docs compliance", () => {
 				setGitBranch() {},
 				setSeparator() {},
 				getActiveExtensionStatuses: () => new Map<string, string>([["alpha", "ok"]]),
-				setExtensionStatusPlacement(key, placement) {
+				setExtensionStatusChoice(key, placement) {
 					placements.push({ key, placement });
 				},
 				setExtensionStatusColorMode() {},
@@ -6462,8 +6494,8 @@ describe("Pi docs compliance", () => {
 						makeTaggedTheme(),
 						{},
 						() => {},
-					) as { handleInput?: (data: string) => void };
-					navigateToSettingsSection(component, "Extensions");
+					) as { render?: (width: number) => string[]; handleInput?: (data: string) => void };
+					openExtensionStatusesSettings(component);
 					component.handleInput?.("\x1b[B");
 					component.handleInput?.(" ");
 				},
@@ -6472,10 +6504,10 @@ describe("Pi docs compliance", () => {
 
 		expect(placements).toEqual([{ key: "alpha", placement: "off" }]);
 		expect(dependencyRenderRequests).toBe(1);
-		expect(tuiRenderRequests).toBe(9);
+		expect(tuiRenderRequests).toBeGreaterThanOrEqual(9);
 	});
 
-	it("does not show inactive saved placements in the extension segments tab", async () => {
+	it("shows inactive saved placements in the Extension statuses page", async () => {
 		let command: { handler: (args: string, ctx: unknown) => Promise<void> } | undefined;
 		let rendered = "";
 
@@ -6487,7 +6519,7 @@ describe("Pi docs compliance", () => {
 			} as never,
 			{
 				...settingsCommandDefaults,
-				sessionLifecycle: inactiveSessionLifecycle,
+				sessionLifecycle: settingsSessionLifecycle,
 				getConfig: () =>
 					configWithExtensionStatuses({
 						placements: { active: "middle", inactive: "left" },
@@ -6500,7 +6532,7 @@ describe("Pi docs compliance", () => {
 				setGitBranch() {},
 				setSeparator() {},
 				getActiveExtensionStatuses: () => new Map<string, string>([["active", "ok"]]),
-				setExtensionStatusPlacement() {},
+				setExtensionStatusChoice() {},
 				setExtensionStatusColorMode() {},
 				requestRender() {},
 				settingsListTheme: {
@@ -6524,15 +6556,15 @@ describe("Pi docs compliance", () => {
 						render?: (width: number) => string[];
 						handleInput?: (data: string) => void;
 					};
-					navigateToSettingsSection(component, "Extensions");
+					openExtensionStatusesSettings(component);
 					rendered = component.render?.(80).join("\n") ?? "";
 				},
 			},
 		});
 
 		expect(rendered).toContain("active");
-		expect(rendered).toContain("middle");
-		expect(rendered).not.toContain("inactive");
+		expect(rendered).toContain("Middle");
+		expect(rendered).toContain("inactive");
 	});
 	it("sanitizes project-derived metadata in built-in, custom, and compact Footer routes", () => {
 		const hostile = "safe\x1b]52;c;PAYLOAD\x07tail";
@@ -6858,7 +6890,7 @@ describe("three-state Footer lifecycle", () => {
 		};
 	}
 
-	it("installs Hidden as an owned zero-row component without Starship timers or subscriptions", async () => {
+	it("installs Hidden with no rows when statuses are empty, without Starship timers or subscriptions", async () => {
 		writeFileSync(
 			join(isolatedAgentDir.path, "zentui.json"),
 			JSON.stringify({ projectRefreshIntervalMs: 0, components: { footer: { style: "hidden" } } }),
@@ -7076,106 +7108,7 @@ describe("three-state Footer lifecycle", () => {
 		expect(harness.factory).toBe(replacement);
 	});
 
-	it("reports the Accent Rail layout diagnostic only when debug logging is enabled", async () => {
-		const previousEntrypoint = process.argv[1];
-		const previousDebug = process.env.ZENTUI_DEBUG;
-		const error = vi.spyOn(console, "error").mockImplementation(() => {});
-		process.argv[1] = join(isolatedAgentDir.path, "missing-pi-entrypoint.js");
-		process.env.ZENTUI_DEBUG = "1";
-		const handlers = loadExtension();
-		const ctx = makeContext();
-		try {
-			await emit(handlers, "session_start", ctx);
-			expect(error).toHaveBeenCalledWith(
-				"[zentui] Accent Rail fullscreen layout patch: host-module-unavailable",
-			);
-			await emit(handlers, "session_shutdown", ctx);
-		} finally {
-			process.argv[1] = previousEntrypoint;
-			if (previousDebug === undefined) delete process.env.ZENTUI_DEBUG;
-			else process.env.ZENTUI_DEBUG = previousDebug;
-			error.mockRestore();
-		}
-	});
-
-	it.skipIf(!localSupportsAccentRailLayoutPatch)(
-		"installs and restores the fullscreen Accent Rail layout patch with the owned outer editor",
-		async () => {
-			writeFileSync(
-				join(isolatedAgentDir.path, "zentui.json"),
-				JSON.stringify({
-					projectRefreshIntervalMs: 0,
-					components: {
-						editor: { enabled: true, style: "accent-rail" },
-						userMessages: { enabled: false },
-						selectorBorders: { enabled: false },
-						footer: { style: "hidden" },
-					},
-				}),
-			);
-			let editorFactory: unknown;
-			const ctx = makeContext({
-				ui: {
-					theme: makeTheme(),
-					setFooter() {},
-					setEditorComponent(factory: unknown) {
-						editorFactory = factory;
-					},
-					getEditorComponent: () => editorFactory,
-				},
-			});
-			const require = createRequire(import.meta.url);
-			const tuiEntry = require.resolve("@earendil-works/pi-tui");
-			const hostEntrypoint = join(dirname(tuiEntry), "../../pi-coding-agent/dist/cli.js");
-			const previousEntrypoint = process.argv[1];
-			process.argv[1] = hostEntrypoint;
-			const handlers = loadExtension();
-			try {
-				await emit(handlers, "session_start", ctx);
-				const editor = (
-					editorFactory as (...args: unknown[]) => {
-						render(width: number): string[];
-						invalidate(): void;
-					}
-				)(
-					{ requestRender() {}, terminal: { rows: 24, cols: 80 } } as never,
-					{ borderColor: (text: string) => text, selectList: {} } as never,
-					{} as never,
-				);
-				expect(Object.hasOwn(editor, ZENTUI_ACCENT_RAIL_LAYOUT_EDITOR)).toBe(true);
-				const target = await discoverAccentRailLayoutPatchTargetFromEntrypoint(hostEntrypoint);
-				expect(target?.version).toBe(localPiTuiVersion);
-				const editorContainer = {
-					children: [editor],
-					render: () => ["rail"],
-					invalidate() {},
-				};
-				const stack = Object.create(target?.prototype ?? null) as Record<PropertyKey, unknown>;
-				stack.entries = [{ component: editorContainer, shrink: 1, minSize: 3 }];
-				stack.layoutType = "vstack";
-				stack.gap = 0;
-				stack.align = "stretch";
-				const layout = () =>
-					(
-						stack[Symbol.for("@earendil-works/pi-tui/layout-node")] as () => {
-							entries: Array<{ component: { render(): string[] }; minSize?: number }>;
-						}
-					)();
-				const adjusted = layout().entries[0];
-				expect(adjusted?.minSize).toBe(3);
-				expect(adjusted?.component).not.toBe(editorContainer);
-				expect(adjusted?.component.render()).toEqual(["", "rail"]);
-
-				await emit(handlers, "session_shutdown", ctx);
-				expect(layout().entries[0]?.minSize).toBe(3);
-				expect(layout().entries[0]?.component).toBe(editorContainer);
-			} finally {
-				process.argv[1] = previousEntrypoint;
-			}
-		},
-	);
-
-	it("marks only the outer editor when wrapping a third-party factory", async () => {
+	it("keeps ambiguous third-party Accent Rail rows and editor state intact", async () => {
 		writeFileSync(
 			join(isolatedAgentDir.path, "zentui.json"),
 			JSON.stringify({
@@ -7209,8 +7142,17 @@ describe("three-state Footer lifecycle", () => {
 			{ borderColor: (text: string) => text, selectList: {} } as never,
 			{} as never,
 		);
-		expect(Object.hasOwn(outer, ZENTUI_ACCENT_RAIL_LAYOUT_EDITOR)).toBe(true);
-		expect(Object.hasOwn(baseEditor, ZENTUI_ACCENT_RAIL_LAYOUT_EDITOR)).toBe(false);
+		expect(outer).not.toBe(baseEditor);
+		const rows = (outer as { render(width: number): string[] }).render(80);
+		expect(rows).toHaveLength(3);
+		expect(rows.join("\n")).toContain("third-party");
+		expect(Reflect.ownKeys(baseEditor)).toEqual([
+			"render",
+			"invalidate",
+			"handleInput",
+			"getText",
+			"setText",
+		]);
 		await emit(handlers, "session_shutdown", ctx);
 	});
 
@@ -7324,6 +7266,7 @@ describe("component preset lifecycle", () => {
 				configPath,
 				JSON.stringify({
 					projectRefreshIntervalMs: 0,
+					icons: { mode: "nerd" },
 					components: { editor: { enabled: initial === "owned" } },
 				}),
 			);
@@ -7712,18 +7655,19 @@ describe("component preset lifecycle", () => {
 			const nativeThinking = AssistantMessageComponent.prototype.updateContent;
 			const displacedSelector = () => ["other selector"];
 			ModelSelectorComponent.prototype.render = displacedSelector;
-			const workingMessageCalls = setWorkingMessage.mock.calls.length;
 			const workingIndicatorCalls = setWorkingIndicator.mock.calls.length;
 			const command = commands.get("zentui") as {
 				handler(args: string, ctx: unknown): Promise<void>;
 			};
 			for (const id of ["opencode-copy-friendly", "rail", "minimalist", "opencode"]) {
+				const workingMessageCalls = setWorkingMessage.mock.calls.length;
 				await command.handler(`preset ${id}`, ctx);
 				expect(ctx.ui.getEditorComponent()).toBe(editor);
 				expect(ctx.ui.getEditorText()).toBe("unsent draft");
 				expect(ModelSelectorComponent.prototype.render).toBe(displacedSelector);
 				expect(AssistantMessageComponent.prototype.updateContent).toBe(nativeThinking);
-				expect(setWorkingMessage).toHaveBeenCalledTimes(workingMessageCalls);
+				// Existing reconciles reassert the owned message, without reacquiring frames.
+				expect(setWorkingMessage.mock.calls.slice(workingMessageCalls)).toEqual([[""], [""]]);
 				expect(setWorkingIndicator).toHaveBeenCalledTimes(workingIndicatorCalls);
 				if (id === "minimalist") {
 					expect(footer?.render(100)).toEqual([]);