@bacnh85/pi-sub 0.1.5 → 0.1.7

package/README.md

@@ -2,7 +2,7 @@
 
 Pi extension that shows subscription usage for the currently selected supported model provider.
 
-V1 supports OpenAI Codex models by reading Pi's auth state from `~/.pi/agent/auth.json` (or `$PI_CODING_AGENT_DIR/auth.json`) and displays a subscription footer status after Pi's built-in status/token usage line only while the active Pi model provider is `openai-codex`.
+Supports OpenAI Codex (`openai-codex`) with live usage windows from ChatGPT's usage endpoint, and OpenCode Go (`opencode-go`) with session cost tracking. Displays a subscription footer status after Pi's built-in status/token usage line.
 
 ## Install
 
@@ -26,6 +26,8 @@ pi -e ./extensions/pi-sub
 
 ## What it shows
 
+### OpenAI Codex
+
 The footer status appears after Pi's built-in status/token usage line and includes:
 
 - active account email;
@@ -40,6 +42,14 @@ Example subscription line:
 Sub · Plus · user@example.com · 5H 85% (18:12) · W 80% (08:00 on 2 Jul) · gpt-5-codex
 ```
 
+### OpenCode Go
+
+OpenCode Go does not expose usage windows, so the footer shows only the accumulated session cost:
+
+```text
+OpenCode Go $0.23
+```
+
 When the current model provider is not supported, `pi-sub` clears its subscription line and does not refresh subscription data.
 
 ## Commands
@@ -57,6 +67,14 @@ ACCOUNT                 PLAN  5H USAGE     WEEKLY USAGE           LAST ACTIVITY
 * user@example.com     Plus  85% (18:12)  80% (08:00 on 2 Jul)   Now
 ```
 
+For OpenCode Go, `/sub` shows the provider/model and session cost:
+
+```text
+Provider: OpenCode Go · Model: kimi-k2.6 · Fetched: 14:23
+OpenCode Go does not expose usage windows.
+Session cost: $0.23
+```
+
 ## Refresh behavior
 
 `pi-sub` refreshes usage data:
@@ -73,12 +91,10 @@ Refreshes are cached briefly to avoid excessive usage endpoint calls.
 
 ## Requirements and troubleshooting
 
-- Pi auth must contain an `openai-codex` OAuth entry in `~/.pi/agent/auth.json` or `$PI_CODING_AGENT_DIR/auth.json`.
-- The entry must include `access` and `accountId` fields.
-- `pi-sub` redacts auth/token-related errors and never prints Codex tokens.
-
-If usage is unavailable, verify that Pi can use the `openai-codex` provider and that the auth file exists.
+- **OpenAI Codex**: Pi auth must contain an `openai-codex` OAuth entry in `~/.pi/agent/auth.json` or `$PI_CODING_AGENT_DIR/auth.json`. The entry must include `access` and `accountId` fields.
+- **OpenCode Go**: Pi auth must contain an `opencode-go` API key entry (via `/login` or env var). The entry must have a `key` field or an `accountId` field.
+- `pi-sub` redacts auth/token-related errors and never prints credentials.
 
 ## Design notes
 
-The extension is named `pi-sub` rather than `pi-codex-usage` so future subscription providers can be added as separate adapters. V1 intentionally supports only OpenAI Codex and vendors only the small amount of behavior needed for this extension instead of invoking `codex-auth` directly.
+The extension is named `pi-sub` rather than `pi-codex-usage` so future subscription providers can be added as separate adapters. Supports OpenAI Codex (live usage API) and OpenCode Go (session cost only).

package/index.ts

@@ -80,8 +80,10 @@ interface SubscriptionProviderAdapter {
 interface State {
 	model?: ModelLike;
 	adapter?: SubscriptionProviderAdapter;
+	adapterId?: string;
 	snapshot?: SubscriptionUsageSnapshot;
 	lastRefreshAt: number;
+	refreshGeneration: number;
 	inFlight?: Promise<SubscriptionUsageSnapshot>;
 	refreshTimer?: NodeJS.Timeout;
 	debounceTimer?: NodeJS.Timeout;
@@ -132,6 +134,14 @@ function accountFromPiAuth(entry: PiAuthEntry): SubscriptionAccountSnapshot {
 	};
 }
 
+function getCodexAccountId(entry: PiAuthEntry | undefined): string | undefined {
+	if (!entry) return undefined;
+	if (typeof entry.accountId === "string" && entry.accountId.length > 0) return entry.accountId;
+	const claims = decodeJwtPayload(entry.access);
+	const auth = claims?.["https://api.openai.com/auth"];
+	return typeof auth?.chatgpt_account_id === "string" ? auth.chatgpt_account_id : undefined;
+}
+
 function planLabel(plan: string | undefined): string | undefined {
 	if (!plan) return undefined;
 	const normalized = plan.toLowerCase().replace(/[_-]+/g, " ");
@@ -220,37 +230,20 @@ function parseUsageResponse(body: unknown): UsageApiSnapshot | undefined {
 	};
 }
 
-function parseOpcodeUsageResponse(body: unknown): UsageApiSnapshot | undefined {
-	if (!body || typeof body !== "object") return undefined;
-	const root = body as any;
-	const usage = root.usage ?? root;
-	const parseWindow = (window: any): UsageApiWindow | 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 : typeof window.reset_ts === "number" ? window.reset_ts : undefined,
-		};
-	};
-	return {
-		primary: parseWindow(usage.rolling ?? usage.primary_window),
-		secondary: parseWindow(usage.weekly ?? usage.secondary_window),
-		plan_type: typeof root.plan_type === "string" ? root.plan_type : typeof usage.plan_type === "string" ? usage.plan_type : undefined,
-	};
-}
-
-async function readPiCodexAuth(): Promise<PiAuthEntry> {
+async function readPiCodexAuth(): Promise<PiAuthEntry & { accountId: string }> {
 	const auth = await readJsonFile<PiAuthFile>(piAuthPath());
 	const entry = auth[CODEX_PROVIDER];
-	if (!entry?.access || !entry.accountId) throw new Error("Missing openai-codex OAuth entry in Pi auth");
-	return entry;
+	const accountId = getCodexAccountId(entry!);
+	if (!entry?.access || !accountId) throw new Error("Missing openai-codex OAuth entry in Pi auth");
+	return { ...entry, accountId };
 }
 
-async function readOpenCodeGoAuth(): Promise<{ key: string }> {
+async function readOpenCodeGoAuth(): Promise<{ key?: string; accountId?: string }> {
 	const auth = await readJsonFile<PiAuthFile>(piAuthPath());
 	const entry = auth[OPC_PROVIDER];
-	if (!entry?.key || typeof entry.key !== "string") throw new Error("Missing opencode-go API key in Pi auth");
-	return { key: entry.key };
+	if (!entry?.key && !entry?.accountId) throw new Error("Missing opencode-go API key or accountId in Pi auth");
+	if (typeof entry.key === "string") return { key: entry.key };
+	return { accountId: typeof entry.accountId === "string" ? entry.accountId : undefined };
 }
 
 async function fetchUsageFromPiAuth(entry: PiAuthEntry, signal?: AbortSignal): Promise<UsageApiSnapshot | undefined> {
@@ -260,7 +253,7 @@ async function fetchUsageFromPiAuth(entry: PiAuthEntry, signal?: AbortSignal): P
 		headers: {
 			Accept: "application/json",
 			Authorization: `Bearer ${entry.access}`,
-			"ChatGPT-Account-Id": entry.accountId!,
+			"ChatGPT-Account-Id": getCodexAccountId(entry) ?? entry.accountId,
 			"User-Agent": "pi-sub/0.1.0",
 		},
 		signal: combinedSignal,
@@ -303,19 +296,13 @@ async function fetchCodexUsage(signal?: AbortSignal): Promise<SubscriptionUsageS
 	}
 }
 
-async function fetchOpenCodeGoUsage(signal?: AbortSignal): Promise<SubscriptionUsageSnapshot> {
+async function fetchOpenCodeGoUsage(_signal?: AbortSignal): Promise<SubscriptionUsageSnapshot> {
 	try {
 		await readOpenCodeGoAuth();
-		const account: SubscriptionAccountSnapshot = {
-			isActive: true,
-			accountLabel: "OpenCode Go",
-			lastActivity: "Now",
-		};
 		return {
 			providerId: OPC_PROVIDER,
 			providerDisplayName: "OpenCode Go",
-			accounts: [account],
-			activeAccount: account,
+			accounts: [],
 			fetchedAt: Date.now(),
 		};
 	} catch (error) {
@@ -442,11 +429,21 @@ function stopTimer(state: State): void {
 }
 
 function updateActiveAdapter(ctx: ExtensionContext, state: State, model: ModelLike): void {
+	const nextAdapter = supportedAdapter(model);
+	const adapterChanged = state.adapterId !== nextAdapter?.id;
+
 	state.model = model;
-	state.adapter = supportedAdapter(model);
-	if (!state.adapter) {
+	state.adapter = nextAdapter;
+	state.adapterId = nextAdapter?.id;
+
+	if (adapterChanged) {
 		state.snapshot = undefined;
 		state.lastRefreshAt = 0;
+		state.inFlight = undefined;
+		state.refreshGeneration++;
+	}
+
+	if (!state.adapter) {
 		stopTimer(state);
 	}
 	renderSubscriptionLine(ctx, state);
@@ -461,15 +458,19 @@ async function refreshUsage(ctx: ExtensionContext, state: State, force: boolean)
 	}
 	if (!force && state.snapshot && Date.now() - state.lastRefreshAt < REFRESH_TTL_MS) return state.snapshot;
 	if (state.inFlight) return state.inFlight;
+	const generation = state.refreshGeneration;
 	renderSubscriptionLine(ctx, state);
 	state.inFlight = adapter.fetchUsage(ctx.signal).then((snapshot) => {
+		if (state.refreshGeneration !== generation) return snapshot;
 		snapshot.cost = aggregateSessionCost(ctx);
 		state.snapshot = snapshot;
 		state.lastRefreshAt = Date.now();
 		renderSubscriptionLine(ctx, state);
 		return snapshot;
 	}).finally(() => {
-		state.inFlight = undefined;
+		if (state.refreshGeneration === generation) {
+			state.inFlight = undefined;
+		}
 	});
 	return state.inFlight;
 }
@@ -491,7 +492,11 @@ function buildDetails(snapshot: SubscriptionUsageSnapshot | undefined, state: St
 	if (!state.adapter) return `Subscription tracking inactive for current model provider (${state.model?.provider ?? "unknown"}).`;
 	if (!snapshot) return "Subscription usage has not been loaded yet.";
 	if (snapshot.error) return `${snapshot.providerDisplayName}: ${snapshot.error}`;
-	if (snapshot.accounts.length === 0) return `${snapshot.providerDisplayName}: no accounts found.`;
+	if (snapshot.accounts.length === 0) {
+		const costLine = snapshot.cost !== undefined && snapshot.cost > 0 ? `\nSession cost: $${snapshot.cost.toFixed(2)}` : "";
+		const modelInfo = state.model?.id ? ` · Model: ${state.model.id}` : "";
+		return `Provider: ${snapshot.providerDisplayName}${modelInfo} · Fetched: ${new Date(snapshot.fetchedAt).toLocaleTimeString()}\n${snapshot.providerDisplayName} does not expose usage windows.${costLine}`;
+	}
 
 	const columns: { key: string; label: string; get: (a: SubscriptionAccountSnapshot) => string }[] = [
 		{ key: "account", label: "ACCOUNT", get: (a) => a.accountLabel ?? "unknown" },
@@ -529,7 +534,7 @@ function buildDetails(snapshot: SubscriptionUsageSnapshot | undefined, state: St
 }
 
 export default function (pi: ExtensionAPI) {
-	const state: State = { lastRefreshAt: 0 };
+	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));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bacnh85/pi-sub",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Pi extension showing subscription usage for supported model providers.",
   "type": "module",
   "license": "MIT",
@@ -33,6 +33,7 @@
       "./index.ts"
     ]
   },
+  "engines": { "node": ">=20.3.0" },
   "peerDependencies": {
     "@earendil-works/pi-coding-agent": "*",
     "@earendil-works/pi-tui": "*"