pi-hypercharm-provider 1.1.5 → 1.2.0

package/models.json

@@ -109,9 +109,9 @@
       "text"
     ],
     "cost": {
-      "input": 0.13,
-      "output": 0.43,
-      "cacheRead": 0.065,
+      "input": 0.124,
+      "output": 0.42,
+      "cacheRead": 0.062,
       "cacheWrite": 0
     },
     "contextWindow": 256000,
@@ -123,37 +123,6 @@
       "maxTokensField": "max_tokens"
     }
   },
-  {
-    "id": "glm-5",
-    "name": "GLM-5",
-    "reasoning": true,
-    "thinkingLevelMap": {
-      "off": "off",
-      "minimal": null,
-      "low": null,
-      "medium": null,
-      "high": null,
-      "xhigh": null,
-      "max": "max"
-    },
-    "input": [
-      "text"
-    ],
-    "cost": {
-      "input": 0.85,
-      "output": 2.622,
-      "cacheRead": 0.425,
-      "cacheWrite": 0
-    },
-    "contextWindow": 202752,
-    "maxTokens": 20275,
-    "compat": {
-      "supportsStore": false,
-      "supportsReasoningEffort": false,
-      "thinkingFormat": "deepseek",
-      "maxTokensField": "max_tokens"
-    }
-  },
   {
     "id": "glm-5.1",
     "name": "GLM-5.1",
@@ -233,9 +202,9 @@
       "text"
     ],
     "cost": {
-      "input": 0.188,
-      "output": 0.7,
-      "cacheRead": 0.094,
+      "input": 0.178,
+      "output": 0.71,
+      "cacheRead": 0.089,
       "cacheWrite": 0
     },
     "contextWindow": 131072,
@@ -264,9 +233,9 @@
       "text"
     ],
     "cost": {
-      "input": 0.564,
-      "output": 2.82,
-      "cacheRead": 0.282,
+      "input": 0.55,
+      "output": 2.89,
+      "cacheRead": 0.275,
       "cacheWrite": 0
     },
     "contextWindow": 262144,
@@ -382,9 +351,9 @@
       "text"
     ],
     "cost": {
-      "input": 0.5126,
-      "output": 1.0446,
-      "cacheRead": 0.2563,
+      "input": 0.6066,
+      "output": 1.0386,
+      "cacheRead": 0.3033,
       "cacheWrite": 0
     },
     "contextWindow": 128000,
@@ -413,9 +382,9 @@
       "text"
     ],
     "cost": {
-      "input": 0.284,
-      "output": 0.934,
-      "cacheRead": 0.142,
+      "input": 0.274,
+      "output": 0.8992,
+      "cacheRead": 0.137,
       "cacheWrite": 0
     },
     "contextWindow": 430000,
@@ -440,8 +409,8 @@
       "cacheRead": 0.218,
       "cacheWrite": 0
     },
-    "contextWindow": 204800,
-    "maxTokens": 20480,
+    "contextWindow": 262100,
+    "maxTokens": 6553,
     "compat": {
       "supportsStore": false,
       "supportsReasoningEffort": false,
@@ -714,5 +683,37 @@
       "thinkingFormat": "deepseek",
       "maxTokensField": "max_tokens"
     }
+  },
+  {
+    "id": "qwen3.8-max",
+    "name": "Qwen3.8-Max",
+    "reasoning": true,
+    "thinkingLevelMap": {
+      "off": "off",
+      "minimal": null,
+      "low": null,
+      "medium": null,
+      "high": null,
+      "xhigh": null,
+      "max": "max"
+    },
+    "input": [
+      "text",
+      "image"
+    ],
+    "cost": {
+      "input": 2,
+      "output": 6,
+      "cacheRead": 0,
+      "cacheWrite": 0
+    },
+    "contextWindow": 1000000,
+    "maxTokens": 65536,
+    "compat": {
+      "supportsStore": false,
+      "supportsReasoningEffort": false,
+      "thinkingFormat": "deepseek",
+      "maxTokensField": "max_tokens"
+    }
   }
 ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-hypercharm-provider",
-  "version": "1.1.5",
+  "version": "1.2.0",
   "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",
@@ -21,6 +21,12 @@
     "gemma",
     "gpt-oss"
   ],
+  "devDependencies": {
+    "@earendil-works/pi-ai": "0.84.1",
+    "@earendil-works/pi-coding-agent": "0.84.1",
+    "@types/node": "^24.10.1",
+    "typescript": "6.0.3"
+  },
   "author": "",
   "license": "MIT",
   "pi": {
@@ -31,7 +37,8 @@
   "scripts": {
     "clean": "echo 'nothing to clean'",
     "build": "echo 'nothing to build'",
-    "check": "echo 'nothing to check'",
+    "check": "tsc --noEmit && node tests/status.smoke.ts",
+    "smoke": "node tests/status.smoke.ts",
     "update-models": "node scripts/update-models.js"
   }
 }

package/pnpm-workspace.yaml

@@ -0,0 +1,15 @@
+allowBuilds:
+  '@google/genai': set this to true or false
+  protobufjs: set this to true or false
+onlyBuiltDependencies:
+  - '@google/genai'
+  - protobufjs
+
+minimumReleaseAgeExclude:
+  - '@earendil-works/pi-agent-core@0.84.0 || 0.84.1'
+  - '@earendil-works/pi-ai@0.84.0 || 0.84.1'
+  - '@earendil-works/pi-client@0.84.0 || 0.84.1'
+  - '@earendil-works/pi-coding-agent@0.84.0 || 0.84.1'
+  - '@earendil-works/pi-protocol@0.84.0 || 0.84.1'
+  - '@earendil-works/pi-telemetry@0.84.0 || 0.84.1'
+  - '@earendil-works/pi-tui@0.84.0 || 0.84.1'

package/scripts/update-models.js

@@ -13,14 +13,120 @@
  * currently contains no overrides.
  *
  * Merge order for README: models.json → apply patch.json → merge custom-models.json
+ *
+ * API key: the stored `hypercharm` credential in ~/.pi/agent/auth.json wins, then
+ * the HYPERCHARM_API_KEY environment variable. The script refuses to run without one.
  */
 
 import fs from 'fs';
+import os from 'os';
+import { execSync } from 'child_process';
 import path from 'path';
 import { fileURLToPath } from 'url';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
+// pi's agent directory: PI_CODING_AGENT_DIR (with ~ expansion) or ~/.pi/agent.
+function piAgentDir() {
+  const envDir = process.env.PI_CODING_AGENT_DIR;
+  if (envDir) {
+    return envDir.startsWith('~/') || envDir === '~'
+      ? path.join(os.homedir(), envDir.slice(1))
+      : envDir;
+  }
+  return path.join(os.homedir(), '.pi', 'agent');
+}
+
+const AUTH_JSON_PATH = path.join(piAgentDir(), 'auth.json');
+
+/**
+ * Resolve a configured value using pi's semantics (resolve-config-value.ts in
+ * pi-mono): "!command" runs via the shell (10s timeout) and uses trimmed
+ * stdout; "$VAR" / "${VAR}" interpolate environment variables ("$$" escapes a
+ * literal "$", "$!" a literal "!"); anything else is a literal. Returns
+ * undefined when a referenced env var is unset or a command fails.
+ */
+function resolveConfigValue(config, env) {
+  if (typeof config !== 'string' || config.length === 0) return undefined;
+  if (config.startsWith('!')) {
+    try {
+      const out = execSync(config.slice(1), {
+        encoding: 'utf8',
+        timeout: 10000,
+        stdio: ['ignore', 'pipe', 'ignore'],
+      });
+      return out.trim() || undefined;
+    } catch {
+      return undefined;
+    }
+  }
+  const ENV_NAME_RE = /^[A-Za-z_][A-Za-z0-9_]*$/;
+  let resolved = '';
+  let index = 0;
+  while (index < config.length) {
+    const dollar = config.indexOf('$', index);
+    if (dollar < 0) {
+      resolved += config.slice(index);
+      break;
+    }
+    resolved += config.slice(index, dollar);
+    const next = config[dollar + 1];
+    let name;
+    if (next === '$' || next === '!') {
+      resolved += next;
+      index = dollar + 2;
+      continue;
+    } else if (next === '{') {
+      const end = config.indexOf('}', dollar + 2);
+      if (end < 0) {
+        resolved += '$';
+        index = dollar + 1;
+        continue;
+      }
+      const inner = config.slice(dollar + 2, end);
+      if (!ENV_NAME_RE.test(inner)) {
+        resolved += config.slice(dollar, end + 1);
+        index = end + 1;
+        continue;
+      }
+      name = inner;
+      index = end + 1;
+    } else {
+      const match = config.slice(dollar + 1).match(/^[A-Za-z_][A-Za-z0-9_]*/);
+      if (!match) {
+        resolved += '$';
+        index = dollar + 1;
+        continue;
+      }
+      name = match[0];
+      index = dollar + 1 + name.length;
+    }
+    const value = (env && env[name]) || process.env[name] || undefined;
+    if (value === undefined) return undefined;
+    resolved += value;
+  }
+  return resolved;
+}
+
+/**
+ * The API key, resolved the way pi itself resolves it for this provider: the
+ * stored `hypercharm` credential in ~/.pi/agent/auth.json wins, then
+ * the HYPERCHARM_API_KEY environment variable.
+ */
+function resolveApiKey() {
+  try {
+    const auth = JSON.parse(fs.readFileSync(AUTH_JSON_PATH, 'utf8'));
+    const credential = auth?.hypercharm;
+    if (credential && credential.type === 'api_key' && typeof credential.key === 'string') {
+      const key = resolveConfigValue(credential.key, credential.env);
+      if (key) return key;
+    }
+  } catch {
+    // Missing or unparseable auth.json: fall through to the env var.
+  }
+  return process.env.HYPERCHARM_API_KEY || undefined;
+}
+
 const MODELS_API_URL = 'https://hyper.charm.land/v1/provider';
 const MODELS_JSON_PATH = path.join(__dirname, '..', 'models.json');
 const PATCH_JSON_PATH = path.join(__dirname, '..', 'patch.json');
@@ -275,9 +381,9 @@ function updateDeprecatedModels(modelsJsonPath, newModels) {
 }
 
 async function main() {
-  const apiKey = process.env.HYPERCHARM_API_KEY;
+  const apiKey = resolveApiKey();
   if (!apiKey) {
-    console.error('Error: HYPERCHARM_API_KEY environment variable is required');
+    console.error('Error: No API key found: no `hypercharm` credential resolved from ' + AUTH_JSON_PATH + ' and HYPERCHARM_API_KEY is not set');
     console.error('Usage: HYPERCHARM_API_KEY=your-key node scripts/update-models.js');
     process.exit(1);
   }

package/status.ts

@@ -0,0 +1,305 @@
+/**
+ * Footer status presentation for the HyperCharm extension.
+ *
+ * Pure functions + a width-aware widget component — no pi runtime imports.
+ * index.ts owns fetching, events, and config persistence; this module turns
+ * state snapshots into terminal strings.
+ *
+ * Layout (below-editor widget, neuralwatt style):
+ *
+ *   ⚡ 1.24 hc · 7 req                ACME Team ◆ 249 hc · 996/1k/h · 29d
+ *   └ left: session activity ──┘  └── right: account / quota ──────────┘
+ *
+ * The left side is preserved at full fidelity. The right side is rendered
+ * from a tier list (most → least detailed); render() picks the first tier
+ * that fits the remaining width, and as a last resort truncates the minimal
+ * tier. Width math counts only terminal-visible columns (ANSI-aware, wide
+ * glyphs like ◆ ⚡ ⚠ measure 2 columns).
+ */
+
+export type DisplayMode = "widget" | "statusbar" | "off";
+
+export interface StatusConfig {
+	/** Session spend/request line (left side). */
+	session: DisplayMode;
+	/** Team/balance/rate-limit line (right side). */
+	account: DisplayMode;
+	/** Hide everything when the active model is not from this provider. */
+	hideOnOtherProvider: boolean;
+	/** Warn (⚠ + highlight) when balance drops to this many hc. null = never. */
+	lowBalanceHc: number | null;
+}
+
+export const DEFAULT_STATUS_CONFIG: StatusConfig = {
+	session: "widget",
+	account: "widget",
+	hideOnOtherProvider: true,
+	lowBalanceHc: 25,
+};
+
+const VALID_MODES = new Set<string>(["widget", "statusbar", "off"]);
+
+function coerceMode(value: unknown, fallback: DisplayMode): DisplayMode {
+	return typeof value === "string" && VALID_MODES.has(value) ? (value as DisplayMode) : fallback;
+}
+
+/** Merge an unknown raw JSON object onto the defaults, field by field. */
+export function coerceStatusConfig(raw: unknown): StatusConfig {
+	const d = DEFAULT_STATUS_CONFIG;
+	if (typeof raw !== "object" || raw === null || Array.isArray(raw)) return { ...d };
+	const r = raw as Record<string, unknown>;
+	return {
+		session: coerceMode(r.session, d.session),
+		account: coerceMode(r.account, d.account),
+		hideOnOtherProvider: typeof r.hideOnOtherProvider === "boolean" ? r.hideOnOtherProvider : d.hideOnOtherProvider,
+		lowBalanceHc:
+			typeof r.lowBalanceHc === "number" && Number.isFinite(r.lowBalanceHc) && r.lowBalanceHc > 0
+				? r.lowBalanceHc
+				: r.lowBalanceHc === null || r.lowBalanceHc === false
+					? null
+					: d.lowBalanceHc,
+	};
+}
+
+// ─── State snapshots ──────────────────────────────────────────────────────────
+
+export interface RateLimitState {
+	limitHour: number;
+	limitDay: number;
+	remainingHour: number;
+	remainingDay: number;
+	capturedAt: number;
+}
+
+export interface AccountState {
+	/** Canonical balance in hypercredits, from /v1/credits. */
+	balance: number | null;
+	/** Team display name, from /v1/teams (works for API-key auth too). */
+	teamName: string | null;
+	/** Latest x-ratelimit-* headers from a /chat/completions response. */
+	rate: RateLimitState | null;
+	/** Days until the OAuth device session expires (from /v1/devices). */
+	authDaysLeft: number | null;
+}
+
+export const EMPTY_ACCOUNT: AccountState = {
+	balance: null,
+	teamName: null,
+	rate: null,
+	authDaysLeft: null,
+};
+
+export interface SessionStats {
+	requests: number;
+	spendHc: number;
+}
+
+export const EMPTY_SESSION_STATS: SessionStats = { requests: 0, spendHc: 0 };
+
+// ─── Formatters ───────────────────────────────────────────────────────────────
+
+function trimZeros(text: string): string {
+	return text.includes(".") ? text.replace(/0+$/, "").replace(/\.$/, "") : text;
+}
+
+/** Balance in hypercredits: integers get group separators, large values compact. */
+export function formatBalHc(n: number): string {
+	if (!Number.isFinite(n)) return "?";
+	const abs = Math.abs(n);
+	if (abs >= 1_000_000) return `${trimZeros((n / 1_000_000).toFixed(2))}M`;
+	if (abs >= 10_000) return `${trimZeros((n / 1_000).toFixed(1))}k`;
+	return Number.isInteger(n) ? n.toLocaleString("en-US") : trimZeros(n.toFixed(2));
+}
+
+/** Session-cumulative spend: meaningful at small magnitudes, so keep precision. */
+export function formatSpendHc(n: number): string {
+	if (!Number.isFinite(n) || n <= 0) return "0";
+	if (n < 0.001) return "~0";
+	if (n < 0.01) return trimZeros(n.toFixed(4));
+	if (n < 1000) return trimZeros(n.toFixed(2));
+	return Math.round(n).toLocaleString("en-US");
+}
+
+/** Rate-limit counts: exact when small, compact k when ≥ 1000. */
+export function formatRateCompact(n: number): string {
+	if (!Number.isFinite(n)) return "?";
+	if (n >= 1000) return `${trimZeros((n / 1000).toFixed(1))}k`;
+	return String(Math.max(0, Math.round(n)));
+}
+
+// ─── Line builders ────────────────────────────────────────────────────────────
+
+/** Left side: what this session has spent/requested through HyperCharm. */
+export function buildSessionLine(stats: SessionStats): string | undefined {
+	if (stats.requests <= 0 && stats.spendHc <= 0) return undefined;
+	return `⚡ ${formatSpendHc(stats.spendHc)} hc · ${stats.requests} req`;
+}
+
+export function accountHasData(acc: AccountState): boolean {
+	return acc.balance !== null || acc.teamName !== null || acc.rate !== null;
+}
+
+/**
+ * Right side as progressive tiers — entries share no summary separator;
+ * atoms are joined with " · ". Render picks the first that fits.
+ */
+export function buildAccountTiers(acc: AccountState, lowBalance: boolean): string[] {
+	const gem = lowBalance ? "⚠ ◆" : "◆";
+	const bal = acc.balance !== null ? `${gem} ${formatBalHc(acc.balance)} hc` : undefined;
+	const hourRate =
+		acc.rate !== null ? `${formatRateCompact(acc.rate.remainingHour)}/${formatRateCompact(acc.rate.limitHour)}/h` : undefined;
+	const dayRate =
+		acc.rate !== null ? `${formatRateCompact(acc.rate.remainingDay)}/${formatRateCompact(acc.rate.limitDay)}/d` : undefined;
+	const auth = acc.authDaysLeft !== null ? `⟳ ${acc.authDaysLeft}d` : undefined;
+	const team = acc.teamName?.trim() || undefined;
+	// Team and gem form one identity unit (space-separated, no middot);
+	// rate-limit and auth atoms trail it separated by " · ".
+	const head = [team, bal].filter((p): p is string => !!p).join(" ") || undefined;
+	const numOnly = acc.balance !== null ? `${formatBalHc(acc.balance)} hc` : undefined;
+
+	const join = (parts: (string | undefined)[]) => parts.filter((p): p is string => !!p).join(" · ");
+
+	const tiers: string[] = [
+		join([head, hourRate, dayRate, auth]),
+		join([head, hourRate, auth]),
+		join([head, hourRate]),
+		join([bal, hourRate]),
+		join([head]),
+		join([team]),
+		join([hourRate]),
+		join([numOnly]),
+	];
+
+	// Dedupe adjacent identical tiers (happens when atoms are missing).
+	const out: string[] = [];
+	for (const t of tiers) {
+		if (t && t !== out[out.length - 1]) out.push(t);
+	}
+	return out;
+}
+
+// ─── Terminal width math ──────────────────────────────────────────────────────
+// Adapted from pi-neuralwatt-provider: ANSI-aware, wide-glyph-aware column
+// counting. ◆ is ambiguous-width but this terminal class renders it wide.
+
+const EMOJI_RE = /\p{Emoji_Presentation}/u;
+// East-Asian-Ambiguous glyphs some terminals render as 2 columns. ◆ is NOT
+// listed: pi widths it as 1 here, and counting it wide leaves a trailing gap
+// before the right edge.
+const AMBIGUOUS_WIDE = new Set(["■", "▲", "◉"]);
+
+export function termVisWidth(str: string): number {
+	let width = 0;
+	let i = 0;
+	while (i < str.length) {
+		const code = str.charCodeAt(i);
+		if (code === 0x1b && i + 1 < str.length) {
+			const next = str.charCodeAt(i + 1);
+			if (next === 0x5b) {
+				i += 2;
+				while (i < str.length && str.charCodeAt(i) >= 0x20 && str.charCodeAt(i) <= 0x3f) i++;
+				while (i < str.length && str.charCodeAt(i) >= 0x30 && str.charCodeAt(i) <= 0x3f) i++;
+				if (i < str.length) i++;
+				continue;
+			}
+		}
+		const cp = str.codePointAt(i)!;
+		const char = cp > 0xffff ? str.slice(i, i + 2) : str[i];
+		if (cp >= 0x1f1e6 && cp <= 0x1f1ff) {
+			width += 1;
+		} else if (EMOJI_RE.test(char)) {
+			width += 2;
+		} else if (AMBIGUOUS_WIDE.has(char)) {
+			width += 2;
+		} else {
+			width += 1;
+		}
+		i += cp > 0xffff ? 2 : 1;
+	}
+	return width;
+}
+
+/** Cut a (possibly ANSI-containing) string to fit maxCols visible columns. */
+export function truncateAnsi(str: string, maxCols: number): string {
+	if (maxCols <= 0) return "";
+	if (termVisWidth(str) <= maxCols) return str;
+	let result = "";
+	let visWidth = 0;
+	let i = 0;
+	const target = maxCols - 1;
+	while (i < str.length) {
+		const code = str.charCodeAt(i);
+		if (code === 0x1b && i + 1 < str.length && str.charCodeAt(i + 1) === 0x5b) {
+			const start = i;
+			i += 2;
+			while (i < str.length && str.charCodeAt(i) >= 0x20 && str.charCodeAt(i) <= 0x3f) i++;
+			while (i < str.length && str.charCodeAt(i) >= 0x30 && str.charCodeAt(i) <= 0x3f) i++;
+			if (i < str.length) i++;
+			result += str.slice(start, i);
+			continue;
+		}
+		const cp = str.codePointAt(i)!;
+		const char = cp > 0xffff ? str.slice(i, i + 2) : str[i];
+		let charWidth: number;
+		if (cp >= 0x1f1e6 && cp <= 0x1f1ff) charWidth = 1;
+		else if (EMOJI_RE.test(char)) charWidth = 2;
+		else if (AMBIGUOUS_WIDE.has(char)) charWidth = 2;
+		else charWidth = 1;
+		if (visWidth + charWidth > target) break;
+		result += char;
+		visWidth += charWidth;
+		i += cp > 0xffff ? 2 : 1;
+	}
+	return result + "…";
+}
+
+// ─── Widget component ─────────────────────────────────────────────────────────
+
+export interface LineTheme {
+	fg(color: string, text: string): string;
+}
+
+/**
+ * Width-aware two-zone line. Left (session) is preserved verbatim and
+ * truncated only if it alone exceeds the terminal width. Right (account)
+ * selects progressively more compact tiers as space tightens; when no tier
+ * fits, the line degrades to left-only. The right side flips to the theme's
+ * warning color while the balance is at/below the configured threshold.
+ */
+export class StatusLineWidget {
+	private theme: LineTheme;
+	private leftRaw: string;
+	private rightTiers: string[];
+	private rightWarn: boolean;
+
+	constructor(theme: LineTheme, leftRaw: string, rightTiers: string[] = [], rightWarn = false) {
+		this.theme = theme;
+		this.leftRaw = leftRaw;
+		this.rightTiers = rightTiers;
+		this.rightWarn = rightWarn;
+	}
+
+	invalidate(): void {}
+
+	render(width: number): string[] {
+		const leftVis = termVisWidth(this.leftRaw);
+		if (leftVis > width) {
+			return [this.theme.fg("dim", truncateAnsi(this.leftRaw, width))];
+		}
+
+		const rightColor = this.rightWarn ? "warning" : "dim";
+		const themedLeft = this.theme.fg("dim", this.leftRaw);
+		const budget = width - leftVis - 1;
+
+		for (const tier of this.rightTiers) {
+			if (termVisWidth(tier) <= budget) {
+				const themedRight = this.theme.fg(rightColor, tier);
+				const pad = width - termVisWidth(themedLeft) - termVisWidth(themedRight);
+				return [themedLeft + " ".repeat(Math.max(1, pad)) + themedRight];
+			}
+		}
+
+		const pad = width - termVisWidth(themedLeft);
+		return [themedLeft + " ".repeat(Math.max(0, pad))];
+	}
+}