@zgltyq/pi-provider-claude 1.3.1 → 1.3.3

package/README.md

@@ -91,12 +91,13 @@ the assistant message (`stopReason: "error"`) via `message_end`, including Claud
 is hit, the turn errors once, the pool flips (with a UI notification), and you just
 resend your message to continue on the other account.
 
-**OAuth compatibility and background token refresh (v1.3.1):** The pool now
-uses its own Anthropic OAuth login/refresh adapter, keeping it compatible with
-pi 0.81.x where the old runtime OAuth export is no longer available. OAuth access
-tokens are short-lived. An account that sat idle (e.g. your fallback) would have
-a dead access token by the time failover switched to it — producing a `401
-authentication_error`. v1.3.1 retains the v1.3.0 keep-warm behavior:
+**OAuth compatibility and background token refresh (v1.3.3):** The pool now
+uses its own Anthropic OAuth login/refresh adapter and the login callback bridge
+matches pi 0.81.x, where the old runtime OAuth export is no longer available.
+OAuth access tokens are short-lived. An account that sat idle (e.g. your fallback)
+would have a dead access token by the time failover switched to it — producing a
+`401 authentication_error`. v1.3.3 also applies `/claude-pool-add` immediately to
+the running session and excludes accounts whose refresh token is expired or revoked:
 
 - A `setInterval` keep-warm loop that refreshes **every** pooled account before it
   expires, even when idle and not the active account (the timer is `unref()`'d so
@@ -124,8 +125,9 @@ so the extension adds a command to snapshot each login into the pool:
 /claude-pool-status        → verify both are present
 ```
 
-Restart, and failover activates. `/claude-pool-add <label>` only writes
-`claude-pool.json` (it never touches the request path).
+Restart after initially creating the pool to activate failover. Once active,
+`/claude-pool-add <label>` updates both `claude-pool.json` and the running session,
+so replacing a revoked credential no longer requires another restart.
 
 ### Alternative: harvest via separate profiles
 

package/index.ts

@@ -307,6 +307,7 @@ const POOL_BG_REFRESH_INTERVAL_MS = 4 * 60_000;
 let poolAccounts: PoolAccount[] = [];
 let poolActive = 0;
 let poolCooldownUntil: number[] = [];
+let poolInvalid: boolean[] = [];
 let poolBgTimer: ReturnType<typeof setInterval> | undefined;
 let poolRefreshInFlight = false;
 
@@ -325,6 +326,7 @@ function loadPool(): boolean {
 		if (accts.length < 2) return false;
 		poolAccounts = accts;
 		poolCooldownUntil = accts.map(() => 0);
+		poolInvalid = accts.map(() => false);
 		poolActive = 0;
 		return true;
 	} catch {
@@ -354,21 +356,25 @@ function poolSelectActive(): void {
 	// return to it instead of staying on the fallback account.
 	let pick = -1;
 	for (let i = 0; i < poolAccounts.length; i++) {
-		if (poolCooldownUntil[i] <= now) {
+		if (!poolInvalid[i] && poolCooldownUntil[i] <= now) {
 			pick = i;
 			break;
 		}
 	}
 	if (pick === -1) {
-		// all cooling down → pick the one that frees up soonest
+		// All usable accounts are cooling down: pick the one that frees up soonest.
 		let min = Number.POSITIVE_INFINITY;
 		for (let i = 0; i < poolCooldownUntil.length; i++) {
-			if (poolCooldownUntil[i] < min) {
+			if (!poolInvalid[i] && poolCooldownUntil[i] < min) {
 				min = poolCooldownUntil[i];
 				pick = i;
 			}
 		}
 	}
+	if (pick === -1) {
+		poolLog("all pooled accounts have invalid OAuth credentials");
+		return;
+	}
 	if (pick !== poolActive) {
 		poolActive = pick;
 		poolLog(`switched active → ${poolAccounts[poolActive].label}`);
@@ -386,13 +392,17 @@ async function poolRefreshAccount(i: number, force: boolean): Promise<boolean> {
 		acct.access = next.access;
 		acct.expires = next.expires;
 		if (next.refresh) acct.refresh = next.refresh;
+		poolInvalid[i] = false;
 		persistPool();
 		poolLog(`refreshed ${acct.label} (exp ${new Date(acct.expires).toISOString()})`);
 		return true;
 	} catch (e) {
-		poolLog(
-			`refresh FAILED ${acct.label}: ${(e as Error)?.message ?? String(e)}`,
-		);
+		const message = (e as Error)?.message ?? String(e);
+		poolLog(`refresh FAILED ${acct.label}: ${message}`);
+		if (/invalid_grant|refresh token (?:expired|revoked)|authentication_error|\b401\b/i.test(message)) {
+			poolInvalid[i] = true;
+			poolSelectActive();
+		}
 		return false;
 	}
 }
@@ -517,6 +527,28 @@ function poolUpsert(
 	else cfg.accounts.push(entry);
 	cfg.enabled = cfg.enabled !== false;
 	writeFileSync(POOL_PATH, JSON.stringify(cfg, null, 2), { mode: 0o600 });
+
+	// Keep a running session in sync with /claude-pool-add. Previously the file
+	// changed but getApiKey() kept serving the stale in-memory token until restart.
+	const activeLabel = poolAccounts[poolActive]?.label;
+	const previousCooldown = new Map(
+		poolAccounts.map((account, i) => [account.label, poolCooldownUntil[i] ?? 0]),
+	);
+	const previousInvalid = new Map(
+		poolAccounts.map((account, i) => [account.label, poolInvalid[i] ?? false]),
+	);
+	poolAccounts = cfg.accounts;
+	poolCooldownUntil = poolAccounts.map((account) =>
+		account.label === label ? 0 : (previousCooldown.get(account.label) ?? 0),
+	);
+	poolInvalid = poolAccounts.map((account) =>
+		account.label === label ? false : (previousInvalid.get(account.label) ?? false),
+	);
+	poolActive = Math.max(
+		0,
+		poolAccounts.findIndex((account) => account.label === activeLabel),
+	);
+	poolSelectActive();
 	return cfg.accounts.length;
 }
 

package/oauth.ts

@@ -8,9 +8,11 @@ export interface AnthropicOAuthCredential {
 	expires: number;
 }
 
-export interface AnthropicOAuthCallbacks {
-	notify: (event: Record<string, unknown>) => void;
-	prompt: (prompt: Record<string, unknown>) => Promise<string>;
+export interface AnthropicOAuthLoginCallbacks {
+	onAuth: (info: { url: string; instructions?: string }) => void;
+	onManualCodeInput: () => Promise<string>;
+	onProgress?: (message: string) => void;
+	signal?: AbortSignal;
 }
 
 const CLIENT_ID = Buffer.from("OWQxYzI1MGEtZTYxYi00NGQ5LTg4ZWQtNTk0NGQxOTYyZjVl", "base64").toString("utf8");
@@ -165,12 +167,11 @@ async function exchangeAuthorizationCode(
 }
 
 export async function loginAnthropicOAuth(
-	interaction: AnthropicOAuthCallbacks,
+	callbacks: AnthropicOAuthLoginCallbacks,
 ): Promise<AnthropicOAuthCredential> {
 	const verifier = randomBytes(32).toString("base64url");
 	const challenge = createHash("sha256").update(verifier).digest("base64url");
 	const server = await startCallbackServer(verifier);
-	const manualAbort = new AbortController();
 	let manualInput: string | undefined;
 	let manualError: Error | undefined;
 	try {
@@ -184,18 +185,12 @@ export async function loginAnthropicOAuth(
 			code_challenge_method: "S256",
 			state: verifier,
 		});
-		interaction.notify({
-			type: "auth_url",
+		callbacks.onAuth({
 			url: `${AUTHORIZE_URL}?${authParams.toString()}`,
 			instructions: "Complete login in your browser. If the browser is on another machine, paste the final redirect URL here.",
 		});
-		const manualPromise = interaction
-			.prompt({
-				type: "manual_code",
-				message: "Complete login in your browser, or paste the authorization code / redirect URL here:",
-				placeholder: REDIRECT_URI,
-				signal: manualAbort.signal,
-			})
+		const manualPromise = callbacks
+			.onManualCodeInput()
 			.then((input) => {
 				manualInput = input;
 				server.cancelWait();
@@ -216,10 +211,9 @@ export async function loginAnthropicOAuth(
 			parsed.code = fallback.code;
 		}
 		if (!parsed.code) throw new Error("Missing authorization code");
-		interaction.notify({ type: "progress", message: "Exchanging authorization code for tokens..." });
+		callbacks.onProgress?.("Exchanging authorization code for tokens...");
 		return exchangeAuthorizationCode(parsed.code, parsed.state ?? verifier, verifier);
 	} finally {
-		manualAbort.abort();
 		server.server.close();
 	}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgltyq/pi-provider-claude",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "description": "Claude (Anthropic OAuth/subscription) compatibility layer for pi-coding-agent — keeps ALL extension tools usable under the Claude subscription by mapping unknown flat tool names to mcp__pi__<name> on the wire instead of dropping them, plus optional multi-account failover. Self-contained fork of the tool half of @benvargas/pi-claude-code-use.",
   "author": "Leechael",
   "license": "MIT",