@pi-unipi/footer 2.16.1 → 2.17.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/footer",
-  "version": "2.16.1",
+  "version": "2.17.2",
   "description": "Persistent status bar for Unipi — subscribes to UNIPI_EVENTS and renders key stats from all unipi packages",
   "type": "module",
   "main": "index.ts",
@@ -32,8 +32,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@pi-unipi/core": "2.16.1",
-    "@pi-unipi/background-tasks": "2.16.1"
+    "@pi-unipi/core": "2.17.0",
+    "@pi-unipi/background-tasks": "2.17.0"
   },
   "peerDependencies": {
     "@earendil-works/pi-coding-agent": "^0.84.0",

package/src/glance-editor.ts

@@ -35,6 +35,12 @@ export interface GlanceStatus {
 	modelName: string;
 	/** Current thinking level (already "off"-filtered by the provider). */
 	thinkingLevel: string | null;
+	/**
+	 * Active Fusion pair, when selected. When set, the model slot renders
+	 * `Fusion · <lead> <effort> ◆ <sidekick>` — lead lit, sidekick muted —
+	 * and the plain thinking slot is suppressed (efforts are inline).
+	 */
+	fusion: { leadName: string; leadEffort: string; sidekickName: string; sidekickEffort: string; savedUsd?: number } | null;
 }
 
 const BORDER = {
@@ -47,6 +53,9 @@ const BORDER = {
 } as const;
 
 const SEP = " \u2502 "; // │
+const RESET = "\x1b[0m";
+const LEAD_FG = "\x1b[1m\x1b[38;2;181;189;104m"; // bold accent (matches success tint)
+const DIM_FG = "\x1b[38;2;120;124;134m"; // muted grey
 
 /**
  * Every invisible sequence pi-tui embeds in editor lines: CSI SGR, OSC 133
@@ -216,9 +225,19 @@ export class GlanceEditor extends CustomEditor {
 		const pctLabel = ctxPct !== null ? `${Math.round(ctxPct)}%` : "?%";
 		const winLabel = st.contextWindow > 0 ? `/${fmtTokens(st.contextWindow)}` : "";
 		rightParts.push(`${pctLabel}${winLabel}`);
-		if (st.modelName) rightParts.push(st.modelName);
-		if (st.thinkingLevel && st.thinkingLevel !== "off") {
-			rightParts.push(`thinking:${st.thinkingLevel}`);
+		if (st.fusion) {
+			// The working lead is lit; the sidekick stays muted. Efforts are
+			// inline so the separate thinking slot is dropped.
+			const lead = `${st.fusion.leadName}${st.fusion.leadEffort ? ` ${st.fusion.leadEffort}` : ""}`;
+			const side = `${st.fusion.sidekickName}${st.fusion.sidekickEffort ? ` ${st.fusion.sidekickEffort}` : ""}`;
+			rightParts.push(
+				`${LEAD_FG}Fusion · ${lead}${RESET} ${DIM_FG}◆ ${side}${st.fusion.savedUsd !== undefined && st.fusion.savedUsd > 0.005 ? ` · saved $${st.fusion.savedUsd.toFixed(2)}` : ""}${RESET}`,
+			);
+		} else {
+			if (st.modelName) rightParts.push(st.modelName);
+			if (st.thinkingLevel && st.thinkingLevel !== "off") {
+				rightParts.push(`thinking:${st.thinkingLevel}`);
+			}
 		}
 		// Workspace label per icon style (glyph prefix, or workspace: in text mode).
 		let cluster = rightParts.join(SEP);

package/src/index.ts

@@ -7,7 +7,7 @@
 
 import type { ExtensionAPI, Theme, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
-import { UNIPI_EVENTS, emitEvent, UNIPI_PREFIX, FOOTER_COMMANDS } from "@pi-unipi/core";
+import { UNIPI_EVENTS, emitEvent, UNIPI_PREFIX, FOOTER_COMMANDS, getSharedFusionStatus } from "@pi-unipi/core";
 import { FooterRegistry, getFooterRegistry } from "./registry/index.js";
 import { FooterRenderer } from "./rendering/renderer.js";
 import { subscribeToEvents } from "./events.js";
@@ -153,13 +153,10 @@ export default function footerExtension(pi: ExtensionAPI): void {
     // Glance-style input surface (pi-glance-inspired). Preserves all default
     // editor behavior via CustomEditor subclassing; only paint differs.
     //
-    // FOCUS-SAFETY DEFERRAL: setEditorComponent() internally calls
-    // ui.setFocus(newEditor). info-screen (loaded before us) opens its boot
-    // dashboard during ITS session_start handler, so our session_start runs
-    // while that overlay owns keyboard focus. Swapping now would steal focus
-    // and strand the dashboard unclosable (q/Esc would type into the editor).
-    // The boot overlay auto-closes after ~2s; we install after a grace period
-    // longer than any sane bootTimeoutMs.
+    // FOCUS-SAFETY DEFERRAL: the timer remains a grace period for the boot
+    // dashboard, but installGlanceEditor also restores any overlay focus after
+    // setEditorComponent() calls ui.setFocus(newEditor). This covers the
+    // updater prompt too, so q/Esc cannot be stranded in the editor.
     state.glanceInstallTimer = setTimeout(() => installGlanceEditor(state, ctx), 3500);
 
     // Sync TPS cursor with persisted assistant messages so streaming-hook
@@ -420,6 +417,15 @@ function installGlanceEditor(
 ): void {
   if (st.glanceInstalled || !st.piContext || !st.glanceMode) return;
   try {
+    const tui = st.tuiRef as (import("@earendil-works/pi-tui").TUI & {
+      isOverlayFocused?: () => boolean;
+      getFocusedComponent?: () => import("@earendil-works/pi-tui").Component | null;
+    }) | null | undefined;
+    const overlayFocused = tui !== undefined && tui !== null
+      && (typeof tui.isOverlayFocused === "function" ? tui.isOverlayFocused() : tui.hasOverlay());
+    const overlayOwner = overlayFocused && typeof tui?.getFocusedComponent === "function"
+      ? tui.getFocusedComponent() ?? null
+      : null;
     const piCtx = st.piContext as Record<string, unknown> | undefined;
     const cwd = (piCtx?.sessionManager as any)?.getCwd?.() ?? (piCtx as any)?.cwd ?? process.cwd();
     const workspace = String(cwd).split("/").filter(Boolean).pop() ?? "~";
@@ -433,6 +439,7 @@ function installGlanceEditor(
         let modelName = (model?.name || model?.id || "") as string;
         if (modelName.startsWith("Claude ")) modelName = modelName.slice(7);
         const branch = (st.footerData as any)?.getGitBranch?.() ?? null;
+        const fusion = getSharedFusionStatus() ?? null;
         return {
           workspace,
           branch: typeof branch === "string" ? branch : null,
@@ -440,9 +447,11 @@ function installGlanceEditor(
           contextWindow: typeof usage?.contextWindow === "number" ? usage.contextWindow : 0,
           modelName,
           thinkingLevel: typeof p?.thinkingLevel === "string" ? p.thinkingLevel : null,
+          fusion,
         };
       }),
     );
+    if (overlayOwner && tui) tui.setFocus(overlayOwner);
     st.glanceInstalled = true;
   } catch {
     st.glanceInstalled = false;