pi-cc-extensions 0.9.11 → 0.9.12

package/README.en.md

@@ -61,14 +61,14 @@ Renderer snapshots for `on` / `compact` modes: [default](./docs/tool-render-exam
   "expandedOutputMaxLines": 10, // expanded tool Output lines; overflow shows a footer hint
   "expandedPreviewMaxLines": 40, // max lines for expanded TaskList bodies (expanded diffs always show all)
   "expandedCardBackground": "userMessageBg", // expanded card background slot: userMessageBg (same as user prompts) / toolPendingBg (neutral) etc.
-  "inputClip": 0, // tool summary path/command clip length; 0 = fit width
+  "toolLabelClip": 0, // tool summary path/command clip length; 0 = fit width
   "showStartupHeader": true, // startup header (logo + tips) toggle
 
   // diff
   "diffViewMode": "auto", // layout: auto / split / unified
   "diffIndicatorMode": "bars", // change indicators: bars / classic / none
   "diffSplitMinWidth": 120, // min terminal width for side-by-side columns
-  "editDiffCollapsedLines": 24, // Edit collapse lines; beyond that shows the expand hint
+  "editDiffCollapsedLines": 24, // edit collapse lines; 0 = change-count summary only
   "writeDiffCollapsedLines": 0, // write collapse lines; 0 = creation summary only
   "diffWordWrap": true, // wrap long diff lines
 
@@ -83,6 +83,7 @@ Renderer snapshots for `on` / `compact` modes: [default](./docs/tool-render-exam
   "footerCurrency": "USD", // display currency for the footer cost
   "footerCurrencyRate": null, // display units per 1 cost unit; null changes the symbol only
   "footerNerdIcons": true, // Nerd Font glyphs for git/cache; false = plain text
+  "footerGitStatsMode": "working", // working (default): uncommitted; branch: cumulative net changes
   "footerHiddenKeys": [], // hidden plugin chip keys
   "footerLine1Keys": ["pi-usage"], // line1 plugin chip order; pi-usage is shown by default, data from @narumitw/pi-usage
   "footerLine2Keys": [], // line2 plugin chip order (after cwd/git)

package/README.md

@@ -61,14 +61,14 @@ pi install git:github.com/minuque/pi-cc-extensions
   "expandedOutputMaxLines": 10,            // 展开工具卡 Output 可见行数，超出在末行显示展开提示
   "expandedPreviewMaxLines": 40,           // 展开 TaskList 正文最大行数（展开 diff 始终全量）
   "expandedCardBackground": "userMessageBg", // 展开卡背景槽位；userMessageBg 与用户消息同色，toolPendingBg 为中性灰
-  "inputClip": 0,                          // 工具摘要 path/command 折叠字符数；0 = 按可用宽度
+  "toolLabelClip": 0,                      // 工具摘要 path/command 折叠字符数；0 = 按可用宽度
   "showStartupHeader": true,               // 启动头（logo + tips）开关
 
   // diff
   "diffViewMode": "auto",                  // 布局：auto / split / unified
   "diffIndicatorMode": "bars",             // 变更指示：bars / classic / none
   "diffSplitMinWidth": 120,                // 左右分栏的最小终端宽度
-  "editDiffCollapsedLines": 24,            // Edit 折叠行数，超出显示展开提示
+  "editDiffCollapsedLines": 24,            // edit 折叠行数；0 仅显示变更统计摘要
   "writeDiffCollapsedLines": 0,            // write 折叠行数，0 仅显示创建摘要
   "diffWordWrap": true,                    // 长 diff 行换行
 
@@ -83,6 +83,7 @@ pi install git:github.com/minuque/pi-cc-extensions
   "footerCurrency": "USD",                 // 底栏费用的显示币种
   "footerCurrencyRate": null,              // 1 单位费用换成多少显示币种；null 只换符号、不乘倍率
   "footerNerdIcons": true,                 // git/缓存用 Nerd Font 图标；false 为纯文本
+  "footerGitStatsMode": "working",         // working（默认）：未提交改动；branch：分支累计净改动
   "footerHiddenKeys": [],                  // 隐藏的插件芯片 key
   "footerLine1Keys": ["pi-usage"],         // line1 插件芯片顺序；pi-usage 默认显示，数据来自 @narumitw/pi-usage
   "footerLine2Keys": [],                   // line2 插件芯片顺序（接在 cwd/git 后）

package/extensions/config/config.ts

@@ -13,11 +13,13 @@ export type CompactStyleMode = "on" | "compact" | "off";
 
 export type DiffViewMode = "auto" | "split" | "unified";
 export type DiffIndicatorMode = "bars" | "classic" | "none";
+export type FooterGitStatsMode = "working" | "branch";
 
 export interface ToolDisplayConfig {
 	diffViewMode: DiffViewMode;
 	diffIndicatorMode: DiffIndicatorMode;
 	diffSplitMinWidth: number;
+	/** Edit-only collapsed body lines. 0 = change counts and an expand hint. */
 	editDiffCollapsedLines: number;
 	/** Write-only collapsed body lines. 0 = `↳ created · click to show more`. */
 	writeDiffCollapsedLines: number;
@@ -57,7 +59,7 @@ export type Config = {
 	expandedCardBackground: ThemeBg;
 	expandedInputMaxLines: number;
 	expandedOutputMaxLines: number;
-	inputClip: number;
+	toolLabelClip: number;
 	useSummaryTitlesAsThinkingTitle: boolean;
 	previewLines: number;
 	animationIntervalMs: number;
@@ -75,6 +77,7 @@ export type Config = {
 	/** 1 单位费用对应的显示币种数量。null 只换符号、不乘倍率。 */
 	footerCurrencyRate: number | null;
 	footerNerdIcons: boolean;
+	footerGitStatsMode: FooterGitStatsMode;
 	footerHiddenKeys: string[];
 	footerLine1Keys: string[];
 	footerLine2Keys: string[];
@@ -87,8 +90,9 @@ const LEGACY_CONFIG_PATH = join(AGENT_DIR, "claude-code-style.json");
 
 export const DIFF_VIEW_MODES: DiffViewMode[] = ["auto", "split", "unified"];
 export const DIFF_INDICATOR_MODES: DiffIndicatorMode[] = ["bars", "classic", "none"];
+export const FOOTER_GIT_STATS_MODES: FooterGitStatsMode[] = ["working", "branch"];
 export const DIFF_SPLIT_MIN_WIDTH_VALUES = ["80", "100", "120", "140", "160", "180"];
-export const DIFF_COLLAPSED_LINES_VALUES = ["12", "24", "36", "48", "80", "120"];
+export const DIFF_COLLAPSED_LINES_VALUES = ["0", "12", "24", "36", "48", "80", "120"];
 /** Write collapsed presets. 0 = stats only (`+N -0` + expand hint). */
 export const WRITE_DIFF_COLLAPSED_LINES_VALUES = ["0", "4", "8", "12", "24", "36"];
 /** Presets for expanded body height — keep low options first so cycling stays TUI-friendly. */
@@ -112,7 +116,7 @@ export const EXPANDED_INPUT_MAX_LINES_VALUES = ["5", "10", "20", "40", "80"];
 /** 展开工具卡 Output 可见行数预设。 */
 export const EXPANDED_OUTPUT_MAX_LINES_VALUES = ["10", "20", "40", "80", "120"];
 /** 工具摘要里 path/command 等输入的折叠字符数；0 = 只按可用宽度截断。 */
-export const INPUT_CLIP_VALUES = ["0", "40", "60", "80", "100", "120", "160"];
+export const TOOL_LABEL_CLIP_VALUES = ["0", "40", "60", "80", "100", "120", "160"];
 export const THINKING_PREVIEW_LINES_VALUES = ["0", "1", "3", "5", "10"];
 export const THINKING_ANIMATION_INTERVAL_VALUES = ["40", "60", "90", "120", "180"];
 /** Tools commonly toggled in excludeRenderers via the settings panel. */
@@ -143,7 +147,7 @@ export const DEFAULT_CONFIG: Config = {
 	expandedCardBackground: "userMessageBg",
 	expandedInputMaxLines: 5,
 	expandedOutputMaxLines: 10,
-	inputClip: 0,
+	toolLabelClip: 0,
 	useSummaryTitlesAsThinkingTitle: true,
 	previewLines: 3,
 	animationIntervalMs: 90,
@@ -159,6 +163,7 @@ export const DEFAULT_CONFIG: Config = {
 	footerCurrency: "USD",
 	footerCurrencyRate: null,
 	footerNerdIcons: true,
+	footerGitStatsMode: "working",
 	...DEFAULT_FOOTER_CHIP_LAYOUT,
 };
 
@@ -174,10 +179,10 @@ export function pickPositiveInt(value: unknown, fallback: number, min = 1, max =
 	return Math.min(max, Math.max(min, Math.floor(n)));
 }
 
-/** inputClip：0 表示按宽度自适应，其余夹到 8..500。 */
-export function pickInputClip(value: unknown): number {
+/** toolLabelClip：0 表示按宽度自适应，其余夹到 8..500。 */
+export function pickToolLabelClip(value: unknown): number {
 	const n = typeof value === "number" ? value : typeof value === "string" ? Number(value) : NaN;
-	return n === 0 ? 0 : pickPositiveInt(value, DEFAULT_CONFIG.inputClip, 8, 500);
+	return n === 0 ? 0 : pickPositiveInt(value, DEFAULT_CONFIG.toolLabelClip, 8, 500);
 }
 
 export function pickPositiveNumber(value: unknown, fallback: number, min = 1): number {
@@ -228,7 +233,7 @@ export function normalizeConfig(input: unknown): Config {
 		editDiffCollapsedLines: pickPositiveInt(
 			source.editDiffCollapsedLines,
 			DEFAULT_CONFIG.editDiffCollapsedLines,
-			1,
+			0,
 			500,
 		),
 		writeDiffCollapsedLines: pickPositiveInt(
@@ -261,7 +266,9 @@ export function normalizeConfig(input: unknown): Config {
 			1,
 			5_000,
 		),
-		inputClip: pickInputClip(source.inputClip),
+		toolLabelClip: pickToolLabelClip(
+			source.toolLabelClip ?? source.inputClip, // 兼容旧配置键
+		),
 		useSummaryTitlesAsThinkingTitle: source.useSummaryTitlesAsThinkingTitle !== false,
 		previewLines: pickPositiveInt(
 			source.previewLines,
@@ -285,6 +292,11 @@ export function normalizeConfig(input: unknown): Config {
 		footerCurrency: normalizeCurrency(source.footerCurrency),
 		footerCurrencyRate: normalizeFooterCurrencyRate(source.footerCurrencyRate),
 		footerNerdIcons: source.footerNerdIcons !== false,
+		footerGitStatsMode: pickEnum(
+			source.footerGitStatsMode,
+			FOOTER_GIT_STATS_MODES,
+			DEFAULT_CONFIG.footerGitStatsMode,
+		),
 		...normalizeFooterChipLayout(source),
 	};
 }
@@ -326,7 +338,7 @@ export function formatConfigStatus(source: Config = config): string {
 		`expandedMax=${source.expandedPreviewMaxLines}`,
 		`expandedInput=${source.expandedInputMaxLines}`,
 		`expandedOutput=${source.expandedOutputMaxLines}`,
-		`inputClip=${source.inputClip}`,
+		`toolLabelClip=${source.toolLabelClip}`,
 		`thinkingTitle=${source.useSummaryTitlesAsThinkingTitle ? "summary" : "default"}`,
 		`thinkingPreview=${source.previewLines}`,
 		`thinkingAnimation=${source.animationIntervalMs}ms`,
@@ -342,6 +354,7 @@ export function formatConfigStatus(source: Config = config): string {
 		`footerCurrency=${source.footerCurrency}`,
 		`footerRate=${source.footerCurrencyRate ?? "-"}`,
 		`footerIcons=${source.footerNerdIcons ? "nerd" : "plain"}`,
+		`footerGitStats=${source.footerGitStatsMode}`,
 		formatFooterChipSummary(source),
 	].join(" · ");
 }

package/extensions/config/panel.ts

@@ -11,6 +11,7 @@ import {
 	applyCustomFooter,
 	clearCustomFooter,
 	getFooterStatusSnapshot,
+	refreshFooterGitStats,
 } from "../feature/shell/footer.ts";
 import {
 	FOOTER_CURRENCY_PRESETS,
@@ -41,20 +42,22 @@ import {
 	EXPANDED_INPUT_MAX_LINES_VALUES,
 	EXPANDED_OUTPUT_MAX_LINES_VALUES,
 	EXPANDED_PREVIEW_MAX_LINES_VALUES,
+	FOOTER_GIT_STATS_MODES,
 	formatExcludeRenderers,
 	getCompactThinkingConfig,
-	pickInputClip,
 	pickPositiveInt,
 	pickPositiveNumber,
+	pickToolLabelClip,
 	THINKING_ANIMATION_INTERVAL_VALUES,
 	THINKING_PREVIEW_LINES_VALUES,
-	INPUT_CLIP_VALUES,
+	TOOL_LABEL_CLIP_VALUES,
 	WRITE_DIFF_COLLAPSED_LINES_VALUES,
 	updateConfig,
 	type CompactStyleMode,
 	type Config,
 	type DiffIndicatorMode,
 	type DiffViewMode,
+	type FooterGitStatsMode,
 } from "./config.ts";
 
 /** renderer 注入的渲染副作用，面板自身不触碰渲染状态。 */
@@ -84,6 +87,12 @@ function customFooterDescription(enabled: boolean): string {
 	return "Custom status bar with model, context, cache, cost, git, and plugin chips.";
 }
 
+function footerGitStatsDescription(mode: FooterGitStatsMode): string {
+	return mode === "branch"
+		? "Net changes since the merge base, including uncommitted edits. Base: origin/HEAD, then local main/master. Untracked files excluded; unavailable stats hidden."
+		: "Uncommitted net changes relative to HEAD (default). Includes staged and unstaged edits; excludes untracked files.";
+}
+
 function pluginChipsDescription(): string {
 	return `Arrange plugin chips: ${formatFooterChipSummary(config)}. Enter to edit.`;
 }
@@ -444,15 +453,15 @@ export async function showCcstylePanel(
 				);
 			},
 		};
-		const inputClipSetting = {
-			id: "inputClip",
-			label: "Input clip",
+		const toolLabelClipSetting = {
+			id: "toolLabelClip",
+			label: "Tool label clip",
 			description:
 				"Max characters for path/command/name in single and grouped tool summaries; 0 fits available width. Enter to type a custom value.",
-			currentValue: String(config.inputClip),
-			values: [...INPUT_CLIP_VALUES],
+			currentValue: String(config.toolLabelClip),
+			values: [...TOOL_LABEL_CLIP_VALUES],
 			submenu: (_current: string, closeSubmenu: (selected?: string) => void) =>
-				buildNumberInputSubmenu(theme, inputClipSetting, closeSubmenu),
+				buildNumberInputSubmenu(theme, toolLabelClipSetting, closeSubmenu),
 		};
 		const diffViewSetting = {
 			id: "diffViewMode",
@@ -482,7 +491,7 @@ export async function showCcstylePanel(
 			id: "editDiffCollapsedLines",
 			label: "Edit collapsed lines",
 			description:
-				"How many edit/diff body lines to show before the expand hint (Ctrl+O / click). Write uses its own setting below.",
+				"Edit diff body lines before the expand hint (Ctrl+O / click). 0 shows only change counts and the hint.",
 			currentValue: String(config.editDiffCollapsedLines),
 			values: [...DIFF_COLLAPSED_LINES_VALUES],
 			submenu: (_current: string, closeSubmenu: (selected?: string) => void) =>
@@ -705,6 +714,13 @@ export async function showCcstylePanel(
 			currentValue: config.enableCustomFooter ? "on" : "off",
 			values: ["on", "off"],
 		};
+		const footerGitStatsSetting = {
+			id: "footerGitStatsMode",
+			label: "Git changes",
+			description: footerGitStatsDescription(config.footerGitStatsMode),
+			currentValue: config.footerGitStatsMode,
+			values: FOOTER_GIT_STATS_MODES,
+		};
 		const pluginChipsSetting = {
 			id: "footerPluginChips",
 			label: "Plugin chips",
@@ -769,6 +785,14 @@ export async function showCcstylePanel(
 				ctx.ui.notify(`Updated ${id}: ${footerCurrencyRateSetting.currentValue}`, "info");
 				return;
 			}
+			if (id === "footerGitStatsMode") {
+				updateConfig({ footerGitStatsMode: value as FooterGitStatsMode });
+				footerGitStatsSetting.currentValue = config.footerGitStatsMode;
+				footerGitStatsSetting.description = footerGitStatsDescription(config.footerGitStatsMode);
+				refreshFooterGitStats();
+				ctx.ui.notify(`Updated ${id}: ${value}`, "info");
+				return;
+			}
 			if (id === "footerNerdIcons") {
 				const enabled = value === "on";
 				updateConfig({ footerNerdIcons: enabled });
@@ -788,11 +812,11 @@ export async function showCcstylePanel(
 				return;
 			}
 			switch (id) {
-				case "inputClip":
+				case "toolLabelClip":
 					updateConfig({
-						inputClip: pickInputClip(value),
+						toolLabelClip: pickToolLabelClip(value),
 					});
-					inputClipSetting.currentValue = String(config.inputClip);
+					toolLabelClipSetting.currentValue = String(config.toolLabelClip);
 					break;
 				case "mode": {
 					// 选项值带 Experimental 标记，选择后还原为真实 mode 值。
@@ -825,7 +849,7 @@ export async function showCcstylePanel(
 						editDiffCollapsedLines: pickPositiveInt(
 							value,
 							DEFAULT_CONFIG.editDiffCollapsedLines,
-							1,
+							0,
 							500,
 						),
 					});
@@ -950,7 +974,7 @@ export async function showCcstylePanel(
 					expandedOutputSetting,
 					expandedMaxSetting,
 					expandedCardBgSetting,
-					inputClipSetting,
+					toolLabelClipSetting,
 					startupHeaderSetting,
 				],
 			},
@@ -984,6 +1008,7 @@ export async function showCcstylePanel(
 					footerCurrencySetting,
 					footerCurrencyRateSetting,
 					footerNerdIconsSetting,
+					footerGitStatsSetting,
 					pluginChipsSetting,
 				],
 			},

package/extensions/feature/shell/footer.ts

@@ -14,7 +14,6 @@
 
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { truncateToWidth } from "@earendil-works/pi-tui";
-import { execFile } from "node:child_process";
 import { existsSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
@@ -29,8 +28,11 @@ import {
 	visibleFooterPluginTexts,
 	type FooterChipLayout,
 } from "./footer-layout.ts";
+import { createGitStatsRefresher, readGitStats, type GitStats } from "./git-stats.ts";
 import { MCP_STATUS_KEY, buildMcpChip } from "./mcp-chip.ts";
 
+export { parseGitStats } from "./git-stats.ts";
+
 const GIT_REFRESH_INTERVAL_MS = 10_000;
 const USAGE_REFRESH_INTERVAL_MS = 5 * 60 * 1000;
 // 后台连接 MCP 服务器不会触发 footer 重绘，靠这个兜底轮询把芯片刷出来
@@ -49,8 +51,6 @@ export function footerGlyphs(nerdIcons: boolean): { git: string; cache: string;
 		: { git: "", cache: "", mcp: "" };
 }
 
-type GitStats = { add: number; del: number };
-
 type XaiFooterReport = {
 	buckets?: Array<{
 		id?: string;
@@ -62,19 +62,6 @@ type XaiFooterReport = {
 	metrics?: Array<{ id?: string; value?: unknown }>;
 };
 
-export function parseGitStats(stdout: string): GitStats {
-	let add = 0;
-	let del = 0;
-	for (const line of stdout.split("\n")) {
-		const match = line.match(/^(\d+)\s+(\d+)/);
-		if (match) {
-			add += Number(match[1]);
-			del += Number(match[2]);
-		}
-	}
-	return { add, del };
-}
-
 export function formatXaiFooterChip(report: XaiFooterReport): string | undefined {
 	const included = report.buckets?.find((b) => b.id === "included-allowance");
 	if (included?.unit === "percent" && typeof included.used === "number") {
@@ -181,7 +168,12 @@ function colorUsageChip(theme: any, text: string): string {
 }
 
 let currentTui: any = undefined;
-let refreshCurrentGitStats: (() => void) | undefined;
+let refreshCurrentGitStats: ((reset?: boolean) => void) | undefined;
+
+/** Apply a /ccstyle Git mode change immediately, without recreating the footer. */
+export function refreshFooterGitStats(): void {
+	refreshCurrentGitStats?.(true);
+}
 let refreshCurrentUsage: (() => void) | undefined;
 let refreshCurrentMcpChip: (() => void) | undefined;
 /** 工具/命令列表在 pi API 上，而 footer 工厂只拿得到 ctx，加载时记下来。 */
@@ -193,33 +185,23 @@ const createCustomFooterFactory =
 		const sep = theme.fg("muted", " · ");
 		const joinChips = (parts: string[]) => parts.filter(Boolean).join(sep);
 		let gitStats: GitStats | undefined;
-		let gitRefreshRunning = false;
 		let localUsageChip = "";
 		let usageGeneration = 0;
 		let usageAbort: AbortController | undefined;
 		let disposed = false;
 
-		// 查询在 render 外执行，保留旧值；仅统计结果真正变化时重绘，避免周期性清零抖动。
-		const refreshGitStats = () => {
-			if (gitRefreshRunning || disposed) return;
-			gitRefreshRunning = true;
-			execFile(
-				"git",
-				["diff", "--numstat", "HEAD"],
-				{ cwd: ctx.cwd, timeout: 2000 },
-				(err, stdout) => {
-					gitRefreshRunning = false;
-					if (err || disposed) return;
-					const next = parseGitStats(stdout);
-					if (gitStats?.add === next.add && gitStats.del === next.del) return;
-					gitStats = next;
-					tui.requestRender();
-				},
-			);
-		};
-		refreshCurrentGitStats = refreshGitStats;
-		refreshGitStats();
-		const gitRefreshTimer = setInterval(refreshGitStats, GIT_REFRESH_INTERVAL_MS);
+		// 查询在 render 外执行；模式/分支变化清旧值，普通轮询只在统计变化时重绘。
+		const gitRefresher = createGitStatsRefresher({
+			getMode: () => config.footerGitStatsMode,
+			query: (mode, signal) => readGitStats(ctx.cwd, mode, signal),
+			onChange: (next) => {
+				gitStats = next;
+				tui.requestRender();
+			},
+		});
+		refreshCurrentGitStats = gitRefresher.refresh;
+		gitRefresher.refresh();
+		const gitRefreshTimer = setInterval(() => gitRefresher.refresh(), GIT_REFRESH_INTERVAL_MS);
 		gitRefreshTimer.unref?.();
 
 		const refreshUsage = () => {
@@ -315,9 +297,9 @@ const createCustomFooterFactory =
 		const mcpRefreshTimer = setInterval(refreshMcp, MCP_REFRESH_INTERVAL_MS);
 		mcpRefreshTimer.unref?.();
 
-		// 分支变化时同步更新分支名和相对 HEAD 的统计。
+		// 分支变化时重新选择基准，并拒绝旧分支的异步查询结果。
 		const unsubBranch = footerData.onBranchChange(() => {
-			refreshGitStats();
+			gitRefresher.refresh(true);
 			tui.requestRender();
 		});
 
@@ -442,14 +424,17 @@ const createCustomFooterFactory =
 			}
 			const branch = footerData.getGitBranch();
 			if (branch) {
-				const stats =
-					gitStats && (gitStats.add || gitStats.del)
-						? theme.fg("dim", " (") +
-							theme.fg("success", `+${gitStats.add}`) +
-							" " +
-							theme.fg("error", `−${gitStats.del}`) +
-							theme.fg("dim", ")")
-						: "";
+				const s = gitStats;
+				let stats = "";
+				if (s && s.status)
+					stats = theme.fg("dim", " [") + gitColor(s.status) + theme.fg("dim", "]");
+				if (s && (s.add || s.del))
+					stats +=
+						theme.fg("dim", "(") +
+						theme.fg("success", `+${s.add}`) +
+						" " +
+						theme.fg("error", `−${s.del}`) +
+						theme.fg("dim", ")");
 				const gitLabel = glyphs.git ? `${glyphs.git} ${branch}` : branch;
 				place += theme.fg("muted", " on ") + gitColor(gitLabel) + stats;
 			}
@@ -470,6 +455,7 @@ const createCustomFooterFactory =
 			},
 			dispose(): void {
 				disposed = true;
+				gitRefresher.dispose();
 				usageAbort?.abort();
 				usageAbort = undefined;
 				clearInterval(gitRefreshTimer);

package/extensions/feature/shell/git-stats.ts

@@ -0,0 +1,162 @@
+import { execFile } from "node:child_process";
+import { promisify } from "node:util";
+import type { FooterGitStatsMode } from "../../config/config.ts";
+
+export type GitStats = { add: number; del: number; status?: string };
+
+const execFileAsync = promisify(execFile);
+const BRANCH_BASE_REFS = ["refs/remotes/origin/HEAD", "refs/heads/main", "refs/heads/master"];
+
+export function parseGitStats(stdout: string): GitStats {
+	let add = 0;
+	let del = 0;
+	for (const line of stdout.split("\n")) {
+		const match = line.match(/^(\d+)\s+(\d+)/);
+		if (match) {
+			add += Number(match[1]);
+			del += Number(match[2]);
+		}
+	}
+	return { add, del };
+}
+
+const CONFLICT_CODES = new Set(["DD", "AU", "UD", "UA", "DU", "AA", "UU"]);
+
+/**
+ * git status --porcelain --branch 的第一行带分支头（## branch...origin/branch [ahead N, behind M]），
+ * 其余行是 XY 文件状态。返回 Starship 风格的状态符号串（= ! ? ⇡⇣），无变化时 undefined。
+ */
+export function parseGitStatus(stdout: string): string | undefined {
+	let conflicted = false;
+	let modified = false;
+	let untracked = false;
+	let ahead: number | undefined;
+	let behind: number | undefined;
+	for (const line of stdout.split("\n")) {
+		if (line.startsWith("## ")) {
+			ahead = Number(line.match(/ahead (\d+)/)?.[1]) || undefined;
+			behind = Number(line.match(/behind (\d+)/)?.[1]) || undefined;
+			continue;
+		}
+		const code = line.slice(0, 2);
+		if (code === "??") untracked = true;
+		else if (CONFLICT_CODES.has(code)) {
+			// 冲突文件必然也有未提交内容，! 与 = 同时出现
+			conflicted = true;
+			modified = true;
+		} else if (line.trim()) modified = true;
+	}
+	let status = "";
+	if (conflicted) status += "=";
+	if (modified) status += "!";
+	if (untracked) status += "?";
+	if (ahead) status += `⇡${ahead}`;
+	if (behind) status += `⇣${behind}`;
+	return status || undefined;
+}
+
+/** Read only local refs and tracked files; never fetch or change the index. */
+export async function readGitStats(
+	cwd: string,
+	mode: FooterGitStatsMode,
+	signal?: AbortSignal,
+): Promise<GitStats | undefined> {
+	const git = async (args: string[]) => {
+		const { stdout } = await execFileAsync("git", args, {
+			cwd,
+			timeout: 2000,
+			maxBuffer: 16 * 1024 * 1024,
+			signal,
+		});
+		return stdout.trim();
+	};
+	try {
+		let base = "HEAD";
+		if (mode === "branch") {
+			let baseCommit: string | undefined;
+			for (const ref of BRANCH_BASE_REFS) {
+				try {
+					baseCommit = await git(["rev-parse", "--verify", `${ref}^{commit}`]);
+					break;
+				} catch {
+					if (signal?.aborted) return undefined;
+					// Missing/dangling remote HEAD: try the local default branches.
+				}
+			}
+			if (!baseCommit) return undefined;
+			base = await git(["merge-base", "HEAD", baseCommit]);
+		}
+		// One comparison includes committed + staged + unstaged net changes,
+		// without double-counting edits that are later reverted. Untracked files are excluded.
+		const [numstat, statusOut] = await Promise.all([
+			git(["diff", "--numstat", base, "--"]),
+			git(["status", "--porcelain", "--branch"]).catch(() => ""),
+		]);
+		if (signal?.aborted) return undefined;
+		const stats = parseGitStats(numstat);
+		const status = parseGitStatus(statusOut);
+		return status ? { ...stats, status } : stats;
+	} catch {
+		// Non-repository, unborn HEAD, unrelated histories, timeout, etc.
+		return undefined;
+	}
+}
+
+/** Coalesce overlapping refreshes and reject stale results after a mode/branch change. */
+export function createGitStatsRefresher(options: {
+	getMode: () => FooterGitStatsMode;
+	query: (mode: FooterGitStatsMode, signal: AbortSignal) => Promise<GitStats | undefined>;
+	onChange: (stats: GitStats | undefined) => void;
+}): { refresh: (reset?: boolean) => void; dispose: () => void } {
+	let stats: GitStats | undefined;
+	let mode = options.getMode();
+	let generation = 0;
+	let running = false;
+	let pending = false;
+	let disposed = false;
+	let controller: AbortController | undefined;
+	const publish = (next: GitStats | undefined) => {
+		if (stats?.add === next?.add && stats?.del === next?.del && stats?.status === next?.status)
+			return;
+		stats = next;
+		options.onChange(next);
+	};
+	const refresh = (reset = false) => {
+		if (disposed) return;
+		const nextMode = options.getMode();
+		if (reset || mode !== nextMode) publish(undefined);
+		mode = nextMode;
+		const request = ++generation;
+		if (running) {
+			pending = true;
+			return;
+		}
+		running = true;
+		const queryController = new AbortController();
+		controller = queryController;
+		void (async () => {
+			let next: GitStats | undefined;
+			try {
+				next = await options.query(nextMode, queryController.signal);
+			} catch {
+				// Failed queries clear the old numbers rather than leaving a stale chip.
+			} finally {
+				if (!disposed && request === generation && nextMode === options.getMode()) publish(next);
+				running = false;
+				controller = undefined;
+				if (pending && !disposed) {
+					pending = false;
+					refresh();
+				}
+			}
+		})();
+	};
+	return {
+		refresh,
+		dispose: () => {
+			disposed = true;
+			generation++;
+			controller?.abort();
+		},
+	};
+}

package/extensions/renderer/compact-mode.ts

@@ -42,6 +42,7 @@ import {
 	isRichDiffComponent,
 } from "./tool/diff/diff-renderer.ts";
 import { renderRichToolResult } from "./tool/diff/index.ts";
+import { displayConfigCacheKey } from "./tool/diff/diff-component.ts";
 import type { WriteExecutionMetadataStore } from "./tool/diff/write-execution.ts";
 import { isToolCallHovered } from "./mouse/hover.ts";
 import { getToolMouseTui } from "./mouse/scroll.ts";
@@ -710,8 +711,9 @@ function compactEditWriteLine(
 	// 展开卡 Box(1,1) 已 pad；折叠行自己留 1 格前导空格
 	const iconPart = `${options.flushLeft ? "" : " "}${theme.fg(iconColor, icon)} `;
 	const namePart = theme.fg("toolTitle", name);
-	const hintText =
-		options.hint !== false && component.expanded !== true ? ` · ${showMoreHintText()}` : "";
+	const clickable = options.hint !== false && component.expanded !== true;
+	const clickText = clickable ? showMoreHintText() : "";
+	const hintText = clickable ? ` · ${clickText}` : "";
 	const fixedWidth =
 		visibleWidth(iconPart) +
 		visibleWidth(namePart) +
@@ -720,7 +722,11 @@ function compactEditWriteLine(
 	const pathWidth = Math.max(0, width - fixedWidth - (path ? 1 : 0));
 	const pathPart =
 		pathWidth > 0 && path ? ` ${formatDisplayPath(path, component.cwd, pathWidth)}` : "";
-	const line = `${iconPart}${namePart}${theme.fg("toolTitle", pathPart)}${statsStyled}${hintText ? theme.fg("dim", hintText) : ""}`;
+	// 圆点保持 dim；hover 只高亮可点击文字，与 compact 摘要行一致
+	const hintPart = clickable
+		? `${theme.fg("dim", " · ")}${theme.fg(isToolCallHovered(component.toolCallId) ? "text" : "dim", clickText)}`
+		: "";
+	const line = `${iconPart}${namePart}${theme.fg("toolTitle", pathPart)}${statsStyled}${hintPart}`;
 	return ["", truncateToWidth(line, width, "")];
 }
 
@@ -735,6 +741,7 @@ type CompactEditPaintHit = {
 	theme: unknown;
 	/** 展开卡的背景槽位同样参与命中判断。 */
 	bgSlot: string;
+	diffConfigKey: string;
 	expanded: boolean;
 	result: unknown;
 	isPartial: boolean;
@@ -766,6 +773,7 @@ function compactEditWriteLines(
 	const hover = isToolCallHovered(component.toolCallId);
 	const ioHover = compactEditIoHover(component);
 	const theme = themeOf();
+	const diffConfigKey = displayConfigCacheKey(getToolDisplayConfig());
 	if (!pending) {
 		const hit = compactEditPaintCache.get(component);
 		if (
@@ -773,6 +781,7 @@ function compactEditWriteLines(
 			hit.width === width &&
 			hit.theme === theme &&
 			hit.bgSlot === config.expandedCardBackground &&
+			hit.diffConfigKey === diffConfigKey &&
 			hit.expanded === expanded &&
 			hit.result === component.result &&
 			hit.isPartial === isPartial &&
@@ -789,6 +798,7 @@ function compactEditWriteLines(
 			width,
 			theme,
 			bgSlot: config.expandedCardBackground,
+			diffConfigKey,
 			expanded,
 			result: component.result,
 			isPartial,

package/extensions/renderer/tool/diff/diff-edit-render.ts

@@ -1,6 +1,7 @@
-import { Text, type Component } from "@earendil-works/pi-tui";
+import { Text, visibleWidth, type Component } from "@earendil-works/pi-tui";
 import type { EditToolDetails } from "@earendil-works/pi-coding-agent";
 import { sanitizeToolResultText } from "../../../utils/tool-result-sanitize.ts";
+import { showMoreHintText } from "../show-more-hint.ts";
 import {
 	getLineNumberWidth,
 	parseDiff,
@@ -20,6 +21,7 @@ import {
 import { renderDiffFrameLine, renderHeaderRows, renderSingleDiffRow } from "./diff-header.ts";
 import {
 	applyLineLimit,
+	clampDiffLineToWidth,
 	clampDiffLinesToWidth,
 	resolveDiffDisplayLimit,
 	resolveDiffProcessBudget,
@@ -81,6 +83,33 @@ export function countEditDiffStats(
 	}
 }
 
+/** Keep counts in the result row: the default-mode edit title does not include them. */
+function renderEditCollapsedSummaryLine(
+	stats: ParsedDiff["stats"],
+	width: number,
+	theme: DiffTheme,
+	hovered: boolean,
+): string {
+	const counts = `+${stats.added} -${stats.removed}`;
+	const hint = showMoreHintText();
+	const candidates = [
+		`↳ diff ${counts} · ${hint}`,
+		`↳ ${counts} · ${hint}`,
+		`${counts} · ${hint}`,
+		`↳ diff ${counts}`,
+		counts,
+		"diff",
+		"…",
+	];
+	const text = candidates.find((candidate) => visibleWidth(candidate) <= width) ?? "";
+	const hintIndex = text.lastIndexOf(hint);
+	const styled =
+		hovered && hintIndex >= 0
+			? theme.fg("muted", text.slice(0, hintIndex)) + theme.fg("text", hint)
+			: theme.fg("muted", text);
+	return clampDiffLineToWidth(styled, width);
+}
+
 export function renderEditDiffResult(
 	details: unknown,
 	options: DiffRenderOptions,
@@ -110,25 +139,33 @@ export function renderEditDiffResult(
 		return new Text(theme.fg("muted", "↳ no diff data"), 0, 0);
 	}
 
-	const splitRows = buildSplitRows(renderEntries);
-	const showHashlineAnchors =
-		options.expanded === true &&
-		renderEntries.some((entry) => entry.kind === "line" && !!entry.hashlineAnchorContent);
-	const lineNumberWidth = getLineNumberWidth(renderEntries, showHashlineAnchors);
 	const palette = resolveDiffPalette(theme);
 	// Rich diffs use ccstyle's self shell. Keep the panel transparent so the
 	// separator cannot leak toolSuccessBg across the entire new column.
 	const containerBgAnsi = undefined;
 	const language = resolveLanguageFromPath(options.filePath);
 	const cache = createDiffRenderCache();
-	const highlightLine = createCodeLineHighlighter(language, theme, renderEntries, () => {
-		cache.invalidate();
-		options.invalidate?.();
-	});
+	// Summary-only previews need parsed counts, not split rows or syntax highlighting.
+	// Keep detailed data lazy so a live setting change can still reveal the same diff.
+	function buildDetailedData() {
+		const showHashlineAnchors =
+			options.expanded === true &&
+			renderEntries.some((entry) => entry.kind === "line" && !!entry.hashlineAnchorContent);
+		return {
+			splitRows: buildSplitRows(renderEntries),
+			showHashlineAnchors,
+			lineNumberWidth: getLineNumberWidth(renderEntries, showHashlineAnchors),
+			highlightLine: createCodeLineHighlighter(language, theme, renderEntries, () => {
+				cache.invalidate();
+				options.invalidate?.();
+			}),
+		};
+	}
+	let detailedData: ReturnType<typeof buildDetailedData> | undefined;
 
 	return {
 		[RICH_DIFF_COMPONENT]: true,
-		/** 鼠标层只在真正的 remainder 行上提供展开入口。 */
+		/** Only the current summary/remainder row is an expand target, never diff body text. */
 		isCollapsedHintLine(plainLine: string): boolean {
 			const hint = cache.getHintLine();
 			return hint !== undefined && normalizeCollapsedHintLine(plainLine) === hint;
@@ -147,6 +184,20 @@ export function renderEditDiffResult(
 				return cached;
 			}
 
+			// Like write's zero-line preview, handle this before the normal body limiter.
+			if (!options.expanded && live.editDiffCollapsedLines === 0) {
+				const summary = renderEditCollapsedSummaryLine(parsed.stats, safeWidth, theme, hovered);
+				return cache.set(
+					safeWidth,
+					options.expanded,
+					mode,
+					configKey,
+					hovered,
+					[summary],
+					normalizeCollapsedHintLine(summary),
+				);
+			}
+
 			if (mode === "summary") {
 				return cache.set(
 					safeWidth,
@@ -166,6 +217,8 @@ export function renderEditDiffResult(
 				);
 			}
 
+			const { splitRows, showHashlineAnchors, lineNumberWidth, highlightLine } = (detailedData ??=
+				buildDetailedData());
 			const headerRows = renderHeaderRows(parsed.stats, mode, safeWidth, theme);
 			const displayLimit = resolveDiffDisplayLimit(options.expanded, live.editDiffCollapsedLines);
 			const processBudget = resolveDiffProcessBudget(displayLimit, wordWrap);

package/extensions/renderer/tool/names.ts

@@ -5,9 +5,9 @@ import { config } from "../../config/config.ts";
 import { oneLine } from "../../utils/format.ts";
 import { headTruncateToWidth } from "./result.ts";
 
-/** inputClip=0 时不设字符上限，交给渲染时的实际宽度截断。 */
+/** toolLabelClip=0 时不设字符上限，交给渲染时的实际宽度截断。 */
 function clipLimit(): number {
-	return config.inputClip > 0 ? config.inputClip : Number.POSITIVE_INFINITY;
+	return config.toolLabelClip > 0 ? config.toolLabelClip : Number.POSITIVE_INFINITY;
 }
 
 function clip(value: unknown): string {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pi-cc-extensions",
-	"version": "0.9.11",
+	"version": "0.9.12",
 	"license": "MIT",
 	"description": "Claude Code-style TUI output with some personal touches and handy utilities.",
 	"type": "module",