rinco-pi-hud 1.3.0 → 1.4.0

package/README.md

@@ -20,6 +20,8 @@ Rinco Pi HUD takes over Pi's footer with four groups of live state and lets you
 
 ## Install
 
+Requires Pi **1.3.0 or newer within the 1.x release line**. Development and CI dependencies are pinned to 1.3.0.
+
 ```bash
 pi install npm:rinco-pi-hud
 ```
@@ -42,7 +44,7 @@ pi install "$PWD"
 > Pi extensions run with your user permissions. Review the source before installing any third-party extension.
 
 > [!NOTE]
-> The footer needs a Truecolor terminal. The screenshot above renders with ASCII icon mode; `/zentui` switches between the `auto`, `nerd`, and `ascii` glyph sets.
+> Truecolor and 256-color terminals are supported; explicit RGB colors use Pi's terminal-capability-aware encoder. The screenshot above renders with ASCII icon mode; `/zentui` switches between the `auto`, `nerd`, and `ascii` glyph sets.
 
 ## Commands
 
@@ -113,7 +115,7 @@ See [docs/footer.md](docs/footer.md) for the full variable and segment reference
 | [`extensions/hud/ui/`](extensions/hud/ui/) | Icons and terminal style utilities |
 | [`docs/footer.md`](docs/footer.md) | Complete footer configuration reference |
 | [`docs/CONTRIBUTING.md`](docs/CONTRIBUTING.md) | Local development, testing guidance, and pull request checklist |
-| [`tests/`](tests/) | Vitest suite: footer layout, telemetry, provider balances, MCP parsing |
+| [`tests/`](tests/) | Vitest suite: footer layout, telemetry, provider balances, MCP configuration counts |
 
 ## Development
 
@@ -154,7 +156,7 @@ The footer measures the terminal and wraps at segment boundaries, so narrow wind
 <details>
 <summary>Colors look incorrect</summary>
 
-The default palette emits `38;2;r;g;b` Truecolor sequences that terminals without Truecolor support approximate or ignore.
+The default RGB palette follows Pi's detected terminal color mode, with 256-color approximation when needed. Check terminal capability settings and try the theme color source in `/zentui`.
 </details>
 
 <details>

package/docs/CONTRIBUTING.md

@@ -50,7 +50,8 @@ npm run pack:check
 
 Tests live in `tests/`:
 
-- `zentui-status.test.ts` — Config counts, MCP status parsing, and extension status helpers.
+- `zentui-status.test.ts` — Config counts, MCP configuration counts, and extension status helpers.
+- `mcp-footer.test.ts` — MCP count rendering, segment controls, custom formats, and legacy third-party statuses.
 - `codex-usage.test.ts` — Codex payload normalization and model-specific quota formatting.
 - `footer-layout.test.ts` — Four-group categorized layout, segment wrapping, and narrow-width budget.
 - `footer-groups.test.ts` — Semantic Project, Session, Activity, and Usage segment ordering.

package/docs/README.zh-CN.md

@@ -20,6 +20,8 @@ Rinco Pi HUD 用四组实时状态替换 Pi 的脚注行，不需要的部分都
 
 ## 安装
 
+需要 **Pi 1.3.0 或更新的 1.x 版本**。开发与 CI 依赖固定为 1.3.0。
+
 ```bash
 pi install npm:rinco-pi-hud
 ```
@@ -42,7 +44,7 @@ pi install "$PWD"
 > Pi 扩展以当前用户权限运行。安装任何第三方扩展前，请先审查其源码。
 
 > [!NOTE]
-> 脚注需要支持 Truecolor 的终端。上图用的是 ASCII 图标模式，`/zentui` 可以在 `auto`、`nerd`、`ascii` 三套符号之间切换。
+> 支持 Truecolor 和 256 色终端；显式 RGB 颜色通过 Pi 的终端能力适配接口输出。上图用的是 ASCII 图标模式，`/zentui` 可以在 `auto`、`nerd`、`ascii` 三套符号之间切换。
 
 ## 命令
 
@@ -113,7 +115,7 @@ Usage 行跟随当前模型的 Provider：
 | [`extensions/hud/ui/`](../extensions/hud/ui/) | 图标与终端样式工具 |
 | [`docs/footer.md`](footer.md) | 完整脚注配置参考 |
 | [`docs/CONTRIBUTING.md`](CONTRIBUTING.md) | 本地开发、测试规范和 PR 检查清单 |
-| [`tests/`](../tests/) | Vitest 测试套件：脚注布局、遥测、各家余额与 MCP 解析 |
+| [`tests/`](../tests/) | Vitest 测试套件：脚注布局、遥测、各家余额与 MCP 配置计数 |
 
 ## 开发
 
@@ -154,7 +156,7 @@ npx tsx assets/readme/source/build-assets.mts /tmp/footer.json
 <details>
 <summary>颜色显示异常</summary>
 
-默认配色输出 `38;2;r;g;b` Truecolor 序列，不支持 Truecolor 的终端会近似处理或直接忽略。
+默认 RGB 配色跟随 Pi 检测到的终端颜色模式，必要时近似为 256 色。请检查终端能力配置，也可以在 `/zentui` 中切换到主题色源。
 </details>
 
 <details>

package/docs/footer.md

@@ -7,10 +7,12 @@ When `footerFormat` is empty, the HUD displays four semantic groups:
 ```text
 Project  · pi-sakura ·  main ·  24.18
 Session  · gpt-5.3 · Thinking level: high · Turn 8
-Activity · Agent idle · Skill 2/3 · MCP 2/2
+Activity · Agent idle · Skill 2/3 · MCP 2
 Usage    · 35%/200k · ↑ 4.2k · ↓ 1.1k · $ 0.030
 ```
 
+The MCP segment counts server entries in Pi's agent-directory `mcp.json` and the project's `.pi/mcp.json`. Same-name entries count once; disabled entries are included. This is a raw file-entry count: differently spelled names such as `my-server` and `my_server` remain separate, even though Pi may reject them as a namespace collision. Zero entries hide the segment. Counts refresh with the project state polling interval. This does not report connection state, validate individual server settings, or include servers registered dynamically by extensions. Missing, unreadable, malformed, or larger-than-1-MiB files contribute no entries. Legacy adapter footer statuses remain ordinary third-party statuses.
+
 The category column is sized from visible text so every separator aligns. When a row exceeds the terminal width, complete status segments move to an indented continuation line. Only a single segment that is wider than the available content area is truncated. Third-party extension statuses appear on the Activity group in configured `left`, `middle`, then `right` order.
 
 Control each default-layout row independently:
@@ -50,7 +52,7 @@ The command shape is `/zentui row <project|session|activity|usage> <enable|disab
 | `activeAgents` | on | Activity | Active primary agent runs |
 | `agentIdle` | on | Activity | `Agent idle` when no primary agent run is active |
 | `skills` | on | Activity | Active/available skills count, e.g. `Skill 1/3` |
-| `mcp` | on | Activity | MCP connected/total servers |
+| `mcp` | on | Activity | File-configured MCP servers, e.g. `MCP 2` |
 | `context` | on | Usage | Context percentage, window size, and/or gauge |
 | `inputTokens` | on | Usage | Cumulative input tokens |
 | `outputTokens` | on | Usage | Cumulative output tokens |
@@ -119,7 +121,7 @@ Clear it:
 | `$skills` | Active/available skills, e.g. `Skill 1/3` |
 | `$active_skills` | Active skills count only |
 | `$extensions` | Installed Pi packages count |
-| `$mcp` | MCP connected/total |
+| `$mcp` | File-configured MCP server count |
 | `$tool_counts` | Native tool completion counts |
 | `$running_tools` | Recently running tools |
 | `$active_agents` | Active primary agent runs |

package/extensions/hud/commands/settings-controller.ts

@@ -42,6 +42,7 @@ export function registerSettingsController(pi: ExtensionAPI, deps: SettingsContr
 		},
 		setFooterRows(patch) {
 			updateConfig(saveFooterRowsPatch(patch));
+			deps.restartSessionTimer();
 		},
 		setFooterSegments(patch) {
 			updateConfig(saveFooterSegmentsPatch(patch));

package/extensions/hud/commands/settings.ts

@@ -133,7 +133,7 @@ const footerSegmentSettingLabels: Record<FooterSegmentSettingId, string> = {
 	activeAgents: "Active agents",
 	agentIdle: "Agent idle status",
 	skills: "Skill activity",
-	mcp: "MCP connections",
+	mcp: "MCP configured servers",
 	context: "Context usage",
 	inputTokens: "Input tokens",
 	outputTokens: "Output tokens",
@@ -173,7 +173,7 @@ const footerSegmentSettingDescriptions: Record<FooterSegmentSettingId, string> =
 	codexUsage: "Show OpenAI Codex subscription rate limits on the usage row when available.",
 	configCounts: "Show instruction-file and installed Pi package counts on the project row.",
 	skills: "Show active/available Pi skill counts on the activity row.",
-	mcp: "Show parsed MCP connected/total server counts on the activity row.",
+	mcp: "Show the configured server count from global and project mcp.json, including disabled entries.",
 	runningTools: "Show currently running native tools and their elapsed time.",
 	toolCounts: "Show cumulative completed native-tool counts.",
 	activeAgents: "Show active main agent runs on the activity row (not subagent count).",

package/extensions/hud/config/config-counts.ts

@@ -1,6 +1,7 @@
 import { createRequire } from "node:module";
 import { readFileSync, statSync } from "node:fs";
 import { isAbsolute, join } from "node:path";
+import { countConfiguredMcpServers } from "../segments/mcp-status.js";
 
 export interface ConfigCounts {
 	instructionFiles: {
@@ -9,6 +10,7 @@ export interface ConfigCounts {
 		total: number;
 	};
 	packages: number;
+	mcpServers: number;
 }
 
 export interface ConfigCountOptions {
@@ -82,6 +84,7 @@ export function countConfigEntries(cwd: string, options: ConfigCountOptions = {}
 			total: agentsMd + claudeMd,
 		},
 		packages: countPackages(agentDir),
+		mcpServers: countConfiguredMcpServers(cwd, agentDir),
 	};
 }
 

package/extensions/hud/footer/format.ts

@@ -7,24 +7,48 @@
  * variable (and nested group) renders empty.
  */
 
-export type FormatToken =
+export type FormatToken = Readonly<
 	| { kind: "text"; value: string }
 	| { kind: "var"; name: string }
 	| { kind: "fill" }
-	| { kind: "group"; tokens: FormatToken[] };
+	| { kind: "group"; tokens: readonly FormatToken[] }
+>;
+
+const FORMAT_CACHE_LIMIT = 128;
+const FORMAT_CACHE_MAX_LENGTH = 16384;
+const formatCache = new Map<string, readonly FormatToken[]>();
+
+function freezeTokens(tokens: readonly FormatToken[]): readonly FormatToken[] {
+	for (const token of tokens) {
+		if (token.kind === "group") freezeTokens(token.tokens);
+		Object.freeze(token);
+	}
+	return Object.freeze(tokens);
+}
 
 const TOKEN_REGEX = /\$\{([a-zA-Z_][a-zA-Z0-9_]*)\}|\$([a-zA-Z_][a-zA-Z0-9_]*)/g;
 
 /**
- * Tokenize a format string into text/var/fill/group tokens.
+ * Tokenize a format string into deeply frozen text/var/fill/group tokens.
+ * Repeated bounded inputs reuse the same immutable AST; rendered values are never cached.
  *
  * `$name` and `${name}` both produce a variable token. A variable named
  * `fill` becomes a fill token instead. Parentheses form conditional groups
  * that drop entirely when all nested vars are empty.
  */
-export function parseFooterFormat(format: string): FormatToken[] {
-	if (!format) return [];
-	return parseTokenSlice(format, 0, format.length, true).tokens;
+export function parseFooterFormat(format: string): readonly FormatToken[] {
+	const cached = formatCache.get(format);
+	if (cached) return cached;
+	const tokens = freezeTokens(parseTokenSlice(format, 0, format.length, true).tokens);
+	// Bound both entry count and retained input size, including ad-hoc format strings.
+	if (format.length <= FORMAT_CACHE_MAX_LENGTH) {
+		if (formatCache.size >= FORMAT_CACHE_LIMIT) {
+			const oldest = formatCache.keys().next().value;
+			if (oldest !== undefined) formatCache.delete(oldest);
+		}
+		formatCache.set(format, tokens);
+	}
+	return tokens;
 }
 
 function parseTokenSlice(
@@ -112,7 +136,7 @@ function parseTokenSlice(
  * spaces are inserted — the user controls all spacing.
  */
 export function renderFormatSplit(
-	tokens: FormatToken[],
+	tokens: readonly FormatToken[],
 	renderVariable: (name: string) => string,
 ): { left: string; middle: string; right: string } {
 	const fillIndices = findTopLevelFillIndices(tokens);
@@ -151,7 +175,7 @@ export function renderFormatSplit(
 	};
 }
 
-function findTopLevelFillIndices(tokens: FormatToken[]): number[] {
+function findTopLevelFillIndices(tokens: readonly FormatToken[]): number[] {
 	const fillIndices: number[] = [];
 	for (let index = 0; index < tokens.length; index++) {
 		if (tokens[index]?.kind === "fill") fillIndices.push(index);
@@ -160,7 +184,7 @@ function findTopLevelFillIndices(tokens: FormatToken[]): number[] {
 }
 
 function renderTokenSlice(
-	tokens: FormatToken[],
+	tokens: readonly FormatToken[],
 	start: number,
 	end: number,
 	renderVariable: (name: string) => string,

package/extensions/hud/footer/index.ts

@@ -31,7 +31,6 @@ import {
 } from "../telemetry/format.js";
 import { resolveRuntimeSymbol } from "../ui/icons.js";
 import type { LiveContextOverride } from "../session/live-context.js";
-import { parseMcpStatus } from "../segments/mcp-status.js";
 import type { FooterState } from "../state/index.js";
 import { renderStyleForSource } from "../ui/style.js";
 
@@ -74,7 +73,6 @@ export function installFooter(
 				const colorSource = config.colorSources.starship;
 				const iconMode = config.icons.mode;
 				const rawExtensionStatuses = footerData.getExtensionStatuses();
-				const mcpStatus = parseMcpStatus(rawExtensionStatuses.get("mcp"));
 				const { safeCwd, safeRuntime, safePackageVersion, safeCommit } = sanitizeFooterInputs(
 					ctx,
 					state,
@@ -166,7 +164,7 @@ export function installFooter(
 					runningToolsLabel,
 					activeAgentsLabel,
 					agentIdleLabel,
-				} = buildTelemetryLabels(ctx, state, config, theme, colorSource, mcpStatus);
+				} = buildTelemetryLabels(ctx, state, config, theme, colorSource);
 				const renderVariable = (name: string): string => {
 					const canonical = FOOTER_FORMAT_ALIASES[name] ?? name;
 					switch (canonical) {
@@ -439,14 +437,7 @@ export function installFooter(
 							formatTimeLabel(""),
 						)}`
 					: "";
-				const formatNeedsMcp = /\$\{?mcp\b/.test(config.footerFormat);
-				const dedicatedMcpVisible = Boolean(
-					mcpStatus && (config.footerFormat ? formatNeedsMcp : config.footerSegments.mcp),
-				);
-				const extensionStatusSource = dedicatedMcpVisible
-					? new Map([...rawExtensionStatuses].filter(([key]) => key !== "mcp"))
-					: rawExtensionStatuses;
-				const extensionStatuses = collectExtensionStatusSegments(extensionStatusSource, config);
+				const extensionStatuses = collectExtensionStatusSegments(rawExtensionStatuses, config);
 				const renderExtensionStatus = (segment: ExtensionStatusSegment) =>
 					segment.colorMode === "original"
 						? segment.text

package/extensions/hud/footer/render-labels.ts

@@ -11,7 +11,6 @@
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { truncateToWidth } from "@earendil-works/pi-tui";
 import type { ColorSource, PolishedTuiConfig } from "../config/config.js";
-import type { McpStatus } from "../segments/mcp-status.js";
 import { formatSkillCounts } from "../segments/skill-activity.js";
 import type { FooterState } from "../state/index.js";
 import { getTelemetryStats } from "../state/telemetry.js";
@@ -164,7 +163,6 @@ export function buildTelemetryLabels(
 	config: PolishedTuiConfig,
 	theme: ThemeLike,
 	colorSource: ColorSource,
-	mcpStatus: McpStatus | undefined,
 ): TelemetryLabels {
 	const statusStyle = (style: string, text: string) =>
 		text ? renderStyleForSource(theme, colorSource, style, text) : "";
@@ -267,9 +265,10 @@ export function buildTelemetryLabels(
 			: "";
 	const configCountsLabel = [instructionFilesLabel, extensionsLabel].filter(Boolean).join(" ");
 
-	const mcpLabel = mcpStatus
-		? statusStyle(config.colors.gitStatus, `MCP ${mcpStatus.connected}/${mcpStatus.total}`)
-		: "";
+	const mcpLabel =
+		state.configCounts.mcpServers > 0
+			? statusStyle(config.colors.gitStatus, `MCP ${state.configCounts.mcpServers}`)
+			: "";
 
 	const telemetryStats = getTelemetryStats(state.telemetry);
 	const toolCountsText = Object.entries(telemetryStats.completedToolCounts)

package/extensions/hud/index.ts

@@ -3,6 +3,7 @@ import registerCodexUsage from "./telemetry/codex-usage/index.js";
 import { ensureConfigExists, loadConfig, type PolishedTuiConfig } from "./config/config.js";
 import { installFooter } from "./footer/index.js";
 import { buildSessionDurationLabel } from "./telemetry/format.js";
+import { footerClockNeeds } from "./session/footer-clock.js";
 import { emptyGitStatus } from "./segments/git.js";
 import { LiveContextController } from "./session/live-context.js";
 import { createProjectStateController } from "./state/project-controller.js";
@@ -33,6 +34,7 @@ export default function (pi: ExtensionAPI) {
 	let footerInstalled = false;
 	let stopSessionTimer: () => void = () => {};
 	let lastDurationLabel = "";
+	let sessionTimerKey = "";
 
 	const refresh = () => {
 		if (sessionLifecycle.isCurrent()) requestFooterRender?.();
@@ -83,24 +85,29 @@ export default function (pi: ExtensionAPI) {
 	const refreshInteractiveState = (ctx: ExtensionContext, project = false) => {
 		if (!sessionLifecycle.isCurrent() || !ctx.hasUI) return;
 		syncFooterState(ctx);
+		startSessionTimer();
 		if (project && currentConfig.features.statusLine) scheduleProjectRefresh(ctx);
 		refresh();
 	};
 
 	const startSessionTimer = () => {
+		const needs = footerClockNeeds(
+			currentConfig,
+			state.telemetry.tools.some((tool) => tool.status === "running"),
+		);
+		const key = footerInstalled ? JSON.stringify(needs) : "";
+		if (sessionTimerKey === key) return;
 		stopSessionTimer();
-		lastDurationLabel = "";
-		const segments = currentConfig.footerSegments;
-		const format = currentConfig.footerFormat ?? "";
-		const needsWallClock = segments.time || /\$\{?time\b/.test(format);
-		const needsDuration =
-			segments.sessionDuration || /\$\{?(?:session_duration|duration)\b/.test(format);
-		const needsActivityClock = segments.runningTools || /\$\{?running_tools\b/.test(format);
-		if (
-			!currentConfig.features.statusLine ||
-			!(needsWallClock || needsDuration || needsActivityClock)
-		)
-			return;
+		sessionTimerKey = key;
+		lastDurationLabel = state.sessionStartEpoch
+			? buildSessionDurationLabel(state.sessionStartEpoch)
+			: "";
+		const {
+			wallClock: needsWallClock,
+			duration: needsDuration,
+			activity: needsActivityClock,
+		} = needs;
+		if (!footerInstalled || !(needsWallClock || needsDuration || needsActivityClock)) return;
 
 		const timer = setInterval(() => {
 			if (!sessionLifecycle.isCurrent()) return;
@@ -118,6 +125,7 @@ export default function (pi: ExtensionAPI) {
 		timer.unref?.();
 		stopSessionTimer = () => {
 			clearInterval(timer);
+			sessionTimerKey = "";
 			stopSessionTimer = () => {};
 		};
 	};

package/extensions/hud/segments/mcp-status.ts

@@ -1,26 +1,31 @@
-import { stripVTControlCharacters } from "node:util";
+import { readFileSync, statSync } from "node:fs";
+import { join } from "node:path";
 
-export interface McpStatus {
-	connected: number;
-	total: number;
+const MAX_CONFIG_BYTES = 1024 * 1024;
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+	return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 
-/** Parses the adapter's public status text without intercepting or modifying UI methods. */
-export function parseMcpStatus(text: string | undefined): McpStatus | undefined {
-	if (typeof text !== "string" || text.length === 0) return undefined;
-	const status = stripVTControlCharacters(text.slice(0, 2048));
-	const enabledMatch = status.match(
-		/MCP:\s*(\d{1,5})\s+servers?\s+enabled(?:\s*\(\s*(\d{1,5})\s+connected\s*\))?(?:\s*\(\s*(\d{1,5})\s+disabled\s*\))?\s*$/i,
-	);
-	const legacyMatch = status.match(/MCP:\s*(\d{1,5})\s*\/\s*(\d{1,5})\s+servers\b/i);
-	if (!enabledMatch && !legacyMatch) return undefined;
-	const connected = Number(enabledMatch ? (enabledMatch[2] ?? 0) : legacyMatch![1]);
-	const total = Number(enabledMatch ? enabledMatch[1] : legacyMatch![2]);
-	const disabled = enabledMatch?.[3] === undefined ? 0 : Number(enabledMatch[3]);
-	if (![connected, total, disabled].every(Number.isSafeInteger)) return undefined;
-	if (connected < 0 || total < 0 || connected > total || total > 10_000 || disabled > 10_000)
-		return undefined;
-	return { connected, total };
+function readServerNames(path: string): string[] {
+	try {
+		const stats = statSync(path);
+		if (!stats.isFile() || stats.size > MAX_CONFIG_BYTES) return [];
+		const config: unknown = JSON.parse(readFileSync(path, "utf8"));
+		if (!isRecord(config) || !isRecord(config.mcpServers)) return [];
+		return Object.entries(config.mcpServers)
+			.filter(([name, entry]) => /^[A-Za-z0-9_-]+$/.test(name) && isRecord(entry))
+			.map(([name]) => name);
+	} catch {
+		return [];
+	}
 }
 
-export const parseMcpAdapterStatus = parseMcpStatus;
+/** Count file-configured server entries, including disabled ones, without resolving secrets
+ * or starting connections. Project entries override global entries with the same name.
+ * This is not a connection count or a validation of individual server settings. */
+export function countConfiguredMcpServers(cwd: string, agentDir: string): number {
+	const globalNames = agentDir ? readServerNames(join(agentDir, "mcp.json")) : [];
+	const projectNames = readServerNames(join(cwd, ".pi", "mcp.json"));
+	return new Set([...globalNames, ...projectNames]).size;
+}

package/extensions/hud/segments/runtime.ts

@@ -1,3 +1,4 @@
+import { createHash } from "node:crypto";
 import { existsSync, readdirSync, statSync } from "node:fs";
 import { join } from "node:path";
 import { runtimeDefinitions, type RuntimeDef } from "./runtime-definitions.js";
@@ -15,32 +16,32 @@ export type RuntimeInfo = Pick<RuntimeMetadata, "name" | "symbol" | "style"> & {
 export type RuntimeReadResult = { kind: "ok"; runtime?: RuntimeInfo } | { kind: "error" };
 
 type RuntimeCacheEntry = {
-	fingerprint: string;
-	runtime: RuntimeInfo | undefined;
+	result: RuntimeReadResult;
+	expiresAt: number;
 };
 
 const RUNTIME_CACHE_MAX = 32;
+const RUNTIME_CACHE_TTL_MS = 60_000;
+const RUNTIME_RETRY_TTL_MS = 5_000;
 const runtimeInfoCache = new Map<string, RuntimeCacheEntry>();
+const runtimeReadsInFlight = new Map<string, Promise<RuntimeReadResult>>();
+let cacheEpoch = 0;
 
 export function clearRuntimeInfoCache(): void {
+	cacheEpoch += 1;
 	runtimeInfoCache.clear();
+	// New callers must not join a probe started before the clear.
+	runtimeReadsInFlight.clear();
 }
 
 function topLevelFingerprint(entries: readonly string[]): string {
 	return entries.slice().sort().join("\0");
 }
 
-function cacheRuntimeInfo(
-	cwd: string,
-	fingerprint: string,
-	runtime: RuntimeInfo | undefined,
-): void {
-	// Drop prior fingerprints for the same cwd so stale marker sets do not linger.
-	for (const key of runtimeInfoCache.keys()) {
-		if (key === cwd || key.startsWith(`${cwd}\0`)) runtimeInfoCache.delete(key);
-	}
-	const key = `${cwd}\0${fingerprint}`;
-	runtimeInfoCache.set(key, { fingerprint, runtime });
+function cacheRuntimeInfo(key: string, result: RuntimeReadResult): void {
+	const ttl =
+		result.kind === "ok" && result.runtime?.version ? RUNTIME_CACHE_TTL_MS : RUNTIME_RETRY_TTL_MS;
+	runtimeInfoCache.set(key, { result, expiresAt: Date.now() + ttl });
 	while (runtimeInfoCache.size > RUNTIME_CACHE_MAX) {
 		const oldest = runtimeInfoCache.keys().next().value;
 		if (oldest === undefined) break;
@@ -140,28 +141,53 @@ export async function readRuntimeInfo(cwd: string): Promise<RuntimeReadResult> {
 		return { kind: "error" };
 	}
 
-	const fingerprint = topLevelFingerprint(entries);
-	const cacheKey = `${cwd}\0${fingerprint}`;
+	// Detection uses shell variables and version commands inherit the environment.
+	// Include all variables (including PATH and toolchain-manager settings) so a
+	// changed environment never reuses the old probe. JSON avoids key collisions.
+	const env = { ...process.env };
+	const environment = Object.keys(env)
+		.sort()
+		.map((key) => [key, env[key]]);
+	// Hash environment values so cache keys do not retain plaintext credentials.
+	const environmentKey = createHash("sha256").update(JSON.stringify(environment)).digest("hex");
+	const cacheKey = JSON.stringify([cwd, topLevelFingerprint(entries), environmentKey]);
 	const cached = runtimeInfoCache.get(cacheKey);
-	if (cached && cached.fingerprint === fingerprint) {
-		return { kind: "ok", runtime: cached.runtime };
+	if (cached) {
+		if (Date.now() < cached.expiresAt) return cached.result;
+		runtimeInfoCache.delete(cacheKey);
 	}
+	const inFlight = runtimeReadsInFlight.get(cacheKey);
+	if (inFlight) return inFlight;
 
-	try {
-		const runtime = detectRuntime(cwd, entries);
-		if (!runtime) {
-			cacheRuntimeInfo(cwd, fingerprint, undefined);
-			return { kind: "ok", runtime: undefined };
+	const epoch = cacheEpoch;
+	const read = async (): Promise<RuntimeReadResult> => {
+		try {
+			const runtime = detectRuntime(cwd, entries, env);
+			if (!runtime) return { kind: "ok", runtime: undefined };
+			return {
+				kind: "ok",
+				runtime: {
+					name: runtime.name,
+					symbol: runtime.symbol,
+					style: runtime.style,
+					version: await runtime.version(cwd),
+				},
+			};
+		} catch {
+			return { kind: "error" };
 		}
-		const info: RuntimeInfo = {
-			name: runtime.name,
-			symbol: runtime.symbol,
-			style: runtime.style,
-			version: await runtime.version(cwd),
-		};
-		cacheRuntimeInfo(cwd, fingerprint, info);
-		return { kind: "ok", runtime: info };
-	} catch {
-		return { kind: "error" };
-	}
+	};
+	const pending = read()
+		.then((result) => {
+			// Clearing the cache must also invalidate outstanding writers.
+			if (epoch === cacheEpoch) cacheRuntimeInfo(cacheKey, result);
+			return result;
+		})
+		.finally(() => {
+			if (runtimeReadsInFlight.get(cacheKey) === pending) {
+				runtimeReadsInFlight.delete(cacheKey);
+			}
+		});
+	runtimeReadsInFlight.set(cacheKey, pending);
+	return pending;
 }

package/extensions/hud/segments/skill-activity.ts

@@ -119,13 +119,18 @@ export class SkillActivityTracker {
 				}
 				continue;
 			}
-			if (
-				message.role !== "toolResult" ||
-				message.toolName !== "read" ||
-				message.isError === true
-			) {
-				continue;
+			if (message.role !== "toolResult") continue;
+			// Nested calls are persisted on the outer result, even when that outer
+			// tool subsequently fails. Restore each successful read independently.
+			const nestedCalls = isRecord(message.nestedCalls) ? message.nestedCalls.calls : undefined;
+			if (Array.isArray(nestedCalls)) {
+				for (const call of nestedCalls) {
+					if (!isRecord(call) || call.name !== "read" || call.status !== "ok") continue;
+					const path = isRecord(call.args) ? call.args.path : undefined;
+					if (typeof path === "string") this.activateFromRead(path, cwd);
+				}
 			}
+			if (message.toolName !== "read" || message.isError === true) continue;
 			const id = typeof message.toolCallId === "string" ? message.toolCallId : undefined;
 			const path = id ? pendingReads.get(id) : undefined;
 			if (path) this.activateFromRead(path, cwd);

package/extensions/hud/session/event-handlers.ts

@@ -64,7 +64,9 @@ export function registerSessionEventHandlers(
 
 	pi.on("before_agent_start", (event, ctx) => {
 		deps.updateSkillCounts(ctx, event.systemPromptOptions.skills ?? []);
-		deps.skillActivity.activateFromPrompt(event.prompt, ctx.cwd);
+		if (event.messageType === "user") {
+			deps.skillActivity.activateFromPrompt(event.prompt, ctx.cwd);
+		}
 		deps.state.skillCounts = deps.skillActivity.counts();
 		deps.refreshInteractiveState(ctx);
 	});

package/extensions/hud/session/footer-clock.ts

@@ -0,0 +1,36 @@
+import type { PolishedTuiConfig } from "../config/config.js";
+import { parseFooterFormat, type FormatToken } from "../footer/format.js";
+
+export interface FooterClockNeeds {
+	wallClock: boolean;
+	duration: boolean;
+	activity: boolean;
+}
+
+/** Only clocks actually referenced by the visible layout need periodic work. */
+export function footerClockNeeds(
+	config: PolishedTuiConfig,
+	hasRunningTools: boolean,
+): FooterClockNeeds {
+	if (!config.features.statusLine) return { wallClock: false, duration: false, activity: false };
+	if (config.footerFormat) {
+		const names = new Set<string>();
+		const visit = (tokens: readonly FormatToken[]) => {
+			for (const token of tokens) {
+				if (token.kind === "var") names.add(token.name);
+				if (token.kind === "group") visit(token.tokens);
+			}
+		};
+		visit(parseFooterFormat(config.footerFormat));
+		return {
+			wallClock: names.has("time"),
+			duration: names.has("session_duration") || names.has("duration"),
+			activity: hasRunningTools && names.has("running_tools"),
+		};
+	}
+	return {
+		wallClock: config.footerRows.usage && config.footerSegments.time,
+		duration: config.footerRows.session && config.footerSegments.sessionDuration,
+		activity: hasRunningTools && config.footerRows.activity && config.footerSegments.runningTools,
+	};
+}

package/extensions/hud/state/index.ts

@@ -42,6 +42,7 @@ export function createInitialState(gitDefaults: GitStatusSummary): FooterState {
 		configCounts: {
 			instructionFiles: { agentsMd: 0, claudeMd: 0, total: 0 },
 			packages: 0,
+			mcpServers: 0,
 		},
 		skillCounts: undefined,
 		codexUsageStatus: undefined,

package/extensions/hud/state/project-controller.ts

@@ -17,6 +17,7 @@ import {
 interface ProjectRefreshTarget {
 	cwd: string;
 	generation: number;
+	epoch: number;
 }
 
 export interface ProjectStateController {
@@ -42,9 +43,14 @@ export function createProjectStateController({
 }: ProjectStateControllerDeps): ProjectStateController {
 	let stopInterval: StopProjectRefreshInterval = () => {};
 	let lastProjectCwd: string | undefined;
+	let epoch = 0;
 
-	const refreshProjectState = async ({ cwd, generation }: ProjectRefreshTarget): Promise<void> => {
-		if (!lifecycle.isCurrent(generation)) return;
+	const refreshProjectState = async ({
+		cwd,
+		generation,
+		epoch: targetEpoch,
+	}: ProjectRefreshTarget): Promise<void> => {
+		if (targetEpoch !== epoch || !lifecycle.isCurrent(generation)) return;
 		const config = getConfig();
 		const format = config.footerFormat;
 		const formatNeedsTag = /\$\{?(?:git_tag|tag)\b/.test(format);
@@ -66,7 +72,7 @@ export function createProjectStateController({
 			wantPackage ? readPackageVersionResult(cwd) : Promise.resolve(undefined),
 			Promise.resolve(countConfigEntries(cwd)),
 		]);
-		if (!lifecycle.isCurrent(generation)) return;
+		if (targetEpoch !== epoch || !lifecycle.isCurrent(generation)) return;
 		state.configCounts = configCounts;
 		lastProjectCwd = applyProjectRefreshToState(state, {
 			cwd,
@@ -79,6 +85,8 @@ export function createProjectStateController({
 
 	const scheduler = createProjectRefreshScheduler(refreshProjectState, requestRender);
 	const stop = () => {
+		// Invalidate work even when the session lifecycle itself has not changed.
+		epoch += 1;
 		stopInterval();
 		stopInterval = () => {};
 		scheduler.stop();
@@ -86,11 +94,13 @@ export function createProjectStateController({
 	const schedule = (ctx: ExtensionContext, options?: ScheduleProjectRefreshOptions) => {
 		const generation = lifecycle.currentGeneration();
 		if (!lifecycle.isCurrent(generation)) return;
-		scheduler.schedule({ cwd: ctx.cwd, generation }, options);
+		scheduler.schedule({ cwd: ctx.cwd, generation, epoch }, options);
 	};
 
 	return {
 		reset() {
+			epoch += 1;
+			scheduler.stop();
 			lastProjectCwd = undefined;
 		},
 		schedule,

package/extensions/hud/telemetry/codex-usage/query.ts

@@ -195,10 +195,13 @@ function hasHeader(headers: Record<string, string>, name: string): boolean {
 	return Object.keys(headers).some((key) => key.toLowerCase() === name.toLowerCase());
 }
 
-function allowedAuthHeaders(source: Record<string, string>): Record<string, string> {
+function allowedAuthHeaders(source: Record<string, string | null>): Record<string, string> {
 	const allowed = new Set(["authorization", "chatgpt-account-id", "user-agent", "accept"]);
 	return Object.fromEntries(
-		Object.entries(source).filter(([key]) => allowed.has(key.toLowerCase())),
+		Object.entries(source).filter(
+			(entry): entry is [string, string] =>
+				allowed.has(entry[0].toLowerCase()) && typeof entry[1] === "string",
+		),
 	);
 }
 

package/extensions/hud/telemetry/format.ts

@@ -85,6 +85,7 @@ type SessionEntry = {
 	type?: string;
 	id?: string | number;
 	timestamp?: string | number;
+	usage?: AssistantMessage["usage"];
 	message?: {
 		role?: string;
 		usage?: AssistantMessage["usage"];
@@ -133,9 +134,22 @@ function calculateCacheHitRate(
 	return promptTokens > 0 ? (cacheRead / promptTokens) * 100 : undefined;
 }
 
+function entryUsage(entry: SessionEntry): AssistantMessage["usage"] | undefined {
+	if (entry.type === "usage" || entry.type === "compaction" || entry.type === "branch_summary") {
+		return entry.usage;
+	}
+	if (
+		entry.type === "message" &&
+		(entry.message?.role === "assistant" || entry.message?.role === "toolResult")
+	) {
+		return entry.message.usage;
+	}
+	return undefined;
+}
+
 function entryIdentity(entry: SessionEntry | undefined): string {
 	if (!entry) return "";
-	const usage = entry.message?.usage;
+	const usage = entryUsage(entry);
 	const usageKey = usage
 		? `${usage.input ?? 0}:${usage.output ?? 0}:${usage.cacheRead ?? 0}:${usage.cacheWrite ?? 0}:${usage.cost?.total ?? 0}`
 		: "";
@@ -158,8 +172,8 @@ function computeUsageTotals(entries: readonly SessionEntry[]): UsageTotals {
 	let cost = 0;
 
 	for (const entry of entries) {
-		if (entry.type !== "message" || entry.message?.role !== "assistant") continue;
-		const usage = entry.message.usage;
+		const usage = entryUsage(entry);
+		if (!usage) continue;
 		const entryInput = usage?.input ?? 0;
 		const entryCacheRead = usage?.cacheRead ?? 0;
 		const entryCacheWrite = usage?.cacheWrite ?? 0;
@@ -169,7 +183,9 @@ function computeUsageTotals(entries: readonly SessionEntry[]): UsageTotals {
 		cacheRead += entryCacheRead;
 		cacheWrite += entryCacheWrite;
 		cost += usage?.cost?.total ?? 0;
-		latestCacheHitRate = calculateCacheHitRate(entryInput, entryCacheRead, entryCacheWrite);
+		if (entry.type === "message" && entry.message?.role === "assistant") {
+			latestCacheHitRate = calculateCacheHitRate(entryInput, entryCacheRead, entryCacheWrite);
+		}
 	}
 
 	return Object.freeze({ input, output, cacheRead, cacheWrite, latestCacheHitRate, cost });

package/extensions/hud/ui/style.ts

@@ -1,8 +1,10 @@
-import type { ThemeColor } from "@earendil-works/pi-coding-agent";
+import type { ThemeColor, ThemeStyle } from "@earendil-works/pi-coding-agent";
+import type { Color } from "@earendil-works/pi-tui";
 import type { ColorSource, ColorSpec } from "../config/config.js";
 
 type ThemeLike = {
 	fg(color: string, text: string): string;
+	style?: (text: string, options: ThemeStyle) => string;
 	bold?: (text: string) => string;
 	italic?: (text: string) => string;
 	underline?: (text: string) => string;
@@ -126,6 +128,10 @@ const themeColorTokens = new Set<ThemeColor>([
 	"thinkingMedium",
 	"thinkingHigh",
 	"thinkingXhigh",
+	"thinkingMax",
+	"scrollbarTrack",
+	"scrollbarThumb",
+	"searchMatchText",
 	"bashMode",
 ]);
 
@@ -164,12 +170,14 @@ function isSupportedStyleToken(token: string): boolean {
 }
 
 export function isSupportedColorSpec(style: ColorSpec): boolean {
-	const trimmed = style.trim();
-	if (trimmed === "") return true;
-	return trimmed.split(/\s+/).every(isSupportedStyleToken);
+	return parseStyle(style).supported;
 }
 
-function applyThemeModifiers(theme: ThemeLike, styleTokens: string[], text: string): string {
+function applyThemeModifiers(
+	theme: ThemeLike,
+	styleTokens: readonly string[],
+	text: string,
+): string {
 	let rendered = text;
 	for (const token of styleTokens) {
 		const normalized = token.toLowerCase();
@@ -188,7 +196,7 @@ export function safeThemeFg(theme: ThemeLike, color: string, text: string): stri
 	}
 }
 
-function mapThemeColor(styleTokens: string[]): string | undefined {
+function mapThemeColor(styleTokens: readonly string[]): string | undefined {
 	let fallback: string | undefined;
 	for (const token of styleTokens) {
 		const normalized = token.toLowerCase();
@@ -212,35 +220,114 @@ function mapThemeColor(styleTokens: string[]): string | undefined {
  */
 export function colorize(theme: ThemeLike, color: ColorSpec, text: string): string {
 	if (isHexColor(color)) {
+		try {
+			if (theme.style) return theme.style(text, { fg: hexColor(color) });
+		} catch {
+			// Older/mock themes retain the original truecolor fallback.
+		}
 		return `${hexToAnsi(color)}${text}\x1b[39m`;
 	}
 	return safeThemeFg(theme, color, text);
 }
 
-/**
- * Render text with Starship-style terminal styling strings (e.g. "bold red", "fg:202",
- * "bg:blue", "underline bg:#bf5700").
- */
-export function renderTerminalStyle(style: string, text: string): string {
-	const codes: string[] = [];
-	for (const token of style.trim().split(/\s+/)) {
-		if (!token) continue;
+type ParsedStyle = {
+	readonly tokens: readonly string[];
+	readonly codes: string;
+	readonly options: Readonly<ThemeStyle>;
+	readonly hasHex: boolean;
+	readonly explicit: boolean;
+	readonly supported: boolean;
+};
+
+// Cache syntax only: never retain a Theme or themed ANSI across theme changes.
+const STYLE_CACHE_LIMIT = 256;
+const STYLE_CACHE_MAX_LENGTH = 4096;
+const styleCache = new Map<string, ParsedStyle>();
+
+function hexColor(hex: string): Color {
+	const normalized = expandHexColor(hex);
+	return Object.freeze({
+		kind: "rgb",
+		r: Number.parseInt(normalized.slice(0, 2), 16),
+		g: Number.parseInt(normalized.slice(2, 4), 16),
+		b: Number.parseInt(normalized.slice(4, 6), 16),
+	});
+}
 
+function parseStyle(style: string): ParsedStyle {
+	const cached = styleCache.get(style);
+	if (cached) return cached;
+	const tokens = Object.freeze(style.trim().split(/\s+/).filter(Boolean));
+	const codes: string[] = [];
+	const options: ThemeStyle = {};
+	let hasHex = false;
+	for (const token of tokens) {
 		const normalized = token.toLowerCase();
 		const modifier = terminalStyleModifiers.get(normalized);
 		if (modifier !== undefined) {
 			codes.push(`${modifier}`);
+			const attribute = normalized === "dimmed" ? "dim" : normalized;
+			if (
+				attribute === "bold" ||
+				attribute === "dim" ||
+				attribute === "italic" ||
+				attribute === "underline"
+			)
+				options[attribute] = true;
 			continue;
 		}
-
 		const isForeground = normalized.startsWith("fg:");
 		const isBackground = normalized.startsWith("bg:");
 		const colorName = isForeground || isBackground ? normalized.slice(3) : normalized;
-		const color = terminalColorToAnsi(colorName, isBackground);
-		if (color) codes.push(color);
+		const code = terminalColorToAnsi(colorName, isBackground);
+		if (!code) continue;
+		codes.push(code);
+		let color: Color;
+		if (isHexColor(colorName)) {
+			hasHex = true;
+			color = hexColor(colorName);
+		} else {
+			const named = terminalColorCodes.get(colorName);
+			color = Object.freeze({
+				kind: "indexed",
+				index: named === undefined ? Number(colorName) : named >= 90 ? named - 90 + 8 : named - 30,
+			});
+		}
+		options[isBackground ? "bg" : "fg"] = color;
 	}
+	const parsed = Object.freeze({
+		tokens,
+		codes: codes.join(";"),
+		options: Object.freeze(options),
+		hasHex,
+		explicit: tokens.some(isExplicitTerminalColorToken),
+		supported: tokens.every(isSupportedStyleToken),
+	});
+	if (style.length <= STYLE_CACHE_MAX_LENGTH) {
+		if (styleCache.size >= STYLE_CACHE_LIMIT) {
+			const oldest = styleCache.keys().next().value;
+			if (oldest !== undefined) styleCache.delete(oldest);
+		}
+		styleCache.set(style, parsed);
+	}
+	return parsed;
+}
 
-	return codes.length ? `\x1b[${codes.join(";")}m${text}\x1b[0m` : text;
+/**
+ * Render Starship terminal styles. With a Theme, explicit RGB uses its color-mode encoder;
+ * named/indexed-only styles and simple mocks retain the original terminal ANSI semantics.
+ */
+export function renderTerminalStyle(style: string, text: string, theme?: ThemeLike): string {
+	const parsed = parseStyle(style);
+	if (parsed.hasHex && theme?.style) {
+		try {
+			// Pass a fresh options object so a custom theme cannot mutate cached syntax.
+			return theme.style(text, { ...parsed.options });
+		} catch {
+			// Preserve terminal styling for partial/legacy theme implementations.
+		}
+	}
+	return parsed.codes ? `\x1b[${parsed.codes}m${text}\x1b[0m` : text;
 }
 
 /**
@@ -248,17 +335,16 @@ export function renderTerminalStyle(style: string, text: string): string {
  * legacy config values such as "accent" or "syntaxKeyword".
  */
 export function renderStyle(theme: ThemeLike, style: ColorSpec, text: string): string {
-	if (style.trim() === "") return text;
-	const styled = renderTerminalStyle(style, text);
+	if (parseStyle(style).tokens.length === 0) return text;
+	const styled = renderTerminalStyle(style, text, theme);
 	return styled === text ? colorize(theme, style, text) : styled;
 }
 
 export function renderThemeStyle(theme: ThemeLike, style: ColorSpec, text: string): string {
-	const trimmed = style.trim();
-	if (trimmed === "") return text;
-
-	const tokens = trimmed.split(/\s+/).filter(Boolean);
-	if (tokens.some(isExplicitTerminalColorToken)) return renderTerminalStyle(style, text);
+	const parsed = parseStyle(style);
+	const tokens = parsed.tokens;
+	if (tokens.length === 0) return text;
+	if (parsed.explicit) return renderTerminalStyle(style, text, theme);
 
 	const color = mapThemeColor(tokens) ?? "text";
 	return safeThemeFg(theme, color, applyThemeModifiers(theme, tokens, text));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rinco-pi-hud",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "A dynamic HUD footer for Pi, ported from Sakura Zentui Footer.",
   "type": "module",
   "license": "MIT",
@@ -39,8 +39,9 @@
     "pack:check": "npm pack --dry-run"
   },
   "peerDependencies": {
-    "@earendil-works/pi-coding-agent": "*",
-    "@earendil-works/pi-tui": "*"
+    "@earendil-works/pi-ai": "^1.3.0",
+    "@earendil-works/pi-coding-agent": "^1.3.0",
+    "@earendil-works/pi-tui": "^1.3.0"
   },
   "pi": {
     "extensions": [
@@ -48,7 +49,9 @@
     ]
   },
   "devDependencies": {
-    "@earendil-works/pi-ai": "^0.83.0",
+    "@earendil-works/pi-ai": "1.3.0",
+    "@earendil-works/pi-coding-agent": "1.3.0",
+    "@earendil-works/pi-tui": "1.3.0",
     "@eslint/js": "^10.0.1",
     "@types/node": "^24.12.4",
     "eslint": "^10.8.1",