pi-cc-extensions 0.9.1 → 0.9.3

package/extensions/config/panel.ts

@@ -7,7 +7,22 @@
 import { getSettingsListTheme } from "@earendil-works/pi-coding-agent";
 import { Input, SettingsList, matchesKey, truncateToWidth } from "@earendil-works/pi-tui";
 import type { CompactThinkingController } from "../feature/compact-thinking.ts";
-import { applyCustomFooter, clearCustomFooter } from "../feature/shell/footer.ts";
+import {
+	applyCustomFooter,
+	clearCustomFooter,
+	getFooterStatusSnapshot,
+} from "../feature/shell/footer.ts";
+import {
+	footerChipDescription,
+	footerLineOfKey,
+	formatFooterChipSummary,
+	orderedFooterKeys,
+	reorderFooterKey,
+	resolveFooterChipLayout,
+	shiftFooterKeyLine,
+	toggleFooterKeyHidden,
+	type FooterChipLayout,
+} from "../feature/shell/footer-layout.ts";
 import { applyStartupHeader, clearStartupHeader } from "../feature/shell/startup-header.ts";
 import type { ToolGroupingHooks } from "../renderer/tool/grouping.ts";
 import {
@@ -59,6 +74,120 @@ function excludeRenderersDescription(names: readonly string[]): string {
 		: `Native renderer for: ${names.join(", ")}. Agent is always native. Enter to toggle.`;
 }
 
+function customFooterDescription(enabled: boolean): string {
+	if (!enabled) return "Pi native footer restored. Chip layout below still applies when turned on.";
+	return "Custom status bar with model, context, cache, cost, git, and plugin chips.";
+}
+
+function pluginChipsDescription(): string {
+	return `Arrange plugin chips: ${formatFooterChipSummary(config)}. Enter to edit.`;
+}
+
+function footerLayoutFromConfig(): FooterChipLayout {
+	return {
+		footerHiddenKeys: config.footerHiddenKeys,
+		footerLine1Keys: config.footerLine1Keys,
+		footerLine2Keys: config.footerLine2Keys,
+		footerLine3Keys: config.footerLine3Keys,
+	};
+}
+
+function persistFooterLayout(layout: FooterChipLayout): void {
+	updateConfig({
+		footerHiddenKeys: layout.footerHiddenKeys,
+		footerLine1Keys: layout.footerLine1Keys,
+		footerLine2Keys: layout.footerLine2Keys,
+		footerLine3Keys: layout.footerLine3Keys,
+	});
+}
+
+function footerChipItem(
+	key: string,
+	layout: FooterChipLayout,
+	snapshot: ReadonlyMap<string, string>,
+) {
+	const line = footerLineOfKey(layout, key) ?? 2;
+	const hidden = layout.footerHiddenKeys.includes(key);
+	const live = snapshot.get(key)?.trim() ?? "";
+	return {
+		id: key,
+		label: key,
+		description: footerChipDescription(key, live),
+		currentValue: hidden ? `line${line} · hidden` : `line${line}`,
+	};
+}
+
+function buildFooterChipsSubmenu(
+	onClose: () => void,
+	onLiveChange: () => void,
+): {
+	render: (width: number) => string[];
+	invalidate: () => void;
+	handleInput: (data: string) => void;
+} {
+	const snapshot = () => getFooterStatusSnapshot();
+	const resolved = () => resolveFooterChipLayout(footerLayoutFromConfig(), [...snapshot().keys()]);
+	const items: ReturnType<typeof footerChipItem>[] = [];
+	const rebuildItems = (layout: FooterChipLayout, selectedKey?: string) => {
+		const next = orderedFooterKeys(layout).map((key) => footerChipItem(key, layout, snapshot()));
+		items.length = 0;
+		items.push(...next);
+		if (!selectedKey) return 0;
+		const index = items.findIndex((item) => item.id === selectedKey);
+		return index >= 0 ? index : 0;
+	};
+	rebuildItems(resolved());
+	const list = new SettingsList(
+		items,
+		Math.min(8, Math.max(4, items.length)),
+		getSettingsListTheme(),
+		() => {},
+		() => onClose(),
+		{ enableSearch: false },
+	);
+	const listState = list as unknown as { selectedIndex: number; items: typeof items };
+
+	const mutate = (transform: (layout: FooterChipLayout, key: string) => FooterChipLayout) => {
+		const key = listState.items[listState.selectedIndex]?.id;
+		if (!key) return;
+		const next = transform(resolved(), key);
+		persistFooterLayout(next);
+		listState.selectedIndex = rebuildItems(
+			resolveFooterChipLayout(next, [...snapshot().keys()]),
+			key,
+		);
+		onLiveChange();
+	};
+
+	return {
+		render: (width: number) => list.render(width),
+		invalidate: () => list.invalidate(),
+		handleInput: (data: string) => {
+			if (matchesKey(data, "left")) {
+				mutate((layout, key) => shiftFooterKeyLine(layout, key, -1));
+				return;
+			}
+			if (matchesKey(data, "right")) {
+				mutate((layout, key) => shiftFooterKeyLine(layout, key, 1));
+				return;
+			}
+			if (data === "[") {
+				mutate((layout, key) => reorderFooterKey(layout, key, -1));
+				return;
+			}
+			if (data === "]") {
+				mutate((layout, key) => reorderFooterKey(layout, key, 1));
+				return;
+			}
+			if (data === " " || matchesKey(data, "space")) {
+				mutate((layout, key) => toggleFooterKeyHidden(layout, key));
+				return;
+			}
+			list.handleInput(data);
+		},
+	};
+}
+
 function diffViewModeDescription(mode: DiffViewMode): string {
 	if (mode === "split") return "Force side-by-side diff when width allows; otherwise unified.";
 	if (mode === "unified") return "Always render a single unified diff column.";
@@ -186,7 +315,7 @@ function buildNumberInputSubmenu(
 
 /** Section tabs for /ccstyle — matches Zentui-style "A / B / C" headers. */
 type CcstyleSection = {
-	id: "style" | "diff" | "thinking" | "ui" | "feature";
+	id: "style" | "diff" | "thinking" | "ui" | "feature" | "footer";
 	label: string;
 	items: any[];
 };
@@ -242,19 +371,22 @@ export async function showCcstylePanel(
 			currentValue: config.mode === "compact" ? "compact (Experimental)" : config.mode,
 			values: ["on", "compact (Experimental)", "off"],
 		};
-		// Tracks whether the Exclude-tools submenu is open so Tab switches sections
+		// Tracks whether a nested submenu is open so Tab switches sections
 		// only at the top level (mirrors Zentui settings: Tab = switch sections).
-		let excludeSubmenuOpen = false;
+		let nestedSubmenuOpen = false;
+		let nestedHint = "";
 		const excludeSetting = {
 			id: "excludeRenderers",
 			label: "Exclude tools",
 			description: excludeRenderersDescription(config.excludeRenderers),
 			currentValue: formatExcludeRenderers(config.excludeRenderers),
 			submenu: (_current: string, closeSubmenu: (selected?: string) => void) => {
-				excludeSubmenuOpen = true;
+				nestedSubmenuOpen = true;
+				nestedHint = "  Enter/Space to toggle · Esc back to Style";
 				return buildExcludeRenderersSubmenu(
 					() => {
-						excludeSubmenuOpen = false;
+						nestedSubmenuOpen = false;
+						nestedHint = "";
 						excludeSetting.currentValue = formatExcludeRenderers(config.excludeRenderers);
 						excludeSetting.description = excludeRenderersDescription(config.excludeRenderers);
 						closeSubmenu();
@@ -456,13 +588,45 @@ export async function showCcstylePanel(
 			"Aliases disabled.",
 			config.enableAliases,
 		);
-		const customFooterToggle = featureToggleSetting(
-			"enableCustomFooter",
-			"Status bar",
-			"Two-line chips status bar with model, context, git, and usage. Applies immediately. Needs a Nerd Font.",
-			"Pi native footer restored.",
-			config.enableCustomFooter,
-		);
+		const footerNerdIconsSetting = {
+			id: "footerNerdIcons",
+			label: "Nerd Font icons",
+			description: config.footerNerdIcons
+				? "Git and cache chips use Nerd Font glyphs. Turn off for plain text."
+				: "Git and cache chips use plain text. No Nerd Font required.",
+			currentValue: config.footerNerdIcons ? "on" : "off",
+			values: ["on", "off"],
+		};
+		const customFooterSetting = {
+			id: "enableCustomFooter",
+			label: "Status bar",
+			description: customFooterDescription(config.enableCustomFooter),
+			currentValue: config.enableCustomFooter ? "on" : "off",
+			values: ["on", "off"],
+		};
+		const pluginChipsSetting = {
+			id: "footerPluginChips",
+			label: "Plugin chips",
+			description: pluginChipsDescription(),
+			currentValue: formatFooterChipSummary(config),
+			submenu: (_current: string, closeSubmenu: (selected?: string) => void) => {
+				nestedSubmenuOpen = true;
+				nestedHint = "  ←→ line · [ ] reorder · Space hide · Esc back to Footer";
+				return buildFooterChipsSubmenu(
+					() => {
+						nestedSubmenuOpen = false;
+						nestedHint = "";
+						pluginChipsSetting.currentValue = formatFooterChipSummary(config);
+						pluginChipsSetting.description = pluginChipsDescription();
+						closeSubmenu();
+					},
+					() => {
+						pluginChipsSetting.currentValue = formatFooterChipSummary(config);
+						pluginChipsSetting.description = pluginChipsDescription();
+					},
+				);
+			},
+		};
 		const featureToggles: Record<string, { apply: (on: boolean) => void }> = {
 			enableSessionReference: sessionReferenceToggle,
 			enableSubagentAutocomplete: subagentAutocompleteToggle,
@@ -476,12 +640,23 @@ export async function showCcstylePanel(
 			if (id === "enableCustomFooter") {
 				const enabled = value === "on";
 				updateConfig({ enableCustomFooter: enabled });
-				customFooterToggle.apply(enabled);
+				customFooterSetting.currentValue = enabled ? "on" : "off";
+				customFooterSetting.description = customFooterDescription(enabled);
 				if (enabled) applyCustomFooter(ctx);
 				else clearCustomFooter(ctx);
 				ctx.ui.notify(`Updated ${id}: ${value}`, "info");
 				return;
 			}
+			if (id === "footerNerdIcons") {
+				const enabled = value === "on";
+				updateConfig({ footerNerdIcons: enabled });
+				footerNerdIconsSetting.currentValue = enabled ? "on" : "off";
+				footerNerdIconsSetting.description = enabled
+					? "Git and cache chips use Nerd Font glyphs. Turn off for plain text."
+					: "Git and cache chips use plain text. No Nerd Font required.";
+				ctx.ui.notify(`Updated ${id}: ${value}`, "info");
+				return;
+			}
 			// 额外功能开关：字段名与配置布尔字段一一对应，切换后重启生效。
 			const featureToggle = featureToggles[id];
 			if (featureToggle) {
@@ -633,6 +808,30 @@ export async function showCcstylePanel(
 				label: "Style",
 				items: [modeSetting, excludeSetting],
 			},
+			{
+				id: "feature",
+				label: "Features",
+				items: [
+					sessionReferenceToggle.setting,
+					subagentAutocompleteToggle.setting,
+					contextCommandToggle.setting,
+					agentSummaryToggle.setting,
+					workingMessageToggle.setting,
+					aliasesToggle.setting,
+				],
+			},
+			{
+				id: "ui",
+				label: "UI",
+				items: [
+					expandedInputSetting,
+					expandedOutputSetting,
+					expandedMaxSetting,
+					inputClipSetting,
+					startupHeaderSetting,
+					scrollStepSetting,
+				],
+			},
 			{
 				id: "diff",
 				label: "Diff",
@@ -656,29 +855,9 @@ export async function showCcstylePanel(
 				],
 			},
 			{
-				id: "ui",
-				label: "UI",
-				items: [
-					expandedInputSetting,
-					expandedOutputSetting,
-					expandedMaxSetting,
-					inputClipSetting,
-					startupHeaderSetting,
-					scrollStepSetting,
-				],
-			},
-			{
-				id: "feature",
-				label: "Feature",
-				items: [
-					sessionReferenceToggle.setting,
-					subagentAutocompleteToggle.setting,
-					contextCommandToggle.setting,
-					agentSummaryToggle.setting,
-					workingMessageToggle.setting,
-					aliasesToggle.setting,
-					customFooterToggle.setting,
-				],
+				id: "footer",
+				label: "Footer",
+				items: [customFooterSetting, footerNerdIconsSetting, pluginChipsSetting],
 			},
 		];
 
@@ -699,7 +878,7 @@ export async function showCcstylePanel(
 		const activeList = () => lists[activeSection]!;
 
 		const switchSection = (delta: number) => {
-			if (excludeSubmenuOpen) return;
+			if (nestedSubmenuOpen) return;
 			activeSection = (activeSection + delta + sections.length) % sections.length;
 		};
 
@@ -749,7 +928,8 @@ export async function showCcstylePanel(
 					truncateToWidth(
 						theme.fg(
 							"dim",
-							"  Enter/Space to change · Enter on numbers types a custom value · Tab/Shift+Tab to switch sections · Esc to close",
+							nestedHint ||
+								"  Enter/Space to change · Enter on numbers types a custom value · Tab/Shift+Tab to switch sections · Esc to close",
 						),
 						safeWidth,
 					),
@@ -760,12 +940,12 @@ export async function showCcstylePanel(
 				for (const list of lists) list.invalidate();
 			},
 			handleInput(data: string) {
-				if (!excludeSubmenuOpen && isForwardTabKey(data)) {
+				if (!nestedSubmenuOpen && isForwardTabKey(data)) {
 					switchSection(1);
 					tui.requestRender();
 					return;
 				}
-				if (!excludeSubmenuOpen && isBackTabKey(data)) {
+				if (!nestedSubmenuOpen && isBackTabKey(data)) {
 					switchSection(-1);
 					tui.requestRender();
 					return;

package/extensions/feature/shell/footer-layout.ts

@@ -0,0 +1,229 @@
+/**
+ * 自定义 footer 插件芯片布局：行、顺序、隐藏。
+ * 纯函数，供 config 规范化、footer 渲染、配置面板共用。
+ */
+
+export const PI_USAGE_KEY = "pi-usage";
+export const PI_USAGE_SOURCE = "@narumitw/pi-usage";
+const LEGACY_PI_USAGE_KEYS = new Set(["localUsage", "piUsage"]);
+export const SKIP_FOOTER_STATUS_KEY = "model";
+
+export type FooterLineId = 1 | 2 | 3;
+
+export type FooterChipLayout = {
+	footerHiddenKeys: string[];
+	footerLine1Keys: string[];
+	footerLine2Keys: string[];
+	footerLine3Keys: string[];
+};
+
+export const DEFAULT_FOOTER_CHIP_LAYOUT: FooterChipLayout = {
+	footerHiddenKeys: [],
+	footerLine1Keys: [PI_USAGE_KEY],
+	footerLine2Keys: [],
+	footerLine3Keys: [],
+};
+
+export function isSkippedFooterStatusKey(key: string): boolean {
+	return key === SKIP_FOOTER_STATUS_KEY;
+}
+
+/** 未单独配置时的默认行：usage 类和本包用量在 line1，其余 line2。不会默认进 line3。 */
+export function defaultFooterLine(key: string): FooterLineId {
+	if (key === PI_USAGE_KEY) return 1;
+	if (/usage|quota|balance/i.test(key)) return 1;
+	return 2;
+}
+
+export function normalizeFooterKeyList(value: unknown): string[] {
+	if (!Array.isArray(value)) return [];
+	const out: string[] = [];
+	const seen = new Set<string>();
+	for (const item of value) {
+		if (typeof item !== "string") continue;
+		let key = item.trim();
+		if (LEGACY_PI_USAGE_KEYS.has(key)) key = PI_USAGE_KEY;
+		if (!key || isSkippedFooterStatusKey(key) || seen.has(key)) continue;
+		seen.add(key);
+		out.push(key);
+	}
+	return out;
+}
+
+function takeUnique(keys: string[], seen: Set<string>): string[] {
+	const out: string[] = [];
+	for (const key of keys) {
+		if (seen.has(key)) continue;
+		seen.add(key);
+		out.push(key);
+	}
+	return out;
+}
+
+/** 跨行去重（line1 → line2 → line3）；补上 pi-usage 槽位。 */
+export function normalizeFooterChipLayout(source: Record<string, unknown>): FooterChipLayout {
+	const hasHidden = Array.isArray(source.footerHiddenKeys);
+	const hasAnyLine = [source.footerLine1Keys, source.footerLine2Keys, source.footerLine3Keys].some(
+		Array.isArray,
+	);
+	const seen = new Set<string>();
+	let footerLine1Keys = takeUnique(normalizeFooterKeyList(source.footerLine1Keys), seen);
+	const footerLine2Keys = takeUnique(normalizeFooterKeyList(source.footerLine2Keys), seen);
+	const footerLine3Keys = takeUnique(normalizeFooterKeyList(source.footerLine3Keys), seen);
+	const footerHiddenKeys = normalizeFooterKeyList(source.footerHiddenKeys);
+
+	if (!seen.has(PI_USAGE_KEY)) {
+		footerLine1Keys = [PI_USAGE_KEY, ...footerLine1Keys];
+	}
+	if (!hasHidden && !hasAnyLine) {
+		return { ...DEFAULT_FOOTER_CHIP_LAYOUT };
+	}
+	return { footerHiddenKeys, footerLine1Keys, footerLine2Keys, footerLine3Keys };
+}
+
+/** 面板描述用：pi-usage 数据来自 @narumitw/pi-usage，其它芯片用来源 setStatus key。 */
+export function footerChipSource(key: string): string {
+	return key === PI_USAGE_KEY ? PI_USAGE_SOURCE : key;
+}
+
+export function footerChipDescription(key: string, liveText: string): string {
+	const source = footerChipSource(key);
+	const live = liveText.trim();
+	if (live) return `${live} · from ${source}`;
+	if (key === PI_USAGE_KEY) return `From ${source}. No text right now.`;
+	return `inactive · from ${source}`;
+}
+
+export function footerLineOfKey(layout: FooterChipLayout, key: string): FooterLineId | undefined {
+	if (layout.footerLine1Keys.includes(key)) return 1;
+	if (layout.footerLine2Keys.includes(key)) return 2;
+	if (layout.footerLine3Keys.includes(key)) return 3;
+	return undefined;
+}
+
+function keysOnLine(layout: FooterChipLayout, line: FooterLineId): string[] {
+	if (line === 1) return layout.footerLine1Keys;
+	if (line === 2) return layout.footerLine2Keys;
+	return layout.footerLine3Keys;
+}
+
+function withLineKeys(
+	layout: FooterChipLayout,
+	line: FooterLineId,
+	keys: string[],
+): FooterChipLayout {
+	if (line === 1) return { ...layout, footerLine1Keys: keys };
+	if (line === 2) return { ...layout, footerLine2Keys: keys };
+	return { ...layout, footerLine3Keys: keys };
+}
+
+/**
+ * 配置里还没有的 live key 接到默认行末尾（按 key 字母序，避免每次渲染乱序）。
+ * pi-usage 由 normalize 保证已在某一行。
+ */
+export function resolveFooterChipLayout(
+	layout: FooterChipLayout,
+	liveKeys: readonly string[],
+): FooterChipLayout {
+	const known = new Set([
+		...layout.footerLine1Keys,
+		...layout.footerLine2Keys,
+		...layout.footerLine3Keys,
+	]);
+	const extras = [
+		...new Set(liveKeys.filter((key) => key && !isSkippedFooterStatusKey(key) && !known.has(key))),
+	].sort((a, b) => a.localeCompare(b));
+	const next: FooterChipLayout = {
+		footerHiddenKeys: [...layout.footerHiddenKeys],
+		footerLine1Keys: [...layout.footerLine1Keys],
+		footerLine2Keys: [...layout.footerLine2Keys],
+		footerLine3Keys: [...layout.footerLine3Keys],
+	};
+	for (const key of extras) {
+		if (defaultFooterLine(key) === 1) next.footerLine1Keys.push(key);
+		else next.footerLine2Keys.push(key);
+	}
+	return next;
+}
+
+export function moveFooterKeyToLine(
+	layout: FooterChipLayout,
+	key: string,
+	line: FooterLineId,
+): FooterChipLayout {
+	if (isSkippedFooterStatusKey(key)) return layout;
+	const current = footerLineOfKey(layout, key);
+	if (current === line) return layout;
+	const stripped: FooterChipLayout = {
+		footerHiddenKeys: [...layout.footerHiddenKeys],
+		footerLine1Keys: layout.footerLine1Keys.filter((item) => item !== key),
+		footerLine2Keys: layout.footerLine2Keys.filter((item) => item !== key),
+		footerLine3Keys: layout.footerLine3Keys.filter((item) => item !== key),
+	};
+	return withLineKeys(stripped, line, [...keysOnLine(stripped, line), key]);
+}
+
+export function shiftFooterKeyLine(
+	layout: FooterChipLayout,
+	key: string,
+	delta: -1 | 1,
+): FooterChipLayout {
+	const current = footerLineOfKey(layout, key);
+	if (!current) return layout;
+	const next = (current + delta) as number;
+	if (next < 1 || next > 3) return layout;
+	return moveFooterKeyToLine(layout, key, next as FooterLineId);
+}
+
+export function reorderFooterKey(
+	layout: FooterChipLayout,
+	key: string,
+	delta: -1 | 1,
+): FooterChipLayout {
+	const line = footerLineOfKey(layout, key);
+	if (!line) return layout;
+	const keys = [...keysOnLine(layout, line)];
+	const index = keys.indexOf(key);
+	const nextIndex = index + delta;
+	if (index < 0 || nextIndex < 0 || nextIndex >= keys.length) return layout;
+	const swap = keys[nextIndex]!;
+	keys[nextIndex] = key;
+	keys[index] = swap;
+	return withLineKeys(layout, line, keys);
+}
+
+export function toggleFooterKeyHidden(layout: FooterChipLayout, key: string): FooterChipLayout {
+	if (isSkippedFooterStatusKey(key)) return layout;
+	const hidden = new Set(layout.footerHiddenKeys);
+	if (hidden.has(key)) hidden.delete(key);
+	else hidden.add(key);
+	return { ...layout, footerHiddenKeys: [...hidden] };
+}
+
+/** 按行顺序收集可见、且当前有文案的插件芯片文本。 */
+export function visibleFooterPluginTexts(
+	lineKeys: readonly string[],
+	hiddenKeys: readonly string[],
+	texts: ReadonlyMap<string, string>,
+): string[] {
+	const hidden = new Set(hiddenKeys);
+	const out: string[] = [];
+	for (const key of lineKeys) {
+		if (hidden.has(key)) continue;
+		const text = texts
+			.get(key)
+			?.replace(/[\r\n\t]+/g, " ")
+			.trim();
+		if (text) out.push(text);
+	}
+	return out;
+}
+
+export function formatFooterChipSummary(layout: FooterChipLayout): string {
+	const hidden = layout.footerHiddenKeys.length;
+	return `hidden=${hidden} · L1=${layout.footerLine1Keys.length} · L2=${layout.footerLine2Keys.length} · L3=${layout.footerLine3Keys.length}`;
+}
+
+export function orderedFooterKeys(layout: FooterChipLayout): string[] {
+	return [...layout.footerLine1Keys, ...layout.footerLine2Keys, ...layout.footerLine3Keys];
+}