pi-hypercharm-provider 1.3.28 → 1.3.30

package/README.md

@@ -138,11 +138,13 @@ DeepSeek V4 models use the `deepseek` thinking format — the same native format
 
 ## Footer Status
 
-A Neuralwatt-style status line sits below the editor. It appears after the
-session's first HyperCharm turn completes (never before — no half-empty line
-on fresh sessions or other providers), refreshes its balance when the agent
-run fully settles, and makes no status-related API calls in sessions that
-never use HyperCharm:
+A Neuralwatt-style status line sits below the editor. It appears as soon as a
+HyperCharm model is selected — the account side (team, balance, rate limits)
+renders when the session-start or model-select credits fetch lands, and the
+session side joins it after the first HyperCharm turn completes. Selecting
+another provider hides it (`hideOnOtherProvider` defaults to `true`), the
+balance refreshes when the agent run fully settles, and sessions that never
+use HyperCharm make no status-related API calls:
 
 ```
 ⚡ 1.24 hc · 7 req                       Xu's Team ◆ 249 hc · 996/1k/h · 29d
@@ -184,12 +186,13 @@ Non-interactive toggles:
 
 `glyphs: "auto"` replaces the footer glyphs (bolt, gem, warning, auth arrow,
 separator) with ASCII equivalents on legacy terminals (mintty/Cygwin), whose
-cell-width tables disagree with the extension's width math. There a
-full-width widget line can wrap physically, which desynchronizes pi's
-renderer and leaves stale rows behind. The widget also never paints the
-terminal's last column, and clamps an explicit `unicode` choice to ASCII on
-legacy terminals; the statusbar is not edge-padded and always honors the
-exact choice.
+cell-width tables disagree with the extension's width math. There a glyph the
+terminal renders wider than the extension measures overflows the widget line,
+which desynchronizes pi's renderer and leaves stale rows behind. The widget
+also right-aligns the account side flush with the terminal's last column, the
+way pi's built-in footer does, and clamps an explicit `unicode` choice to
+ASCII on legacy terminals; the statusbar is not edge-padded and always honors
+the exact choice.
 
 
 ## Authentication

package/index.ts

@@ -33,12 +33,15 @@
  *   The right side compresses across progressive tiers as the terminal
  *   narrows. The balance flips to a ⚠ warning at/below lowBalanceHc.
  *
- *   Lifecycle (mirrors pi-neuralwatt-provider): nothing renders before this
- *   session's first HyperCharm turn completes, so fresh sessions and other
- *   providers' sessions see no half-empty line. Credits/team are prefetched
- *   on session start or model select when a HyperCharm model is active, so
- *   the first turn ends with data already cached. The balance is polled
- *   again on pi's agent_settled event (fires only once no automatic retry,
+ *   Lifecycle (mirrors pi-neuralwatt-provider): selecting a HyperCharm model
+ *   shows the line — the account side renders as soon as the credits/team
+ *   prefetch lands, and the session side (spend/requests) joins it on the
+ *   first completed turn. hideOnOtherProvider (default true) clears
+ *   everything the moment the active model belongs to another provider.
+ *   Credits/team are prefetched on session start or model select when a
+ *   HyperCharm model is active, so the first turn ends with data already
+ *   cached. The balance is polled again on pi's agent_settled event (fires
+ *   only once no automatic retry,
  *   compaction, or queued continuation can follow) — and nowhere else, so
  *   sessions without HyperCharm turns make zero status-related API calls.
  *   Between polls the balance moves optimistically: each turn's
@@ -74,10 +77,11 @@
  *
  *   - glyphs "auto" swaps the emoji footer glyphs for ASCII on legacy
  *     terminals (mintty/Cygwin), whose cell-width tables disagree with the
- *     width math and wrap the full-width widget line. "unicode"/"ascii"
- *     force a set. The widget never paints the terminal's last column, and
- *     clamps an explicit "unicode" to ASCII on legacy terminals; the
- *     statusbar is not edge-padded and honors the exact choice.
+ *     width math and can overflow the widget line. "unicode"/"ascii"
+ *     force a set. The widget right-aligns the account side flush with the
+ *     terminal's last column (as pi's built-in footer does) and clamps an
+ *     explicit "unicode" to ASCII on legacy terminals; the statusbar is
+ *     not edge-padded and honors the exact choice.
  *     /hypercharm-status refresh          (re-fetch balance/team now)
  *     /hypercharm-status reset
  *
@@ -827,10 +831,13 @@ function renderStatus(ctx: ExtensionContext): void {
 		widgetGlyphClampNotified = true;
 		ctx.ui.notify("HyperCharm: widget glyphs stay ASCII on this terminal — unicode glyphs overflow legacy mintty/Cygwin cell widths. Statusbar is unaffected.", "info");
 	}
-	// Show only after HyperCharm activity this session (like pi-neuralwatt):
-	// no empty-gap line on fresh sessions, no stale account glare on other
-	// providers' sessions.
-	const accountVisible = statusConfig.account !== "off" && accountHasData(account) && hasActivity;
+	// Show while HyperCharm is the selected provider — the account side renders
+	// as soon as the session_start/model_select credits fetch lands, with no
+	// need to wait for a turn — and once this session recorded HyperCharm
+	// activity, which is what keeps the line alive after a switch when
+	// hideOnOtherProvider is false. The default true clears it on the switch.
+	const visible = hasActivity || provider === PROVIDER_ID;
+	const accountVisible = statusConfig.account !== "off" && accountHasData(account) && visible;
 	const lowBalance =
 		statusConfig.lowBalanceHc !== null && account.balance !== null && account.balance <= statusConfig.lowBalanceHc;
 	const sessionLine = statusConfig.session !== "off" ? buildSessionLine(sessionStats, glyphs) : undefined;
@@ -1151,7 +1158,7 @@ export default function (pi: ExtensionAPI) {
 
 		loadStatusConfig();
 		resetStatusState();
-		updateStatus(ctx); // clears any carryover; activity-gated, renders nothing yet
+		updateStatus(ctx); // clears any carryover; the account side lands with the credits fetch
 		// Re-register so our identity (custom api + streamSimple) always wins
 		// over anything that touched provider registration during load.
 		pi.registerProvider(PROVIDER_ID, makeProviderConfig());
@@ -1187,8 +1194,11 @@ export default function (pi: ExtensionAPI) {
 		updateStatus(ctx);
 		const model: any = (event as any).model;
 		if (model?.provider === PROVIDER_ID && cachedApiKey) {
+			// Both refreshes repaint when they land: selection alone must fill in
+			// the account side (balance now, team/auth atoms a moment later)
+			// instead of leaving a bare gem until the next turn.
 			updateStatusAfter(refreshCredits(cachedApiKey, statusAbort?.signal ?? undefined, false), ctx);
-			void refreshAccountMeta(cachedApiKey, statusAbort?.signal ?? undefined);
+			updateStatusAfter(refreshAccountMeta(cachedApiKey, statusAbort?.signal ?? undefined), ctx);
 		}
 	});
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-hypercharm-provider",
-  "version": "1.3.28",
+  "version": "1.3.30",
   "description": "HyperCharm provider extension for pi - Access DeepSeek, GLM, Kimi, Qwen, MiniMax, Gemma, and GPT-OSS models through the Charm Hyper API",
   "type": "module",
   "main": "index.ts",

package/status.ts

@@ -21,10 +21,13 @@
  *     or when the glyphs config asks for it (see GlyphMode). Older mintty
  *     builds measure these glyphs with cell tables that disagree with the
  *     ones above; the statusbar absorbs that (its lines are not edge-padded)
- *     but the full-width widget line wraps, which desyncs pi's row
- *     bookkeeping and leaves ghost rows behind.
- *   - render() budgets width − 1, so the widget never paints the terminal's
- *     last column (the classic pending-wrap hazard).
+ *     but a glyph the terminal renders wider than the math above measures it
+ *     overflows the widget line, which desyncs pi's row bookkeeping and
+ *     leaves ghost rows behind.
+ *   - render() budgets the terminal's full width, so the right zone ends
+ *     flush with the last column. Overlong lines are what pi rejects — its
+ *     renderer throws when a line's visible width exceeds the terminal — so
+ *     the width math above must never undercount a glyph.
  */
 
 export type DisplayMode = "widget" | "statusbar" | "off";
@@ -299,10 +302,16 @@ export function termVisWidth(str: string): number {
 export function truncateAnsi(str: string, maxCols: number, ellipsis = "…"): string {
 	if (maxCols <= 0) return "";
 	if (termVisWidth(str) <= maxCols) return str;
+	// Reserve the ellipsis's own width, not a fixed column: ASCII "..." is
+	// three cells, and a line that overshoots the terminal is what pi's
+	// renderer rejects — it throws instead of wrapping. An ellipsis too wide
+	// for the budget is itself cut to it.
+	const ellipsisWidth = termVisWidth(ellipsis);
+	if (ellipsisWidth >= maxCols) return truncateAnsi(ellipsis, maxCols, "");
 	let result = "";
 	let visWidth = 0;
 	let i = 0;
-	const target = maxCols - 1;
+	const target = maxCols - ellipsisWidth;
 	while (i < str.length) {
 		const code = str.charCodeAt(i);
 		if (code === 0x1b && i + 1 < str.length && str.charCodeAt(i + 1) === 0x5b) {
@@ -360,10 +369,14 @@ export class StatusLineWidget {
 	invalidate(): void {}
 
 	render(width: number): string[] {
-		// Never paint the terminal's last column: writing the final cell marks a
-		// pending wrap on legacy terminals, and any real-vs-table width
-		// disagreement then scrolls the frame and desyncs pi's row bookkeeping.
-		const w = Math.max(1, width - 1);
+		// Budget the terminal's full width, so the right zone ends flush with the
+		// last column. pi's built-in footer right-aligns its model/thinking text
+		// the same way and both rows share one frame, so holding a column back
+		// reads as a gap under a flush right edge. pi clears each line before
+		// writing it and separates rows with CR/LF, so ending on the final column
+		// carries no wrap hazard — the lines its renderer rejects are the
+		// overlong ones.
+		const w = Math.max(1, width);
 		const leftVis = termVisWidth(this.leftRaw);
 		if (leftVis > w) {
 			return [this.theme.fg("dim", truncateAnsi(this.leftRaw, w, this.glyphs.ellipsis))];

package/tests/provider.integration.test.ts

@@ -80,6 +80,11 @@ function captureUI(runner) {
 	const notifications = [];
 	const statusKeys = [];
 	const widgetKeys = [];
+	// Install (component factory) vs clear (undefined), split so a test can
+	// assert both "the widget popped up" and "the widget went away".
+	const widgetInstalls = [];
+	const widgetClears = [];
+	const widgetRenders = [];
 	const base = runner.createContext().ui ?? {};
 	const ui = {
 		...base,
@@ -90,12 +95,24 @@ function captureUI(runner) {
 		setStatus: (key) => {
 			statusKeys.push(String(key));
 		},
-		setWidget: (key) => {
-			widgetKeys.push(String(key));
+		setWidget: (key, value) => {
+			const name = String(key);
+			widgetKeys.push(name);
+			if (value === undefined) {
+				widgetClears.push(name);
+				return;
+			}
+			widgetInstalls.push(name);
+			try {
+				const component = value(undefined, ui.theme);
+				widgetRenders.push(component?.render ? component.render(80).join("\n") : "");
+			} catch {
+				widgetRenders.push("");
+			}
 		},
 	};
 	runner.setUIContext(ui, "tui");
-	return { notifications, statusKeys, widgetKeys };
+	return { notifications, statusKeys, widgetKeys, widgetInstalls, widgetClears, widgetRenders };
 }
 
 async function load(options = {}) {
@@ -414,3 +431,55 @@ test("co-installs with the official identifier surface without interference", as
 		harness.session.dispose();
 	}
 });
+
+test("shows the footer widget on model selection and clears it when the provider is deselected", async () => {
+	const requests = [];
+	const json = (body) => new Response(JSON.stringify(body), { status: 200, headers: { "content-type": "application/json" } });
+	const accountApi = async (input) => {
+		const url = String(input);
+		requests.push(url);
+		if (url.endsWith("/credits")) return json({ balance: 249 });
+		if (url.endsWith("/teams")) return json({ items: [{ name: "Xu's Team" }] });
+		if (url.endsWith("/devices")) return json({ items: [] });
+		if (url.endsWith("/provider")) return json({ models: [FIXTURE_MODEL] });
+		throw new Error("unexpected request: " + url);
+	};
+	const harness = await load({ extensionPaths: [extensionPath, officialSurfacePath], fetchImpl: accountApi });
+	try {
+		// The model_select handler only refreshes credits once session_start has
+		// cached a key, so wait for the catalog refresh that follows resolution.
+		await waitFor("session-start catalog refresh", () =>
+			requests.some((url) => url.endsWith("/provider")) ? true : undefined,
+		);
+
+		const ui = captureUI(harness.runner);
+		const ours = harness.runtime.getModel("hypercharm", "deepseek-v4-flash");
+		assert.ok(ours, "embedded catalog serves deepseek-v4-flash");
+		await harness.session.setModel(ours);
+		// No turn_end is ever emitted in this test: selection alone must install
+		// the widget, with the account side already filled in.
+		await waitFor("widget installed on selection", () => (ui.widgetInstalls.includes("hypercharm") ? true : undefined));
+		const filled = await waitFor("account side in the widget", () =>
+			ui.widgetRenders.find((line) => line.includes("Xu's Team")),
+		);
+		assert.match(filled, /249 hc/, "balance renders from the credits prefetch");
+
+		const installsWhileSelected = ui.widgetInstalls.length;
+		await harness.credentials.modify("hyper", async () => ({ type: "api_key", key: "fixture-official-key" }));
+		const official = harness.runtime.getModel("hyper", "glm-5.3");
+		assert.ok(official, "the official-surface fixture serves glm-5.3");
+		await harness.session.setModel(official);
+		await waitFor("widget cleared on deselect", () => (ui.widgetClears.includes("hypercharm") ? true : undefined));
+
+		// Deselected stays deselected: another provider's turn must not bring the
+		// line back (hideOnOtherProvider defaults to true).
+		await harness.runner.emit({ type: "turn_end", turnIndex: 0, message: assistantMessage(), toolResults: [] });
+		assert.equal(
+			ui.widgetInstalls.length,
+			installsWhileSelected,
+			"no reinstall while another provider's model is active",
+		);
+	} finally {
+		harness.session.dispose();
+	}
+});

package/tests/status.smoke.ts

@@ -101,38 +101,40 @@ const left = buildSessionLine({ requests: 7, spendHc: 1.24 })!;
 assert.ok(left.startsWith("\u26A1 "), "unicode glyph set is the default");
 const widget = new StatusLineWidget(fakeTheme, left, tiers, false);
 
-// Wide: full tier, left-right justified at width − 1 (the widget never
-// paints the terminal's last column — legacy terminals treat that cell as a
-// pending wrap).
+// Wide: full tier, left-right justified to the terminal's last column
+// (pi's built-in footer right-aligns its model text the same way, so both
+// rows end flush).
 const wide = widget.render(80);
 assert.equal(wide.length, 1);
-assert.equal(termVisWidth(wide[0]), 79);
+assert.equal(termVisWidth(wide[0]), 80);
 assert.ok(stripAnsi(wide[0]).startsWith("⚡ 1.24 hc"));
 assert.ok(stripAnsi(wide[0]).endsWith("⟳ 29d"));
 
-// Medium: drops to a compressed tier, still exactly width − 1
+// Medium: drops to a compressed tier, still exactly width
 const med = widget.render(52);
-assert.equal(termVisWidth(med[0]), 51);
+assert.equal(termVisWidth(med[0]), 52);
 assert.ok(!stripAnsi(med[0]).includes("⟳"), "compressed tiers drop auth first");
 
 // Narrow: no tier fits → left only, padded
 const narrow = widget.render(termVisWidth(left) + 3);
-assert.equal(termVisWidth(narrow[0]), termVisWidth(left) + 2);
+assert.equal(termVisWidth(narrow[0]), termVisWidth(left) + 3);
 assert.ok(stripAnsi(narrow[0]).startsWith("⚡"));
 assert.ok(!stripAnsi(narrow[0]).includes("◆"));
 
 // Narrower than left itself: truncation never overflows (crash guard)
 const tiny = widget.render(10);
-assert.equal(termVisWidth(tiny[0]), 9);
+assert.equal(termVisWidth(tiny[0]), 10);
 
 // Left empty (session gated) → right-aligned account line
 const rightOnly = new StatusLineWidget(fakeTheme, "", tiers, false);
 const ro = rightOnly.render(70);
-assert.equal(termVisWidth(ro[0]), 69);
+assert.equal(termVisWidth(ro[0]), 70, "account side hugs the last column");
+assert.equal(stripAnsi(ro[0]).length - stripAnsi(ro[0]).trimStart().length, 70 - termVisWidth(tiers[0]),
+  "left zone stays empty: account text starts where the tier width demands");
 assert.ok(stripAnsi(ro[0]).endsWith("⟳ 29d"));
 
 // No data at all
-assert.deepEqual(new StatusLineWidget(fakeTheme, "", [], false).render(40), [fakeTheme.fg("dim", "") + " ".repeat(39)]);
+assert.deepEqual(new StatusLineWidget(fakeTheme, "", [], false).render(40), [fakeTheme.fg("dim", "") + " ".repeat(40)]);
 
 // Warning color wired through
 const warn = new StatusLineWidget(fakeTheme, "", buildAccountTiers(acc({ balance: 10 }), true), true);
@@ -197,11 +199,25 @@ assert.ok(asciiTiers[0].endsWith("~ 29d"), `got ${asciiTiers[0]}`);
 const asciiWidget = new StatusLineWidget(fakeTheme, asciiLine, asciiTiers, true, ASCII_GLYPHS).render(60)[0];
 assert.equal([...stripAnsi(asciiWidget)].every((c) => c.charCodeAt(0) < 128), true);
 
+// ASCII truncation must fit the width too: the three-cell "..." used to
+// overshoot by two columns on a narrow terminal, and pi's renderer throws
+// on an overlong line instead of wrapping it.
+for (const width of [10, 14, 17]) {
+	const line = new StatusLineWidget(fakeTheme, asciiLine, asciiTiers, true, ASCII_GLYPHS).render(width)[0];
+	assert.equal(termVisWidth(line), width, `ascii truncation must fit width ${width}`);
+	assert.equal([...stripAnsi(line)].every((c) => c.charCodeAt(0) < 128), true, `ascii truncation stays ascii at ${width}`);
+}
+
 // Unicode mode keeps the glyphs (regression guard for the default path)
 assert.ok(buildAccountTiers(acc({ balance: 10 }), true)[0].includes("\u26A0 \u25C6"));
 
 // Truncation takes the caller's ellipsis so ASCII mode stays ASCII
-assert.equal(truncateAnsi("abcdefghij", 5, "..."), "abcd...");
+// The ellipsis is billed its own width: ASCII "..." (3 cells) leaves 2 for text
+assert.equal(truncateAnsi("abcdefghij", 5, "..."), "ab...");
+assert.equal(termVisWidth(truncateAnsi("abcdefghij", 5, "...")), 5);
+// An ellipsis wider than the whole budget is itself cut to it
+assert.equal(truncateAnsi("abcdefghij", 2, "..."), "..");
+assert.equal(truncateAnsi("abcdefghij", 1, "..."), ".");
 assert.ok(truncateAnsi("abcdefghij", 5).endsWith("\u2026"));
 
 assert.equal(coerceStatusConfig({ glyphs: "bogus" }).glyphs, "auto");