pi-cc-extensions 1.0.4 → 1.0.6

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

@@ -6,7 +6,48 @@
 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";
+
+/** 内置芯片。不是 setStatus key，由本扩展自己画。 */
+export const FOOTER_MODEL_KEY = "model";
+export const FOOTER_CONTEXT_KEY = "context";
+export const FOOTER_CACHE_KEY = "cache";
+export const FOOTER_RATE_KEY = "rate";
+export const FOOTER_COST_KEY = "cost";
+export const FOOTER_CWD_KEY = "cwd";
+export const FOOTER_GIT_KEY = "git";
+
+/** 默认第一行，顺序与改成可排布之前的硬编码一致。 */
+export const DEFAULT_FOOTER_LINE1_KEYS = [
+	FOOTER_MODEL_KEY,
+	FOOTER_CONTEXT_KEY,
+	FOOTER_CACHE_KEY,
+	FOOTER_RATE_KEY,
+	FOOTER_COST_KEY,
+	PI_USAGE_KEY,
+] as const;
+
+/** 默认第二行。cwd 在前，git 在后。 */
+export const DEFAULT_FOOTER_LINE2_KEYS = [FOOTER_CWD_KEY, FOOTER_GIT_KEY] as const;
+
+/** 改成可排布之前就写死的项。pi-usage 不算：旧配置里本来就有它。 */
+const LEGACY_FIXED_FOOTER_KEYS = [
+	FOOTER_MODEL_KEY,
+	FOOTER_CONTEXT_KEY,
+	FOOTER_CACHE_KEY,
+	FOOTER_RATE_KEY,
+	FOOTER_COST_KEY,
+	FOOTER_CWD_KEY,
+	FOOTER_GIT_KEY,
+] as const;
+
+const BUILTIN_FOOTER_KEYS = new Set<string>([
+	...DEFAULT_FOOTER_LINE1_KEYS,
+	...DEFAULT_FOOTER_LINE2_KEYS,
+]);
+
+export function isBuiltinFooterKey(key: string): boolean {
+	return BUILTIN_FOOTER_KEYS.has(key);
+}
 
 export type FooterLineId = 1 | 2 | 3;
 
@@ -19,18 +60,20 @@ export type FooterChipLayout = {
 
 export const DEFAULT_FOOTER_CHIP_LAYOUT: FooterChipLayout = {
 	footerHiddenKeys: [],
-	footerLine1Keys: [PI_USAGE_KEY],
-	footerLine2Keys: [],
+	footerLine1Keys: [...DEFAULT_FOOTER_LINE1_KEYS],
+	footerLine2Keys: [...DEFAULT_FOOTER_LINE2_KEYS],
 	footerLine3Keys: [],
 };
 
+/** 别的扩展写的 model 状态与本扩展的模型芯片重名，不当插件芯片接纳。配置里的 model 不受影响。 */
 export function isSkippedFooterStatusKey(key: string): boolean {
-	return key === SKIP_FOOTER_STATUS_KEY;
+	return key === FOOTER_MODEL_KEY;
 }
 
-/** 未单独配置时的默认行：usage 类和本包用量在 line1，其余 line2。不会默认进 line3。 */
+/** 未单独配置时的默认行：内置项按原来的行，usage 类在 line1，其余 line2。不会默认进 line3。 */
 export function defaultFooterLine(key: string): FooterLineId {
-	if (key === PI_USAGE_KEY) return 1;
+	if ((DEFAULT_FOOTER_LINE1_KEYS as readonly string[]).includes(key)) return 1;
+	if ((DEFAULT_FOOTER_LINE2_KEYS as readonly string[]).includes(key)) return 2;
 	if (/usage|quota|balance/i.test(key)) return 1;
 	return 2;
 }
@@ -43,7 +86,7 @@ export function normalizeFooterKeyList(value: unknown): string[] {
 		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;
+		if (!key || seen.has(key)) continue;
 		seen.add(key);
 		out.push(key);
 	}
@@ -60,37 +103,81 @@ function takeUnique(keys: string[], seen: Set<string>): string[] {
 	return out;
 }
 
-/** 跨行去重（line1 → line2 → line3）；补上 pi-usage 槽位。 */
+/**
+ * 旧配置只排插件芯片，内置项是硬编码的。
+ * 三条行都没出现过内置 key 时，按原位置补上，已有插件顺序不动。
+ */
+function ensureBuiltinKeys(
+	line1: string[],
+	line2: string[],
+	line3: string[],
+): { footerLine1Keys: string[]; footerLine2Keys: string[]; footerLine3Keys: string[] } {
+	const seen = new Set([...line1, ...line2, ...line3]);
+	if (LEGACY_FIXED_FOOTER_KEYS.some((key) => seen.has(key))) {
+		return { footerLine1Keys: line1, footerLine2Keys: line2, footerLine3Keys: line3 };
+	}
+	const line1Builtins = DEFAULT_FOOTER_LINE1_KEYS.filter((key) => key !== PI_USAGE_KEY);
+	const usageAt = line1.indexOf(PI_USAGE_KEY);
+	const footerLine1Keys =
+		usageAt >= 0
+			? [...line1.slice(0, usageAt), ...line1Builtins, ...line1.slice(usageAt)]
+			: [...line1Builtins, ...line1];
+	return {
+		footerLine1Keys,
+		footerLine2Keys: [...DEFAULT_FOOTER_LINE2_KEYS, ...line2],
+		footerLine3Keys: line3,
+	};
+}
+
+/** 跨行去重（line1 → line2 → line3）；旧配置补上内置芯片。 */
 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: [...DEFAULT_FOOTER_LINE1_KEYS],
+			footerLine2Keys: [...DEFAULT_FOOTER_LINE2_KEYS],
+			footerLine3Keys: [],
+		};
 	}
-	return { footerHiddenKeys, footerLine1Keys, footerLine2Keys, footerLine3Keys };
+	const seen = new Set<string>();
+	const line1 = takeUnique(normalizeFooterKeyList(source.footerLine1Keys), seen);
+	const line2 = takeUnique(normalizeFooterKeyList(source.footerLine2Keys), seen);
+	const line3 = takeUnique(normalizeFooterKeyList(source.footerLine3Keys), seen);
+	return {
+		footerHiddenKeys: normalizeFooterKeyList(source.footerHiddenKeys),
+		...ensureBuiltinKeys(line1, line2, line3),
+	};
 }
 
-/** 面板描述用：pi-usage 数据来自 @narumitw/pi-usage，其它芯片用来源 setStatus key。 */
+const BUILTIN_FOOTER_LABEL: Record<string, string> = {
+	[FOOTER_MODEL_KEY]: "Model and thinking level",
+	[FOOTER_CONTEXT_KEY]: "Context window bar",
+	[FOOTER_CACHE_KEY]: "Cache hit rate",
+	[FOOTER_RATE_KEY]: "Output rate",
+	[FOOTER_COST_KEY]: "Session cost",
+	[FOOTER_CWD_KEY]: "Working directory and session name",
+	[FOOTER_GIT_KEY]: "Branch and change stats",
+};
+
+/** 面板描述用：内置项写明内容，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 builtin = BUILTIN_FOOTER_LABEL[key];
+	if (builtin) {
+		const live = liveText.trim();
+		return live ? `${builtin} · ${live}` : builtin;
+	}
 	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.`;
+	if (key === PI_USAGE_KEY) return `From ${PI_USAGE_SOURCE}. No text right now.`;
 	return `inactive · from ${source}`;
 }
 
@@ -151,7 +238,6 @@ export function moveFooterKeyToLine(
 	key: string,
 	line: FooterLineId,
 ): FooterChipLayout {
-	if (isSkippedFooterStatusKey(key)) return layout;
 	const current = footerLineOfKey(layout, key);
 	if (current === line) return layout;
 	const stripped: FooterChipLayout = {
@@ -193,7 +279,6 @@ export function reorderFooterKey(
 }
 
 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);

package/extensions/feature/shell/footer.ts

@@ -1,9 +1,10 @@
 /**
  * 自定义底栏：chips + zentui 图标/句子
  *
- * 第一行：model  thinking · ██████░░░░ 45%/200k · 󰆼 42% · $0.01 · 用户排到 line1 的插件芯片
- * 第二行：cwd in session on  branch (+16 −1) · 用户排到 line2 的插件芯片
- * 第三行：仅当 line3 有可见插件芯片时出现
+ * 默认第一行：model  thinking · ██████░░░░ 45%/200k · 󰆼 42% · $0.01 · pi-usage · 其余 line1 芯片
+ * 默认第二行：cwd in session ·  branch (+16 −1) · 其余 line2 芯片
+ * 第三行：仅当 line3 有可见芯片时出现
+ * model / context / cache / rate / cost / cwd / git 与插件芯片同一套排布，可换行、调序、隐藏
  *
  *  - line1 短芯片，· 分隔；缓存用 zentui 󰆼，费用 success
  *  - line2 用 zentui 句式 in / on + 
@@ -23,7 +24,15 @@ import { stripAnsi } from "../../utils/ansi-text.ts";
 import { formatFooterCost } from "./footer-currency.ts";
 import { formatTokenCount } from "../../utils/format.ts";
 import {
+	FOOTER_CACHE_KEY,
+	FOOTER_CONTEXT_KEY,
+	FOOTER_COST_KEY,
+	FOOTER_CWD_KEY,
+	FOOTER_GIT_KEY,
+	FOOTER_MODEL_KEY,
+	FOOTER_RATE_KEY,
 	PI_USAGE_KEY,
+	isBuiltinFooterKey,
 	isSkippedFooterStatusKey,
 	resolveFooterChipLayout,
 	visibleFooterPluginTexts,
@@ -31,6 +40,7 @@ import {
 } from "./footer-layout.ts";
 import { createGitStatsRefresher, readGitStats, type GitStats } from "./git-stats.ts";
 import { MCP_STATUS_KEY, buildMcpChip } from "./mcp-chip.ts";
+import { inputTextIndent } from "./prompt-editor.ts";
 import { currentTtftMs, displayTokenRate, formatTokenRate } from "./token-rate.ts";
 
 export { parseGitStats } from "./git-stats.ts";
@@ -144,11 +154,11 @@ function ownMcpChip(): string {
 	return cachedMcpChip && !cachedExtensionStatuses.has(MCP_STATUS_KEY) ? cachedMcpChip : "";
 }
 
-/** 面板用：当前 setStatus 文案 + 本包 pi-usage / MCP（无文案时为空字符串）。 */
+/** 面板用：当前 setStatus 文案 + 本包 pi-usage / MCP（无文案时为空字符串）。内置项由配置保证在列表里。 */
 export function getFooterStatusSnapshot(): Map<string, string> {
 	const out = new Map<string, string>();
 	for (const [key, text] of cachedExtensionStatuses) {
-		if (isSkippedFooterStatusKey(key)) continue;
+		if (isSkippedFooterStatusKey(key) || isBuiltinFooterKey(key)) continue;
 		out.set(key, text);
 	}
 	out.set(PI_USAGE_KEY, cachedLocalUsageText);
@@ -418,21 +428,6 @@ const createCustomFooterFactory =
 			if (mcpChip) pluginTexts.set(MCP_STATUS_KEY, mcpChip);
 			const layout = resolveFooterChipLayout(layoutFromConfig(), [...pluginTexts.keys()]);
 			const dimPlugin = (text: string) => colorUsageChip(theme, text);
-			const line1Plugins = visibleFooterPluginTexts(
-				layout.footerLine1Keys,
-				layout.footerHiddenKeys,
-				pluginTexts,
-			).map(dimPlugin);
-			const line2Plugins = visibleFooterPluginTexts(
-				layout.footerLine2Keys,
-				layout.footerHiddenKeys,
-				pluginTexts,
-			).map(dimPlugin);
-			const line3Plugins = visibleFooterPluginTexts(
-				layout.footerLine3Keys,
-				layout.footerHiddenKeys,
-				pluginTexts,
-			).map(dimPlugin);
 
 			const pctLabel = percent === null || percent === undefined ? "?" : `${Math.floor(percent)}%`;
 			const cachePct = getCachePct();
@@ -447,22 +442,13 @@ const createCustomFooterFactory =
 						config.footerTokenRateTtft,
 					)
 				: "";
-			const rateChip = rateLabel ? theme.fg("dim", rateLabel) : "";
-			const costChip =
+			const costLabel =
 				cost || usingSubscription
-					? theme.fg(
-							"dim",
-							formatFooterCost(cost, config.footerCurrency, config.footerCurrencyRate),
-						) + (usingSubscription ? theme.fg("warning", " sub") : "")
+					? formatFooterCost(cost, config.footerCurrency, config.footerCurrencyRate)
 					: "";
-			const line1 = joinChips([
-				modelChip(theme, modelLabel, model?.reasoning ? thinkingLevelStr : "", thinkingColor),
-				barGauge(percent ?? 0) + theme.fg("dim", ` ${pctLabel}/${fmt(contextWindow)}`),
-				cacheLabel ? theme.fg("dim", cacheLabel) : "",
-				rateChip,
-				costChip,
-				...line1Plugins,
-			]);
+			const costChip = costLabel
+				? theme.fg("dim", costLabel) + (usingSubscription ? theme.fg("warning", " sub") : "")
+				: "";
 
 			const gitColor = theme.getThinkingBorderColor("medium");
 			let place = theme.fg("accent", cwdLabel);
@@ -471,6 +457,7 @@ const createCustomFooterFactory =
 				place += theme.fg("muted", " in ") + theme.fg("success", sessionName);
 			}
 			const branch = footerData.getGitBranch();
+			let gitChip = "";
 			if (branch) {
 				const s = gitStats;
 				let stats = "";
@@ -484,16 +471,45 @@ const createCustomFooterFactory =
 						theme.fg("error", `−${s.del}`) +
 						theme.fg("dim", ")");
 				const gitLabel = glyphs.git ? `${glyphs.git} ${branch}` : branch;
-				place += theme.fg("muted", " on ") + gitColor(gitLabel) + stats;
+				gitChip = gitColor(gitLabel) + stats;
 			}
-			const line2 = joinChips([place, ...line2Plugins]);
-			const line3 = joinChips(line3Plugins);
-
-			return [
-				truncateToWidth(line1, width),
-				...(line2 ? [truncateToWidth(line2, width)] : []),
-				...(line3 ? [truncateToWidth(line3, width)] : []),
-			];
+
+			const builtinChips = new Map<string, string>([
+				[
+					FOOTER_MODEL_KEY,
+					modelChip(theme, modelLabel, model?.reasoning ? thinkingLevelStr : "", thinkingColor),
+				],
+				[
+					FOOTER_CONTEXT_KEY,
+					barGauge(percent ?? 0) + theme.fg("dim", ` ${pctLabel}/${fmt(contextWindow)}`),
+				],
+				[FOOTER_CACHE_KEY, cacheLabel ? theme.fg("dim", cacheLabel) : ""],
+				[FOOTER_RATE_KEY, rateLabel ? theme.fg("dim", rateLabel) : ""],
+				[FOOTER_COST_KEY, costChip],
+				[FOOTER_CWD_KEY, place],
+				[FOOTER_GIT_KEY, gitChip],
+			]);
+
+			const lineOf = (keys: readonly string[]) =>
+				joinChips(
+					keys
+						.filter((key) => !layout.footerHiddenKeys.includes(key))
+						.map((key) => {
+							if (isBuiltinFooterKey(key)) return builtinChips.get(key) ?? "";
+							const text = visibleFooterPluginTexts([key], [], pluginTexts)[0];
+							return text ? dimPlugin(text) : "";
+						}),
+				);
+			const line1 = lineOf(layout.footerLine1Keys);
+			const line2 = lineOf(layout.footerLine2Keys);
+			const line3 = lineOf(layout.footerLine3Keys);
+
+			// 对齐输入文本起始列：editorPaddingX + `❯ ` 的 2 列（随编辑器 render 实时更新）。
+			const indent = " ".repeat(inputTextIndent());
+			const fit = (line: string) =>
+				indent + truncateToWidth(line, Math.max(1, width - indent.length));
+
+			return [fit(line1), ...(line2 ? [fit(line2)] : []), ...(line3 ? [fit(line3)] : [])];
 		};
 
 		return {

package/extensions/feature/shell/prompt-editor.ts

@@ -0,0 +1,96 @@
+/**
+ * 输入框 `❯` 提示符（issue #68）。
+ *
+ * `PromptEditor` 继承 `CustomEditor`：pi 的 setCustomEditorComponent 会自动接线
+ * onSubmit/onChange/actionHandlers/autocomplete/工作状态指示器，本扩展只管渲染。
+ *
+ * `❯ ` 恒占左侧 2 列：渲染前把 paddingX 抬到「用户值 + 2」（直接改字段绕过
+ * setter，避免每帧 requestRender 自激），渲染后恢复。首内容行前两列换成
+ * `❯ `，其后仍保留用户 editorPaddingX 的空格。
+ * `❯` 颜色直接用 `borderColor`，随 thinking 等级 / bash mode 自动联动。
+ *
+ * `userPaddingX` 记录渲染时读到的用户 editorPaddingX（pi 通过 setPaddingX
+ * 同步进本编辑器），footer 用 `inputTextIndent()` 对齐输入文本起始列：
+ * 前缀开 = userPaddingX + 2，关 = userPaddingX。
+ */
+import { CustomEditor, type ExtensionContext } from "@earendil-works/pi-coding-agent";
+import { config } from "../../config/config.ts";
+
+/** `❯ ` 固定 2 列：glyph + 尾随空格。 */
+const PROMPT_GLYPH = "❯";
+const PROMPT_COLS = 2;
+
+/** 最近一次 render 读到的用户 editorPaddingX；未启用过提示符时为 0。 */
+let userPaddingX = 0;
+
+/** 输入文本起始列：footer 按它对齐。 */
+export function inputTextIndent(): number {
+	return config.enableEditorPrefix ? userPaddingX + PROMPT_COLS : userPaddingX;
+}
+
+export class PromptEditor extends CustomEditor {
+	render(width: number): string[] {
+		// ❯ + 用户 padding：文本从 userPaddingX+2 列开始。
+		const self = this as unknown as { paddingX: number };
+		const saved = self.paddingX;
+		userPaddingX = saved;
+		self.paddingX = saved + PROMPT_COLS;
+		try {
+			const lines = super.render(width);
+			// 布局：lines[0] 顶边框，lines[1..n-2] 内容，lines[n-1] 底边框（autocomplete 在底边框后追加，
+			// 首内容行恒为 index 1）。开头是 paddingX 个纯空格，前两列换成 ❯+空格，剩余 padding 保留；
+			// 续行不动——Claude Code 行为。
+			if (lines.length > 2 && lines[1].startsWith("  ")) {
+				lines[1] = this.borderColor(PROMPT_GLYPH) + " " + lines[1].slice(2);
+			}
+			return lines;
+		} finally {
+			self.paddingX = saved;
+		}
+	}
+}
+
+type EditorFactory = Parameters<ExtensionContext["ui"]["setEditorComponent"]>[0];
+
+const promptEditorFactory: EditorFactory = (tui, theme, keybindings) =>
+	new PromptEditor(tui, theme, keybindings, { embedWorkingStatus: true });
+
+/** 是否正占着插槽；占据前的工厂用于原样还回去。 */
+let active = false;
+let previousEditorFactory: EditorFactory | undefined;
+
+/** 撤销本扩展占据的插槽；从未占用就不碰插槽。 */
+function releasePromptEditor(ctx: ExtensionContext): void {
+	if (!active) return;
+	ctx.ui.setEditorComponent(previousEditorFactory);
+	active = false;
+	previousEditorFactory = undefined;
+}
+
+/** 应用输入框前缀；enableEditorPrefix=false 时只撤自己装的那层。 */
+export function applyPromptEditor(ctx: ExtensionContext): void {
+	if (!ctx?.hasUI || typeof ctx.ui?.setEditorComponent !== "function") return;
+	try {
+		if (!config.enableEditorPrefix) {
+			releasePromptEditor(ctx);
+			return;
+		}
+		if (!active) {
+			// pi 的插槽是硬替换、没有栈，先记住是谁占着，撤销时还回去。
+			previousEditorFactory = ctx.ui.getEditorComponent?.();
+			active = true;
+		}
+		ctx.ui.setEditorComponent(promptEditorFactory);
+	} catch (err) {
+		ctx.ui.notify(
+			`prompt editor error: ${err instanceof Error ? err.message : String(err)}`,
+			"error",
+		);
+	}
+}
+
+/** 恢复本扩展占据前的编辑器；未占用时不动作。 */
+export function clearPromptEditor(ctx: ExtensionContext): void {
+	if (!ctx?.hasUI || typeof ctx.ui?.setEditorComponent !== "function") return;
+	releasePromptEditor(ctx);
+}

package/extensions/index.ts

@@ -5,6 +5,7 @@ import { config } from "./config/config.ts";
 import piAliases from "./feature/shell/aliases.ts";
 import { installFlushDockedBash } from "./feature/shell/flush-docked-bash.ts";
 import customFooter from "./feature/shell/footer.ts";
+import { applyPromptEditor } from "./feature/shell/prompt-editor.ts";
 import piStartupHeader, { installEarlyStartupHeader } from "./feature/shell/startup-header.ts";
 import workingMessage from "./feature/shell/working-message.ts";
 
@@ -28,6 +29,11 @@ export default function (pi: ExtensionAPI): void {
 	if (config.enableWorkingMessage) workingMessage(pi);
 	customFooter(pi);
 
+	// 输入框 ❯ 提示符：session_start 时按配置应用；setEditorComponent 是一次性替换。
+	pi.on("session_start", (_event, ctx) => {
+		applyPromptEditor(ctx);
+	});
+
 	// render stack：thinking controller 直接交给 style 作 query
 	markdownEnhance(pi);
 	claudeCodeStyle(pi, undefined, installCompactThinking(pi, getCompactThinkingConfig()));