@bacnh85/pi-sub 0.1.4 → 0.1.6

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, " ");
@@ -239,11 +249,12 @@ function parseOpcodeUsageResponse(body: unknown): UsageApiSnapshot | 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 }> {
@@ -260,7 +271,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,
@@ -305,33 +316,13 @@ async function fetchCodexUsage(signal?: AbortSignal): Promise<SubscriptionUsageS
 
 async function fetchOpenCodeGoUsage(signal?: AbortSignal): Promise<SubscriptionUsageSnapshot> {
 	try {
-		const auth = await readOpenCodeGoAuth();
-		const timeoutSignal = AbortSignal.timeout(7_000);
-		const combinedSignal = signal ? AbortSignal.any([signal, timeoutSignal]) : timeoutSignal;
-		const response = await fetch("https://opencode.ai/zen/go/v1/usage", {
-			headers: {
-				Accept: "application/json",
-				Authorization: `Bearer ${auth.key}`,
-				"User-Agent": "pi-sub/0.1.4",
-			},
-			signal: combinedSignal,
-		});
-		if (!response.ok) throw new Error(`usage request failed with HTTP ${response.status}`);
-		const usage = parseOpcodeUsageResponse(await response.json());
-		const account: SubscriptionAccountSnapshot = {
-			isActive: true,
-			accountLabel: "OpenCode Go",
-			plan: planLabel(usage?.plan_type),
-			fiveHour: usageWindowFromApi(usage?.primary),
-			weekly: usageWindowFromApi(usage?.secondary),
-			lastActivity: "Now",
-		};
+		await readOpenCodeGoAuth();
 		return {
 			providerId: OPC_PROVIDER,
 			providerDisplayName: "OpenCode Go",
-			accounts: [account],
-			activeAccount: account,
+			accounts: [],
 			fetchedAt: Date.now(),
+			error: "OpenCode Go usage tracking not yet implemented",
 		};
 	} catch (error) {
 		return {
@@ -427,9 +418,12 @@ function renderSubscriptionLine(ctx: ExtensionContext, state: State): void {
 		const account = snapshot.activeAccount;
 		const segments = windowSegments(account);
 		const cost = snapshot.cost;
+		const hasWindows = segments.length > 0;
 		if (cost !== undefined && cost > 0) segments.push(`$${cost.toFixed(2)}`);
 		if (segments.length === 0) {
 			line = `Sub ${state.adapter.displayName}`;
+		} else if (!hasWindows) {
+			line = `${state.adapter.displayName} ${segments.join(" ")}`;
 		} else {
 			line = segments.join(" ");
 		}
@@ -454,11 +448,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);
@@ -473,15 +477,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;
 }
@@ -541,7 +549,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.4",
+  "version": "0.1.6",
   "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": "*"