maxpool 1.5.66 → 1.5.68

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "maxpool",
-  "version": "1.5.66",
+  "version": "1.5.68",
   "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

@@ -2692,6 +2692,17 @@ export class AccountManager {
     // ~60s forever (hammering Anthropic's OAuth endpoint). Cleared on re-login.
     if (account.refreshDead) return false;
 
+    // A DISABLED account never spends its single-use refresh token. The prober still
+    // READS its quota by design (you disable an exhausted account and still want to
+    // watch it recover — prober.js:73), but rotation is a WRITE that can permanently
+    // brick the account: each rotation invalidates the previous token, so a refresh
+    // that races a restart (or another writer) loses the new token and the account
+    // dies with invalid_grant. Spending that risk on an account the user has
+    // explicitly benched is never worth it — it serves its existing access token for
+    // read-only probing, and re-enabling refreshes on the next real request.
+    // `force` still wins: an explicit re-auth/enable path may need the rotation.
+    if (!force && account.enabled === false) return true;
+
     if (!force && !isTokenExpiringSoon(account.expiresAt)) return true;
 
     // Coalesce concurrent refreshes
@@ -2965,8 +2976,26 @@ export class AccountManager {
         if (idx >= 0 && this.accounts[idx].inFlight === 0) this.removeAccount(idx);
       }
     }
+    // Remove state-restored (header-based) providers whose token is now served by a
+    // config provider — otherwise the same key shows up twice (once as the old
+    // "glm-fallback"/"kimi-fallback" from state.json, once as the config provider).
+    const configTokens = new Set(
+      entries.map(e => e.token).filter(Boolean),
+    );
+    for (const a of [...this.accounts]) {
+      if (!a.configSourced && a.type === 'provider' && a.credential && configTokens.has(a.credential)) {
+        const idx = this.accounts.indexOf(a);
+        if (idx >= 0 && this.accounts[idx].inFlight === 0) this.removeAccount(idx);
+      }
+    }
     for (const entry of entries) {
       if (!entry || !entry.name || !entry.provider) continue;
+      // Default model maps — match what `cc all` sends via headers. Users can override
+      // per-provider in config. Without these z.ai returns [1210 Invalid API parameter].
+      const defaultModelMap = entry.provider === 'zai'
+        ? { opus: 'glm-5.2', sonnet: 'glm-5.2', haiku: 'glm-5.1', default: 'glm-5.2' }
+        : null;
+      const defaultModel = entry.provider === 'kimi' ? 'kimi-k3' : null;
       this.upsertRuntimeAccount({
         name: entry.name,
         type: 'provider',
@@ -2978,10 +3007,13 @@ export class AccountManager {
         authHeader: 'authorization',
         profiles: ['all'],
         priority: Number.isFinite(entry.priority) ? entry.priority : 10,
-        modelMap: entry.modelMap,
-        model: entry.model,
+        modelMap: entry.modelMap || defaultModelMap,
+        model: entry.model || defaultModel,
         stripBetaHeaders: true,
         configSourced: true,
+        // An explicitly-disabled provider in config stays benched across restarts —
+        // a second GLM account you keep configured but off (a teammate's, a spare).
+        enabled: entry.enabled !== false,
       });
       if (!entry.token) {
         const a = this.accounts.find(a => a.name === entry.name);

package/src/index.js

@@ -537,16 +537,23 @@ async function serverWorkerCommand() {
   const logTo = argValue('--log-to');
   if (logTo) config.logDir = logTo;
 
-  if (config.accounts.length === 0) {
+  // A provider-only fleet is valid: a teammate may have a GLM/Kimi key and no Claude
+  // account at all. Counting only `accounts` refused to start for them — the exact
+  // onboarding case this config-provider feature exists to serve.
+  if (config.accounts.length === 0 && !(Array.isArray(config.providers) && config.providers.length > 0)) {
     console.error('No accounts configured.\n');
     console.error('Add an account first:');
     console.error('  maxpool login            OAuth login via browser');
     console.error('  maxpool login --api      Add an API key');
+    console.error('  (or add a GLM/Kimi provider from the TUI: press p → a)');
     process.exit(1);
   }
 
   const accounts = await resolveAccounts(config);
-  if (accounts.length === 0) {
+  // Config providers are loaded further below (they need an AccountManager first), so
+  // a provider-only fleet legitimately has zero accounts HERE. Only bail when there is
+  // nothing to load at all.
+  if (accounts.length === 0 && !(Array.isArray(config.providers) && config.providers.length > 0)) {
     console.error('No valid accounts after initialization');
     process.exit(1);
   }

package/src/tui.js

@@ -585,6 +585,18 @@ export class TUI {
     }
   }
 
+  // Derive a human-readable account name from a GCP secret name.
+  // RESTRICTED_AL_MAXPOOL_ZAI → glm al  |  ZAI_API_KEY → glm primary
+  // RESTRICTED_MAX_KIMI_API_KEY → kimi max  |  KIMI_API_KEY → kimi primary
+  static deriveProviderName(provider, secretName) {
+    const provLabel = provider === 'kimi' ? 'kimi' : 'glm';
+    const s = String(secretName || '').toUpperCase();
+    // Try to extract a user from RESTRICTED_<USER>_...
+    const m = /^RESTRICTED_([A-Z]+)_/.exec(s);
+    const user = m ? m[1].toLowerCase() : null;
+    return user ? `${provLabel} ${user}` : `${provLabel} primary`;
+  }
+
   _keyProviders(k) {
     if (k === 'a') {
       this._providerAddStep('name');
@@ -620,9 +632,12 @@ export class TUI {
       this.inputCb = value => {
         const provider = String(value || '').trim().toLowerCase();
         if (provider !== 'zai' && provider !== 'kimi') { this._addLog('Type must be zai or kimi'); this.mode = 'providers'; return; }
-        this._providerAddStep('secret', { ...prev, provider });
+        // Suggest a name derived from the provider type
+        const suggested = provider === 'kimi' ? 'kimi' : 'glm';
+        this._providerAddStep('secret', { ...prev, provider, suggestedName: suggested });
       };
     } else if (step === 'secret') {
+      const suggested = TUI.deriveProviderName(prev.provider, '');
       this.mode = 'input';
       this.inputPrompt = `${prev.name}: GCP secret name OR paste API key directly`;
       this.inputBuf = '';