@bacnh85/pi-sub 0.1.9 → 0.1.11

package/README.md

@@ -15,13 +15,9 @@ pi install npm:@bacnh85/pi-sub
 From this repository checkout:
 
 ```bash
-cd extensions/pi-sub
-npm install
-cd ../..
-
-pi install ./extensions/pi-sub
+pi install ./pi-sub
 # or test directly
-pi -e ./extensions/pi-sub
+pi -e ./pi-sub
 ```
 
 ## What it shows

package/{index.ts → extensions/index.ts}

@@ -1,5 +1,4 @@
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { Box, Text } from "@earendil-works/pi-tui";
 import { createHash } from "node:crypto";
 import fs from "node:fs/promises";
 import os from "node:os";
@@ -20,7 +19,6 @@ type ModelLike = { provider?: string; id?: string } | undefined;
 
 type UsageApiWindow = {
 	used_percent?: number;
-	limit_window_seconds?: number;
 	reset_at?: number;
 };
 
@@ -46,14 +44,10 @@ type PiAuthEntry = {
 };
 
 interface UsageWindow {
-	used?: number;
-	limit?: number;
 	percent?: number;
 	remaining?: number;
 	remainingLabel?: string;
 	resetLabel?: string;
-	resetsAt?: string | number | Date;
-	label?: string;
 }
 
 interface SubscriptionAccountSnapshot {
@@ -63,12 +57,10 @@ interface SubscriptionAccountSnapshot {
 	plan?: string;
 	fiveHour?: UsageWindow;
 	weekly?: UsageWindow;
-	monthly?: UsageWindow;
 	lastActivity?: string;
 }
 
 interface SubscriptionUsageSnapshot {
-	providerId: string;
 	providerDisplayName: string;
 	accounts: SubscriptionAccountSnapshot[];
 	activeAccount?: SubscriptionAccountSnapshot;
@@ -77,12 +69,11 @@ interface SubscriptionUsageSnapshot {
 	cost?: number;
 }
 
-interface SubscriptionProviderAdapter {
+type SubscriptionProviderAdapter = {
 	id: string;
 	displayName: string;
-	isModelSupported(model: ModelLike): boolean;
 	fetchUsage(signal?: AbortSignal): Promise<SubscriptionUsageSnapshot>;
-}
+};
 
 interface State {
 	model?: ModelLike;
@@ -246,8 +237,6 @@ function usageWindowFromApi(window: UsageApiWindow | undefined): UsageWindow | u
 		remaining,
 		remainingLabel,
 		resetLabel,
-		resetsAt: window.reset_at,
-		label: remainingLabel ? `${remaining}% (${remainingLabel})` : `${remaining}%`,
 	};
 }
 
@@ -270,7 +259,6 @@ function parseUsageResponse(body: unknown): UsageApiSnapshot | undefined {
 		if (!window || typeof window !== "object" || typeof window.used_percent !== "number") return undefined;
 		return {
 			used_percent: window.used_percent,
-			limit_window_seconds: typeof window.limit_window_seconds === "number" ? window.limit_window_seconds : undefined,
 			reset_at: typeof window.reset_at === "number" ? window.reset_at : undefined,
 		};
 	};
@@ -289,13 +277,11 @@ async function readPiCodexAuth(): Promise<PiAuthEntry & { accountId: string }> {
 	return { ...entry, accountId };
 }
 
-async function readOpenCodeGoAuth(): Promise<{ key?: string; accountId?: string; account: SubscriptionAccountSnapshot }> {
+async function readOpenCodeGoAuth(): Promise<SubscriptionAccountSnapshot> {
 	const auth = await readJsonFile<PiAuthFile>(piAuthPath());
 	const entry = auth[OPC_PROVIDER];
 	if (!entry?.key && !entry?.accountId) throw new Error("Missing opencode-go API key or accountId in Pi auth");
-	const account = authAccountSnapshot("OpenCode Go", entry, { plan: "Go" });
-	if (typeof entry.key === "string") return { key: entry.key, account };
-	return { accountId: typeof entry.accountId === "string" ? entry.accountId : undefined, account };
+	return authAccountSnapshot("OpenCode Go", entry, { plan: "Go" });
 }
 
 async function readZaiAuth(): Promise<{ key: string; account: SubscriptionAccountSnapshot }> {
@@ -341,7 +327,6 @@ async function fetchCodexUsage(signal?: AbortSignal): Promise<SubscriptionUsageS
 		const usage = await fetchUsageFromPiAuth(entry, signal);
 		activeAccount = mergeUsageIntoAccount(activeAccount, usage);
 		return {
-			providerId: CODEX_PROVIDER,
 			providerDisplayName: "Codex",
 			accounts: [activeAccount],
 			activeAccount,
@@ -349,7 +334,6 @@ async function fetchCodexUsage(signal?: AbortSignal): Promise<SubscriptionUsageS
 		};
 	} catch (error) {
 		return {
-			providerId: CODEX_PROVIDER,
 			providerDisplayName: "Codex",
 			accounts: [],
 			fetchedAt: Date.now(),
@@ -360,9 +344,8 @@ async function fetchCodexUsage(signal?: AbortSignal): Promise<SubscriptionUsageS
 
 async function fetchOpenCodeGoUsage(_signal?: AbortSignal): Promise<SubscriptionUsageSnapshot> {
 	try {
-		const { account } = await readOpenCodeGoAuth();
+		const account = await readOpenCodeGoAuth();
 		return {
-			providerId: OPC_PROVIDER,
 			providerDisplayName: "OpenCode Go",
 			accounts: [account],
 			activeAccount: account,
@@ -370,7 +353,6 @@ async function fetchOpenCodeGoUsage(_signal?: AbortSignal): Promise<Subscription
 		};
 	} catch (error) {
 		return {
-			providerId: OPC_PROVIDER,
 			providerDisplayName: "OpenCode Go",
 			accounts: [],
 			fetchedAt: Date.now(),
@@ -418,8 +400,6 @@ function zaiLimitToUsageWindow(limit: ZaiLimitEntry): UsageWindow | undefined {
 		remaining,
 		remainingLabel,
 		resetLabel,
-		resetsAt: limit.nextResetTime,
-		label: remainingLabel ? `${remaining}% (${remainingLabel})` : `${remaining}%`,
 	};
 }
 
@@ -473,7 +453,6 @@ async function fetchZaiUsage(signal?: AbortSignal): Promise<SubscriptionUsageSna
 		};
 
 		return {
-			providerId: ZAI_PROVIDER,
 			providerDisplayName: "Z.ai",
 			accounts: [account],
 			activeAccount: account,
@@ -481,7 +460,6 @@ async function fetchZaiUsage(signal?: AbortSignal): Promise<SubscriptionUsageSna
 		};
 	} catch (error) {
 		return {
-			providerId: ZAI_PROVIDER,
 			providerDisplayName: "Z.ai",
 			accounts: [],
 			fetchedAt: Date.now(),
@@ -490,31 +468,11 @@ async function fetchZaiUsage(signal?: AbortSignal): Promise<SubscriptionUsageSna
 	}
 }
 
-const codexAdapter: SubscriptionProviderAdapter = {
-	id: CODEX_PROVIDER,
-	displayName: "Codex",
-	isModelSupported: isCodexModel,
-	fetchUsage: fetchCodexUsage,
-};
-
-const openCodeGoAdapter: SubscriptionProviderAdapter = {
-	id: OPC_PROVIDER,
-	displayName: "OpenCode Go",
-	isModelSupported: isOpenCodeGoModel,
-	fetchUsage: fetchOpenCodeGoUsage,
-};
-
-const zaiAdapter: SubscriptionProviderAdapter = {
-	id: ZAI_PROVIDER,
-	displayName: "Z.ai",
-	isModelSupported: isZaiModel,
-	fetchUsage: fetchZaiUsage,
-};
-
-const adapters = [codexAdapter, openCodeGoAdapter, zaiAdapter];
-
 function supportedAdapter(model: ModelLike): SubscriptionProviderAdapter | undefined {
-	return adapters.find((adapter) => adapter.isModelSupported(model));
+	if (isCodexModel(model)) return { id: CODEX_PROVIDER, displayName: "Codex", fetchUsage: fetchCodexUsage };
+	if (isOpenCodeGoModel(model)) return { id: OPC_PROVIDER, displayName: "OpenCode Go", fetchUsage: fetchOpenCodeGoUsage };
+	if (isZaiModel(model)) return { id: ZAI_PROVIDER, displayName: "Z.ai", fetchUsage: fetchZaiUsage };
+	return undefined;
 }
 
 function formatRemaining(window: UsageWindow | undefined): string {
@@ -525,20 +483,10 @@ function formatRemaining(window: UsageWindow | undefined): string {
 	return "?";
 }
 
-function formatWindow(window: UsageWindow | undefined, _compact = true): string {
-	if (!window) return "?";
-	if (window.percent !== undefined && window.resetLabel) return `${window.percent}% (${window.resetLabel})`;
-	if (window.label) return window.label;
-	if (window.percent !== undefined) return `${window.percent}%`;
-	if (window.used !== undefined && window.limit !== undefined) return `${window.used}/${window.limit}`;
-	return "?";
-}
-
 function minRemaining(account: SubscriptionAccountSnapshot | undefined): number {
 	const values: number[] = [];
 	if (account?.fiveHour?.remaining !== undefined) values.push(account.fiveHour.remaining);
 	if (account?.weekly?.remaining !== undefined) values.push(account.weekly.remaining);
-	if (account?.monthly?.remaining !== undefined) values.push(account.monthly.remaining);
 	if (values.length === 0) return 100;
 	return Math.min(...values);
 }
@@ -548,7 +496,6 @@ function windowSegments(account: SubscriptionAccountSnapshot | undefined): strin
 	const segments: string[] = [];
 	if (account.fiveHour) segments.push(`R:${formatRemaining(account.fiveHour)}`);
 	if (account.weekly) segments.push(`W:${formatRemaining(account.weekly)}`);
-	if (account.monthly) segments.push(`M:${formatRemaining(account.monthly)}`);
 	return segments;
 }
 
@@ -688,12 +635,8 @@ function buildDetails(snapshot: SubscriptionUsageSnapshot | undefined, state: St
 
 	const hasFiveHour = snapshot.accounts.some((a) => a.fiveHour);
 	const hasWeekly = snapshot.accounts.some((a) => a.weekly);
-	const hasMonthly = snapshot.accounts.some((a) => a.monthly);
-
 	if (hasFiveHour) columns.push({ key: "five", label: "ROLLING", get: (a) => formatRemaining(a.fiveHour) });
 	if (hasWeekly) columns.push({ key: "weekly", label: "WEEKLY", get: (a) => formatRemaining(a.weekly) });
-	if (hasMonthly) columns.push({ key: "monthly", label: "MONTHLY", get: (a) => formatRemaining(a.monthly) });
-
 	const rows = snapshot.accounts.map((account) => ({
 		active: account.isActive ? "*" : " ",
 		snapshot: account,
@@ -714,7 +657,7 @@ function buildDetails(snapshot: SubscriptionUsageSnapshot | undefined, state: St
 
 	const costLine = snapshot.cost !== undefined ? `\nSession cost: $${snapshot.cost.toFixed(2)}` : "";
 	const lines = [`Provider: ${snapshot.providerDisplayName} · Model: ${state.model?.id ?? "unknown-model"} · Fetched: ${new Date(snapshot.fetchedAt).toLocaleTimeString()}${costLine}`, "", header, sep, ...body];
-	if (!hasFiveHour && !hasWeekly && !hasMonthly) {
+	if (!hasFiveHour && !hasWeekly) {
 		lines.push("", `${snapshot.providerDisplayName} does not expose usage windows.`);
 	}
 	return lines.join("\n");
@@ -723,12 +666,6 @@ function buildDetails(snapshot: SubscriptionUsageSnapshot | undefined, state: St
 export default function (pi: ExtensionAPI) {
 	const state: State = { lastRefreshAt: 0, refreshGeneration: 0 };
 
-	pi.registerMessageRenderer(MESSAGE_TYPE, (message, _options, theme) => {
-		const box = new Box(1, 1, (text) => theme.bg("customMessageBg", text));
-		box.addChild(new Text(String(message.content ?? ""), 0, 0));
-		return box;
-	});
-
 	pi.on("session_start", async (_event, ctx) => {
 		updateActiveAdapter(ctx, state, ctx.model);
 		if (state.adapter) void refreshUsage(ctx, state, true);

package/extensions/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@bacnh85/pi-sub",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "description": "Pi extension showing subscription usage for supported model providers.",
   "type": "module",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
   },
-  "homepage": "https://github.com/bacnh85/skills#readme",
+  "homepage": "https://github.com/bacnh85/pi-extensions#readme",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/bacnh85/skills.git",
-    "directory": "extensions/pi-sub"
+    "url": "git+https://github.com/bacnh85/pi-extensions.git",
+    "directory": "pi-sub"
   },
   "bugs": {
-    "url": "https://github.com/bacnh85/skills/issues"
+    "url": "https://github.com/bacnh85/pi-extensions/issues"
   },
   "keywords": [
     "pi-package",
@@ -26,18 +26,18 @@
   ],
   "files": [
     "README.md",
-    "index.ts"
+    "extensions/index.ts",
+    "extensions/package.json"
   ],
   "pi": {
     "extensions": [
-      "./index.ts"
+      "./extensions/index.ts"
     ]
   },
   "engines": {
     "node": ">=20.3.0"
   },
   "peerDependencies": {
-    "@earendil-works/pi-coding-agent": "*",
-    "@earendil-works/pi-tui": "*"
+    "@earendil-works/pi-coding-agent": "*"
   }
 }