pi-chatgpt-pool 0.2.1 → 0.2.3

package/README.md

@@ -12,14 +12,15 @@ Requires pi 0.99.1 or later. The plugin uses pi's own Sign in with ChatGPT flow,
 
 ## Set up accounts
 
-Run `/chatgpt-pool` and choose **+ Add account**, or add them directly:
+Run `/chatgpt-pool`, press `a` to add an account, then Enter to sign in. Or from the editor:
 
 ```text
 /chatgpt-pool add personal
 /chatgpt-pool add work
-/login
 ```
 
+After adding an account, pi fills in `/login chatgpt-<n>` for it; press Enter to open the ChatGPT sign-in. Sign in to each account with a different ChatGPT account. `/chatgpt-pool login <label>` does the same for an existing account.
+
 `/login` lists each account as `ChatGPT (<label>)`, or under a name you choose with `/chatgpt-pool name`. Renaming keeps the account signed in. Sign in to each one with a different ChatGPT account. Then pick a pooled model:
 
 ```text
@@ -34,9 +35,9 @@ The pool offers the ChatGPT subscription models: the OpenAI models that pi also
 | --- | --- |
 | `/chatgpt-pool` | Open the pool panel (see below) |
 | `/chatgpt-pool add <label>` | Add an account slot. Sign in to it with `/login` |
+| `/chatgpt-pool login <label>` | Fill in `/login` for that account, so Enter starts its sign-in |
 | `/chatgpt-pool name <label> <name>` | Set the name the account shows in `/login`, for example `Work (jal@mastra.ai)`. Leave the name empty to go back to `ChatGPT (<label>)` |
 | `/chatgpt-pool remove <label>` | Remove an account. Run `/logout` for it first to delete its token |
-| `/chatgpt-pool spend <label>` | Spend one banked reset on that account, after you confirm |
 | `/chatgpt-pool strategy <name>` | Set the routing strategy: `fill-first`, `round-robin`, `least-used`, or `use-it-or-lose-it` |
 | `/chatgpt-pool reset` | Forget recorded limits, for example after a limit clears early |
 
@@ -44,12 +45,12 @@ The command autocompletes its actions and account labels.
 
 ## Pool panel
 
-`/chatgpt-pool` opens a panel with every account, its state (ready, limited with a countdown, or not signed in), a usage bar per window with the time until it resets, and its banked resets.
+`/chatgpt-pool` shows each account's sign-in status and any recorded limit countdown. Usage meters and banked resets are hidden for ChatGPT subscription-sharing sign-ins until a compatible usage endpoint is verified. Opening the panel does not send rejected Codex usage requests.
 
 | Key | Action |
 | --- | --- |
 | `↑` `↓` or `j` `k` | Select an account |
-| `s` | Spend a banked reset on the selected account, after you confirm |
+| `enter` | Sign in to the selected account (fills in `/login` for it; press Enter again) |
 | `c` | Clear the selected account's recorded limit |
 | `n` | Set the name the selected account shows in `/login` |
 | `d` | Remove the selected account |
@@ -60,7 +61,7 @@ The command autocompletes its actions and account labels.
 
 Over RPC the same actions are offered as a list instead.
 
-While a pooled model is selected, the footer shows the account in use with its usage and reset time, for example `chatgpt: work 42% · resets in 3d 4h`, plus how many accounts are limited. When a conversation moves to another account, pi shows a notice such as `ChatGPT pool: personal is limited (back in 1h 30m), switched to work.`
+While a pooled model is selected, the footer shows the account in use, for example `chatgpt: work`, plus how many accounts have recorded limits and when the next one returns. When a conversation moves to another account, pi shows a notice such as `ChatGPT pool: personal is limited (back in 1h 30m), switched to work.`
 
 `/chatgpt-pool` and `spend` need the interactive UI; in `--print` or `--mode json` they stop with an error instead of spending anything. From a shell, use pi's own commands:
 
@@ -83,7 +84,7 @@ A conversation stays on the same account while it works, so prompt caching and r
 | Least used | The account with the lowest usage % |
 | Use it or lose it | The account whose usage window resets soonest, so its remaining quota isn't wasted |
 
-Choose one from the **Strategy** row in `/chatgpt-pool`, or run `/chatgpt-pool strategy <name>`. It's saved in `chatgpt-pool.json`, and the round-robin position is shared across pi sessions. Least used and use it or lose it read usage from ChatGPT, cached for 5 minutes; accounts whose usage can't be read go last.
+Choose one from the **Strategy** row in `/chatgpt-pool`, or run `/chatgpt-pool strategy <name>`. It's saved in `chatgpt-pool.json`, and the round-robin position is shared across pi sessions. Least used and use it or lose it require usage data. The current ChatGPT sign-in flow cannot read it, so these strategies use the configured account order. Round robin spreads new conversations without usage data.
 
 ## How failover works
 
@@ -92,13 +93,11 @@ Choose one from the **Strategy** row in `/chatgpt-pool`, or run `/chatgpt-pool s
 - Reset times are saved in `chatgpt-pool.json`, so they survive restarts.
 - If every account is signed out or limited, the request fails with a message pointing to `/chatgpt-pool`.
 
-## Banked resets
-
-ChatGPT gives some accounts reset credits that clear a usage limit early. `/chatgpt-pool` shows how many each account has banked and how many apply right now.
+## Usage and banked resets
 
-The plugin never spends one on its own. Pick the account in `/chatgpt-pool`, or run `/chatgpt-pool spend <label>`. It picks the credit that expires first and asks you to confirm. It warns you when ChatGPT reports nothing to reset.
+OpenAI's subscription-sharing sign-in tokens are not accepted by the Codex `backend-api/wham` usage service. Usage meters and banked-reset actions are hidden for these accounts. No reset is spent, and the pool never spends one automatically. Recorded limits and failover still work from inference errors.
 
-Usage and banked resets come from ChatGPT's `backend-api/wham` endpoints, the same ones the Codex CLI uses.
+Review actual usage in [ChatGPT Usage settings](https://chatgpt.com/settings/usage). Codex reset credits have not been verified to reset subscription-sharing limits.
 
 ## Releasing
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-chatgpt-pool",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "Pool several Sign in with ChatGPT accounts in pi, with routing strategies, failover, and banked resets",
   "keywords": [
     "pi-package",

package/src/index.ts

@@ -114,7 +114,8 @@ export default function chatgptPool(pi: ExtensionAPI) {
 	};
 	const usageCache = new Map<string, { snapshot: UsageSnapshot; at: number }>();
 
-	const rememberUsage = (accountId: string, usage: Usage) => {
+	const rememberUsage = (accountId: string, usage: Usage | undefined) => {
+		if (!usage) return;
 		const snapshot = snapshotOf(usage);
 		if (snapshot) usageCache.set(accountId, { snapshot, at: Date.now() });
 	};
@@ -260,6 +261,7 @@ export default function chatgptPool(pi: ExtensionAPI) {
 				if (!token || signal?.aborted) return { account, signedIn: !!token };
 				try {
 					const usage = await fetchUsage(token);
+					if (!usage) return { account, signedIn: true };
 					rememberUsage(account.id, usage);
 					const limitedUntil = usage.limitReached ? Math.max(...usage.windows.map((w) => w.resetsAt)) : undefined;
 					if (limitedUntil !== account.resetsAt && (usage.limitReached || (account.resetsAt ?? 0) > Date.now())) {
@@ -284,9 +286,9 @@ export default function chatgptPool(pi: ExtensionAPI) {
 
 	const describe = ({ account, signedIn, usage, error }: AccountStatus): string => {
 		const limitedUntil = account.resetsAt && account.resetsAt > Date.now() ? account.resetsAt : undefined;
-		if (!signedIn) return `${account.label}  ·  not signed in, run /login and pick ${loginName(account)}`;
-		const state = limitedUntil ? `limited until ${formatReset(limitedUntil)}` : "ready";
-		if (!usage) return `${account.label}  ·  ${state}  ·  usage unavailable${error ? ` (${error})` : ""}`;
+		if (!signedIn) return `${account.label}  ·  not signed in, run /chatgpt-pool login ${account.label}`;
+		const state = limitedUntil ? `limited until ${formatReset(limitedUntil)}` : usage ? "ready" : "signed in";
+		if (!usage) return `${account.label}  ·  ${state}${error ? `  ·  ${error}` : ""}`;
 		const windows = usage.windows.map(
 			(w) => `${formatWindow(w.windowSeconds)} ${Math.round(w.usedPercent)}%, resets ${formatReset(w.resetsAt)}`,
 		);
@@ -306,7 +308,8 @@ export default function chatgptPool(pi: ExtensionAPI) {
 		update((config) => ({ ...config, accounts: [...config.accounts, account] }));
 		registerPooledModels();
 		pi.registerProvider(accountProvider(openai, account, onReset));
-		ctx.ui.notify(`Added ${loginName(account)}. Run /login and pick it to sign in.`, "info");
+		ctx.ui.notify(`Added ${loginName(account)}.`, "info");
+		startLogin(ctx, account);
 	};
 
 	const setLoginName = (ctx: ExtensionContext, account: Account, name: string) => {
@@ -327,6 +330,14 @@ export default function chatgptPool(pi: ExtensionAPI) {
 		if (name !== undefined) setLoginName(ctx, account, name);
 	};
 
+	const startLogin = (ctx: ExtensionContext, account: Account) => {
+		if (ctx.mode !== "tui") {
+			return ctx.ui.notify(`Run /login ${account.id} to sign in to ${loginName(account)}.`, "info");
+		}
+		ctx.ui.setEditorText(`/login ${account.id}`);
+		ctx.ui.notify(`Press Enter to sign in to ${loginName(account)}.`, "info");
+	};
+
 	const removeAccount = (ctx: ExtensionContext, account: Account) => {
 		update((config) => ({ ...config, accounts: config.accounts.filter((candidate) => candidate.id !== account.id) }));
 		pi.unregisterProvider(account.id);
@@ -341,7 +352,7 @@ export default function chatgptPool(pi: ExtensionAPI) {
 		const token = await ctx.modelRegistry.getApiKeyForProvider(account.id);
 		if (!token) return ctx.ui.notify(`ChatGPT (${account.label}) is not signed in.`, "warning");
 		const usage = known ?? (await withLoader(ctx, `Checking ${account.label}...`, () => fetchUsage(token)));
-		if (!usage) return;
+		if (!usage) return ctx.ui.notify("Banked resets are unavailable for this sign-in. No reset spent.", "info");
 		const credit = [...usage.credits].sort(
 			(a, b) => (a.expiresAt ?? Number.POSITIVE_INFINITY) - (b.expiresAt ?? Number.POSITIVE_INFINITY),
 		)[0];
@@ -398,13 +409,14 @@ export default function chatgptPool(pi: ExtensionAPI) {
 				reload = true;
 			} else if (action.type === "add") {
 				const label = (await ctx.ui.input("Label for the new ChatGPT account", "work"))?.trim();
-				if (label) addAccount(ctx, label);
-				reload = !!label;
+				if (label) return addAccount(ctx, label);
 			} else if (action.type === "strategy") {
 				await chooseStrategy(ctx);
 			} else if (status && action.type === "spend") {
 				await spend(ctx, status.account, status.usage);
 				reload = true;
+			} else if (status && action.type === "login") {
+				return startLogin(ctx, status.account);
 			} else if (status && action.type === "name") {
 				await askLoginName(ctx, status.account);
 			} else if (status && action.type === "clear") {
@@ -461,14 +473,14 @@ export default function chatgptPool(pi: ExtensionAPI) {
 	const SUBCOMMANDS = [
 		{ value: "add", label: "add", description: "Add an account slot" },
 		{ value: "remove", label: "remove", description: "Remove an account" },
-		{ value: "spend", label: "spend", description: "Spend a banked reset, after confirming" },
+		{ value: "login", label: "login", description: "Sign in to an account" },
 		{ value: "name", label: "name", description: "Set the name an account shows in /login" },
 		{ value: "reset", label: "reset", description: "Forget recorded limits" },
 		{ value: "strategy", label: "strategy", description: "Choose how new conversations pick an account" },
 	];
 
 	pi.registerCommand("chatgpt-pool", {
-		description: "Manage pooled ChatGPT accounts: usage, banked resets, strategy, add, remove, name, spend, reset",
+		description: "Manage pooled ChatGPT accounts: sign-in, strategy, add, remove, name, reset",
 		getArgumentCompletions(prefix) {
 			const [action, ...rest] = prefix.split(" ");
 			if (rest.length === 0) return SUBCOMMANDS.filter((item) => item.value.startsWith(action));
@@ -477,7 +489,7 @@ export default function chatgptPool(pi: ExtensionAPI) {
 					.filter(([name]) => name.startsWith(rest.join(" ")))
 					.map(([name, description]) => ({ value: `strategy ${name}`, label: name, description }));
 			}
-			if (action !== "remove" && action !== "spend" && action !== "name") return null;
+			if (!["remove", "spend", "name", "login"].includes(action)) return null;
 			if (action === "name" && rest.length > 1) return null;
 			const partial = rest.join(" ");
 			return accounts
@@ -499,6 +511,12 @@ export default function chatgptPool(pi: ExtensionAPI) {
 				return removeAccount(ctx, account);
 			}
 
+			if (action === "login") {
+				const account = findAccount(label);
+				if (!account) return ctx.ui.notify("Usage: /chatgpt-pool login <label>", "warning");
+				return startLogin(ctx, account);
+			}
+
 			if (action === "name") {
 				const [target = "", ...nameParts] = rest;
 				const account = findAccount(target);
@@ -533,7 +551,7 @@ export default function chatgptPool(pi: ExtensionAPI) {
 				return spend(ctx, account);
 			}
 
-			if (action) return ctx.ui.notify(`Unknown action "${action}". Use add, remove, name, spend, reset, or strategy.`, "warning");
+			if (action) return ctx.ui.notify(`Unknown action "${action}". Use add, login, remove, name, reset, or strategy.`, "warning");
 			if (accounts.length === 0) {
 				const label = (await ctx.ui.input("No ChatGPT accounts yet. Label for the first one", "personal"))?.trim();
 				if (label) addAccount(ctx, label);

package/src/panel.ts

@@ -1,7 +1,7 @@
 import type { Theme } from "@earendil-works/pi-coding-agent";
 import { type Component, Key, matchesKey, truncateToWidth, type TUI, visibleWidth } from "@earendil-works/pi-tui";
 import { formatIn, formatWindow, usageBar } from "./format.ts";
-import { type Account, loginName } from "./pool.ts";
+import type { Account } from "./pool.ts";
 import type { Usage } from "./usage.ts";
 
 export type AccountStatus = { account: Account; signedIn: boolean; usage?: Usage; error?: string };
@@ -11,7 +11,7 @@ export type PanelAction =
 	| { type: "refresh" }
 	| { type: "add" }
 	| { type: "strategy" }
-	| { type: "spend" | "clear" | "remove" | "name"; accountId: string };
+	| { type: "spend" | "clear" | "remove" | "name" | "login"; accountId: string };
 
 const ACCOUNT_KEYS = new Map<string, "spend" | "clear" | "remove" | "name">([
 	["s", "spend"],
@@ -26,9 +26,9 @@ const POOL_KEYS = new Map<string, "refresh" | "add" | "strategy">([
 ]);
 const BAR_WIDTH = 16;
 const HINTS = [
-	"↑↓ select · s spend reset · c clear limit · n login name · d remove · a add · t strategy · r refresh · esc close",
-	"↑↓ · s spend · c clear · n name · d remove · a add · t strategy · r refresh · esc",
-	"s spend · c clear · n name · d del · a add · esc",
+	"↑↓ select · enter sign in · s spend reset · c clear limit · n login name · d remove · a add · t strategy · r refresh · esc close",
+	"↑↓ · enter sign in · s spend · c clear · n name · d remove · a add · t strategy · esc",
+	"enter sign in · s spend · n name · d del · a add · esc",
 ];
 
 export class PoolPanel implements Component {
@@ -47,9 +47,14 @@ export class PoolPanel implements Component {
 		if (matchesKey(data, Key.escape) || data === "q") return this.done({ type: "close" });
 		if (matchesKey(data, Key.up) || data === "k") return this.move(-1);
 		if (matchesKey(data, Key.down) || data === "j") return this.move(1);
+		if (matchesKey(data, Key.enter)) {
+			const account = this.statuses[this.selected]?.account;
+			return account ? this.done({ type: "login", accountId: account.id }) : undefined;
+		}
 		const poolAction = POOL_KEYS.get(data);
 		const accountAction = ACCOUNT_KEYS.get(data);
 		const account = this.statuses[this.selected]?.account;
+		if (accountAction === "spend" && !this.statuses[this.selected]?.usage?.banked) return;
 		if (poolAction) this.done({ type: poolAction });
 		else if (accountAction && account) this.done({ type: accountAction, accountId: account.id });
 	}
@@ -66,7 +71,10 @@ export class PoolPanel implements Component {
 		];
 		if (this.statuses.length === 0) lines.push(theme.fg("muted", "No accounts yet. Press a to add one."), "");
 		this.statuses.forEach((status, index) => lines.push(...this.renderAccount(status, index === this.selected), ""));
-		const hint = HINTS.find((text) => visibleWidth(text) <= width) ?? HINTS[HINTS.length - 1];
+		const hints = this.statuses[this.selected]?.usage?.banked
+			? HINTS
+			: HINTS.map((text) => text.replace(/s spend(?: reset)? · /g, ""));
+		const hint = hints.find((text) => visibleWidth(text) <= width) ?? hints[hints.length - 1];
 		lines.push(theme.fg("dim", hint), rule);
 		return lines.map((line) => truncateToWidth(line, width));
 	}
@@ -88,7 +96,7 @@ export class PoolPanel implements Component {
 			? theme.fg("muted", "not signed in")
 			: limitedUntil
 				? theme.fg("warning", `limited · back in ${formatIn(limitedUntil - now)}`)
-				: theme.fg("success", "ready");
+				: usage ? theme.fg("success", "ready") : theme.fg("muted", "signed in");
 		const banked =
 			usage && usage.banked > 0
 				? theme.fg("accent", `  ${usage.banked} banked reset${usage.banked === 1 ? "" : "s"}`) +
@@ -96,8 +104,8 @@ export class PoolPanel implements Component {
 				: "";
 		const header = `${pointer}${name}${active}  ${state}${banked}`;
 
-		if (!signedIn) return [header, theme.fg("dim", `    run /login and pick ${loginName(account)}`)];
-		if (!usage) return [header, theme.fg("dim", `    usage unavailable${error ? `: ${error}` : ""}`)];
+		if (!signedIn) return [header, theme.fg("dim", "    press enter to sign in")];
+		if (!usage) return error ? [header, theme.fg("muted", `    ${error}`)] : [header];
 		return [
 			header,
 			...usage.windows.map((window) => {

package/src/usage.ts

@@ -22,25 +22,31 @@ export type Usage = {
 };
 export type SpendOutcome = ConsumeResponse["code"];
 
-function accountIdFromToken(token: string): string | undefined {
+type TokenClaims = { scope?: string; "https://api.openai.com/auth"?: { chatgpt_account_id?: string } };
+
+function tokenClaims(token: string): TokenClaims | undefined {
 	const payload = token.split(".")[1];
 	if (!payload) return undefined;
 	try {
-		return JSON.parse(Buffer.from(payload, "base64url").toString("utf8"))["https://api.openai.com/auth"]
-			?.chatgpt_account_id;
+		return JSON.parse(Buffer.from(payload, "base64url").toString("utf8"));
 	} catch {
 		return undefined;
 	}
 }
 
+function supportsUsage(token: string): boolean {
+	const claims = tokenClaims(token);
+	return !(typeof claims?.scope === "string" && claims.scope.split(/\s+/).includes("chatgpt.tokens.use.direct"));
+}
+
 async function backend<T>(token: string, path: string, init: RequestInit = {}): Promise<T> {
+	if (!supportsUsage(token)) throw new Error("Banked resets are unavailable for ChatGPT subscription-sharing sign-ins.");
 	const headers = new Headers({ authorization: `Bearer ${token}`, "content-type": "application/json" });
-	const accountId = accountIdFromToken(token);
+	const accountId = tokenClaims(token)?.["https://api.openai.com/auth"]?.chatgpt_account_id;
 	if (accountId) headers.set("chatgpt-account-id", accountId);
 	const response = await fetch(`${BACKEND}/${path}`, { ...init, headers, signal: AbortSignal.timeout(15_000) });
 	if (!response.ok) {
-		const body = await response.text().catch(() => "");
-		throw new Error(`ChatGPT ${path} failed (${response.status})${body ? `: ${body.slice(0, 200)}` : ""}`);
+		throw new Error(`ChatGPT ${path} failed (${response.status}).`);
 	}
 	return response.json();
 }
@@ -50,7 +56,8 @@ function toWindow(window: Window | null | undefined): UsageWindow[] {
 	return [{ usedPercent: window.used_percent, windowSeconds: window.limit_window_seconds, resetsAt: window.reset_at * 1000 }];
 }
 
-export async function fetchUsage(token: string): Promise<Usage> {
+export async function fetchUsage(token: string): Promise<Usage | undefined> {
+	if (!supportsUsage(token)) return undefined;
 	const [usage, credits] = await Promise.all([
 		backend<UsageResponse>(token, "usage"),
 		backend<CreditsResponse>(token, "rate-limit-reset-credits"),