@jaggerxtrm/pi-extensions 0.9.4 → 0.9.5

package/extensions/custom-footer/index.ts

@@ -10,7 +10,7 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 
-import { SubprocessRunner, EventAdapter } from "../../src/core";
+import { EventAdapter, SubprocessRunner } from "../../src/core";
 
 export default function (pi: ExtensionAPI) {
 	interface BeadClaim {
@@ -32,6 +32,8 @@ export default function (pi: ExtensionAPI) {
 		lastFetch: number;
 	}
 
+	type RefreshKind = "runtime" | "beads";
+
 	const STATUS_ICONS: Record<string, string> = {
 		open: "○",
 		in_progress: "◐",
@@ -39,7 +41,6 @@ export default function (pi: ExtensionAPI) {
 		closed: "✓",
 	};
 
-	// Chip background colours (raw ANSI — theme has no bg() API)
 	const CHIP_BG_NEUTRAL = "\x1b[48;5;238m";
 	const CHIP_BG_ACTIVE = "\x1b[48;5;39m";
 	const CHIP_BG_BLOCKED = "\x1b[48;5;88m";
@@ -52,13 +53,22 @@ export default function (pi: ExtensionAPI) {
 		blocked: CHIP_BG_BLOCKED,
 	};
 
+	const CACHE_TTL = 5000;
+	const REFRESH_TIMEOUT_MS = 2000;
+	const TOOL_RESULT_REFRESH_DELAY_MS = 200;
+	const FOOTER_REAPPLY_DELAY_MS = 40;
+
 	const chip = (text: string, bg = CHIP_BG_NEUTRAL): string => `${bg}${CHIP_FG} ${text} ${CHIP_RESET}`;
 
 	let capturedPi: ExtensionAPI = pi;
 	let capturedCtx: any = null;
 	let requestRender: (() => void) | null = null;
+	let footerReapplyTimer: ReturnType<typeof setTimeout> | null = null;
+	let scheduledRefreshTimer: ReturnType<typeof setTimeout> | null = null;
+	let scheduledRefreshKinds = new Set<RefreshKind>();
+	let runningRefreshPromise: Promise<void> | null = null;
+	let branchChangeUnsub: (() => void) | null = null;
 
-	const CACHE_TTL = 5000;
 	let refreshingBeads = false;
 	let refreshingRuntime = false;
 
@@ -76,10 +86,9 @@ export default function (pi: ExtensionAPI) {
 
 	const getCwd = () => capturedCtx?.cwd || process.cwd();
 	const getShortId = (id: string) => id.split("-").pop() ?? id;
+	const runCommand = (command: string, args: string[], cwd: string) =>
+		SubprocessRunner.run(command, args, { cwd, timeoutMs: REFRESH_TIMEOUT_MS });
 
-	/**
-	 * Parse git status --porcelain output into status flags
-	 */
 	const parseGitFlags = (porcelain: string): string => {
 		let modified = false;
 		let staged = false;
@@ -92,9 +101,6 @@ export default function (pi: ExtensionAPI) {
 		return `${modified ? "*" : ""}${staged ? "+" : ""}${deleted ? "-" : ""}`;
 	};
 
-	/**
-	 * Fetch git branch and status
-	 */
 	const refreshRuntimeState = async () => {
 		if (refreshingRuntime || Date.now() - runtimeState.lastFetch < CACHE_TTL) return;
 		refreshingRuntime = true;
@@ -103,25 +109,21 @@ export default function (pi: ExtensionAPI) {
 			let branch: string | null = null;
 			let gitStatus = "";
 
-			const rootResult = await SubprocessRunner.run("git", ["rev-parse", "--show-toplevel"], { cwd });
+			const rootResult = await runCommand("git", ["rev-parse", "--show-toplevel"], cwd);
 			const repoRoot = rootResult.code === 0 ? rootResult.stdout.trim() : null;
 
 			if (repoRoot) {
-				const branchResult = await SubprocessRunner.run("git", ["branch", "--show-current"], { cwd });
+				const branchResult = await runCommand("git", ["branch", "--show-current"], cwd);
 				branch = branchResult.code === 0 ? branchResult.stdout.trim() || null : null;
 
-				const porcelainResult = await SubprocessRunner.run(
-					"git",
-					["--no-optional-locks", "status", "--porcelain"],
-					{ cwd },
-				);
+				const porcelainResult = await runCommand("git", ["--no-optional-locks", "status", "--porcelain"], cwd);
 				const baseFlags = porcelainResult.code === 0 ? parseGitFlags(porcelainResult.stdout) : "";
 
 				let upstreamFlags = "";
-				const abResult = await SubprocessRunner.run(
+				const abResult = await runCommand(
 					"git",
 					["--no-optional-locks", "rev-list", "--left-right", "--count", "@{upstream}...HEAD"],
-					{ cwd },
+					cwd,
 				);
 				if (abResult.code === 0) {
 					const [behindRaw, aheadRaw] = abResult.stdout.trim().split(/\s+/);
@@ -148,9 +150,6 @@ export default function (pi: ExtensionAPI) {
 		}
 	};
 
-	/**
-	 * Format token counts (from original footer)
-	 */
 	const formatTokens = (count: number): string => {
 		if (count < 1000) return count.toString();
 		if (count < 10000) return `${(count / 1000).toFixed(1)}k`;
@@ -165,14 +164,14 @@ export default function (pi: ExtensionAPI) {
 		if (!EventAdapter.isBeadsProject(cwd)) return;
 		refreshingBeads = true;
 		try {
-			const inProgressResult = await SubprocessRunner.run("bd", ["list", "--status=in_progress"], { cwd });
+			const inProgressResult = await runCommand("bd", ["list", "--status=in_progress"], cwd);
 			const inProgressRaw = inProgressResult.code === 0 ? inProgressResult.stdout : "";
 			const ids = [...new Set([...inProgressRaw.matchAll(/^◐\s+([a-z][\w-]+)/gm)].map((m) => m[1]).filter((id) => id.includes("-")))];
 
 			let claims: BeadClaim[] = [];
 			if (ids.length === 1) {
 				const [id] = ids;
-				const showResult = await SubprocessRunner.run("bd", ["show", id, "--json"], { cwd });
+				const showResult = await runCommand("bd", ["show", id, "--json"], cwd);
 				if (showResult.code === 0) {
 					try {
 						const issue = JSON.parse(showResult.stdout)?.[0];
@@ -189,10 +188,10 @@ export default function (pi: ExtensionAPI) {
 
 			let openCount = 0;
 			if (claims.length === 0) {
-				const listResult = await SubprocessRunner.run("bd", ["list"], { cwd });
+				const listResult = await runCommand("bd", ["list"], cwd);
 				if (listResult.code === 0) {
-					const m = listResult.stdout.match(/\((\d+)\s+open/);
-					if (m) openCount = parseInt(m[1], 10);
+					const match = listResult.stdout.match(/\((\d+)\s+open/);
+					if (match) openCount = parseInt(match[1], 10);
 				}
 			}
 
@@ -209,9 +208,35 @@ export default function (pi: ExtensionAPI) {
 		}
 	};
 
-	/**
-	 * Build beads line: ◐ 4843.5 Rework project bootstrap... or ○ 6 open
-	 */
+	const runRefreshKinds = async (refreshKinds: ReadonlySet<RefreshKind>) => {
+		await Promise.all([
+			refreshKinds.has("runtime") ? refreshRuntimeState() : Promise.resolve(),
+			refreshKinds.has("beads") ? refreshBeadState() : Promise.resolve(),
+		]);
+	};
+
+	const flushScheduledRefreshes = async () => {
+		if (runningRefreshPromise) return runningRefreshPromise;
+		const refreshKinds = scheduledRefreshKinds;
+		scheduledRefreshKinds = new Set<RefreshKind>();
+		runningRefreshPromise = runRefreshKinds(refreshKinds).finally(async () => {
+			runningRefreshPromise = null;
+			if (scheduledRefreshKinds.size > 0) {
+				await flushScheduledRefreshes();
+			}
+		});
+		return runningRefreshPromise;
+	};
+
+	const scheduleRefresh = (kinds: readonly RefreshKind[], delayMs = 0) => {
+		for (const kind of kinds) scheduledRefreshKinds.add(kind);
+		if (scheduledRefreshTimer) return;
+		scheduledRefreshTimer = setTimeout(() => {
+			scheduledRefreshTimer = null;
+			void flushScheduledRefreshes();
+		}, delayMs);
+	};
+
 	const buildBeadsLine = (width: number, theme: any): string => {
 		const { claims, openCount } = beadState;
 
@@ -239,55 +264,50 @@ export default function (pi: ExtensionAPI) {
 		return truncateToWidth(`○ no open issues`, width);
 	};
 
-	let footerReapplyTimer: ReturnType<typeof setTimeout> | null = null;
+	const attachBranchChangeListener = (footerData: any) => {
+		branchChangeUnsub?.();
+		const unsubscribe = footerData.onBranchChange(() => {
+			runtimeState.lastFetch = 0;
+			scheduleRefresh(["runtime"]);
+		});
+		branchChangeUnsub = unsubscribe;
+		return unsubscribe;
+	};
 
 	const applyCustomFooter = (ctx: any) => {
 		capturedCtx = ctx;
 		ctx.ui.setFooter((tui, theme, footerData) => {
-			requestRender = () => tui.requestRender();
-			const unsub = footerData.onBranchChange(() => {
-				runtimeState.lastFetch = 0;
-				tui.requestRender();
-			});
+			const instanceRequestRender = () => tui.requestRender();
+			requestRender = instanceRequestRender;
+			const instanceBranchChangeUnsub = attachBranchChangeListener(footerData);
 
 			return {
 				dispose() {
-					unsub();
-					requestRender = null;
+					instanceBranchChangeUnsub?.();
+					if (branchChangeUnsub === instanceBranchChangeUnsub) branchChangeUnsub = null;
+					if (requestRender === instanceRequestRender) requestRender = null;
 				},
 				invalidate() {},
 				render(width: number): string[] {
-					refreshRuntimeState().catch(() => {});
-					refreshBeadState().catch(() => {});
-
-					// === LINE 1: ~/path (branch *+↑) ===
-					// Like original, no session name, but with git status flags
 					let pwd = process.cwd();
 					const home = process.env.HOME || process.env.USERPROFILE;
 					if (home && pwd.startsWith(home)) {
 						pwd = `~${pwd.slice(home.length)}`;
 					}
 
-					// Use runtimeState branch (with git status) or fallback to footerData
 					const branch = runtimeState.branch || footerData.getGitBranch();
 					if (branch) {
-						const branchWithStatus = runtimeState.gitStatus
-							? `${branch} ${runtimeState.gitStatus}`
-							: branch;
+						const branchWithStatus = runtimeState.gitStatus ? `${branch} ${runtimeState.gitStatus}` : branch;
 						pwd = `${pwd} (${branchWithStatus})`;
 					}
 
 					const pwdLine = truncateToWidth(theme.fg("dim", pwd), width, theme.fg("dim", "..."));
 
-					// === LINE 2: XX%/window (provider) model • thinking ===
 					const usage = ctx.getContextUsage();
 					const model = ctx.model;
-
 					const contextWindow = usage?.contextWindow ?? model?.contextWindow ?? 0;
 					const contextPercentValue = usage?.percent ?? 0;
 					const contextPercent = usage?.percent !== null ? contextPercentValue.toFixed(1) : "?";
-
-					// Build left side: context %/window (color-coded like original)
 					const contextDisplay =
 						contextPercent === "?"
 							? `?/${formatTokens(contextWindow)}`
@@ -299,11 +319,8 @@ export default function (pi: ExtensionAPI) {
 						return text;
 					};
 
-					// Build right side: (provider) model • thinking
 					const modelName = model?.id || "no-model";
 					const providerCount = footerData.getAvailableProviderCount();
-
-					// Thinking level if model supports reasoning
 					let rightSideWithoutProvider = modelName;
 					if (model?.reasoning) {
 						const thinkingLevel = capturedPi.getThinkingLevel() || "off";
@@ -311,7 +328,6 @@ export default function (pi: ExtensionAPI) {
 							thinkingLevel === "off" ? `${modelName} • thinking off` : `${modelName} • ${thinkingLevel}`;
 					}
 
-					// Prepend provider if >1
 					let rightSide = rightSideWithoutProvider;
 					if (providerCount > 1 && model) {
 						rightSide = `(${model.provider}) ${rightSideWithoutProvider}`;
@@ -320,7 +336,6 @@ export default function (pi: ExtensionAPI) {
 						}
 					}
 
-					// Keep provider/model adjacent to usage (no right-bound alignment)
 					const separator = " ";
 					const leftWidth = visibleWidth(contextDisplay);
 					const separatorWidth = visibleWidth(separator);
@@ -334,16 +349,14 @@ export default function (pi: ExtensionAPI) {
 						line2 = `${colorizeUsage(contextDisplay)}${theme.fg("dim", separator)}${theme.fg("dim", truncatedRight)}`;
 					}
 
-					// === LINE 3: ◐ 4843.5 Rework project bootstrap... ===
 					const line3 = buildBeadsLine(width, theme);
-
 					return [pwdLine, line2, line3];
 				},
 			};
 		});
 	};
 
-	const scheduleFooterReapply = (ctx: any, delayMs = 40) => {
+	const scheduleFooterReapply = (ctx: any, delayMs = FOOTER_REAPPLY_DELAY_MS) => {
 		if (footerReapplyTimer) clearTimeout(footerReapplyTimer);
 		footerReapplyTimer = setTimeout(() => {
 			applyCustomFooter(ctx);
@@ -351,25 +364,35 @@ export default function (pi: ExtensionAPI) {
 		}, delayMs);
 	};
 
-	pi.on("session_start", async (_event, ctx) => {
-		capturedCtx = ctx;
+	const resetRefreshCaches = () => {
 		runtimeState.lastFetch = 0;
 		beadState.lastFetch = 0;
+	};
+
+	pi.on("session_start", async (_event, ctx) => {
+		capturedCtx = ctx;
+		resetRefreshCaches();
 		applyCustomFooter(ctx);
 		scheduleFooterReapply(ctx);
+		scheduleRefresh(["runtime", "beads"]);
 	});
 
 	pi.on("session_switch", async (_event, ctx) => {
-		runtimeState.lastFetch = 0;
+		capturedCtx = ctx;
+		resetRefreshCaches();
 		scheduleFooterReapply(ctx);
+		scheduleRefresh(["runtime", "beads"]);
 	});
 
 	pi.on("session_fork", async (_event, ctx) => {
-		runtimeState.lastFetch = 0;
+		capturedCtx = ctx;
+		resetRefreshCaches();
 		scheduleFooterReapply(ctx);
+		scheduleRefresh(["runtime", "beads"]);
 	});
 
 	pi.on("model_select", async (_event, ctx) => {
+		capturedCtx = ctx;
 		scheduleFooterReapply(ctx);
 	});
 
@@ -378,20 +401,31 @@ export default function (pi: ExtensionAPI) {
 			clearTimeout(footerReapplyTimer);
 			footerReapplyTimer = null;
 		}
+		if (scheduledRefreshTimer) {
+			clearTimeout(scheduledRefreshTimer);
+			scheduledRefreshTimer = null;
+		}
+		scheduledRefreshKinds.clear();
+		branchChangeUnsub?.();
+		branchChangeUnsub = null;
+		requestRender = null;
 	});
 
-	// Bust caches immediately after relevant writes
 	pi.on("tool_result", async (event: any) => {
 		const cmd = event?.input?.command;
 		if (!cmd) return undefined;
 
+		const refreshKinds: RefreshKind[] = [];
 		if (/\bbd\s+(close|update|create|claim)\b/.test(cmd)) {
 			beadState.lastFetch = 0;
-			setTimeout(() => refreshBeadState().catch(() => {}), 200);
+			refreshKinds.push("beads");
 		}
 		if (/\bgit\s+/.test(cmd)) {
 			runtimeState.lastFetch = 0;
-			setTimeout(() => refreshRuntimeState().catch(() => {}), 200);
+			refreshKinds.push("runtime");
+		}
+		if (refreshKinds.length > 0) {
+			scheduleRefresh(refreshKinds, TOOL_RESULT_REFRESH_DELAY_MS);
 		}
 		return undefined;
 	});