pi-chatgpt-pool 0.2.0 → 0.2.2

package/README.md

@@ -12,15 +12,16 @@ 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
 ```
 
-`/login` lists each account as `ChatGPT (<label>)`. Sign in to each one with a different ChatGPT account. Then pick a pooled model:
+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
 /model chatgpt/gpt-5.6-sol
@@ -34,6 +35,8 @@ 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` |
@@ -48,8 +51,10 @@ The command autocompletes its actions and account labels.
 | Key | Action |
 | --- | --- |
 | `↑` `↓` or `j` `k` | Select an account |
+| `enter` | Sign in to the selected account (fills in `/login` for it; press Enter again) |
 | `s` | Spend a banked reset on the selected account, after you confirm |
 | `c` | Clear the selected account's recorded limit |
+| `n` | Set the name the selected account shows in `/login` |
 | `d` | Remove the selected account |
 | `a` | Add an account |
 | `t` | Choose the strategy |

package/package.json

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

package/src/index.ts

@@ -8,6 +8,7 @@ import {
 	isStrategy,
 	failoverMessage,
 	limitCooldown,
+	loginName,
 	nextAccountId,
 	orderAccounts,
 	parseResetAt,
@@ -79,7 +80,7 @@ function subscriptionModels(providers: readonly Provider[]): Model<Api>[] {
 }
 
 function accountProvider(openai: Provider, account: Account, onReset: ResetListener): Provider {
-	const name = `ChatGPT (${account.label})`;
+	const name = loginName(account);
 	const signIn = openai.auth.oauth;
 	if (!signIn) throw new Error("pi's openai provider has no Sign in with ChatGPT flow; update pi to 0.99.1 or later");
 	const models: Model<Api>[] = subscriptionModels(builtinProviders()).map((model) => ({
@@ -283,7 +284,7 @@ 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 ChatGPT (${account.label})`;
+		if (!signedIn) return `${account.label}  ·  not signed in, run /chatgpt-pool login ${account.label}`;
 		const state = limitedUntil ? `limited until ${formatReset(limitedUntil)}` : "ready";
 		if (!usage) return `${account.label}  ·  ${state}  ·  usage unavailable${error ? ` (${error})` : ""}`;
 		const windows = usage.windows.map(
@@ -305,7 +306,34 @@ export default function chatgptPool(pi: ExtensionAPI) {
 		update((config) => ({ ...config, accounts: [...config.accounts, account] }));
 		registerPooledModels();
 		pi.registerProvider(accountProvider(openai, account, onReset));
-		ctx.ui.notify(`Added ChatGPT (${label}). 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) => {
+		const next = { ...account, name: name.trim() || undefined };
+		update((config) => ({
+			...config,
+			accounts: config.accounts.map((candidate) => (candidate.id === account.id ? next : candidate)),
+		}));
+		pi.registerProvider(accountProvider(openai, next, onReset));
+		ctx.ui.notify(`${account.label} now shows as "${loginName(next)}" in /login. Its sign-in is unchanged.`, "info");
+	};
+
+	const askLoginName = async (ctx: ExtensionContext, account: Account) => {
+		const name = await ctx.ui.input(
+			`Name shown in /login for ${account.label} (empty for "ChatGPT (${account.label})")`,
+			loginName(account),
+		);
+		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) => {
@@ -379,13 +407,16 @@ 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") {
 				setResetsAt(status.account.id, undefined);
 				ctx.ui.notify(`ChatGPT (${status.account.label}) is back in rotation.`, "info");
@@ -441,12 +472,14 @@ export default function chatgptPool(pi: ExtensionAPI) {
 		{ 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, spend, reset",
+		description: "Manage pooled ChatGPT accounts: usage, banked resets, strategy, add, login, remove, name, spend, reset",
 		getArgumentCompletions(prefix) {
 			const [action, ...rest] = prefix.split(" ");
 			if (rest.length === 0) return SUBCOMMANDS.filter((item) => item.value.startsWith(action));
@@ -455,7 +488,8 @@ 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") 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
 				.filter((account) => account.label.startsWith(partial))
@@ -476,8 +510,22 @@ 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);
+				if (!account) return ctx.ui.notify("Usage: /chatgpt-pool name <label> <name shown in /login>", "warning");
+				if (nameParts.length > 0 || !ctx.hasUI) return setLoginName(ctx, account, nameParts.join(" "));
+				return askLoginName(ctx, account);
+			}
+
 			if (action === "reset") {
-				update((config) => ({ ...config, accounts: config.accounts.map(({ id, label }) => ({ id, label })) }));
+				update((config) => ({ ...config, accounts: config.accounts.map((account) => ({ ...account, resetsAt: undefined })) }));
 				updateStatus(ctx);
 				return ctx.ui.notify("Cleared recorded limits. Every signed-in account is back in rotation.", "info");
 			}
@@ -502,7 +550,7 @@ export default function chatgptPool(pi: ExtensionAPI) {
 				return spend(ctx, account);
 			}
 
-			if (action) return ctx.ui.notify(`Unknown action "${action}". Use add, remove, spend, reset, or strategy.`, "warning");
+			if (action) return ctx.ui.notify(`Unknown action "${action}". Use add, login, remove, name, spend, 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

@@ -11,12 +11,13 @@ export type PanelAction =
 	| { type: "refresh" }
 	| { type: "add" }
 	| { type: "strategy" }
-	| { type: "spend" | "clear" | "remove"; accountId: string };
+	| { type: "spend" | "clear" | "remove" | "name" | "login"; accountId: string };
 
-const ACCOUNT_KEYS = new Map<string, "spend" | "clear" | "remove">([
+const ACCOUNT_KEYS = new Map<string, "spend" | "clear" | "remove" | "name">([
 	["s", "spend"],
 	["c", "clear"],
 	["d", "remove"],
+	["n", "name"],
 ]);
 const POOL_KEYS = new Map<string, "refresh" | "add" | "strategy">([
 	["r", "refresh"],
@@ -25,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 · d remove · a add · t strategy · r refresh · esc close",
-	"↑↓ · s spend · c clear · d remove · a add · t strategy · r refresh · esc",
-	"s spend · c clear · d del · a add · t strat · 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 {
@@ -46,6 +47,10 @@ 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;
@@ -95,7 +100,7 @@ export class PoolPanel implements Component {
 				: "";
 		const header = `${pointer}${name}${active}  ${state}${banked}`;
 
-		if (!signedIn) return [header, theme.fg("dim", `    run /login and pick ChatGPT (${account.label})`)];
+		if (!signedIn) return [header, theme.fg("dim", "    press enter to sign in")];
 		if (!usage) return [header, theme.fg("dim", `    usage unavailable${error ? `: ${error}` : ""}`)];
 		return [
 			header,

package/src/pool.ts

@@ -1,4 +1,8 @@
-export type Account = { id: string; label: string; resetsAt?: number };
+export type Account = { id: string; label: string; name?: string; resetsAt?: number };
+
+export function loginName(account: Account): string {
+	return account.name || `ChatGPT (${account.label})`;
+}
 
 const USAGE_LIMIT = /usage.?limit|subscription_sharing_usage_limit_exceeded|insufficient_quota|quota/i;
 const RATE_LIMIT = /rate.?limit|too many requests|\b429\b/i;