pi-cc-extensions 0.9.11 → 1.0.0

package/README.en.md

@@ -61,14 +61,15 @@ 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
+  "stickyUserMessage": true, // fullscreen: pin a user message's first line once it scrolls off the top edge, until the next one takes over
 
   // 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 +84,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)
@@ -91,7 +93,7 @@ Renderer snapshots for `on` / `compact` modes: [default](./docs/tool-render-exam
 ```
 
 > [!TIP]
-> **Fullscreen**: click `click to show more` to expand tool cards, thinking, Skill, and compact summaries. An expanded diff always shows every line; when expanded Input/Output exceeds the line cap, the footer `… +N more lines · click to show more` opens a full preview. Click to collapse (dragging inside the card selects text).
+> **Fullscreen**: click `click to show more` to expand tool cards, thinking, Skill, and compact summaries. An expanded diff always shows every line; when expanded Input/Output exceeds the line cap, the footer `… +N more lines · click to show more` opens a full preview. Click to collapse.
 
 > [!NOTE]
 > **Mermaid rendering**: set `markdown.mermaid` to `final` via `~/.pi/agent/settings.json` or the Mermaid diagrams option in `/settings`. Default `streaming` redraws per frame; `final` renders once at completion.

package/README.md

@@ -61,14 +61,15 @@ 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）开关
+  "stickyUserMessage": true,              // fullscreen：userMessage 正文首行滚出视口上沿后钉住，直到下一条指令接手
 
   // 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 +84,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 后）
@@ -91,7 +93,7 @@ pi install git:github.com/minuque/pi-cc-extensions
 ```
 
 > [!TIP]
-> **全屏模式**：单击 `click to show more` 展开工具卡、思考、Skill 和 compact 摘要；工具卡展开态 diff 全量显示，Input/Output 超行时末行 `… +N more lines · click to show more` 打开全量预览，单击收起（卡内拖动为选中文本）。
+> **全屏模式**：单击 `click to show more` 展开工具卡、思考、Skill 和 compact 摘要；工具卡展开态 diff 全量显示，Input/Output 超行时末行 `… +N more lines · click to show more` 打开全量预览，单击收起。
 
 > [!NOTE]
 > **Mermaid 渲染**：建议把 `markdown.mermaid` 设为 `final`（`~/.pi/agent/settings.json` 或 `/settings` 面板的 Mermaid diagrams 选项）。默认 `streaming` 逐帧重绘，`final` 渲染最终版更稳定。

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,12 +59,14 @@ export type Config = {
 	expandedCardBackground: ThemeBg;
 	expandedInputMaxLines: number;
 	expandedOutputMaxLines: number;
-	inputClip: number;
+	toolLabelClip: number;
 	useSummaryTitlesAsThinkingTitle: boolean;
 	previewLines: number;
 	animationIntervalMs: number;
 	dimThinkingText: boolean;
 	showStartupHeader: boolean;
+	/** fullscreen：userMessage 正文首行滚出视口上沿后钉住，直到下一条指令接手。 */
+	stickyUserMessage: boolean;
 	enableSessionReference: boolean;
 	enableSubagentAutocomplete: boolean;
 	enableContextCommand: boolean;
@@ -75,6 +79,7 @@ export type Config = {
 	/** 1 单位费用对应的显示币种数量。null 只换符号、不乘倍率。 */
 	footerCurrencyRate: number | null;
 	footerNerdIcons: boolean;
+	footerGitStatsMode: FooterGitStatsMode;
 	footerHiddenKeys: string[];
 	footerLine1Keys: string[];
 	footerLine2Keys: string[];
@@ -87,8 +92,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 +118,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,12 +149,13 @@ export const DEFAULT_CONFIG: Config = {
 	expandedCardBackground: "userMessageBg",
 	expandedInputMaxLines: 5,
 	expandedOutputMaxLines: 10,
-	inputClip: 0,
+	toolLabelClip: 0,
 	useSummaryTitlesAsThinkingTitle: true,
 	previewLines: 3,
 	animationIntervalMs: 90,
 	dimThinkingText: false,
 	showStartupHeader: true,
+	stickyUserMessage: true,
 	enableSessionReference: true,
 	enableSubagentAutocomplete: true,
 	enableContextCommand: true,
@@ -159,6 +166,7 @@ export const DEFAULT_CONFIG: Config = {
 	footerCurrency: "USD",
 	footerCurrencyRate: null,
 	footerNerdIcons: true,
+	footerGitStatsMode: "working",
 	...DEFAULT_FOOTER_CHIP_LAYOUT,
 };
 
@@ -174,10 +182,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 +236,7 @@ export function normalizeConfig(input: unknown): Config {
 		editDiffCollapsedLines: pickPositiveInt(
 			source.editDiffCollapsedLines,
 			DEFAULT_CONFIG.editDiffCollapsedLines,
-			1,
+			0,
 			500,
 		),
 		writeDiffCollapsedLines: pickPositiveInt(
@@ -261,7 +269,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,
@@ -275,6 +285,7 @@ export function normalizeConfig(input: unknown): Config {
 		),
 		dimThinkingText: source.dimThinkingText === true,
 		showStartupHeader: source.showStartupHeader !== false,
+		stickyUserMessage: source.stickyUserMessage !== false,
 		enableSessionReference: source.enableSessionReference !== false,
 		enableSubagentAutocomplete: source.enableSubagentAutocomplete !== false,
 		enableContextCommand: source.enableContextCommand !== false,
@@ -285,6 +296,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,12 +342,13 @@ 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`,
 		`thinkingDim=${source.dimThinkingText ? "on" : "off"}`,
 		`startupHeader=${source.showStartupHeader ? "on" : "off"}`,
+		`stickyUserMessage=${source.stickyUserMessage ? "on" : "off"}`,
 		`sessionRef=${source.enableSessionReference ? "on" : "off"}`,
 		`subagentAuto=${source.enableSubagentAutocomplete ? "on" : "off"}`,
 		`context=${source.enableContextCommand ? "on" : "off"}`,
@@ -342,6 +359,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 注入的渲染副作用，面板自身不触碰渲染状态。 */
@@ -65,7 +68,7 @@ export type CcstylePanelHooks = {
 
 function modeSettingDescription(mode: CompactStyleMode): string {
 	if (mode === "compact") {
-		return "(Experimental) One summary line per assistant round; edit/write reuse the same Diff preview settings as on.";
+		return "One summary line per assistant round; edit/write reuse the same Diff preview settings as on.";
 	}
 	if (mode === "off") {
 		return "Pi native tool rendering. Diff options below still apply independently.";
@@ -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.`;
 }
@@ -413,8 +422,8 @@ export async function showCcstylePanel(
 			id: "mode",
 			label: "Mode",
 			description: modeSettingDescription(config.mode),
-			currentValue: config.mode === "compact" ? "compact (Experimental)" : config.mode,
-			values: ["on", "compact (Experimental)", "off"],
+			currentValue: config.mode,
+			values: ["on", "compact", "off"],
 		};
 		// Tracks whether a nested submenu is open so Tab switches sections
 		// only at the top level (mirrors Zentui settings: Tab = switch sections).
@@ -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) =>
@@ -586,6 +595,15 @@ export async function showCcstylePanel(
 			currentValue: config.showStartupHeader ? "on" : "off",
 			values: ["on", "off"],
 		};
+		const stickyUserMessageSetting = {
+			id: "stickyUserMessage",
+			label: "Sticky user message",
+			description: config.stickyUserMessage
+				? "Fullscreen: pin a user message's first line once it scrolls off the top edge, until the next one takes over."
+				: "User messages scroll normally.",
+			currentValue: config.stickyUserMessage ? "on" : "off",
+			values: ["on", "off"],
+		};
 
 		// 额外功能开关：注册于扩展加载期，切换后需重启（/reload）生效。
 		const sessionReferenceToggle = featureToggleSetting(
@@ -705,6 +723,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 +794,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,16 +821,14 @@ 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 值。
-					const mode: CompactStyleMode =
-						value === "compact (Experimental)" ? "compact" : (value as CompactStyleMode);
+					const mode = value as CompactStyleMode;
 					modeSetting.description = modeSettingDescription(mode);
 					hooks.applyStyleMode(mode, ctx, toolGrouping);
 					return;
@@ -825,7 +856,7 @@ export async function showCcstylePanel(
 						editDiffCollapsedLines: pickPositiveInt(
 							value,
 							DEFAULT_CONFIG.editDiffCollapsedLines,
-							1,
+							0,
 							500,
 						),
 					});
@@ -906,6 +937,13 @@ export async function showCcstylePanel(
 						? "Thinking text uses the theme's dim color."
 						: "Keep the default thinking text color.";
 					break;
+				case "stickyUserMessage": {
+					updateConfig({ stickyUserMessage: value === "on" });
+					stickyUserMessageSetting.description = config.stickyUserMessage
+						? "Fullscreen: pin a user message's first line once it scrolls off the top edge, until the next one takes over."
+						: "User messages scroll normally.";
+					break;
+				}
 				case "showStartupHeader": {
 					const enabled = value === "on";
 					updateConfig({ showStartupHeader: enabled });
@@ -950,7 +988,8 @@ export async function showCcstylePanel(
 					expandedOutputSetting,
 					expandedMaxSetting,
 					expandedCardBgSetting,
-					inputClipSetting,
+					toolLabelClipSetting,
+					stickyUserMessageSetting,
 					startupHeaderSetting,
 				],
 			},
@@ -984,6 +1023,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);