maxpool 1.24.22 → 1.24.24

package/package.json

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

package/src/tui.js

@@ -271,6 +271,28 @@ function settingsTags(am, a) {
   return tags;
 }
 
+/** The session (5h) window is what keeps traffic off this account: a pure mirror of
+ *  the router's _isSessionQuotaUnavailable, without its expiry-clearing write.
+ *  Which readings expire on their reset is the ROUTER's rule, copied here: it clears
+ *  the Claude 5h reading and the API-key limits when their reset passes, but NEVER
+ *  a provider's (GLM/Kimi) providerSes — that stays until the next usage probe, so a
+ *  provider past its reset stamp is still refused and must not read "active". */
+function sessionFull(am, a) {
+  const q = a?.quota || {};
+  const now = Date.now();
+  const bench = am?._sessionBenchThreshold?.(a, now);
+  if (!Number.isFinite(bench)) return false;
+  const expired = reset => reset != null && now >= reset;
+  if (q.unified5h != null && !expired(q.unified5hReset) && q.unified5h >= bench) return true;
+  const apiLive = !(q.resetsAt && now >= new Date(q.resetsAt).getTime());
+  if (apiLive && q.tokensLimit != null && q.tokensRemaining != null
+      && 1 - q.tokensRemaining / q.tokensLimit >= bench) return true;
+  if (apiLive && q.requestsLimit != null && q.requestsRemaining != null
+      && 1 - q.requestsRemaining / q.requestsLimit >= bench) return true;
+  if (q.providerSes != null && q.providerSes >= bench) return true;
+  return false;
+}
+
 /** True when the reservation is what is currently keeping traffic off this account
  *  — either window at or past the cap. Reads the manager's own predicate so the
  *  label can never disagree with routing. */
@@ -282,7 +304,13 @@ function capBenched(am, a) {
   // Each reading is judged against ITS OWN window's cap — under the dynamic cap the
   // two differ (a 5h window nearly over is lifted while the weekly is still at its
   // floor), so passing the default window for both would mislabel one of them.
-  return !!(am?._capped?.(a, ses, 'ses') || am?._capped?.(a, wk, 'wk'));
+  if (am?._capped?.(a, ses, 'ses') || am?._capped?.(a, wk, 'wk')) return true;
+  // Providers: the router's weekly gate judges max(5h, weekly) against the WEEKLY
+  // cap (_weeklyRawState), so a 5h reading over the weekly cap benches it too.
+  if (a.type === 'provider' && (ses != null || wk != null)) {
+    return !!am?._capped?.(a, Math.max(ses ?? 0, wk ?? 0), 'wk');
+  }
+  return false;
 }
 
 export function weeklyPolicyText(am, account) {
@@ -1000,10 +1028,12 @@ export class TUI {
 
 
   _keyRouting(k) {
-    if (k === 'a') {
+    if (k === 'a' && this.am.routingMode !== 'preferred') {
+      this._addLog('No account is pinned — routing is already automatic');
+    } else if (k === 'a') {
       this._confirm(
-        'Use automatic routing?',
-        'Spread new requests across healthy accounts using load, quota, and recent errors.',
+        'Unpin and use automatic routing?',
+        'Removes the pinned account. New requests are spread across all healthy accounts again.',
         () => this._setAutomaticRouting(),
       );
     } else if (k === 'p' && this.am.accounts.some(account => account.type !== 'provider')) {
@@ -1999,12 +2029,22 @@ export class TUI {
     // 2 = separator + footer; confirm adds its detail line; updates adds its detail block.
     const footerH = this.mode === 'confirm' ? 3
       : this.mode === 'updates' ? 2 + this._renderUpdatesDetail().length
+      : this.mode === 'routing' ? 2 + this._renderRoutingDetail().length
       : 2;
     const space = Math.max(0, H - lines.length - footerH);
     for (let i = 0; i < space && i < this.log.length; i++) {
       lines.push(`   ${gray(this.log[i].t)}  ${this.log[i].msg}`);
     }
 
+    // The footer is the screen's controls — it must never be pushed off. On a short
+    // terminal cut the BODY from the bottom, and say so.
+    if (lines.length > H - footerH) {
+      const keep = Math.max(0, H - footerH - 1);
+      const hidden = lines.length - keep;
+      lines.length = keep;
+      lines.push(` ${dim(`… ${hidden} more row${hidden === 1 ? '' : 's'} — make the window taller to see them`)}`);
+    }
+
     // Pad to fill
     while (lines.length < H - footerH) lines.push('');
 
@@ -2015,6 +2055,7 @@ export class TUI {
     // very bottom of a busy screen, which reads as "nothing happened" (reported twice).
     // Every other mode draws something visible; this one must too.
     if (this.mode === 'updates') lines.push(...this._renderUpdatesDetail());
+    if (this.mode === 'routing') lines.push(...this._renderRoutingDetail());
     lines.push(this._renderFooter());
 
     this._writeScreen(lines, W, H);
@@ -2094,6 +2135,20 @@ export class TUI {
     // credentials were fine or long dead, so re-enabling it later silently produced a
     // broken account. Reported 2026-08-10 with all 8 disabled accounts sitting on dead
     // credentials (HTTP 401) and no way to see it.
+    // HELD BY ITS OWN LIMITS (2026-10-13). An account the router refuses must not read
+    // "active": 16 requests sat parked for 35 minutes while two rows said "active" next
+    // to an account held at its usage cap and another whose 5h window was full. Only
+    // relabels an otherwise-active row; exhausted / throttled / auth states keep their
+    // own (more specific) word. "capped" = the owner's usage cap is holding it;
+    // "5h full" = its session window is used up until the reset shown on the row.
+    // Pure predicates on purpose: _weeklyRawState/_isSessionQuotaUnavailable call
+    // _clearExpiredQuotas, which MUTATES the quota (nulls an expired window), so calling
+    // them here blanked this row's own bars mid-render. (_render already runs the
+    // manager's expiry refresh once per frame, before any row is drawn.)
+    if (a.enabled !== false && effectiveStatus === 'active') {
+      if (capBenched(this.am, a)) effectiveStatus = 'capped';
+      else if (sessionFull(this.am, a)) effectiveStatus = '5h full';
+    }
     if (a.refreshDead) effectiveStatus = a.enabled === false ? 'disabled-reauth' : 'reauth';
     // Subscription gone (org-disabled 403): a DISTINCT state from reauth — re-logging in
     // will NOT fix it until the subscription is re-purchased. Says the actionable thing.
@@ -2130,6 +2185,8 @@ export class TUI {
         break;
       }
       case 'exhausted': status = red('exhausted'); break;
+      case 'capped':    status = yellow('capped'); break;
+      case '5h full':   status = yellow('5h full'); break;
       case 'error':     status = red('error'); break;
       default:          status = a.status || 'ready';
     }
@@ -2493,6 +2550,37 @@ export class TUI {
     return out;
   }
 
+  /**
+   * Routing DETAIL — what each key on this screen controls and how to undo it.
+   * (2026-10-13: "the cap setting only changes GLM", "I pinned an account and have no
+   * idea how to switch it back", "where is the cap for individual accounts?")
+   */
+  _renderRoutingDetail() {
+    // Every line fits 80 columns: a truncated explanation is no explanation.
+    const out = [];
+    const pinned = this.am.routingMode === 'preferred' && this.am.preferredAccountName;
+    // The manual pin: state, what it does, and the way out — always visible.
+    if (pinned) {
+      out.push(` ${yellow(`Pinned to ${this.am.preferredAccountName}`)}  ${bold('a')} Unpin  ${bold('p')} Change`);
+      out.push(` ${dim('It gets every request it can take; the others only cover for it.')}`);
+    } else {
+      out.push(` ${bold('p')} Pin one Claude account ${dim('(undo:')} ${bold('a')}${dim(')')}`);
+      out.push(` ${dim('Sends everything to it first; the others only cover for it.')}`);
+    }
+    const hasPeak = this.am.accounts.some(a => a.type === 'provider'
+      && (this.am._peakSettingsFor?.(a.provider)?.windows || []).length > 0);
+    if (hasPeak) {
+      out.push(` ${bold('c')} GLM peak cap ${dim('— GLM accounts only, in GLM peak hours. Not Claude.')}`);
+    }
+    // Where the per-account cap actually is.
+    out.push(` ${dim('Usage cap for ONE account:')} ${bold('Esc')} ${dim('then')} ${bold('a')} ${dim('→')} ${bold('u')} ${dim('(Claude or GLM)')}`);
+    const capped = this.am.accounts.filter(a => a.capUtilization != null && a.enabled !== false);
+    if (capped.length) {
+      out.push(` ${dim('Caps set:')} ${capped.map(a => `${a.name} ${Math.round(a.capUtilization * 100)}%`).join(', ')}`);
+    }
+    return out;
+  }
+
   _renderFooter() {
     switch (this.mode) {
       case 'normal':
@@ -2531,9 +2619,13 @@ export class TUI {
           const dep = ps.depreference ? yellow('GLM last') : cyan('normal');
           const cap = ps.cap >= 1 ? 'off' : ps.cap === 0 ? 'never' : `${Math.round(ps.cap * 100)}%`;
           const wk = this.am.scheduler.weeklyAwareScoring === false ? yellow('5h-only') : cyan('weekly');
-          peakPart = `  ${dim('│')} ${bold(' d ')}Peak${now}: ${dep} ${bold(' c ')}cap ${cyan(cap)} ${bold(' w ')}score:${wk}`;
+          // "cap" alone read as THE usage cap for every account (2026-10-13). It is not:
+          // it only limits GLM accounts, only during GLM's peak hours. Say so.
+          peakPart = `  ${dim('│')} ${bold(' d ')}Peak${now}: ${dep} ${bold(' c ')}GLM peak cap ${cyan(cap)} ${bold(' w ')}score:${wk}`;
         }
-        return ` ${bold('f')} Routing: ${cyan(mode.label)} ↻${provPart}${peakPart}  ${bold('p')} Preference  ${bold('Esc')} Back`;
+        // The pin and the account-cap pointer live in the DETAIL block above this line
+        // (_renderRoutingDetail) — one footer line cannot carry them without truncating.
+        return ` ${bold('f')} Routing: ${cyan(mode.label)} ↻${provPart}${peakPart}  ${bold('Esc')} Back`;
       }
       case 'select': {
         const act = this.selAction === 'prefer'