maxpool 1.5.24 → 1.5.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "maxpool",
-  "version": "1.5.24",
+  "version": "1.5.26",
   "description": "Multi-account Claude Code proxy with adaptive, rate-aware load balancing across Claude accounts",
   "type": "module",
   "main": "src/index.js",

package/src/account-manager.js

@@ -1,4 +1,4 @@
-import { refreshAccessToken, isTokenExpiringSoon, modelFamily } from './oauth.js';
+import { refreshAccessToken, isTokenExpiringSoon, modelFamily, tokenFingerprint } from './oauth.js';
 
 // Bounded re-poll hold for an account blocked ONLY by a transient, self-clearing
 // condition whose exact recovery time is unknown: (a) a weekly-critical account
@@ -2298,8 +2298,24 @@ export class AccountManager {
         account.expiresAt = newTokens.expiresAt;
         account.status = 'active';
         account.cooldownUntil = null;
-        console.log(`[Maxpool] Token refreshed for account "${account.name}"`);
-        this._onTokenRefresh?.(accountIndex, newTokens);
+        console.log(`[Maxpool] Token refreshed for account "${account.name}" (rotated ${tokenFingerprint(account._refreshedFrom)} → ${tokenFingerprint(newTokens.refreshToken)})`);
+        // Persist-before-serve: the rotated single-use refresh token must be
+        // DURABLE on disk before we return true (before this request serves on the
+        // new access token). A non-graceful kill (SIGKILL/crash/OOM/terminal-close)
+        // between here and the disk write would otherwise leave the now-CONSUMED
+        // token on disk → next boot POSTs it → invalid_grant → forced re-auth.
+        // This minimizes the loss window to the write duration (it cannot be zero —
+        // the upstream consumes the old token the instant the POST returns); the
+        // fingerprint audit trail makes the irreducible residual diagnosable.
+        // persistTokenRefresh is bulletproofed to never throw, but the refresh has
+        // ALREADY succeeded — a persist anomaly must never be re-classified as a
+        // refresh failure (which would latch refreshDead on a working account), so
+        // guard the await too.
+        try {
+          await this._onTokenRefresh?.(accountIndex, newTokens);
+        } catch (persistErr) {
+          console.error(`[Maxpool] Token persist raised unexpectedly for "${account.name}": ${persistErr?.message || persistErr}`);
+        }
         return true;
       } catch (err) {
         console.error(`[Maxpool] Token refresh failed for "${account.name}": ${err.message}`);
@@ -2319,6 +2335,11 @@ export class AccountManager {
             // dead token. Set ONLY here (a rejected refresh), never in markAuthFailed
             // (shared with provider auth failures).
             account.refreshDead = true;
+            // Monitoring: name the exact token that was rejected + how to diagnose it
+            // from the persistent event log next time this recurs. (fp= is safe from
+            // the log's secret-redactor; refresh_token= would be redacted.)
+            const rejFp = tokenFingerprint(account._refreshedFrom);
+            console.error(`[Maxpool] Token refresh REJECTED for "${account.name}" (invalid_grant) — the refresh token maxpool sent (fp=${rejFp}) was not accepted. Diagnose from the event log: an earlier "rotated → ${rejFp}" that WAS "Persisted" ⇒ upstream revocation; NO persisted line for ${rejFp} ⇒ the rotation was lost across a restart (double-spend); the SAME source fp in two "rotated" lines in one window ⇒ two writers double-spent it. Re-login via the TUI ('l' key).`);
           }
           return false;
         }

package/src/index.js

@@ -8,7 +8,7 @@ import { SleepGuard } from './sleep-guard.js';
 import { AccountManager } from './account-manager.js';
 import { createProxyServer } from './server.js';
 import { Prober } from './prober.js';
-import { loginOAuth, fetchProfile, refreshAccessToken, isTokenExpiringSoon } from './oauth.js';
+import { loginOAuth, fetchProfile, refreshAccessToken, isTokenExpiringSoon, tokenFingerprint } from './oauth.js';
 import { TUI } from './tui.js';
 import { RestartController } from './restart-controller.js';
 import { resolveAccounts } from './account-config.js';
@@ -595,46 +595,63 @@ async function serverWorkerCommand() {
   // baton hands off and the new worker boots from the now-invalidated on-disk
   // token (B1/M3). New refreshes can't start without the lease (ensureTokenFresh
   // no-ops), so every callback here is from a legitimate lease-era refresh.
-  const persistTokenRefresh = (idx, newTokens) => {
+  //
+  // BULLETPROOF CONTRACT: ensureTokenFresh now AWAITs this (persist-before-serve),
+  // so it must NEVER throw or reject. A throw here — including from the synchronous
+  // prologue (findConfigAccount / addAccount) — would land in ensureTokenFresh's
+  // refresh-FAILURE catch and latch `refreshDead` on an account whose refresh POST
+  // actually SUCCEEDED (bricking a working account — strictly worse than the window
+  // this fix closes). So the ENTIRE body is wrapped, prologue included, and every
+  // exit resolves. Returns the awaitable persist promise.
+  const persistTokenRefresh = async (idx, newTokens) => {
     const account = accountManager.accounts[idx];
     if (!account) return;
-    // Keep config.accounts in sync so TUI saveConfig doesn't clobber fresh tokens
-    const memIdx = findConfigAccount(config, account);
-    if (memIdx >= 0) {
-      config.accounts[memIdx].accessToken = newTokens.accessToken;
-      config.accounts[memIdx].refreshToken = newTokens.refreshToken;
-      config.accounts[memIdx].expiresAt = newTokens.expiresAt;
-    }
-    atomicConfigUpdate(diskConfig => {
-      // Pick up any new accounts from disk so index matching stays correct
-      // (only add, don't refresh credentials — we're about to write the authoritative tokens)
-      for (const diskAcct of diskConfig.accounts) {
-        const known = (diskAcct.accountUuid && config.accounts.some(a => a.accountUuid === diskAcct.accountUuid))
-          || config.accounts.some(a => a.name === diskAcct.name);
-        if (!known) {
-          config.accounts.push(diskAcct);
-          accountManager.addAccount(diskAcct);
-        }
+    try {
+      // Keep config.accounts in sync so TUI saveConfig doesn't clobber fresh tokens
+      const memIdx = findConfigAccount(config, account);
+      if (memIdx >= 0) {
+        config.accounts[memIdx].accessToken = newTokens.accessToken;
+        config.accounts[memIdx].refreshToken = newTokens.refreshToken;
+        config.accounts[memIdx].expiresAt = newTokens.expiresAt;
       }
-      // Match by UUID first, then by name — index may have shifted
-      const cfgIdx = findConfigAccount(diskConfig, account);
-      if (cfgIdx >= 0) {
+      let skipped = false; // guard-skip or account-not-on-disk → nothing was persisted
+      await atomicConfigUpdate(diskConfig => {
+        // Pick up any new accounts from disk so index matching stays correct
+        // (only add, don't refresh credentials — we're about to write the authoritative tokens)
+        for (const diskAcct of diskConfig.accounts) {
+          const known = (diskAcct.accountUuid && config.accounts.some(a => a.accountUuid === diskAcct.accountUuid))
+            || config.accounts.some(a => a.name === diskAcct.name);
+          if (!known) {
+            config.accounts.push(diskAcct);
+            accountManager.addAccount(diskAcct);
+          }
+        }
+        // Match by UUID first, then by name — index may have shifted
+        const cfgIdx = findConfigAccount(diskConfig, account);
+        if (cfgIdx < 0) { skipped = true; return; }
         const onDisk = diskConfig.accounts[cfgIdx];
         // Generation guard: if the on-disk refresh token already advanced past
         // the token we rotated FROM, another writer beat us — skip the write so
         // we don't revert a fresher single-use token (the brick-the-account case).
         if (onDisk.refreshToken && onDisk.refreshToken !== account._refreshedFrom &&
             onDisk.refreshToken !== newTokens.refreshToken) {
+          skipped = true;
           return;
         }
         onDisk.accessToken = newTokens.accessToken;
         onDisk.refreshToken = newTokens.refreshToken;
         onDisk.expiresAt = newTokens.expiresAt;
+      });
+      // Monitoring: the rotated token is now DURABLE on disk. Correlate this fp
+      // with a later "REJECTED sent fp=" line to tell a lost-rotation double-spend
+      // (no matching Persisted line) from an upstream revocation (fp matches).
+      if (!skipped) {
+        console.log(`[Maxpool] Persisted rotated token for "${account.name}" (fp=${tokenFingerprint(newTokens.refreshToken)})`);
       }
-    }).catch(err => {
+    } catch (err) {
       if (err?.code === 'STALE_GENERATION') return; // another writer advanced; benign
-      console.error(`[Maxpool] Failed to save refreshed token: ${err.message}`);
-    });
+      console.error(`[Maxpool] Failed to save refreshed token for "${account.name}" (fp=${tokenFingerprint(newTokens?.refreshToken)}): ${err?.message || err}`);
+    }
   };
   accountManager.onTokenRefresh(persistTokenRefresh);
 

package/src/oauth.js

@@ -10,6 +10,19 @@ const DEFAULT_TOKEN_ENDPOINT = process.env.MAXPOOL_OAUTH_TOKEN_ENDPOINT
   || 'https://platform.claude.com/v1/oauth/token';
 const DEFAULT_CLIENT_ID = '9d1c250a-e61b-44d9-88ed-5944d1962f5e';
 
+/**
+ * A short, NON-REVERSIBLE fingerprint of a refresh token, for audit logging of
+ * the single-use-token rotation lifecycle. NEVER log the token itself — an
+ * 8-char sha256 prefix is irreversible yet enough to correlate a rotation
+ * ("rotated → fp / Persisted fp") with the token later rejected on boot
+ * ("REJECTED sent fp"), which is what distinguishes a lost-rotation double-spend
+ * from an upstream revocation. Returns 'none' for a falsy token.
+ */
+export function tokenFingerprint(token) {
+  if (!token) return 'none';
+  return createHash('sha256').update(String(token)).digest('hex').slice(0, 8);
+}
+
 /**
  * Refresh an expired OAuth access token using the refresh token.
  * Retries on 5xx and network errors with exponential backoff.

package/src/tui.js

@@ -402,8 +402,8 @@ export class TUI {
       };
     } else if (k === 'l') {
       this._confirm(
-        'Log in via browser?',
-        'Opens a browser to add any Claude account; you name it afterward.',
+        'Log in / re-authenticate via browser?',
+        'Opens a browser. Logging into an account that\'s already added RE-AUTHENTICATES it in place (revives a reauth/error account) — no duplicate. Otherwise a new account is added.',
         () => this._doLogin(),
       );
     } else if (k === 'n' && this.am.accounts.length > 0) {
@@ -577,8 +577,10 @@ export class TUI {
     }
   }
 
-  // Browser OAuth login: any Claude account, named afterward. Suspends the TUI
-  // around the interactive flow (browser + name prompt), then resumes.
+  // Browser OAuth login — the SAME flow re-authenticates an existing account (matched
+  // by accountUuid) or adds a new one. When the login is for an account already added,
+  // we say so, keep its name, and skip the "name this account" prompt — so it's clear
+  // it's a RE-AUTH in place (revives a dead-refresh/reauth account), not a duplicate.
   async _doLogin() {
     const wasRunning = this.running;
     if (wasRunning) this.stop();
@@ -586,14 +588,26 @@ export class TUI {
       process.stdout.write('\nOpening browser to log into Claude…\n');
       const creds = await loginOAuth();
       const profile = await fetchProfile(creds.accessToken);
-      const suggested = profile?.email
-        || `account-${this.config.accounts.filter(a => a.name.startsWith('account-')).length + 1}`;
-      const rl = createInterface({ input: process.stdin, output: process.stdout });
-      const answer = await new Promise(resolve => rl.question(`Name this account [${suggested}]: `, resolve));
-      rl.close();
-      const name = String(answer || '').trim() || suggested;
-      await this._upsertOAuthAccount({ creds, profile, name, source: 'login', verb: 'Added' });
-      process.stdout.write(`\nAdded account "${name}". Returning to maxpool…\n`);
+      const existing = this._findExistingOAuthAccount(profile);
+      let name;
+      if (existing) {
+        process.stdout.write(`\nThis Claude account is already added as "${existing.name}" — re-authenticating it in place (no duplicate).\n`);
+        name = existing.name;
+      } else {
+        const suggested = profile?.email
+          || `account-${this.config.accounts.filter(a => a.name.startsWith('account-')).length + 1}`;
+        const rl = createInterface({ input: process.stdin, output: process.stdout });
+        const answer = await new Promise(resolve => rl.question(`Name this NEW account [${suggested}]: `, resolve));
+        rl.close();
+        name = String(answer || '').trim() || suggested;
+      }
+      // Message honors the ACTUAL result: if a manually-typed name collided with a
+      // different existing account, upsert updates in place → "Re-authenticated", never
+      // a false "Added new account".
+      const { updated } = await this._upsertOAuthAccount({ creds, profile, name, source: 'login' });
+      process.stdout.write(updated
+        ? `\nRe-authenticated "${name}". Returning to maxpool…\n`
+        : `\nAdded new account "${name}". Returning to maxpool…\n`);
     } catch (e) {
       process.stdout.write(`\nLogin failed: ${e.message}\n`);
     } finally {
@@ -671,6 +685,7 @@ export class TUI {
         if (amAcct.status === 'error') amAcct.status = 'active';
       }
       this._addLog(`Updated account "${name}"`);
+      return { updated: true, name };
     } else {
       this.config.accounts.push(entry);
       try {
@@ -681,9 +696,21 @@ export class TUI {
       }
       this.am.addAccount(entry);
       this._addLog(`${verb} account "${name}"`);
+      return { updated: false, name };
     }
   }
 
+  // Find an already-configured OAuth account matching a fresh browser-login profile —
+  // by accountUuid (primary), then name===email — the SAME precedence _upsertOAuthAccount
+  // dedupes on, so the login flow can honestly say "re-authenticating" vs "adding new".
+  _findExistingOAuthAccount(profile) {
+    const uuid = profile?.accountUuid || null;
+    const email = profile?.email || null;
+    let acct = uuid ? this.config.accounts.find(a => a.type === 'oauth' && a.accountUuid === uuid) : null;
+    if (!acct && email) acct = this.config.accounts.find(a => a.type === 'oauth' && a.name === email);
+    return acct || null;
+  }
+
   async _doAddKey(apiKey) {
     const key = String(apiKey || '').trim();
     if (!key) { this._addLog('No API key entered'); return; }
@@ -1120,7 +1147,7 @@ export class TUI {
       case 'normal':
         return ` ${bold('a')} Accounts  ${bold('m')} Routing  ${bold('s')} Sync  ${bold('r')} Restart  ${bold('q')} Stop`;
       case 'accounts':
-        return ` ${bold('l')} Login (browser)  ${bold('k')} API key  ${bold('n')} Rename  ${bold('t')} Enable/disable  ${bold('d')} Delete  ${bold('Esc')} Back`;
+        return ` ${bold('l')} Login/re-auth (browser)  ${bold('k')} API key  ${bold('n')} Rename  ${bold('t')} Enable/disable  ${bold('d')} Delete  ${bold('Esc')} Back`;
       case 'routing':
         return ` ${bold('a')} Automatic  ${bold('p')} Manual preference  ${bold('f')} Cross-provider fallback  ${bold('Esc')} Back`;
       case 'select': {