pi-soly 2.5.5 → 2.6.0

package/index.ts

@@ -353,17 +353,7 @@ export default function solyExtension(pi: ExtensionAPI) {
 		d.home = os.homedir();
 		const model = ctx.model as { id?: string; provider?: string; reasoning?: boolean } | undefined;
 		d.modelId = model?.id ?? null;
-		const prevProvider = d.modelProvider;
 		d.modelProvider = model?.provider ?? null;
-		// TEMP DEBUG
-		if (prevProvider !== d.modelProvider) {
-			try {
-				const fs = require("node:fs");
-				const os = require("node:os");
-				const p = require("node:path");
-				fs.appendFileSync(p.join(os.tmpdir(), "pi-soly-quota-debug.log"), `[${new Date().toISOString()}] updateChromeData: modelProvider changed ${prevProvider} -> ${d.modelProvider}, modelId=${d.modelId}\n`);
-			} catch {}
-		}
 		d.reasoning = Boolean(model?.reasoning);
 		try {
 			d.thinkingLevel = pi.getThinkingLevel();
@@ -562,14 +552,6 @@ export default function solyExtension(pi: ExtensionAPI) {
 		// quotaPercent/quotaResetsLabel back for the footer to render).
 		if (quotaPoller) quotaPoller.stop();
 		quotaPoller = startQuotaPoller(chrome.data, () => getActiveConfig().chrome.enabled, () => chrome.poke());
-		// TEMP DEBUG
-		try {
-			const fs = await import("node:fs");
-			const os = await import("node:os");
-			const p = await import("node:path");
-			const dbgLog = p.join(os.tmpdir(), "pi-soly-quota-debug.log");
-			fs.appendFileSync(dbgLog, `[${new Date().toISOString()}] session_start: poller started, chrome.enabled=${getActiveConfig().chrome.enabled}, modelProvider=${chrome.data.modelProvider}\n`);
-		} catch {}
 		// Editors save in bursts (write to .tmp, rename, touch). Coalesce
 		// those rapid reload events into a single sub-line event under the
 		// Working indicator (└─ reloaded 47 rules). Errors here are real

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-soly",
-  "version": "2.5.5",
+  "version": "2.6.0",
   "description": "Workflow + project management for pi-coding-agent. Plans, state, MANDATORY rules, self-review, multi-question picker. One npm install, zero config. LLM drives the workflow inline via the soly_workflow tool — no external subagent plugin.",
   "type": "module",
   "main": "index.ts",

package/quota/minimax.ts

@@ -23,25 +23,19 @@
 //
 // We pick the "general" entry — that's the quota bucket MiniMax-M3 (and all
 // text/chat models) draw from. Video/music have separate buckets.
+//
+// The API returns `current_interval_remaining_percent` (what's left). We
+// invert it to **used** (100 - remaining) to match the MiniMax web dashboard
+// semantics — "used" grows as you spend, which reads more intuitively in a
+// status bar than "remaining" which shrinks.
 // =============================================================================
 
 import { execFile } from "node:child_process";
-import * as fs from "node:fs";
-import * as os from "node:os";
-import * as path from "node:path";
 import type { QuotaProvider, QuotaSnapshot } from "./types.ts";
 
-/** TEMP DEBUG. */
-const DEBUG_LOG = path.join(os.tmpdir(), "pi-soly-quota-debug.log");
-function dbg(msg: string): void {
-	try { fs.appendFileSync(DEBUG_LOG, `[${new Date().toISOString()}] [minimax] ${msg}\n`); } catch { /* best effort */ }
-}
-
-/** Detect Windows (where npm-installed CLIs are `.cmd` shims that execFile
- *  can't spawn directly without a shell). */
-const IS_WIN = process.platform === "win32";
-
-/** Minimal shape we read from `mmx quota show --output json`. */
+// Minimal shape we read from `mmx quota show --output json`. We track
+// `remaining` (what the API calls `current_interval_remaining_percent`) and
+// invert it to `used` for display.
 type MinimaxQuotaResponse = {
 	model_remains?: Array<{
 		model_name?: string;
@@ -51,6 +45,10 @@ type MinimaxQuotaResponse = {
 	base_resp?: { status_code?: number };
 };
 
+/** Detect Windows (where npm-installed CLIs are `.cmd` shims that execFile
+ *  can't spawn directly without a shell). */
+const IS_WIN = process.platform === "win32";
+
 /** Run mmx and capture stdout. Resolves to null on any failure
  *  (mmx missing, non-zero exit, timeout, bad JSON). Never throws.
  *
@@ -66,45 +64,31 @@ function runMmx(args: string[], timeoutMs: number): Promise<string | null> {
 			maxBuffer: 1024 * 1024,
 			shell: IS_WIN, // resolve .cmd shims on Windows
 		};
-		execFile("mmx", args, opts, (err, stdout, stderr) => {
-			if (err) {
-				dbg(`runMmx error: ${err instanceof Error ? err.message : String(err)} (code=${(err as { code?: string }).code ?? "?"}) stderr=${(stderr ?? "").slice(0, 200)}`);
-				resolve(null);
-			} else {
-				dbg(`runMmx ok: ${String(stdout).length} bytes`);
-				resolve(stdout ?? "");
-			}
+		execFile("mmx", args, opts, (err, stdout) => {
+			if (err) resolve(null);
+			else resolve(stdout ?? "");
 		});
 	});
 }
 
-/** Parse the mmx quota response, returning the "general" model snapshot. */
+/** Parse the mmx quota response, returning the "general" model snapshot
+ *  with `remainingPercent` expressed as **used** (100 - remaining). */
 function parseGeneralQuota(raw: string): QuotaSnapshot | null {
 	let parsed: unknown;
 	try {
 		parsed = JSON.parse(raw);
-	} catch (e) {
-		dbg(`parse: JSON.parse failed: ${e instanceof Error ? e.message : String(e)}; raw[0..100]=${raw.slice(0, 100)}`);
+	} catch {
 		return null; // not valid JSON — mmx printed an error to stdout
 	}
 	// Cast at the boundary (single documented place, per code-style rules).
 	const data = parsed as MinimaxQuotaResponse;
-	if (data.base_resp?.status_code !== 0) {
-		dbg(`parse: status_code=${data.base_resp?.status_code} (expected 0)`);
-		return null;
-	}
+	if (data.base_resp?.status_code !== 0) return null;
 	const general = data.model_remains?.find((m) => m.model_name === "general");
-	if (!general) {
-		dbg(`parse: no 'general' model entry; have: ${(data.model_remains ?? []).map((m) => m.model_name).join(",")}`);
-		return null;
-	}
-	const pct = general.current_interval_remaining_percent;
-	if (typeof pct !== "number") {
-		dbg(`parse: pct is ${typeof pct}`);
-		return null;
-	}
+	if (!general) return null;
+	const remaining = general.current_interval_remaining_percent;
+	if (typeof remaining !== "number") return null;
 	return {
-		remainingPercent: pct,
+		remainingPercent: Math.max(0, Math.min(100, 100 - remaining)),
 		resetsInMs: typeof general.remains_time === "number" ? general.remains_time : null,
 	};
 }

package/quota/poller.ts

@@ -21,21 +21,10 @@
 //   It only runs while a session is active.
 // =============================================================================
 
-import * as fs from "node:fs";
-import * as os from "node:os";
-import * as path from "node:path";
 import type { ChromeData } from "../visual/data.ts";
 import { resolveQuotaProvider } from "./registry.ts";
 import { formatReset } from "./format.ts";
 
-/** TEMP DEBUG — append a line to the quota debug log. Remove after diagnosis. */
-const DEBUG_LOG = path.join(os.tmpdir(), "pi-soly-quota-debug.log");
-function dbg(msg: string): void {
-	try {
-		fs.appendFileSync(DEBUG_LOG, `[${new Date().toISOString()}] ${msg}\n`);
-	} catch { /* best effort */ }
-}
-
 /** Default poll interval: 60 seconds. */
 const POLL_INTERVAL_MS = 60_000;
 
@@ -70,25 +59,23 @@ export function startQuotaPoller(
 
 	const tick = async (): Promise<void> => {
 		if (stopped) return;
-		dbg(`tick: enabled=${isEnabled()} provider=${data.modelProvider}`);
 		if (!isEnabled()) {
-			dbg("disabled, skipping");
 			scheduleNext();
 			return;
 		}
 
 		const providerId = data.modelProvider;
 		if (!providerId) {
-			dbg("no modelProvider");
 			scheduleNext();
 			return;
 		}
 
 		const provider = resolveQuotaProvider(providerId);
 		if (!provider) {
-			dbg(`no adapter for ${providerId}`);
+			// No adapter for this provider — clear and skip.
 			data.quotaPercent = null;
 			data.quotaResetsLabel = null;
+			data.quotaResetsMs = null;
 			scheduleNext();
 			return;
 		}
@@ -96,18 +83,16 @@ export function startQuotaPoller(
 		let snapshot;
 		try {
 			snapshot = await provider.fetch();
-			dbg(`fetch result: ${JSON.stringify(snapshot)}`);
-		} catch (e) {
-			dbg(`fetch threw: ${e instanceof Error ? e.message : String(e)}`);
+		} catch {
 			snapshot = null;
 		}
 		if (snapshot) {
 			data.quotaPercent = snapshot.remainingPercent;
+			data.quotaResetsMs = snapshot.resetsInMs;
 			data.quotaResetsLabel = snapshot.resetsInMs !== null ? formatReset(snapshot.resetsInMs) : null;
-			dbg(`wrote data: pct=${data.quotaPercent} label=${data.quotaResetsLabel}`);
 			onUpdate();
-			dbg("called onUpdate (poke)");
 		}
+		// On null (fetch failed), keep the previous snapshot — don't clear.
 		scheduleNext();
 	};
 

package/visual/colors.ts

@@ -22,3 +22,12 @@ export function ctxColor(percent: number | null): ChromeColor {
 	if (percent > 70) return "warning";
 	return "muted";
 }
+
+/** Quota color by **used** percentage. Conservative threshold: only yellow when
+ *  > 90% of the interval is spent (no red — quota resets, it's not a hard
+ *  error). Muted otherwise. */
+export function quotaColor(usedPercent: number | null): ChromeColor {
+	if (usedPercent === null || !Number.isFinite(usedPercent)) return "muted";
+	if (usedPercent > 90) return "warning";
+	return "muted";
+}

package/visual/data.ts

@@ -46,10 +46,15 @@ export type ChromeData = {
 	/** Level of the recent event (used for glyph/color). */
 	recentEventLevel: "info" | "warning" | "error" | null;
 	/** Remaining quota percent (0–100) for the active provider, polled in
-	 *  the background by quota/poller.ts. null = no adapter / not polled. */
+	 *  the background by quota/poller.ts. null = no adapter / not polled.
+	 *  Semantic: **used** (inverted from API's remaining) — grows as you
+	 *  spend, matching the MiniMax dashboard. */
 	quotaPercent: number | null;
 	/** Human-readable reset time label (e.g. "in 20m"), or null. */
 	quotaResetsLabel: string | null;
+	/** Raw ms until the quota window resets, or null. Used by the footer to
+	 *  color the time yellow when < 30 minutes remain. */
+	quotaResetsMs: number | null;
 };
 
 /** A fresh ChromeData with everything empty/idle. */
@@ -73,5 +78,6 @@ export function emptyChromeData(): ChromeData {
 		recentEventLevel: null,
 		quotaPercent: null,
 		quotaResetsLabel: null,
+		quotaResetsMs: null,
 	};
 }

package/visual/footer.ts

@@ -18,7 +18,7 @@
 import type { Component } from "@earendil-works/pi-tui";
 import type { Theme } from "@earendil-works/pi-coding-agent";
 import { composeBar, type Segment } from "./segments.ts";
-import { ctxColor } from "./colors.ts";
+import { ctxColor, quotaColor } from "./colors.ts";
 import { fitPath, formatTokens } from "./format.ts";
 import { withGlyph } from "./glyphs.ts";
 import type { ChromeData } from "./data.ts";
@@ -72,24 +72,19 @@ export function buildFooterLine(data: ChromeData, fd: FooterData, width: number,
 	}
 
 	if (data.quotaPercent !== null) {
-		const quotaText = ascii ? `${data.quotaPercent}%` : `⬢ ${data.quotaPercent}%`;
-		const label = data.quotaResetsLabel ? `${quotaText} · ${data.quotaResetsLabel}` : quotaText;
-		left.push({ id: "quota", text: styler.fg("muted", label), priority: 6 });
-		// TEMP DEBUG
-		try {
-			const fs = require("node:fs");
-			const os = require("node:os");
-			const p = require("node:path");
-			fs.appendFileSync(p.join(os.tmpdir(), "pi-soly-quota-debug.log"), `[${new Date().toISOString()}] [footer] render: pushed quota segment pct=${data.quotaPercent}\n`);
-		} catch {}
-	} else {
-		// TEMP DEBUG
-		try {
-			const fs = require("node:fs");
-			const os = require("node:os");
-			const p = require("node:path");
-			fs.appendFileSync(p.join(os.tmpdir(), "pi-soly-quota-debug.log"), `[${new Date().toISOString()}] [footer] render: quotaPercent=null (segment skipped)\n`);
-		} catch {}
+		const used = data.quotaPercent;
+		const glyph = ascii ? "" : "⬢ ";
+		const pctPart = styler.fg(quotaColor(used), `${glyph}${used}%`);
+		let label: string;
+		if (data.quotaResetsLabel) {
+			// Yellow time when < 30 minutes until reset; muted otherwise.
+			const soon = data.quotaResetsMs !== null && data.quotaResetsMs <= 30 * 60_000;
+			const timePart = soon ? styler.fg("warning", data.quotaResetsLabel) : styler.dim(data.quotaResetsLabel);
+			label = `${pctPart} · ${timePart}`;
+		} else {
+			label = pctPart;
+		}
+		left.push({ id: "quota", text: label, priority: 8 });
 	}
 
 	if (data.rulesActive > 0) {