pi-magi-theme 0.2.3 → 0.2.4

package/README.md

@@ -72,6 +72,8 @@ The window title is `π - Magi - <working directory>`. After a run longer than 3
 
 In fullscreen mode the side panel always reaches the bottom of the terminal.
 
+In a terminal too narrow for it, the footer scrolls as one line instead of being cut off.
+
 ## The seventh seal: smart compaction
 
 The theme does not compact anything itself: it shows who does. For better compaction install [pi-smart-compact](https://www.npmjs.com/package/pi-smart-compact):
@@ -104,15 +106,27 @@ Each nature is a lens, not a specialty, so the council answers any question, not
 {
   "MELCHIOR": { "model": "llama-swap/Qwen3.8 27B Q4_K_M - Thinking", "thinking": "low" },
   "ui": { "compact": false, "kwhPrice": 0.30, "currency": "EUR" },
-  "loads": { "qwen3.8-27b": 41200 }
+  "loads": { "qwen3.8-27b": 41200 },
+  "totalWh": 1843.2
 }
 ```
 
 - per MAGI: `model` (unset = current session model) and optional `thinking` level;
 - `ui.compact`: start with the compact side panel;
-- `ui.kwhPrice` and `ui.currency` (`EUR` or `USD`): the COST row multiplies the GPU energy used in the session by this price;
+- `ui.kwhPrice` and `ui.currency` (`EUR` or `USD`): the COST row multiplies the GPU energy by this price, showing the running total of every session with the current one in brackets;
+- `totalWh`: written by the theme, GPU energy summed over every session (delete the key to reset the COST total);
 - `loads`: written by the theme, how long each llama-swap model took to load last time (paces the angel attack; 60s when unknown).
 
+## Release
+
+`.github/workflows/publish.yml` publishes to npm when a `v*` tag is pushed, and refuses if the tag does not match `package.json`:
+
+```
+npm version patch && git push --follow-tags
+```
+
+No token: npmjs is configured to trust this repository's `publish.yml` (npm trusted publishing, OIDC), which also signs the provenance.
+
 ## llama-swap
 
 When the session model uses the `llama-swap` provider, the side panel:

package/extensions/magi/index.ts

@@ -32,7 +32,7 @@ import type { AssistantMessage, Model } from "@earendil-works/pi-ai";
 import { completeSimple } from "@earendil-works/pi-ai";
 import type { ExtensionAPI, ExtensionContext, Theme, ThemeColor } from "@earendil-works/pi-coding-agent";
 import type { Component, OverlayHandle, TUI } from "@earendil-works/pi-tui";
-import { HStack, matchesKey, truncateToWidth, visibleWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui";
+import { HStack, matchesKey, sliceByColumn, truncateToWidth, visibleWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui";
 
 /* ────────────────────────────────────────────────────────────── art ── */
 
@@ -340,10 +340,15 @@ function setPhase(p: Phase): void {
 }
 
 const ANIM_STEP_MS = 220;
+/** How long one Sephirah stays lit in the footer: its name and meaning are text, they need time to be read. */
+const SEPHIRAH_STEP_MS = 1400;
 const FAIL_FLASH_MS = 2500;
 const REBIRTH_MS = 6000;
 const DONE_TITLE_AFTER_MS = 30_000;
 const SIXTH_SEAL_PERCENT = (6 / 7) * 100;
+/** Footer marquee: one cell every FOOTER_SCROLL_MS, with this gap between the loop's end and its start. */
+const FOOTER_SCROLL_MS = 260;
+const FOOTER_SCROLL_GAP = "   ·   ";
 
 /** Sync ratio: share of tool calls that succeeded (null before the first tool). */
 function syncPercent(): number | null {
@@ -710,6 +715,8 @@ const swap = {
 	cacheTokens: 0,
 	inputTokens: 0,
 	energyWh: 0, // GPU energy since the session started
+	diskWh: 0, // GPU energy of all sessions, as last read from/written to magi.json
+	savedWh: 0, // the part of energyWh already added to diskWh
 	lastSampleAt: 0,
 	lastWatts: 0,
 };
@@ -760,6 +767,34 @@ function sampleEnergy(now = Date.now()): void {
 	}
 	swap.lastSampleAt = now;
 	swap.lastWatts = watts;
+	persistEnergy();
+}
+
+/** GPU energy of every session so far: what is on disk plus this session's not-yet-written part. */
+function totalWh(): number {
+	return swap.diskWh + swap.energyWh - swap.savedWh;
+}
+
+const ENERGY_SAVE_MS = 60_000;
+let lastPersistAt = 0;
+
+/**
+ * Adds this session's new energy to the running total in magi.json, so the COST row survives restarts.
+ * ponytail: writes at most once a minute, and adds a delta so parallel sessions do not overwrite each other.
+ */
+function persistEnergy(force = false): void {
+	const delta = swap.energyWh - swap.savedWh;
+	if (delta <= 0 || (!force && Date.now() - lastPersistAt < ENERGY_SAVE_MS)) return;
+	lastPersistAt = Date.now();
+	const cfg = loadMagiConfig();
+	cfg.totalWh = (cfg.totalWh ?? 0) + delta;
+	try {
+		saveMagiConfig(cfg);
+	} catch {
+		return; // disk unavailable: keep the delta and retry on the next sample
+	}
+	swap.savedWh = swap.energyWh;
+	swap.diskWh = cfg.totalWh;
 }
 
 async function refreshSwapMetrics(): Promise<void> {
@@ -1311,11 +1346,14 @@ class MagiPanel implements Component {
 		return out;
 	}
 
-	/** COST: GPU energy used in the session × price per kWh set with /magi-ui config. */
+	/** COST: GPU energy × price per kWh set with /magi-ui config — all sessions, with this one in brackets. */
 	private costRow(inner: number): string {
 		if (!swap.gpus.length) return this.field("COST", "—", inner, "muted");
 		if (ui.kwhPrice === undefined) return this.field("COST", "→ /magi-ui config", inner, "dim");
-		return this.field("COST", fmtMoney((swap.energyWh / 1000) * ui.kwhPrice), inner, "warning");
+		const th = this.theme;
+		const price = (wh: number) => fmtMoney((wh / 1000) * ui.kwhPrice!);
+		const label = th.fg("dim", "COST".padEnd(9));
+		return this.frameLine(" " + label + th.fg("warning", price(totalWh())) + th.fg("dim", ` (ses ${price(swap.energyWh)})`), inner);
 	}
 
 	private swapRows(inner: number, compact: boolean): string[] {
@@ -1357,7 +1395,7 @@ class MagiPanel implements Component {
 			);
 		}
 		if (swap.ramTotal) out.push(this.field("RAM", `${gib(swap.ramUsed).toFixed(1)} / ${Math.round(gib(swap.ramTotal))}G`, inner, "muted"));
-		if (swap.gpus.length) out.push(this.field("ENERGY", `${(swap.energyWh / 1000).toFixed(3)} kWh`, inner, "muted"));
+		if (swap.gpus.length) out.push(this.field("ENERGY", `${(totalWh() / 1000).toFixed(3)} kWh`, inner, "muted"));
 		out.push(this.costRow(inner));
 		return out;
 	}
@@ -1466,6 +1504,7 @@ interface MagiUnitConfig {
 type MagiConfig = Partial<Record<MagiUnit, MagiUnitConfig>> & {
 	ui?: { compact?: boolean; kwhPrice?: number; currency?: Currency };
 	loads?: Record<string, number>; // real model id → ms its last load took
+	totalWh?: number; // GPU energy summed over every session, for the COST row
 };
 
 const MAGI_CONFIG_PATH = join(homedir(), ".pi", "agent", "magi.json");
@@ -1807,6 +1846,7 @@ async function configureMagi(ctx: ExtensionContext): Promise<void> {
 function footerLeft(th: Theme, now = Date.now()): string {
 	const dim = (s: string) => th.fg("dim", s);
 	const step = Math.floor(now / ANIM_STEP_MS);
+	const slowStep = Math.floor(now / SEPHIRAH_STEP_MS);
 	const lights = (fn: (i: number) => NodeLight) => SEPHIROT.map((_, i) => fn(i));
 
 	if (state.compacting) {
@@ -1860,7 +1900,7 @@ function footerLeft(th: Theme, now = Date.now()): string {
 		);
 	}
 	if (state.phase === "thinking") {
-		const cur = Math.floor(step / 2) % 3; // Keter, Chokmah, Binah
+		const cur = slowStep % 3; // Keter, Chokmah, Binah
 		const s = SEPHIROT[cur]!;
 		return (
 			th.fg("accent", "◆ ") +
@@ -1870,7 +1910,7 @@ function footerLeft(th: Theme, now = Date.now()): string {
 		);
 	}
 	if (state.phase === "responding") {
-		const cur = 5 + (step % 5); // Tiferet → Malkuth
+		const cur = 5 + (slowStep % 5); // Tiferet → Malkuth
 		const s = SEPHIROT[cur]!;
 		const tps = liveTps();
 		return (
@@ -1908,9 +1948,21 @@ function footerLeft(th: Theme, now = Date.now()): string {
 
 /** Footer: the animation on the left, other extensions' statuses on the right. */
 function buildFooter(tui: TUI, theme: Theme, footerData: any) {
+	let scrolling = false;
+	let scrollOff = 0;
+	let scrollPeriod = 1;
+	let scrollLine = "";
 	const timer = setInterval(() => {
 		if (animating()) tui.requestRender();
 	}, ANIM_STEP_MS);
+	// The marquee keeps its own cadence: one cell per tick, never derived from the clock, so it
+	// does not stutter when the line is re-rendered at some other pace (animation, streamed tokens)
+	// nor jump when the left side changes length (sephirah name, tok/s) and with it the loop period.
+	const scrollTimer = setInterval(() => {
+		if (!scrolling) return;
+		scrollOff = (scrollOff + 1) % scrollPeriod;
+		tui.requestRender();
+	}, FOOTER_SCROLL_MS);
 
 	const unsub = footerData?.onBranchChange?.(() => tui.requestRender());
 
@@ -1919,14 +1971,30 @@ function buildFooter(tui: TUI, theme: Theme, footerData: any) {
 			const dim = (s: string) => theme.fg("dim", s);
 			const statuses = footerData?.getExtensionStatuses?.();
 			const right = statuses ? [...statuses.values()].filter(Boolean).join(dim(" │ ")) : "";
-			const room = Math.max(12, width - visibleWidth(right) - 2);
-			const l = truncateToWidth(footerLeft(theme), room);
-			const gap = Math.max(1, width - visibleWidth(l) - visibleWidth(right));
-			return [truncateToWidth(l + " ".repeat(gap) + right, width)];
+			const left = footerLeft(theme);
+			const gap = width - visibleWidth(left) - visibleWidth(right);
+			scrolling = gap < 1;
+			if (!scrolling) {
+				scrollLine = "";
+				scrollOff = 0;
+				return [left + " ".repeat(gap) + right];
+			}
+			// Too narrow to fit: scroll the whole line instead of cutting it off. The line is frozen
+			// while it scrolls — live text changes width (seconds, tok/s, sephirah names) and every
+			// change would shift it under the window. A fresh line is taken when it has the same
+			// width, so nothing moves, otherwise at the end of the loop.
+			const line = left + dim(FOOTER_SCROLL_GAP) + right + dim(FOOTER_SCROLL_GAP);
+			const period = Math.max(1, visibleWidth(line));
+			if (!scrollLine || scrollOff === 0 || period === scrollPeriod) {
+				scrollLine = line;
+				scrollPeriod = period;
+			}
+			return [sliceByColumn(scrollLine + scrollLine, scrollOff % scrollPeriod, width, true)];
 		},
 		invalidate() {},
 		dispose() {
 			clearInterval(timer);
+			clearInterval(scrollTimer);
 			unsub?.();
 		},
 	};
@@ -2120,6 +2188,7 @@ export default function (pi: ExtensionAPI) {
 		ui.compact = cfg.ui?.compact ?? false;
 		ui.kwhPrice = cfg.ui?.kwhPrice;
 		ui.currency = cfg.ui?.currency === "USD" ? "USD" : "EUR";
+		swap.diskWh = cfg.totalWh ?? 0;
 		if (ctx.mode !== "tui") return;
 		applyChrome(ctx);
 		// nothing is loaded at startup: a new session picks its MECHA unit, a resumed one shows whether its model is in VRAM
@@ -2173,6 +2242,7 @@ export default function (pi: ExtensionAPI) {
 	});
 
 	pi.on("session_shutdown", async () => {
+		persistEnergy(true);
 		prewarm.abort?.abort();
 		clearInterval(metricsTimer);
 		metricsTimer = undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-magi-theme",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "MAGI SYSTEM theme + extension for pi (Evangelion fan art): MAGI control screen panel, three-model /magi council, MECHA SELECT model picker, angel-attack loading, seven-seal context gauge, llama-swap telemetry",
   "keywords": [
     "pi-package",