@agnishc/edb-global-footer 0.10.3 → 0.10.5

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [0.10.5] - 2026-05-15
+
+### Changed
+- Working indicator no longer includes its own spinner frame in the message — removed double-spinner (the Loader renders the spinner via `setWorkingIndicator`)
+- Completion message now uses `setWidget` instead of `setWorkingMessage` so it remains visible after `agent_end` tears down the Loader
+- `cancelCompletionTimer` now clears the completion widget immediately when a new agent run starts
+- TPS calculator now excludes tool execution time — clock pauses on `tool_execution_start` and resumes on next `message_update`, so TPS reflects actual streaming speed only
+- TPS indicator moved to the right side of footer line 2, before the provider/model block
+- TPS color is now three-state: red (< 30 t/s), yellow (< 50 t/s), green (≥ 50 t/s); lightning icon remains white
+- Usage overlay now uses `DynamicBorder` (full-width, adapts to terminal) replacing the fixed-width 55-char box (imported from `edb-usage-stats`)
+- `waitForIdle()` removed from `/usage` command handler — overlay now opens immediately even while the agent is running
+
+## [0.10.4] - 2026-05-15
+
 ## [0.10.3] - 2026-05-15
 
 ## [0.9.0] - 2026-05-15

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@agnishc/edb-global-footer",
-	"version": "0.10.3",
+	"version": "0.10.5",
 	"description": "Pi extension: two-line status footer showing path, git branch, token usage, and model",
 	"keywords": [
 		"pi-package",

package/src/footer.ts

@@ -17,7 +17,7 @@ import type { GitStatus } from "./types";
 // Common uses:
 //   - "extmgr" - package manager status ("15 pkgs • auto update off")
 //   - Keys for extensions whose status you want to hide
-const STATUS_KEY_BLACKLIST = new Set<string>(["extmgr"]);
+const STATUS_KEY_BLACKLIST = new Set<string>(["extmgr", "sm"]);
 
 // ── Live state types ───────────────────────────────────────────────────────────
 
@@ -101,17 +101,16 @@ export function createFooterRenderer(
 				}
 
 				// Build three groups separated by pipes
-				// Group 1: ↑input ↓output ⚡tps
+				// Group 1: ↑input ↓output
 				// Group 2: Rcache Wcache $cost
 				// Group 3: context%
 				const { tps } = tpsState;
 				const showTps = tps > 0;
 
-				// Group 1: Read/Write + TPS
+				// Group 1: Read/Write tokens
 				const group1Parts: string[] = [];
 				if (totalInput) group1Parts.push(`↑${formatTokens(totalInput)}`);
 				if (totalOutput) group1Parts.push(`↓${formatTokens(totalOutput)}`);
-				if (showTps) group1Parts.push(theme.fg("accent", `⚡${formatTps(tps)}`));
 				const group1 = group1Parts.length > 0 ? group1Parts.join(" ") : null;
 
 				// Group 2: Cache + Price
@@ -154,6 +153,10 @@ export function createFooterRenderer(
 				// Model + thinking level with icons
 				const model = ctx.model;
 				const rightPartsLine2: string[] = [];
+				if (showTps) {
+					const tpsColor = tps < 30 ? "error" : tps < 50 ? "warning" : "success";
+					rightPartsLine2.push(`⚡${theme.fg(tpsColor, formatTps(tps))}`);
+				}
 				if (model) {
 					if (model.provider && footerData.getAvailableProviderCount() > 1) {
 						rightPartsLine2.push(theme.fg("muted", `(${model.provider})`));
@@ -176,18 +179,19 @@ export function createFooterRenderer(
 				// Filter out blacklisted status keys
 				const visibleStatuses = new Map<string, string>(
 					Array.from(extensionStatuses.entries() as [string, string][]).filter(
-						([key]) => !STATUS_KEY_BLACKLIST.has(key),
+						([key, value]) => !STATUS_KEY_BLACKLIST.has(key) && value.trim() !== "",
 					),
 				);
 				if (visibleStatuses.size > 0) {
 					const statusLine = Array.from(visibleStatuses.values())
 						.map((text) => sanitizeStatusText(text))
+						.filter((text) => text !== "")
 						.sort((a, b) => a.localeCompare(b))
 						.join(" ");
-					lines.push(truncateToWidth(statusLine, width, theme.fg("dim", "...")));
+					if (statusLine) lines.push(truncateToWidth(statusLine, width, theme.fg("dim", "...")));
 				}
 
-				return lines.map((line) => truncateToWidth(line, width));
+				return lines.filter((line) => line !== "").map((line) => truncateToWidth(line, width));
 			},
 		};
 	};

package/src/index.ts

@@ -91,4 +91,12 @@ export default function globalFooterExtension(pi: ExtensionAPI): void {
 		tpsCalculator.onMessageEnd(event.message);
 		requestRender();
 	});
+
+	pi.on("tool_execution_start", () => {
+		tpsCalculator.onToolStart();
+	});
+
+	pi.on("tool_execution_end", () => {
+		tpsCalculator.onToolEnd();
+	});
 }

package/src/tps.ts

@@ -25,7 +25,9 @@ export interface TpsState {
 
 export class TpsCalculator {
 	private streaming = false;
-	private streamStart = 0;
+	private lastUpdateAt = 0; // timestamp of last message_update
+	private accumulatedMs = 0; // total streaming ms, excluding tool execution time
+	private inTool = false; // whether a tool is currently executing
 	private tps = 0;
 	private lastOutputTokens = 0;
 	private lastInputTokens = 0;
@@ -35,33 +37,56 @@ export class TpsCalculator {
 	 */
 	resetForTurn(): void {
 		this.streaming = false;
-		this.streamStart = 0;
+		this.lastUpdateAt = 0;
+		this.accumulatedMs = 0;
+		this.inTool = false;
 		this.tps = 0;
 	}
 
 	/**
-	 * Called when streaming starts (first message_update).
+	 * Call when a tool starts executing — pauses the streaming clock.
 	 */
-	streamStarted(): void {
-		this.streaming = true;
-		this.streamStart = performance.now();
+	onToolStart(): void {
+		if (this.streaming && this.lastUpdateAt > 0) {
+			// Accumulate streaming time up to this point
+			this.accumulatedMs += performance.now() - this.lastUpdateAt;
+			this.lastUpdateAt = 0;
+		}
+		this.inTool = true;
+	}
+
+	/**
+	 * Call when a tool finishes executing — resumes the streaming clock on next update.
+	 */
+	onToolEnd(): void {
+		this.inTool = false;
+		// lastUpdateAt will be reset on the next message_update
 	}
 
 	/**
 	 * Called on each message_update during streaming.
 	 */
 	onMessageUpdate(message: AssistantMessage): void {
+		const now = performance.now();
+
 		if (!this.streaming) {
-			this.streamStarted();
+			// First update of this streaming burst
+			this.streaming = true;
+			this.lastUpdateAt = now;
+		} else if (this.inTool || this.lastUpdateAt === 0) {
+			// Resuming after a tool call — restart the clock segment
+			this.lastUpdateAt = now;
+			this.inTool = false;
 		}
 
+		// Count chars for live estimate
 		let chars = 0;
 		for (const block of message.content) {
 			if (block.type === "text") chars += block.text.length;
 			else if (block.type === "thinking") chars += block.thinking.length;
 		}
 
-		const elapsed = (performance.now() - this.streamStart) / 1000;
+		const elapsed = (this.accumulatedMs + (now - this.lastUpdateAt)) / 1000;
 		if (elapsed > 0.1) {
 			const estimatedTokens = chars / 4;
 			this.tps = estimatedTokens / elapsed;
@@ -72,7 +97,13 @@ export class TpsCalculator {
 	 * Called on message_end to finalize TPS with actual usage.
 	 */
 	onMessageEnd(message: AssistantMessage): void {
-		const elapsed = this.streamStart > 0 ? (performance.now() - this.streamStart) / 1000 : 0;
+		const now = performance.now();
+		// Flush any remaining streaming time
+		if (this.lastUpdateAt > 0) {
+			this.accumulatedMs += now - this.lastUpdateAt;
+			this.lastUpdateAt = 0;
+		}
+		const elapsed = this.accumulatedMs / 1000;
 		const outputTokens = message.usage?.output ?? 0;
 		this.lastInputTokens = message.usage?.input ?? 0;
 		this.lastOutputTokens = outputTokens;

package/src/workingIndicator.ts

@@ -506,9 +506,14 @@ function applyShimmer(text: string, frame: number, baseHex: string, shimmerHex:
 	return result;
 }
 
+export interface WorkingIndicatorRef {
+	currentLine: string | undefined;
+}
+
 // ── Working Indicator ─────────────────────────────────────────────────────────
 
-export function installWorkingIndicator(pi: ExtensionAPI): void {
+export function installWorkingIndicator(pi: ExtensionAPI): WorkingIndicatorRef {
+	const ref: WorkingIndicatorRef = { currentLine: undefined };
 	let ctx: ExtensionContext | null = null;
 	let isActive = false;
 
@@ -519,7 +524,6 @@ export function installWorkingIndicator(pi: ExtensionAPI): void {
 	let completionTimer: ReturnType<typeof setTimeout> | null = null;
 
 	// State
-	let spinnerFrame = 0;
 	let shimmerFrame = 0;
 	let currentVerb = "Working";
 	let startedAt = 0;
@@ -552,9 +556,6 @@ export function installWorkingIndicator(pi: ExtensionAPI): void {
 		const theme = ctx.ui.theme;
 		const sep = theme.fg("dim", " · ");
 
-		// Spinner frame (accent colored)
-		const frame = theme.fg("accent", SPINNER_FRAMES[spinnerFrame % SPINNER_FRAMES.length]!);
-
 		// Verb with shimmer
 		const verbText = `${currentVerb}...`;
 		let verbStyled: string;
@@ -567,20 +568,21 @@ export function installWorkingIndicator(pi: ExtensionAPI): void {
 		// Timer
 		const timer = theme.fg("dim", formatElapsed(elapsedMs));
 
-		// Assemble parts
-		const parts: string[] = [frame, verbStyled];
-		if (toolSuffix) parts.push(toolSuffix);
+		// Assemble parts — do NOT include frame here; the Loader prepends its own spinner via setWorkingIndicator
+		const parts: string[] = [verbStyled];
+		if (toolSuffix) parts.push(theme.fg("dim", toolSuffix));
 		parts.push(timer);
 
-		ctx.ui.setWorkingMessage(parts.join(sep));
+		const rendered = parts.join(sep);
+		ref.currentLine = rendered;
+		ctx.ui.setWorkingMessage(rendered);
 	}
 
 	// ── Timer management ──────────────────────────────────────────────────────
 
 	function startTimers(): void {
-		// Spinner + shimmer: 150ms
+		// Shimmer: 150ms
 		spinnerTimer = setInterval(() => {
-			spinnerFrame++;
 			shimmerFrame++;
 			render();
 		}, SPINNER_INTERVAL_MS);
@@ -621,6 +623,7 @@ export function installWorkingIndicator(pi: ExtensionAPI): void {
 		if (completionTimer) {
 			clearTimeout(completionTimer);
 			completionTimer = null;
+			ctx?.ui.setWidget("wi-completion", undefined);
 		}
 	}
 
@@ -635,14 +638,16 @@ export function installWorkingIndicator(pi: ExtensionAPI): void {
 		const verb = theme.fg("accent", randomItem(COMPLETION_VERBS));
 		const time = theme.fg("dim", formatElapsed(totalMs));
 		const sep = theme.fg("dim", " · ");
+		const completionLine = `${check}${sep}${verb}${sep}${time}`;
 
-		ctx.ui.setWorkingMessage(`${check}${sep}${verb}${sep}${time}`);
-		ctx.ui.setStatus("working-indicator", `${check} ${verb}`);
+		// The Loader is torn down by pi on agent_end, so setWorkingMessage is a no-op.
+		// Use setWidget to briefly show the completion state above the editor.
+		ctx.ui.setWidget("wi-completion", [completionLine]);
 
 		completionTimer = setTimeout(() => {
 			completionTimer = null;
-			ctx?.ui.setWorkingMessage(undefined);
-			ctx?.ui.setStatus("working-indicator", "");
+			ref.currentLine = undefined;
+			ctx?.ui.setWidget("wi-completion", undefined);
 		}, 3000);
 	}
 
@@ -670,7 +675,6 @@ export function installWorkingIndicator(pi: ExtensionAPI): void {
 		isActive = true;
 		startedAt = Date.now();
 		elapsedMs = 0;
-		spinnerFrame = 0;
 		shimmerFrame = 0;
 		toolSuffix = undefined;
 		activeTools.clear();
@@ -742,6 +746,9 @@ export function installWorkingIndicator(pi: ExtensionAPI): void {
 		stopTimers();
 		cancelCompletionTimer();
 		isActive = false;
+		ref.currentLine = undefined;
 		ctx = null;
 	});
+
+	return ref;
 }