@henryqw/pi-footer 2.1.4 → 2.2.1

package/README.md

@@ -30,7 +30,7 @@ pi-harness · clear-field-f8d2 [+2 ~3 ?1 ↑2] · PR #123 · approved    Codex #
 ```
 
 - The first line shows the repository, branch, Git state, and `pi-pr` pull request status beside the checkout identity. The `pi-multi-codex` quota status, when non-empty, occupies the right side. Linked-worktree branches drop the generated `worktree/` prefix.
-- The second line shows cumulative input tokens, output tokens, latest cache-hit rate, and tokens per second for the most recent assistant response. The rate is timed from the response's first streamed content to its end, so request latency and time to first token are excluded for every provider. A response that arrives without streamed content shows `—`. It also shows estimated cost and context usage. Totals include reported tool usage and finished `pi-subagent` background workflows. The active model and thinking level are right-aligned.
+- The second line shows cumulative input tokens, output tokens, latest cache-hit rate, and tokens per second for the most recent assistant response. The rate is timed from the response's first streamed content to its last, so request latency, time to first token, and provider work after the stream ends (such as Claude bridge shutting down Claude Code) are excluded. A response that arrives without streamed content, or all at once, shows `—`. It also shows estimated cost and context usage. Totals include reported tool usage and finished `pi-subagent` background workflows. The active model and thinking level are right-aligned. Under a virtual model, the physical model and thinking level of the latest successful response follow an arrow, for example `auto • high → gpt-5.6-luna • medium`, matching Pi's built-in footer.
 - The third line shows a compact CodeGraph badge first when loaded: `✓ CG` indexed, `● CG` in use, `◐ CG` checking or indexing, `○ CG` missing, `! CG` setup problem, or `? CG` unknown state. Its icon uses the active theme's state color; `CG` remains plain so the badge is readable without color. When pi-codegraph is not loaded, no badge appears. A middle dot separates the CodeGraph badge from other extension statuses; cumulative agent-work time stays on the right, beneath the active model.
 
 Git badges appear only when action is needed:
@@ -58,7 +58,7 @@ Unavailable values render as `—` without a misleading percent sign.
 
 Only the non-empty `pi-multi-codex` quota status occupies the right side of the first line. The `pi-pr` pull-request status stays beside checkout identity, and CodeGraph appears separately on the third line.
 
-Statuses from other extensions, including Ponytail and `pi-rewind`, share the left side of the third line. They are sorted by key; colors, links, glyphs, and interior spacing are preserved. Leading and trailing whitespace is trimmed, line breaks become spaces, and long statuses may be clipped to fit the footer. Scripted `mcpScript` calls are not visible as individual tool calls, so they do not trigger the `● CG` badge.
+Statuses from other extensions, including Ponytail and `pi-rewind`, share the left side of the third line. They are sorted by key; colors, links, glyphs, and interior spacing are preserved. Leading and trailing whitespace is trimmed, line breaks become spaces, and long statuses may be clipped to fit the footer. Only direct `codegraph_explore` tool calls trigger the `● CG` badge; CodeGraph queries made from inside scripted tools are not shown.
 
 ## Limits and recovery
 

package/extensions/footer.ts

@@ -1,6 +1,6 @@
 import { readFile } from "node:fs/promises";
 import { basename, dirname, join } from "node:path";
-import type { ExtensionAPI, Theme } from "@earendil-works/pi-coding-agent";
+import type { ExtensionAPI, ExtensionContext, Theme } from "@earendil-works/pi-coding-agent";
 import { getCapabilities, hyperlink, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 import { configuredOpenUri } from "@henryqw/pi-open-in/open-uri";
 
@@ -15,6 +15,8 @@ const THINKING_COLORS = {
 const HENRY_STATUS_KEY = "pi-multi-codex";
 const AGENT_TIME_ENTRY = "pi-footer:agent-work";
 const SUBAGENT_BACKGROUND_RESULT = "subagent-background-result";
+/** Pi's VIRTUAL_MODEL_API: catalog entries that route each request to a physical model. */
+const VIRTUAL_MODEL_API = "pi-virtual";
 
 type CountedUsage = { input: number; output: number; cost: { total: number } };
 type GitSummary = { badges: string; detachedOid?: string };
@@ -167,11 +169,15 @@ function rainbow(text: string): string {
 	return [...text].map((character, index) => color(character, colors[index % colors.length]!)).join("");
 }
 
-function isCodegraphCall(toolName: string, args: unknown): boolean {
-	if (toolName === "codegraph_explore") return true;
-	if (toolName !== "mcp" || !args || typeof args !== "object") return false;
-	const { tool, server } = args as { tool?: unknown; server?: unknown };
-	return server === "henryqw_pi-codegraph__codegraph" && typeof tool === "string" && tool.startsWith("codegraph_");
+/** Physical model and thinking level of the latest successful response on the branch; failed and aborted requests are skipped. */
+function latestResponse(ctx: ExtensionContext): { model: string; thinkingLevel?: string } | undefined {
+	const branch = ctx.sessionManager.getBranch();
+	for (let index = branch.length - 1; index >= 0; index--) {
+		const entry = branch[index]!;
+		if (entry.type !== "message" || entry.message.role !== "assistant") continue;
+		const { stopReason, model, thinkingLevel } = entry.message;
+		if (stopReason !== "error" && stopReason !== "aborted") return { model, thinkingLevel };
+	}
 }
 
 function codegraphBadge(status: string, inUse: boolean, theme: Theme): string {
@@ -196,7 +202,7 @@ export default function footerExtension(pi: ExtensionAPI): void {
 	let refreshGitStatus: (() => Promise<void>) | undefined;
 	const activeCodegraphCalls = new Set<string>();
 	pi.on("tool_execution_start", (event) => {
-		if (!isCodegraphCall(event.toolName, event.args)) return;
+		if (event.toolName !== "codegraph_explore") return;
 		activeCodegraphCalls.add(event.toolCallId);
 		requestRuntimeRender?.();
 	});
@@ -304,21 +310,26 @@ export default function footerExtension(pi: ExtensionAPI): void {
 		}
 
 		let tps: number | undefined;
-		// Start at the first streamed update: providers emit message_start at different points before the first token.
+		// Measure first to last streamed update: providers emit message_start before the first token,
+		// and some (Claude bridge) emit message_end only after post-stream teardown.
 		let assistantStartedAt: number | undefined;
+		let assistantLastUpdateAt: number | undefined;
 		pi.on("message_update", async (event) => {
-			if (event.message.role === "assistant") assistantStartedAt ??= performance.now();
+			if (event.message.role !== "assistant") return;
+			assistantLastUpdateAt = performance.now();
+			assistantStartedAt ??= assistantLastUpdateAt;
 		});
 		pi.on("message_end", async (event) => {
 			if (event.message.role !== "assistant") return;
 			const output = event.message.usage?.output ?? 0;
-			const seconds = assistantStartedAt === undefined ? 0 : (performance.now() - assistantStartedAt) / 1000;
-			assistantStartedAt = undefined;
+			const seconds = assistantStartedAt === undefined ? 0 : (assistantLastUpdateAt! - assistantStartedAt) / 1000;
+			assistantStartedAt = assistantLastUpdateAt = undefined;
 			tps = seconds > 0 ? output / seconds : undefined;
 		});
 
-		// ponytail: keyed on length + last entry (sessions are append-only); revisit if entries ever mutate in place.
+		// ponytail: keyed on length + last entry (sessions are append-only) + leaf (tree navigation); revisit if entries ever mutate in place.
 		let usageKey: string | undefined;
+		let routed: ReturnType<typeof latestResponse>;
 		let input = 0;
 		let output = 0;
 		let cost = 0;
@@ -366,10 +377,11 @@ export default function footerExtension(pi: ExtensionAPI): void {
 				invalidate() { },
 				render(width: number): string[] {
 					const entries = ctx.sessionManager.getEntries();
-					const key = `${entries.length}:${entries.at(-1)?.type}`;
+					const key = `${entries.length}:${entries.at(-1)?.type}:${ctx.sessionManager.getLeafId()}`;
 					if (key !== usageKey) {
 						usageKey = key;
 						computeUsage();
+						routed = latestResponse(ctx);
 					}
 
 					const reportedBranch = data.getGitBranch()?.replace(/^worktree\//, "");
@@ -388,8 +400,6 @@ export default function footerExtension(pi: ExtensionAPI): void {
 						if (!text) continue;
 						(key === HENRY_STATUS_KEY ? henryStatuses : externalStatuses).push(text);
 					}
-					const thinking = String(ctx.thinkingLevel ?? "off");
-					const thinkingColor = THINKING_COLORS[thinking as keyof typeof THINKING_COLORS];
 					const ellipsis = theme.fg("dim", "…");
 					const usage = theme.fg("dim", [
 						`↑ ${formatTokens(input)}`,
@@ -399,10 +409,15 @@ export default function footerExtension(pi: ExtensionAPI): void {
 					`$ ${cost.toFixed(3)}`,
 						`◔ ${context == null ? "—" : `${context.toFixed(1)}%`}`,
 					].join(" · "));
-					const thinkingText = thinking === "ultra"
-						? rainbow(thinking)
-						: thinkingColor === undefined ? theme.fg("dim", thinking) : color(thinking, thinkingColor);
-					const model = theme.fg("dim", `${ctx.model?.id ?? "no-model"} • `) + thinkingText;
+					const thinkingText = (level: string) => {
+						const thinkingColor = THINKING_COLORS[level as keyof typeof THINKING_COLORS];
+						return level === "ultra" ? rainbow(level) : thinkingColor === undefined ? theme.fg("dim", level) : color(level, thinkingColor);
+					};
+					const selected = theme.fg("dim", `${ctx.model?.id ?? "no-model"} • `) + thinkingText(String(ctx.thinkingLevel ?? "off"));
+					// Under a virtual selection, show where the latest request went, as Pi's own footer does.
+					const model = ctx.model?.api === VIRTUAL_MODEL_API && routed
+						? selected + theme.fg("dim", ` → ${routed.model}`) + (routed.thinkingLevel ? theme.fg("dim", " • ") + thinkingText(routed.thinkingLevel) : "")
+						: selected;
 					const elapsed = activeMilliseconds + (activeStartedAt === undefined ? 0 : performance.now() - activeStartedAt);
 					const runtime = theme.fg("dim", `◷ ${formatDuration(elapsed)}`);
 					const identity = branch ? theme.fg("dim", `${repo} · `) : "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@henryqw/pi-footer",
-  "version": "2.1.4",
+  "version": "2.2.1",
   "description": "Show concise repository, branch, and usage details in the Pi footer.",
   "keywords": [
     "pi-package",
@@ -24,8 +24,8 @@
     "pack:check": "npm pack --dry-run"
   },
   "peerDependencies": {
-    "@earendil-works/pi-coding-agent": ">=0.86.0 <0.88.0",
-    "@earendil-works/pi-tui": ">=0.86.0 <0.88.0"
+    "@earendil-works/pi-coding-agent": ">=0.86.0 <0.100.0",
+    "@earendil-works/pi-tui": ">=0.86.0 <0.100.0"
   },
   "repository": {
     "type": "git",
@@ -48,7 +48,7 @@
     "@henryqw/pi-open-in": "^3.0.0"
   },
   "devDependencies": {
-    "@earendil-works/pi-coding-agent": "0.87.0",
-    "@earendil-works/pi-tui": "0.87.0"
+    "@earendil-works/pi-coding-agent": "0.99.1",
+    "@earendil-works/pi-tui": "0.99.1"
   }
 }