@herbertgao/pi-extensions 2026.10.4 → 2026.10.6

package/node_modules/@herbertgao/pi-cc-extensions/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/node_modules/@herbertgao/pi-cc-extensions/extensions/feature/shell/token-rate.ts

@@ -0,0 +1,204 @@
+/**
+ * footer 输出速率的共享状态：working-message 负责采集，footer 负责显示。
+ *
+ * average：一次用户指令的墙钟平均（工具等待计入分母），显示 `avg`。
+ * live：最近 1 秒的瞬时速率，生成期暂停时钟，显示 `live`；指令结束定格为整段平均。
+ * token 与 working-message 同源：优先 provider `usage.output`，否则按 delta 增量估算
+ * （CJK 1 token，其余 chars/4）。provider 值回填到本段消息窗口。
+ * Pi 的 turn 是单次 assistant 消息，工具调用结束会开新 turn。token 跨 turn 累加，
+ * 计时与 TTFT 直到下一条用户指令才重置。
+ * TTFT：用户指令开始到第一个内容块（text/thinking/toolcall）开始的毫秒数，
+ * 同一指令内只记第一次，定格后保留到下一条指令覆盖。
+ */
+
+export type TokenRateMode = "average" | "live";
+
+const LIVE_WINDOW_MS = 1_000;
+const MIN_SPAN_MS = 250;
+const CJK_CHARS =
+	/[\u3000-\u30ff\u3400-\u4dbf\u4e00-\u9fff\uac00-\ud7af\uf900-\ufaff\uff00-\uffef]/g;
+
+interface TokenSample {
+	t: number;
+	cum: number;
+}
+
+let runStartTime = 0;
+let carriedTokens = 0;
+let currentTokens = 0;
+let pauseStartedAt = 0;
+/** 并行工具调用数；>0 时瞬时采样暂停。 */
+let activeTools = 0;
+let lastRate = 0;
+let lastLiveRate = 0;
+let firstTokenAt = 0;
+let samples: TokenSample[] = [];
+let usageAnchorTime = 0;
+let usageAnchorTokens = 0;
+let countedUsage = 0;
+
+/** 新的用户指令：重置计时、累计 token、定格值与 TTFT。 */
+export function resetTokenRate(startAt = 0): void {
+	runStartTime = startAt;
+	carriedTokens = 0;
+	currentTokens = 0;
+	pauseStartedAt = 0;
+	activeTools = 0;
+	lastRate = 0;
+	lastLiveRate = 0;
+	firstTokenAt = 0;
+	samples = [];
+	usageAnchorTime = 0;
+	usageAnchorTokens = 0;
+	countedUsage = 0;
+}
+
+/**
+ * 一段 assistant 回复结束：保留计时与 TTFT，把本段已计 token 结算进累计。
+ * 下一段的 token 从 0 重计，采样时加回来。
+ */
+export function carryTokenRate(): void {
+	if (currentTokens > 0) carriedTokens += currentTokens;
+	currentTokens = 0;
+	countedUsage = 0;
+}
+
+/** 工具开始执行：计数 +1，第一个工具才真正暂停瞬时采样。 */
+export function pauseTokenRate(now = Date.now()): void {
+	if (!runStartTime) return;
+	activeTools += 1;
+	if (activeTools === 1 && !pauseStartedAt) pauseStartedAt = now;
+}
+
+/** 工具执行结束：计数 -1，最后一个工具结束才恢复采样。 */
+export function resumeTokenRate(): void {
+	activeTools = Math.max(0, activeTools - 1);
+	if (activeTools === 0 && pauseStartedAt) {
+		pauseStartedAt = 0;
+	}
+}
+
+/** 本指令第一个内容块开始时调用；同一指令后续消息不覆盖。 */
+export function markFirstToken(now = Date.now()): void {
+	if (runStartTime && !firstTokenAt) firstTokenAt = now;
+}
+
+function estimateTokens(text: string): number {
+	if (!text) return 0;
+	const cjk = text.match(CJK_CHARS)?.length ?? 0;
+	return Math.ceil(cjk + (text.length - cjk) / 4);
+}
+
+function pushSample(time: number, cum: number): void {
+	samples.push({ t: time, cum });
+	const cutoff = time - LIVE_WINDOW_MS;
+	while (samples.length > 1 && samples[0]!.t < cutoff) samples.shift();
+}
+
+function updateRates(now: number): void {
+	const total = carriedTokens + currentTokens;
+	const elapsed = (now - runStartTime) / 1000;
+	if (elapsed > 0) lastRate = total / elapsed;
+	if (samples.length < 2) return;
+	const first = samples[0]!;
+	const last = samples[samples.length - 1]!;
+	const span = last.t - first.t;
+	if (span >= MIN_SPAN_MS) {
+		lastLiveRate = ((last.cum - first.cum) * 1000) / span;
+	}
+}
+
+/** 每个文本增量采样一次。工具暂停期的增量只累计 token，不进窗口。 */
+export function sampleTokenDelta(delta: string, now = Date.now()): void {
+	if (!runStartTime) return;
+	const added = estimateTokens(delta);
+	if (added <= 0) return;
+	currentTokens += added;
+	if (pauseStartedAt) return;
+	pushSample(now, carriedTokens + currentTokens);
+	updateRates(now);
+}
+
+/**
+ * 记录本段 provider `usage.output`。usage 按锚点摊回窗口：
+ * 首次报告从消息起点铺到现在，之后每次把增量摊在上次报告之后。
+ */
+export function recordProviderUsage(output: number, now = Date.now()): void {
+	if (!runStartTime || output <= 0) return;
+	const firstReport = countedUsage === 0;
+	const jump = output - countedUsage;
+	countedUsage = output;
+	// provider 是权威计数；首次报告以它为准，之后增量接管。
+	currentTokens = output;
+	if (firstReport) {
+		samples = samples.filter((sample) => sample.t < usageAnchorTime);
+		pushSample(usageAnchorTime, carriedTokens + usageAnchorTokens);
+	}
+	const span = Math.max(now - usageAnchorTime, 1);
+	const count = Math.min(Math.max(Math.ceil(jump / 16), 1), 32);
+	const base = firstReport
+		? carriedTokens + usageAnchorTokens
+		: carriedTokens + currentTokens - jump;
+	for (let i = 1; i <= count; i++) {
+		pushSample(usageAnchorTime + (span * i) / count, base + (jump * i) / count);
+	}
+	usageAnchorTime = now;
+	usageAnchorTokens = currentTokens;
+	updateRates(now);
+}
+
+/** 本段消息开始：重置 provider 锚点。 */
+export function startMessageSegment(now = Date.now()): void {
+	if (!runStartTime) return;
+	usageAnchorTime = now;
+	usageAnchorTokens = currentTokens;
+	countedUsage = 0;
+}
+
+/** 整段指令的累计 token 数：已结转段 + 当前段。 */
+export function totalTokens(): number {
+	return carriedTokens + currentTokens;
+}
+
+/** average 的当前值：指令中为实时平均，指令外为上一段定格值。 */
+export function currentTokenRate(): number {
+	return lastRate;
+}
+
+/**
+ * 按显示模式取值。live 在生成中取窗口速率，窗口数据不足或指令结束后回到整段平均。
+ * 工具暂停期间时钟不动，显示上一条窗口值。
+ */
+export function displayTokenRate(mode: TokenRateMode): number {
+	if (mode === "live" && samples.length >= 2 && lastLiveRate > 0) {
+		return lastLiveRate;
+	}
+	return lastRate;
+}
+
+/** 本指令 TTFT（毫秒）；未出首 token 或无活动指令返回 0。定格后保留。 */
+export function currentTtftMs(): number {
+	if (!runStartTime || !firstTokenAt) return 0;
+	return Math.max(0, firstTokenAt - runStartTime);
+}
+
+/** 不足 1 秒用毫秒，否则用一位小数的秒。 */
+export function formatTtft(ttftMs: number): string {
+	if (ttftMs < 1000) return `${Math.round(ttftMs)}ms`;
+	return `${(ttftMs / 1000).toFixed(1)}s`;
+}
+
+/** `avg 1.2k tok/s (TTFT: 812ms)`；无数据显示空串，未出首 token 或 showTtft 为 false 时无括号段。 */
+export function formatTokenRate(
+	rate: number,
+	ttftMs = 0,
+	mode: TokenRateMode = "average",
+	showTtft = true,
+): string {
+	if (!Number.isFinite(rate) || rate <= 0) return "";
+	const value = rate >= 1000 ? `${(rate / 1000).toFixed(1)}k` : `${Math.round(rate)}`;
+	const ttft =
+		showTtft && Number.isFinite(ttftMs) && ttftMs > 0 ? ` (TTFT: ${formatTtft(ttftMs)})` : "";
+	const label = mode === "live" ? "live" : "avg";
+	return `${label} ${value} tok/s${ttft}`;
+}

package/node_modules/@herbertgao/pi-cc-extensions/extensions/feature/shell/working-message.ts

@@ -1,47 +1,26 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { getCompactRunStatusText } from "../../renderer/compact-mode.ts";
+import { formatDuration, formatTokenCount } from "../../utils/format.ts";
 import {
-	fullscreenLazyTui,
-	getToolMouseTui,
-	isFullscreenAtBottom,
-} from "../../renderer/mouse/scroll.ts";
-import { formatDuration } from "../../utils/format.ts";
+	resetTokenRate,
+	carryTokenRate,
+	pauseTokenRate,
+	resumeTokenRate,
+	markFirstToken,
+	sampleTokenDelta,
+	recordProviderUsage,
+	startMessageSegment,
+	totalTokens,
+} from "./token-rate.ts";
 
 const REFRESH_INTERVAL_MS = 1_000;
 /** Elapsed time is only shown once the turn has run this long. */
 const SHOW_TIMER_AFTER_MS = 3_000;
 
-function formatCount(value: number): string {
-	return new Intl.NumberFormat("en-US").format(value);
-}
-
-type ContentBlock = {
-	type?: unknown;
-	text?: unknown;
-	thinkingSignature?: { body?: unknown };
-};
-
 type StreamMessage = {
 	content?: unknown;
 	usage?: { output?: unknown };
 };
 
-/** 每个 content index 的可见文本/思考长度；无对应块的 index 保持稀疏洞。 */
-function textBlockLengths(message: StreamMessage): number[] {
-	const content = message.content;
-	if (!Array.isArray(content)) return [];
-	const lengths: number[] = [];
-	for (let index = 0; index < content.length; index++) {
-		const block = content[index] as ContentBlock;
-		if (block?.type === "text" && typeof block.text === "string") {
-			lengths[index] = block.text.length;
-		} else if (block?.type === "thinking" && block.thinkingSignature?.body) {
-			lengths[index] = (block.thinkingSignature.body as string).length;
-		}
-	}
-	return lengths;
-}
-
 function outputUsage(message: StreamMessage): number {
 	const value = Number(message?.usage?.output);
 	return Number.isFinite(value) && value > 0 ? Math.round(value) : 0;
@@ -55,60 +34,30 @@ type WorkingUi = {
  * Extend Pi's footer working row while preserving its spinner and "Working...":
  * `⠋ Working... (↓ 1,234 tokens · 12s)`
  *
- * Live tokens use the same chars/4 estimate as pi-claude-code-ui, then switch to
- * provider `usage.output` whenever the stream exposes an actual count.
- */
+ * token 数直接读 token-rate 的累计（估算 → provider usage 同源），不再本地重数。 */
 export default function (pi: ExtensionAPI): void {
 	let turnActive = false;
 	let agentStartTime = 0;
 	let turnStartTime = 0;
-	let responseLength = 0;
-	let responseTextBlockLengths: number[] = [];
-	let providerOutputTokens = 0;
+	/** 当前用户指令的起点；工具调用后的 turn 复用它，直到下一条指令。 */
+	let rateRunStartTime = 0;
 	let refreshTimer: ReturnType<typeof setTimeout> | null = null;
 	let lastMessage: string | null = null;
 	let activeCtx: { ui: WorkingUi | undefined; hasUI: boolean } | null = null;
 
 	function tokenCount(): number {
-		return providerOutputTokens || Math.max(0, Math.round(responseLength / 4));
-	}
-
-	function setTextBlockLength(index: number, length: number): void {
-		const previous = responseTextBlockLengths[index] ?? 0;
-		responseTextBlockLengths[index] = Math.max(0, length);
-		responseLength = Math.max(0, responseLength + responseTextBlockLengths[index] - previous);
-	}
-
-	function resetResponseTracking(message?: StreamMessage): void {
-		responseTextBlockLengths = message ? textBlockLengths(message) : [];
-		responseLength = responseTextBlockLengths.reduce((sum, length) => sum + length, 0);
-		providerOutputTokens = message ? outputUsage(message) : 0;
+		return totalTokens();
 	}
 
 	function updateProviderUsage(message: StreamMessage): void {
 		const output = outputUsage(message);
-		if (output > 0) providerOutputTokens = output;
-	}
-
-	/**
-	 * 摘要行滚出视口才镜像：仅 fullscreen 且已离开 transcript 底部。
-	 * regular 没有“离开底部”信号（transcript 在终端回滚区），保持 Pi 默认文案。
-	 */
-	function compactMirrorText(): string | undefined {
-		const tui = getToolMouseTui();
-		if (!tui || !fullscreenLazyTui(tui) || isFullscreenAtBottom(tui)) return undefined;
-		return getCompactRunStatusText();
+		if (output > 0) recordProviderUsage(output);
 	}
 
 	function buildWorkingMessage(): string {
-		// turn_end 后迟到的 provider 事件不得再驱动 footer（否则渲染出 epoch 级计时）。
-		if (!turnActive) return "";
 		const parts: string[] = [];
 		const tokens = tokenCount();
-		if (tokens > 0) parts.push(`↓ ${formatCount(tokens)} tokens`);
-		// compact 活动回合且已滚出摘要行：直接用摘要行文案（自带回合时长，不叠 agent 计时）。
-		const compactStatus = compactMirrorText();
-		if (compactStatus) return [compactStatus, ...parts].join(" · ");
+		if (tokens > 0) parts.push(`↓ ${formatTokenCount(tokens)} tokens`);
 		const elapsed = Date.now() - (agentStartTime || turnStartTime);
 		if (elapsed >= SHOW_TIMER_AFTER_MS || tokens > 0) {
 			// formatDuration 低于 1 秒返回 ""，此处回退 "0s" 保持计时器连续跳动。
@@ -181,7 +130,7 @@ export default function (pi: ExtensionAPI): void {
 		stopRefreshLoop();
 		agentStartTime = 0;
 		turnStartTime = 0;
-		resetResponseTracking();
+		// 不重置 token-rate：footer 定格显示上一回合速率
 		restoreDefaultWorkingMessage();
 	}
 
@@ -189,12 +138,19 @@ export default function (pi: ExtensionAPI): void {
 		if (!agentStartTime) agentStartTime = Date.now();
 	});
 
-	pi.on("turn_start", async (_event, ctx) => {
+	pi.on("turn_start", async (event, ctx) => {
 		turnActive = true;
 		activeCtx = ctx;
-		turnStartTime = Date.now();
+		// 事件时间戳在 handler 之前产生；用 Date.now() 会和紧随的采样落在同一毫秒，分母变成 0。
+		turnStartTime = event?.timestamp || Date.now();
 		if (!agentStartTime) agentStartTime = turnStartTime;
-		resetResponseTracking();
+		// 工具调用后的 turn 属于同一条用户指令：计时、TTFT 与累计 token 保持到下一条指令。
+		// 速率起点用本指令第一个 turn 的时间戳；before_agent_start 只当指令 id。
+		if (rateRunStartTime !== agentStartTime) {
+			rateRunStartTime = agentStartTime;
+			resetTokenRate(turnStartTime);
+		}
+		startMessageSegment(turnStartTime);
 		syncWorkingMessage(true);
 		scheduleRefreshTick();
 	});
@@ -205,25 +161,25 @@ export default function (pi: ExtensionAPI): void {
 		if (!evt) return;
 
 		if (evt.type === "start") {
-			resetResponseTracking(evt.partial);
-		} else if (evt.type === "thinking_start" || evt.type === "text_start") {
-			setTextBlockLength(evt.contentIndex, 0);
+			// 新 assistant 消息起点：速率分段已在 turn_start 处理。
+		} else if (
+			evt.type === "thinking_start" ||
+			evt.type === "text_start" ||
+			evt.type === "toolcall_start"
+		) {
+			// TTFT 的首块含 toolcall_start：模型直接发起 tool call（thinking/text 省略）时也算首 token。
+			// 分段锚点只在 turn_start 重置。这里再重置会把累计 usage.output 当成新的首报。
+			markFirstToken();
 			updateProviderUsage(evt.partial);
 		} else if (evt.type === "thinking_delta" || evt.type === "text_delta") {
-			const add = typeof evt.delta === "string" ? evt.delta.length : 0;
-			setTextBlockLength(evt.contentIndex, (responseTextBlockLengths[evt.contentIndex] ?? 0) + add);
+			if (typeof evt.delta === "string") sampleTokenDelta(evt.delta);
 			updateProviderUsage(evt.partial);
-		} else if (evt.type === "text_end") {
-			setTextBlockLength(
-				evt.contentIndex,
-				typeof evt.content === "string" ? evt.content.length : 0,
-			);
+		} else if (evt.type === "text_end" || evt.type === "thinking_end") {
 			updateProviderUsage(evt.partial);
 		} else if (evt.type === "done") {
-			resetResponseTracking(evt.message);
+			updateProviderUsage(evt.message);
 		} else if (evt.type === "error") {
-			// provider 错误事件的 usage.output 不可信，不得计入 token 统计。
-			resetResponseTracking();
+			updateProviderUsage(evt.error);
 		} else {
 			updateProviderUsage(evt.partial);
 		}
@@ -232,11 +188,20 @@ export default function (pi: ExtensionAPI): void {
 		scheduleRefreshTick();
 	});
 
+	pi.on("tool_execution_start", async () => {
+		pauseTokenRate();
+	});
+
+	pi.on("tool_execution_end", async () => {
+		resumeTokenRate();
+	});
+
 	pi.on("turn_end", async (_event, ctx) => {
 		turnActive = false;
 		activeCtx = ctx;
 		stopRefreshLoop();
-		resetResponseTracking();
+		// 本段 token 结转进累计，下一段 turn 继续累加；此处不清速率。
+		carryTokenRate();
 		// No completion message: return immediately to Pi's default idle state.
 		restoreDefaultWorkingMessage();
 	});