@narumitw/pi-statusline 0.49.5 → 0.49.7

package/README.md

@@ -22,7 +22,7 @@ A representative uncolored layout:
   available under **Advanced**.
 
 > **Need more customization?** See
-> [`pi-starship`](https://github.com/narumiruna/pi-extensions/tree/main/extensions/pi-starship)
+> [`pi-starship`](https://github.com/narumiruna/pi-extensions/tree/main/packages/pi-starship)
 > ([npm](https://www.npmjs.com/package/@narumitw/pi-starship)). It uses a
 > [Starship-inspired](https://starship.rs/) TOML format and style syntax for deeper control over
 > layout, modules, and colors. Choose `pi-statusline` for practical defaults and quick setup.
@@ -49,7 +49,7 @@ For the best result, use a terminal font that includes Powerline glyphs and emoj
 1. Install the extension and start Pi.
 2. Run `/statusline`.
 3. Use the standard Main/Advanced navigation, then choose an appearance or information level;
-   specialized previews still apply changes immediately.
+   appearance previews update the extension-owned footer before you apply a choice.
 
 ```text
 Appearance (tokyo-night)
@@ -93,9 +93,9 @@ reads or writes.
 
 The direct `settings`, `status`, and `help` routes remain for compatibility. The root standard menu
 is TUI-only; Escape returns from Advanced or closes Main. RPC receives observable notifications
-instead of TUI-only controls. Unknown subcommands and trailing arguments are rejected. Palette and
-information previews, the width-aware layout editor, and the JSON editor remain specialized UI
-because they provide live preview/edit behavior rather than standard navigation.
+instead of TUI-only controls. Unknown subcommands and trailing arguments are rejected. The standard
+palette picker owns navigation and cleanup while pi-statusline still owns footer previews, settings,
+and rollback. The width-aware layout editor and JSON editor remain specialized UI.
 
 ## 📐 Runtime behavior
 
@@ -334,7 +334,7 @@ Put transient activity in the value and always clear the same complete key.
 ## 🗂️ Package layout
 
 ```text
-extensions/pi-statusline/
+packages/pi-statusline/
 ├── src/
 │   ├── index.ts          # thin entrypoint forwarding to the source runtime
 │   ├── statusline.ts     # authoritative lifecycle implementation

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@narumitw/pi-statusline",
-	"version": "0.49.5",
+	"version": "0.49.7",
 	"description": "Pi extension that replaces the footer with an information-rich statusline.",
 	"type": "module",
 	"license": "MIT",
@@ -22,6 +22,9 @@
 			"./src/index.ts"
 		]
 	},
+	"piExtension": {
+		"lifecycle": "stable"
+	},
 	"scripts": {
 		"check": "biome check --vcs-use-ignore-file=false src test package.json tsconfig.json README.md && npm run typecheck",
 		"format": "biome check --write --vcs-use-ignore-file=false src test package.json tsconfig.json README.md",
@@ -33,17 +36,17 @@
 	},
 	"devDependencies": {
 		"@biomejs/biome": "2.5.7",
-		"@earendil-works/pi-coding-agent": "0.83.0",
-		"@earendil-works/pi-tui": "0.83.0",
+		"@earendil-works/pi-coding-agent": "0.84.1",
+		"@earendil-works/pi-tui": "0.84.1",
 		"@types/node": "26.1.2",
 		"typescript": "7.0.2"
 	},
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/narumiruna/pi-extensions",
-		"directory": "extensions/pi-statusline"
+		"directory": "packages/pi-statusline"
 	},
 	"dependencies": {
-		"@narumitw/pi-tui-kit": "^0.49.1"
+		"@narumitw/pi-tui-kit": "^0.54.0"
 	}
 }

package/src/commands.ts

@@ -7,8 +7,6 @@ import {
 	Container,
 	Key,
 	matchesKey,
-	type SelectItem,
-	SelectList,
 	Text,
 	truncateToWidth,
 	wrapTextWithAnsi,
@@ -56,13 +54,18 @@ const SEGMENT_DESCRIPTIONS: Record<SegmentName, string> = {
 	time: "Current local time",
 	turn: "Current session turn count",
 };
+interface StatuslineMenuOwner {
+	signal: AbortSignal;
+	isCurrent(): boolean;
+}
+
 export interface StatuslineCommandOptions {
 	settingsPath: string;
 	getLoaded(): LoadedStatuslineSettings;
 	apply(loaded: LoadedStatuslineSettings, ctx: ExtensionCommandContext): void;
 	preview?(palettePreset: PalettePreset | undefined, ctx: ExtensionCommandContext): void;
 	save?: (settingsPath: string, rawDocument: string) => LoadedStatuslineSettings;
-	getMenuOwner?(): { signal: AbortSignal; isCurrent(): boolean };
+	getMenuOwner?(): StatuslineMenuOwner;
 }
 
 export function registerStatuslineCommand(pi: ExtensionAPI, options: StatuslineCommandOptions) {
@@ -191,7 +194,7 @@ async function showMainMenu(ctx: ExtensionCommandContext, options: StatuslineCom
 		},
 		actions: {
 			appearance: async () => {
-				await choosePalettePreset(ctx, options);
+				await choosePalettePreset(ctx, options, owner);
 				return { kind: "close" };
 			},
 			setInformation: async ({ itemId }) => {
@@ -233,6 +236,7 @@ async function showMainMenu(ctx: ExtensionCommandContext, options: StatuslineCom
 async function choosePalettePreset(
 	ctx: ExtensionCommandContext,
 	options: StatuslineCommandOptions,
+	owner: StatuslineMenuOwner,
 ) {
 	if (ctx.mode !== "tui") {
 		if (ctx.hasUI) ctx.ui.notify(`Edit palettePreset manually: ${options.settingsPath}`, "info");
@@ -241,10 +245,19 @@ async function choosePalettePreset(
 	const current = options.getLoaded();
 	let selection: PalettePreset | undefined;
 	try {
-		selection = await showPalettePresetPicker(ctx, current.config.palettePreset, options);
+		selection = await showPalettePresetPicker(ctx, current.config.palettePreset, options, owner);
 	} finally {
-		options.preview?.(undefined, ctx);
+		if (!owner.signal.aborted && owner.isCurrent()) {
+			try {
+				options.preview?.(undefined, ctx);
+			} catch (error) {
+				if (canNotify(ctx)) {
+					ctx.ui.notify(`Palette preview could not be reset: ${formatError(error)}`, "error");
+				}
+			}
+		}
 	}
+	if (owner.signal.aborted || !owner.isCurrent()) return;
 	if (selection === undefined) return;
 
 	let loaded: LoadedStatuslineSettings;
@@ -278,60 +291,27 @@ async function showPalettePresetPicker(
 	ctx: ExtensionCommandContext,
 	current: PalettePreset,
 	options: StatuslineCommandOptions,
+	owner: StatuslineMenuOwner,
 ): Promise<PalettePreset | undefined> {
-	const items: SelectItem[] = PALETTE_PRESET_NAMES.map((palettePreset) => ({
-		value: palettePreset,
-		label: palettePreset,
-		description:
-			[
-				palettePreset === current ? "current" : undefined,
-				palettePreset === "custom" ? "per-segment colors from settings JSON" : undefined,
-			]
-				.filter((part): part is string => part !== undefined)
-				.join(" • ") || undefined,
-	}));
-	const selectedIndex = PALETTE_PRESET_NAMES.indexOf(current);
-	const result = await ctx.ui.custom<PalettePreset | null>((tui, theme, _keybindings, done) => {
-		const container = new Container();
-		container.addChild(new DynamicBorder((text: string) => theme.fg("accent", text)));
-		const title = new Text("", 1, 0);
-		container.addChild(title);
-		const list = new SelectList(items, Math.min(items.length, 10), {
-			selectedPrefix: (text) => theme.fg("accent", text),
-			selectedText: (text) => theme.fg("accent", text),
-			description: (text) => theme.fg("muted", text),
-			scrollInfo: (text) => theme.fg("dim", text),
-			noMatch: (text) => theme.fg("warning", text),
-		});
-		list.setSelectedIndex(selectedIndex);
-		list.onSelectionChange = (item) => {
-			options.preview?.(item.value as PalettePreset, ctx);
-		};
-		list.onSelect = (item) => done(item.value as PalettePreset);
-		list.onCancel = () => done(null);
-		container.addChild(list);
-		const hint = new Text("", 1, 0);
-		container.addChild(hint);
-		container.addChild(new DynamicBorder((text: string) => theme.fg("accent", text)));
-		const updateThemedText = () => {
-			title.setText(theme.fg("accent", theme.bold(`Palette preset (current: ${current})`)));
-			hint.setText(theme.fg("dim", "↑↓ preview • enter apply • esc cancel"));
-		};
-		updateThemedText();
-
-		return {
-			render: (width: number) => container.render(width),
-			invalidate() {
-				container.invalidate();
-				updateThemedText();
-			},
-			handleInput(data: string) {
-				list.handleInput(data);
-				tui.requestRender();
-			},
-		};
+	const { runLiveChoice } = await import("@narumitw/pi-tui-kit");
+	const result = await runLiveChoice(ctx, {
+		title: `Palette preset (current: ${current})`,
+		items: PALETTE_PRESET_NAMES.map((palettePreset) => ({
+			id: palettePreset,
+			label: palettePreset,
+			description: palettePreset === "custom" ? "per-segment colors from settings JSON" : undefined,
+		})),
+		currentItemId: current,
+		initialItemId: current,
+		viewportSize: Math.min(PALETTE_PRESET_NAMES.length, 10),
+		hint: "close",
+		navigationLabel: "preview",
+		confirmLabel: "apply",
+		onSelectionChange: ({ item }) => options.preview?.(item.id, ctx),
+		signal: owner.signal,
+		isCurrent: owner.isCurrent,
 	});
-	return result ?? undefined;
+	return result.kind === "selected" ? result.itemId : undefined;
 }
 
 function applyInformationProfile(

package/src/directory.ts

@@ -1,5 +1,5 @@
 import { basename, isAbsolute, relative, sep } from "node:path";
-import { sanitizeTerminalText } from "./terminal.js";
+import { sanitizeTerminalText } from "@narumitw/pi-tui-kit";
 
 const DEFAULT_TRUNCATION_LENGTH = 3;
 const DEFAULT_HOME_SYMBOL = "~";

package/src/render.ts

@@ -5,6 +5,7 @@ import type {
 	Theme,
 	ThemeColor,
 } from "@earendil-works/pi-coding-agent";
+import { sanitizeTerminalText } from "@narumitw/pi-tui-kit";
 import { formatDirectoryPath } from "./directory.js";
 import {
 	type ExtensionStatusRuntime,
@@ -13,7 +14,6 @@ import {
 } from "./extension-status.js";
 import { formatGitBranchValue, type GitStatusSummary } from "./git-status.js";
 import { renderPowerlineStatusline } from "./powerline.js";
-import { sanitizeTerminalText } from "./terminal.js";
 import {
 	LINE_BREAK_SEGMENT_NAME,
 	type PowerlineBlockName,

package/src/terminal.ts

@@ -1,60 +0,0 @@
-export function sanitizeTerminalText(value: string): string {
-	let result = "";
-	for (let index = 0; index < value.length; ) {
-		const codePoint = value.codePointAt(index) ?? 0;
-		const character = String.fromCodePoint(codePoint);
-		if (codePoint === 0x1b || codePoint === 0x9b || codePoint === 0x9d) {
-			index = skipTerminalEscape(value, index, codePoint);
-			continue;
-		}
-		if (
-			codePoint <= 0x1f ||
-			(codePoint >= 0x7f && codePoint <= 0x9f) ||
-			codePoint === 0x2028 ||
-			codePoint === 0x2029
-		) {
-			if (
-				codePoint === 0x09 ||
-				codePoint === 0x0a ||
-				codePoint === 0x0d ||
-				codePoint === 0x85 ||
-				codePoint === 0x2028 ||
-				codePoint === 0x2029
-			) {
-				result += " ";
-			}
-			index += character.length;
-			continue;
-		}
-		result += character;
-		index += character.length;
-	}
-	return result;
-}
-
-function skipTerminalEscape(value: string, start: number, codePoint: number): number {
-	let index = start + 1;
-	const next = value.charCodeAt(index);
-	const isOsc = codePoint === 0x9d || (codePoint === 0x1b && next === 0x5d);
-	if (isOsc) {
-		if (codePoint === 0x1b) index += 1;
-		while (index < value.length) {
-			const current = value.charCodeAt(index);
-			if (current === 0x07 || current === 0x9c) return index + 1;
-			if (current === 0x1b && value.charCodeAt(index + 1) === 0x5c) return index + 2;
-			index += 1;
-		}
-		return index;
-	}
-	const isCsi = codePoint === 0x9b || (codePoint === 0x1b && next === 0x5b);
-	if (isCsi) {
-		if (codePoint === 0x1b) index += 1;
-		while (index < value.length) {
-			const current = value.charCodeAt(index);
-			index += 1;
-			if (current >= 0x40 && current <= 0x7e) break;
-		}
-		return index;
-	}
-	return Math.min(value.length, start + (codePoint === 0x1b ? 2 : 1));
-}