@sassywares/pi-extensions 0.3.20 → 0.3.22

package/README.md

@@ -151,7 +151,7 @@ Writes do not fail quietly and they are not matched by pattern. `rm`, `sed -i`,
 
 A backend is only trusted after it proves both halves of the contract: reads inside the working directory must succeed **and** a probe write there must fail. A backend that is installed but cannot enforce (for example bubblewrap on a distribution that blocks unprivileged user namespaces) is discarded, and ask mode continues without bash rather than falling back to a command allowlist. The working directory always wins over the temp allowance: if the project itself lives under the temp directory, temp writes are denied too and `/modes` reports `temp dir is read-only`.
 
-`/modes` shows the verdict. While ask mode is active, the footer is replaced by a compact one that draws the badge on the working-directory/session line — `⏸ ask · ro(sandbox-exec)` or `⏸ ask · bash off` — instead of taking a row of its own; other extension statuses keep their line. Leaving ask mode restores pi's native footer.
+`/modes` shows the verdict. The mode badge sits on a footer line of its own, aligned to the right edge: `▶ work`, `⏸ ask · ro(sandbox-exec)`, or `⏸ ask · bash off`. To place it there without reimplementing pi's footer, the extension delegates to pi's own `FooterComponent` and appends the badge line, so directory, session name, token stats, model, and context usage stay exactly as pi renders them. If a future pi release changes what that component reads, the extension restores the native footer and falls back to a left-aligned status line.
 
 - `--ask` starts a session in ask mode; the mode persists across resume.
 - `shift+tab` is not used, because pi binds it to the thinking level. To match an editor that uses it for modes, bind `app.thinking.cycle` to something else in `~/.pi/agent/keybindings.json` and add a shortcut there.

package/extensions/modes/footer.ts

@@ -1,90 +1,54 @@
 /**
- * Ask-mode footer.
+ * Right-aligned mode badge.
  *
- * The built-in footer puts every `ctx.ui.setStatus()` entry on its own line
- * below the token stats, which leaves stale blank space above the model line
- * and pushes the transcript up by one row. This footer is installed only while
- * ask mode is active, and draws the mode badge on the working-directory/session
- * line instead, right-aligned into space that is otherwise empty.
+ * `ctx.ui.setStatus()` has no placement: pi appends status texts as a line of
+ * their own, left-aligned, and its sanitizer collapses runs of spaces, so a
+ * badge cannot be pushed to the right edge from there.
  *
- * It is deliberately a subset of pi's footer: working directory, git branch,
- * session name, token totals, cost, context usage, and model. Any other
- * extension statuses are kept on their own line.
+ * This footer keeps pi's own rendering (it delegates to the exported
+ * `FooterComponent`) and appends one extra line with the badge aligned to the
+ * right edge. Nothing about the directory, session name, token stats, or model
+ * line is reimplemented here, so it stays correct as pi's footer evolves.
+ *
+ * If a future pi version changes what `FooterComponent` reads from its session
+ * argument, the render below throws; `onError` then tells the extension to
+ * restore the native footer and fall back to the plain status line.
  */
 
-import { homedir } from "node:os";
-import { relative, resolve, sep } from "node:path";
 import type { Component } from "@earendil-works/pi-tui";
 import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 import type { ExtensionContext, ReadonlyFooterDataProvider, Theme } from "@earendil-works/pi-coding-agent";
+import { FooterComponent } from "@earendil-works/pi-coding-agent";
 
 export interface ModeBadge {
 	text: string;
-	tone: "warning" | "error";
-}
-
-interface Usage {
-	input?: number;
-	output?: number;
-	cost?: { total?: number };
-}
-
-interface Totals {
-	input: number;
-	output: number;
-	cost: number;
-}
-
-const EMPTY_TOTALS: Totals = { input: 0, output: 0, cost: 0 };
-
-export function formatTokens(count: number): string {
-	if (count < 1000) return count.toString();
-	if (count < 10000) return `${(count / 1000).toFixed(1)}k`;
-	if (count < 1000000) return `${Math.round(count / 1000)}k`;
-	if (count < 10000000) return `${(count / 1000000).toFixed(1)}M`;
-	return `${Math.round(count / 1000000)}M`;
+	tone: "warning" | "error" | "accent";
 }
 
-export function formatCwd(cwd: string, home = homedir()): string {
-	const resolvedCwd = resolve(cwd);
-	const resolvedHome = resolve(home);
-	const delta = relative(resolvedHome, resolvedCwd);
-	const insideHome = delta === "" || (delta !== ".." && !delta.startsWith(`..${sep}`) && !isAbsolutePath(delta));
-	if (!insideHome) return cwd;
-	return delta === "" ? "~" : `~${sep}${delta}`;
-}
-
-function isAbsolutePath(value: string): boolean {
-	return value.startsWith("/") || /^[a-zA-Z]:[\\/]/.test(value);
-}
-
-/** Left text on the left edge, right text on the right edge, one space minimum between. */
-function justify(left: string, right: string, width: number): string {
-	const leftWidth = visibleWidth(left);
-	const rightWidth = visibleWidth(right);
-	if (leftWidth + rightWidth + 1 <= width) {
-		return left + " ".repeat(width - leftWidth - rightWidth) + right;
-	}
-
-	const availableLeft = width - rightWidth - 1;
-	if (availableLeft >= 12) {
-		const shortened = truncateToWidth(left, availableLeft, "…");
-		const shortenedWidth = visibleWidth(shortened);
-		return shortened + " ".repeat(Math.max(0, width - shortenedWidth - rightWidth)) + right;
-	}
-
-	if (rightWidth + 1 <= width) {
-		return " ".repeat(Math.max(0, width - rightWidth)) + right;
-	}
-
-	return truncateToWidth(right, width, "…");
+export interface ModesFooterOptions {
+	/** Session auto-compaction, shown by the footer as the `(auto)` suffix. */
+	autoCompact: boolean;
+	/** Called once if pi's footer cannot be rendered through this shim. */
+	onError: () => void;
 }
 
-function addUsage(totals: Totals, usage: Usage | undefined): void {
-	if (!usage) return;
-	totals.input += usage.input ?? 0;
-	totals.output += usage.output ?? 0;
-	totals.cost += usage.cost?.total ?? 0;
+/**
+ * The subset of `AgentSession` that `FooterComponent` reads. Everything except
+ * a few computed values is already on the extension context.
+ */
+function sessionShim(ctx: ExtensionContext) {
+	return {
+		model: ctx.model,
+		state: { model: ctx.model, thinkingLevel: ctx.thinkingLevel },
+		routedModel: undefined,
+		getContextUsage: () => ctx.getContextUsage(),
+		modelRuntime: {
+			// Extensions cannot observe subscription backing; the provider name is
+			// the only signal available.
+			isUsingSubscription: (provider: string) => provider === "kimi-coding",
+		},
+		sessionManager: ctx.sessionManager,
+	} as unknown as ConstructorParameters<typeof FooterComponent>[0];
 }
 
 export function createModesFooter(
@@ -92,73 +56,33 @@ export function createModesFooter(
 	theme: Theme,
 	footerData: ReadonlyFooterDataProvider,
 	badge: () => ModeBadge,
+	options: ModesFooterOptions,
 ): Component & { dispose?(): void } {
-	let cacheKey = "";
-	let cache: Totals = EMPTY_TOTALS;
-
-	function totals(): Totals {
-		const leaf = ctx.sessionManager.getLeafId() ?? "";
-		const entries = ctx.sessionManager.getEntries();
-		const key = `${leaf}:${entries.length}`;
-		if (key === cacheKey) return cache;
-
-		const next: Totals = { input: 0, output: 0, cost: 0 };
-		for (const entry of entries) {
-			const record = entry as { type: string; usage?: Usage; message?: { role?: string; usage?: Usage } };
-			if (record.type === "usage") {
-				addUsage(next, record.usage);
-			} else if (record.type === "message") {
-				addUsage(next, record.message?.usage);
-			}
-		}
-		cacheKey = key;
-		cache = next;
-		return next;
-	}
-
-	function render(width: number): string[] {
-		const model = ctx.model;
-		const branch = footerData.getGitBranch();
-		const sessionName = ctx.sessionManager.getSessionName();
-
-		let place = formatCwd(ctx.sessionManager.getCwd());
-		if (branch) place += ` (${branch})`;
-		if (sessionName) place += ` • ${sessionName}`;
+	const inner = new FooterComponent(sessionShim(ctx), footerData);
+	inner.setAutoCompactEnabled(options.autoCompact);
+	let failed = false;
 
+	function badgeLine(width: number): string {
 		const current = badge();
-		const lines = [justify(theme.fg("dim", place), theme.fg(current.tone, current.text), width)];
-
-		const used = totals();
-		const stats: string[] = [];
-		if (used.input) stats.push(`↑${formatTokens(used.input)}`);
-		if (used.output) stats.push(`↓${formatTokens(used.output)}`);
-		if (used.cost) stats.push(`$${used.cost.toFixed(3)}`);
-		const context = ctx.getContextUsage();
-		if (context) {
-			const percent = context.percent === null ? "?" : `${context.percent.toFixed(1)}%`;
-			stats.push(`${percent}/${formatTokens(context.contextWindow ?? 0)}`);
-		}
-
-		let modelText = model?.id ?? "no-model";
-		if (model?.reasoning) modelText += ` • ${ctx.thinkingLevel ?? "off"}`;
-		if (stats.length > 0) {
-			lines.push(justify(theme.fg("dim", stats.join(" ")), theme.fg("dim", modelText), width));
-		}
-
-		const statuses = [...footerData.getExtensionStatuses().entries()]
-			.filter(([key]) => key !== "modes")
-			.sort(([a], [b]) => a.localeCompare(b))
-			.map(([, text]) => text.replace(/[\r\n\t]/g, " ").replace(/ +/g, " ").trim())
-			.filter((text) => text.length > 0);
-		if (statuses.length > 0) {
-			lines.push(truncateToWidth(statuses.join(" "), width, "…"));
-		}
-
-		return lines;
+		const text = current.text;
+		if (visibleWidth(text) >= width) return theme.fg(current.tone, truncateToWidth(text, width, "…"));
+		const padding = Math.max(1, width - visibleWidth(text));
+		return " ".repeat(padding) + theme.fg(current.tone, text);
 	}
 
 	return {
-		invalidate() {},
-		render,
+		invalidate() {
+			inner.invalidate();
+		},
+		render(width: number): string[] {
+			if (failed) return [badgeLine(width)];
+			try {
+				return [...inner.render(width), badgeLine(width)];
+			} catch {
+				failed = true;
+				options.onError();
+				return [badgeLine(width)];
+			}
+		},
 	};
 }

package/extensions/modes/index.ts

@@ -52,8 +52,8 @@ export default function modesExtension(pi: ExtensionAPI): void {
 	let backendReason = "not detected yet";
 	let backendChecked = false;
 	let workTools: string[] | undefined;
+	let footerStatus: "none" | "custom" | "fallback" = "none";
 	let footerTui: { requestRender(): void } | undefined;
-	let footerOwned = false;
 	const wrappedCalls = new Set<string>();
 
 	function configuredAskTools(): string[] {
@@ -74,60 +74,55 @@ export default function modesExtension(pi: ExtensionAPI): void {
 		pi.appendEntry(STATE_CUSTOM_TYPE, { mode } satisfies PersistedState);
 	}
 
-	function updateStatus(ctx: ExtensionContext): void {
-		ctx.ui.setStatus("modes", undefined);
-
-		if (mode !== "ask") return;
+	function badgeSpec(): ModeBadge {
+		if (mode === "work") return { text: "▶ work", tone: "accent" };
+		if (backend) return { text: `⏸ ask · ro(${backend.id})`, tone: "warning" };
+		return { text: "⏸ ask · bash off", tone: "error" };
+	}
 
-		// In the TUI the badge lives in the footer's first line; other modes have
-		// no footer, so they keep the plain status line.
-		if (ctx.mode === "tui") {
+	function updateStatus(ctx: ExtensionContext): void {
+		// The custom footer draws the badge itself, right-aligned.
+		if (footerStatus === "custom") {
+			ctx.ui.setStatus("modes", undefined);
 			footerTui?.requestRender();
 			return;
 		}
-
 		const badge = badgeSpec();
 		ctx.ui.setStatus("modes", ctx.ui.theme.fg(badge.tone, badge.text));
 	}
 
-	function badgeSpec(): ModeBadge {
-		if (backend) return { text: `⏸ ask · ro(${backend.id})`, tone: "warning" };
-		return { text: "⏸ ask · bash off", tone: "error" };
-	}
-
 	/**
-	 * Ask mode replaces the built-in footer so the badge can sit on the
-	 * directory/session line instead of taking a row of its own. Work mode
-	 * restores pi's native footer.
+	 * Install a footer that keeps pi's rendering and appends the badge aligned to
+	 * the right edge. Falls back to the native footer plus a status line if pi's
+	 * footer cannot be driven from here.
 	 */
-	function installAskFooter(ctx: ExtensionContext): void {
-		if (ctx.mode !== "tui" || footerOwned) return;
-		try {
-			ctx.ui.setFooter((tui, theme, footerData) => {
-				footerTui = tui;
-				const unsubscribe = footerData.onBranchChange(() => tui.requestRender());
-				return {
-					...createModesFooter(ctx, theme, footerData, badgeSpec),
-					dispose() {
-						unsubscribe();
+	function installFooter(ctx: ExtensionContext): void {
+		if (ctx.mode !== "tui" || footerStatus === "custom") return;
+		const autoCompact = pi.getSettings().compaction?.enabled !== false;
+
+		ctx.ui.setFooter((tui, theme, footerData) => {
+			footerTui = tui;
+			const unsubscribe = footerData.onBranchChange(() => tui.requestRender());
+			return {
+				...createModesFooter(ctx, theme, footerData, badgeSpec, {
+					autoCompact,
+					onError: () => {
+						footerStatus = "fallback";
 						footerTui = undefined;
+						queueMicrotask(() => {
+							ctx.ui.setFooter(undefined);
+							updateStatus(ctx);
+						});
 					},
-				};
-			});
-			footerOwned = true;
-		} catch {
-			// Fall back to the status line rendered by updateStatus().
-			ctx.ui.setFooter(undefined);
-			footerOwned = false;
-			footerTui = undefined;
-		}
-	}
-
-	function removeAskFooter(ctx: ExtensionContext): void {
-		if (ctx.mode !== "tui" || !footerOwned) return;
-		ctx.ui.setFooter(undefined);
-		footerOwned = false;
-		footerTui = undefined;
+				}),
+				dispose() {
+					unsubscribe();
+					footerTui = undefined;
+				},
+			};
+		});
+		footerStatus = "custom";
+		ctx.ui.setStatus("modes", undefined);
 	}
 
 	function describe(): string {
@@ -163,7 +158,6 @@ export default function modesExtension(pi: ExtensionAPI): void {
 			mode = "ask";
 			workTools = pi.getActiveTools();
 			pi.setActiveTools(askToolset());
-			installAskFooter(ctx);
 			updateStatus(ctx);
 			persist();
 			if (backend) {
@@ -177,7 +171,6 @@ export default function modesExtension(pi: ExtensionAPI): void {
 		mode = "work";
 		pi.setActiveTools(workTools ?? pi.getActiveTools());
 		workTools = undefined;
-		removeAskFooter(ctx);
 		updateStatus(ctx);
 		persist();
 		ctx.ui.notify("Work mode: full access restored.", "info");
@@ -291,10 +284,8 @@ export default function modesExtension(pi: ExtensionAPI): void {
 			await ensureBackend(ctx.cwd);
 			workTools = pi.getActiveTools();
 			pi.setActiveTools(askToolset());
-			installAskFooter(ctx);
-		} else {
-			removeAskFooter(ctx);
 		}
+		installFooter(ctx);
 		updateStatus(ctx);
 	});
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sassywares/pi-extensions",
-  "version": "0.3.20",
+  "version": "0.3.22",
   "description": "A zesty power pack for pi: auto-titled sessions, real web access, clean handoffs, isolated subagents, and ask/work modes.",
   "type": "module",
   "license": "MIT",