@cortexkit/opencode-antigravity-auth 3.0.5 → 3.0.6

package/src/tui-compiled/tui.js

@@ -1,4 +1,5 @@
 import { createTextNode as _$createTextNode } from "opentui:runtime-module:%40opentui%2Fsolid";
+import { use as _$use } from "opentui:runtime-module:%40opentui%2Fsolid";
 import { memo as _$memo } from "opentui:runtime-module:%40opentui%2Fsolid";
 import { createComponent as _$createComponent } from "opentui:runtime-module:%40opentui%2Fsolid";
 import { effect as _$effect } from "opentui:runtime-module:%40opentui%2Fsolid";
@@ -21,16 +22,18 @@ import { createElement as _$createElement } from "opentui:runtime-module:%40open
  * score, and per-session routing decisions), so the fleet components are
  * adapted rather than copied verbatim:
  *
- * - `QuotaRow` reads `remainingPercent + resetAt` from the Antigravity
+ * - `WindowRow` reads `remainingPercent + resetAt` from the Antigravity
  *   `SidebarQuotaEntry` shape and colors via `quotaTone` (remaining
- *   threshold) instead of `usageTone` (used threshold).
+ *   threshold) instead of `usageTone` (used threshold). Each window is one
+ *   line sized from the measured sidebar width.
  * - `AccountBlock` derives its status word (`active` / `idle` /
- *   `cooling` / `off` / `blocked`) from the Antigravity account state and
- *   surfaces health as a muted secondary line rather than a top-level
- *   bar — fleet parity for "Quota first, health second".
- * - `Routing` resolves to a single `Route` `StatRow` carrying the most
- *   recent `activeRouting` entry, since Antigravity does not maintain a
- *   per-session sidebar state alongside the slot-rendered tree.
+ *   `cooling` / `off`) from the Antigravity account state, shows the
+ *   reading age once per account, and groups windows under `Gemini` and
+ *   `Other models` headers. The routing health score is not shown.
+ * - `Routing` shows the mounted session's most recent `activeRouting`
+ *   entry, or `No request yet` before the session's first request, since
+ *   Antigravity does not maintain a per-session sidebar state alongside the
+ *   slot-rendered tree.
  *
  * Hard rules for this file:
  *
@@ -48,7 +51,7 @@ import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { createSlot } from "opentui:runtime-module:%40opentui%2Fsolid";
 import { createSignal, For, onCleanup, onMount, Show } from "opentui:runtime-module:solid-js";
-import { formatQuotaReading, quotaReadingParts } from "./quota-presentation.js";
+import { NO_QUOTA_READING, quotaReadingAge, quotaWindowText } from "./quota-presentation.js";
 import { getRpcDir } from "./rpc/rpc-dir.js";
 import { readSidebarState } from "./sidebar-state.js";
 import { createTuiFileLogger } from "./tui/file-logger.js";
@@ -98,15 +101,35 @@ const dispatchedNotificationIds = new Set();
 let rpcInFlight = false;
 const GLOBAL_NOTIFICATION_CURSOR = '__global__';
 const MAX_NOTIFICATION_CURSORS = 256;
-const QUOTA_LABELS = {
-  gemini: 'Gm',
-  'non-gemini': 'NG'
+
+// Group headers name each quota pool in plain words.
+const GROUP_NAMES = {
+  gemini: 'Gemini',
+  'non-gemini': 'Other models'
 };
-const QUOTA_ORDER = ['gemini', 'non-gemini'];
-const WINDOW_GUTTER = {
-  weekly: '7d',
-  '5h': '5h'
+
+// The collapsed row has room for one word before the window name.
+const COLLAPSED_GROUP_NAMES = {
+  gemini: 'Gemini',
+  'non-gemini': 'Other'
 };
+const QUOTA_ORDER = ['gemini', 'non-gemini'];
+
+// Shown instead of a stored figure once the window has reset since it was
+// read: the stored figure describes the window before the reset.
+const RESET_SINCE_READING = 'reset since last check';
+
+// Content width (the panel's width inside its padding) used until the first
+// layout pass reports the real one. It fits the narrowest OpenCode sidebar.
+const ASSUMED_CONTENT_WIDTH = 28;
+
+// A window row is `<name> <bar> <figure> <reset>`. The bar shrinks to this
+// before the reset column is dropped; below it the bar is dropped too.
+const MIN_BAR_WIDTH = 4;
+// The widest figure the formatter writes: `100% left`.
+const FIGURE_WIDTH = 9;
+// A window name (`5h`, `7d`) and the space after it.
+const NAME_WIDTH = 3;
 
 // --- Theme tokens ----------------------------------------------------------
 //
@@ -200,8 +223,7 @@ function quotaTone(usedPct, appearance) {
   if (usedPct < appearance.errorThreshold) return 'warn';
   return 'err';
 }
-function quotaBarSegments(remainingPct, appearance) {
-  const width = appearance.barWidth;
+function quotaBarSegments(remainingPct, width, appearance) {
   const usedCells = Math.max(0, Math.min(Math.round(remainingPct / 100 * width), width));
   const tone = quotaTone(100 - remainingPct, appearance);
   return [{
@@ -314,12 +336,6 @@ function getSidebarController() {
 
 // --- Shared helpers (fleet shape, antigravity data) ------------------------
 
-function clamp(value, min, max) {
-  if (value < min) return min;
-  if (value > max) return max;
-  return value;
-}
-
 // Render a "reset in Nm/Nh/NdNh" string from an epoch-ms reset time.
 // Empty string when no resetAt is cached. The fleet's `formatResetIn`
 // reads ISO strings; Antigravity persists resetAt as a numeric epoch, so
@@ -398,11 +414,9 @@ function StatRow(props) {
   })();
 }
 
-// Fleet CollapsedRow: muted label left, caller-supplied value right. Used
-// for the collapsed sidebar view; the Antigravity adapter renders one
-// CollapsedRow per visible account (Claude's sibling collapses to a
-// single primary-quota line, but Antigravity's multi-quota model fits a
-// per-account row better when the sidebar is collapsed).
+// Fleet CollapsedRow: muted label left, caller-supplied value right. The
+// collapsed view renders one for the active account. The caller sizes both
+// sides to the measured width, so neither side may wrap.
 function CollapsedRow(props) {
   return (() => {
     var _el$8 = _$createElement("box"),
@@ -411,6 +425,8 @@ function CollapsedRow(props) {
     _$setProp(_el$8, "width", '100%');
     _$setProp(_el$8, "flexDirection", 'row');
     _$setProp(_el$8, "justifyContent", 'space-between');
+    _$setProp(_el$9, "flexShrink", 0);
+    _$setProp(_el$9, "wrapMode", 'none');
     _$insert(_el$9, () => props.label);
     _$insert(_el$8, () => props.children, null);
     _$effect(_$p => _$setProp(_el$9, "fg", props.theme().textMuted, _$p));
@@ -418,226 +434,342 @@ function CollapsedRow(props) {
   })();
 }
 
-// The bar fills with remaining quota. The shared formatter supplies the
-// figure, reset and reading age; the right column aligns reset and age text.
-function QuotaRow(props) {
-  const parts = () => quotaReadingParts(props.label, props.entry, props.now());
-  const remaining = () => parts().remaining;
-  const reset = () => parts().detail;
-  return _$createComponent(Show, {
-    get when() {
-      return remaining() != null;
-    },
-    get fallback() {
-      return (() => {
-        var _el$14 = _$createElement("box"),
-          _el$15 = _$createElement("text"),
-          _el$16 = _$createElement("text");
-        _$insertNode(_el$14, _el$15);
-        _$insertNode(_el$14, _el$16);
-        _$setProp(_el$14, "width", '100%');
-        _$setProp(_el$14, "flexDirection", 'row');
-        _$setProp(_el$14, "justifyContent", 'space-between');
-        _$insert(_el$15, () => props.label.padEnd(5));
-        _$insert(_el$16, () => parts().figure);
-        _$effect(_p$ => {
-          var _v$6 = props.theme().textMuted,
-            _v$7 = props.theme().textMuted;
-          _v$6 !== _p$.e && (_p$.e = _$setProp(_el$15, "fg", _v$6, _p$.e));
-          _v$7 !== _p$.t && (_p$.t = _$setProp(_el$16, "fg", _v$7, _p$.t));
-          return _p$;
-        }, {
-          e: undefined,
-          t: undefined
-        });
-        return _el$14;
-      })();
-    },
-    get children() {
-      var _el$0 = _$createElement("box"),
-        _el$1 = _$createElement("box"),
-        _el$10 = _$createElement("text"),
-        _el$11 = _$createElement("box"),
-        _el$12 = _$createElement("text");
-      _$insertNode(_el$0, _el$1);
-      _$setProp(_el$0, "width", '100%');
-      _$setProp(_el$0, "flexDirection", 'row');
-      _$setProp(_el$0, "justifyContent", 'space-between');
-      _$insertNode(_el$1, _el$10);
-      _$insertNode(_el$1, _el$11);
-      _$insertNode(_el$1, _el$12);
-      _$setProp(_el$1, "flexDirection", 'row');
-      _$setProp(_el$10, "width", 5);
-      _$setProp(_el$10, "flexShrink", 0);
-      _$insert(_el$10, () => props.label);
-      _$setProp(_el$11, "flexShrink", 0);
-      _$setProp(_el$11, "flexDirection", 'row');
-      _$insert(_el$11, _$createComponent(For, {
-        get each() {
-          return quotaBarSegments(remaining() ?? 0, props.appearance);
-        },
-        children: segment => (() => {
-          var _el$17 = _$createElement("text");
-          _$insert(_el$17, () => segment.text);
-          _$effect(_$p => _$setProp(_el$17, "fg", toneColor(props.theme(), segment.tone), _$p));
-          return _el$17;
-        })()
-      }));
-      _$insert(_el$12, () => ` ${parts().figure}`);
-      _$insert(_el$0, _$createComponent(Show, {
-        get when() {
-          return reset();
-        },
-        get children() {
-          var _el$13 = _$createElement("text");
-          _$insert(_el$13, reset);
-          _$effect(_$p => _$setProp(_el$13, "fg", props.theme().textMuted, _$p));
-          return _el$13;
-        }
-      }), null);
-      _$effect(_p$ => {
-        var _v$3 = props.theme().textMuted,
-          _v$4 = props.appearance.barWidth,
-          _v$5 = toneColor(props.theme(), quotaTone(100 - (remaining() ?? 0), props.appearance));
-        _v$3 !== _p$.e && (_p$.e = _$setProp(_el$10, "fg", _v$3, _p$.e));
-        _v$4 !== _p$.t && (_p$.t = _$setProp(_el$11, "width", _v$4, _p$.t));
-        _v$5 !== _p$.a && (_p$.a = _$setProp(_el$12, "fg", _v$5, _p$.a));
-        return _p$;
-      }, {
-        e: undefined,
-        t: undefined,
-        a: undefined
-      });
-      return _el$0;
-    }
-  });
+// --- Width-fitted quota rows ------------------------------------------------
+//
+// The OpenCode 1 sidebar is about 32 to 48 columns wide. Every quota line is
+// sized from the measured content width so that it fits on one line: text is
+// never left to the renderer's wrapping, which breaks a row mid-word or down
+// to one character per line once the right-hand column runs out of room.
+
+// One entry per stored window, in group order. A pool stored before
+// per-window readings existed contributes one window without a name.
+function accountWindows(account, now) {
+  const result = [];
+  for (const key of QUOTA_ORDER) {
+    const entry = account.quota[key];
+    if (!entry) continue;
+    const readings = entry.windows && entry.windows.length > 0 ? entry.windows.map(window => ({
+      window: window.window,
+      remainingPercent: window.remainingPercent,
+      resetAt: window.resetAt,
+      checkedAt: window.checkedAt
+    })) : [{
+      remainingPercent: entry.remainingPercent,
+      resetAt: entry.resetAt,
+      checkedAt: entry.checkedAt
+    }];
+    for (const reading of readings) result.push({
+      key,
+      reading,
+      text: quotaWindowText(reading, now)
+    });
+  }
+  return result;
+}
+
+// A window shows its figure only while no reset has happened since it was
+// read and it has a read time at all.
+function showsFigure(window) {
+  return window.text.remaining != null && !window.text.resetSinceReading;
+}
+// Column widths for one `<name> <bar> <figure> <reset>` row within `width`
+// cells. The bar shrinks first, down to MIN_BAR_WIDTH; then the reset column
+// is dropped; then the bar.
+function windowRowLayout(width, named, resetWidth, maxBar) {
+  const room = width - (named ? NAME_WIDTH : 0) - FIGURE_WIDTH;
+  if (resetWidth > 0) {
+    const bar = Math.min(maxBar, room - resetWidth - 2);
+    if (bar >= MIN_BAR_WIDTH) return {
+      bar,
+      reset: true
+    };
+  }
+  const bar = Math.min(maxBar, room - 1);
+  return {
+    bar: bar >= MIN_BAR_WIDTH ? bar : 0,
+    reset: false
+  };
+}
+
+// Shorten a label to `max` cells, marking the cut with an ellipsis.
+function fitLabel(label, max) {
+  if (label.length <= max) return label;
+  if (max <= 0) return '';
+  if (max === 1) return '…';
+  return `${label.slice(0, max - 1)}…`;
 }
 
-// Fleet AccountBlock, adapted to Antigravity's per-account data. Header
-// row is account label (left) + status word (right). The body renders one
-// QuotaRow per present quota group in the fleet's stable order, then a
-// muted secondary line with the account's health score and, when
-// relevant, a cooldown countdown. Status word priorities (first match
-// wins):
+// One quota window on one line. The bar fills with remaining quota; the
+// figure and reset come from the shared formatter. A window that reset since
+// its reading shows that fact, dim, in place of the stale figure.
+function WindowRow(props) {
+  const text = () => props.window.text;
+  const tone = () => quotaTone(100 - (text().remaining ?? 0), props.appearance);
+  return (() => {
+    var _el$0 = _$createElement("box");
+    _$setProp(_el$0, "width", '100%');
+    _$setProp(_el$0, "flexDirection", 'row');
+    _$insert(_el$0, _$createComponent(Show, {
+      get when() {
+        return text().name !== '';
+      },
+      get children() {
+        var _el$1 = _$createElement("text");
+        _$setProp(_el$1, "width", 3);
+        _$setProp(_el$1, "flexShrink", 0);
+        _$setProp(_el$1, "wrapMode", 'none');
+        _$insert(_el$1, () => text().name);
+        _$effect(_$p => _$setProp(_el$1, "fg", props.theme().textMuted, _$p));
+        return _el$1;
+      }
+    }), null);
+    _$insert(_el$0, _$createComponent(Show, {
+      get when() {
+        return showsFigure(props.window);
+      },
+      get fallback() {
+        return (() => {
+          var _el$14 = _$createElement("text");
+          _$setProp(_el$14, "flexShrink", 1);
+          _$setProp(_el$14, "wrapMode", 'none');
+          _$insert(_el$14, (() => {
+            var _c$ = _$memo(() => !!text().resetSinceReading);
+            return () => _c$() ? RESET_SINCE_READING : text().figure;
+          })());
+          _$effect(_$p => _$setProp(_el$14, "fg", props.theme().textMuted, _$p));
+          return _el$14;
+        })();
+      },
+      get children() {
+        return [_$createComponent(Show, {
+          get when() {
+            return props.layout.bar > 0;
+          },
+          get children() {
+            var _el$10 = _$createElement("box");
+            _$setProp(_el$10, "flexShrink", 0);
+            _$setProp(_el$10, "flexDirection", 'row');
+            _$insert(_el$10, _$createComponent(For, {
+              get each() {
+                return quotaBarSegments(text().remaining ?? 0, props.layout.bar, props.appearance);
+              },
+              children: segment => (() => {
+                var _el$15 = _$createElement("text");
+                _$setProp(_el$15, "wrapMode", 'none');
+                _$insert(_el$15, () => segment.text);
+                _$effect(_$p => _$setProp(_el$15, "fg", toneColor(props.theme(), segment.tone), _$p));
+                return _el$15;
+              })()
+            }));
+            _$effect(_$p => _$setProp(_el$10, "width", props.layout.bar + 1, _$p));
+            return _el$10;
+          }
+        }), (() => {
+          var _el$11 = _$createElement("text");
+          _$setProp(_el$11, "flexShrink", 0);
+          _$setProp(_el$11, "wrapMode", 'none');
+          _$insert(_el$11, () => text().figure);
+          _$effect(_$p => _$setProp(_el$11, "fg", toneColor(props.theme(), tone()), _$p));
+          return _el$11;
+        })(), (() => {
+          var _el$12 = _$createElement("box");
+          _$setProp(_el$12, "flexGrow", 1);
+          return _el$12;
+        })(), _$createComponent(Show, {
+          get when() {
+            return _$memo(() => !!props.layout.reset)() && text().reset !== '';
+          },
+          get children() {
+            var _el$13 = _$createElement("text");
+            _$setProp(_el$13, "flexShrink", 0);
+            _$setProp(_el$13, "wrapMode", 'none');
+            _$insert(_el$13, () => text().reset);
+            _$effect(_$p => _$setProp(_el$13, "fg", props.theme().textMuted, _$p));
+            return _el$13;
+          }
+        })];
+      }
+    }), null);
+    return _el$0;
+  })();
+}
+
+// Fleet AccountBlock, adapted to Antigravity's per-account data. The header
+// line is the account label, the reading age when the oldest reading is
+// stale, and the status word right-aligned; the age moves to its own dim
+// line when the three do not fit. Below it each quota group present gets a
+// plain-word header and one WindowRow per window. Status word priorities
+// (first match wins):
 //   - `off` when the account is disabled
-//   - `cooling` when cooldownUntil is still in the future
+//   - `cooling <wait>` when cooldownUntil is still in the future
 //   - `active` when current === true
 //   - `idle` for the fallback (current === false) case
 function AccountBlock(props) {
   const active = () => props.active ?? props.account.current;
+  const cooldownMs = () => {
+    const cd = props.account.cooldownUntil;
+    if (typeof cd !== 'number') return 0;
+    return Math.max(0, cd - props.now());
+  };
   const statusWord = () => {
     if (!props.account.enabled) return 'off';
-    const cd = props.account.cooldownUntil;
-    if (typeof cd === 'number' && cd > props.now()) return 'cooling';
+    if (cooldownMs() > 0) return `cooling ${formatWait(cooldownMs())}`;
     return active() ? 'active' : 'idle';
   };
   const statusTone = () => {
     if (!props.account.enabled) return 'muted';
-    const cd = props.account.cooldownUntil;
-    if (typeof cd === 'number' && cd > props.now()) return 'warn';
+    if (cooldownMs() > 0) return 'warn';
     return active() ? 'ok' : 'muted';
   };
-  const cooldownMs = () => {
-    const cd = props.account.cooldownUntil;
-    if (typeof cd !== 'number') return 0;
-    return Math.max(0, cd - props.now());
-  };
-  const healthText = () => {
-    const base = `health ${Math.round(clamp(props.account.health, 0, 100))}`;
-    return cooldownMs() > 0 ? `${base} · cooling ${formatWait(cooldownMs())}` : base;
-  };
+  const windows = () => accountWindows(props.account, props.now());
+  const age = () => quotaReadingAge(windows().map(window => window.reading), props.now());
+  const ageInline = () => age() !== '' && props.account.label.length + 3 + age().length + 1 + statusWord().length <= props.width();
+  const label = () => fitLabel(props.account.label, props.width() - 1 - statusWord().length);
+  // One reset column width per account, so bars line up across its rows.
+  const resetWidth = () => Math.max(0, ...windows().filter(showsFigure).map(window => window.text.reset.length));
+  const layoutFor = window => windowRowLayout(props.width(), window.text.name !== '', resetWidth(), props.appearance.barWidth);
+  const groups = () => QUOTA_ORDER.map(key => ({
+    key,
+    windows: windows().filter(window => window.key === key)
+  })).filter(group => group.windows.length > 0);
   return (() => {
-    var _el$18 = _$createElement("box"),
-      _el$19 = _$createElement("box"),
-      _el$20 = _$createElement("text"),
-      _el$21 = _$createElement("b"),
+    var _el$16 = _$createElement("box"),
+      _el$17 = _$createElement("box"),
+      _el$18 = _$createElement("text"),
+      _el$19 = _$createElement("b"),
+      _el$21 = _$createElement("box"),
       _el$22 = _$createElement("text"),
-      _el$23 = _$createElement("b"),
-      _el$24 = _$createElement("box"),
-      _el$25 = _$createElement("text");
+      _el$23 = _$createElement("b");
+    _$insertNode(_el$16, _el$17);
+    _$setProp(_el$16, "width", '100%');
+    _$setProp(_el$16, "flexDirection", 'column');
+    _$insertNode(_el$17, _el$18);
+    _$insertNode(_el$17, _el$21);
+    _$insertNode(_el$17, _el$22);
+    _$setProp(_el$17, "width", '100%');
+    _$setProp(_el$17, "flexDirection", 'row');
     _$insertNode(_el$18, _el$19);
-    _$insertNode(_el$18, _el$24);
-    _$setProp(_el$18, "width", '100%');
-    _$setProp(_el$18, "flexDirection", 'column');
-    _$insertNode(_el$19, _el$20);
-    _$insertNode(_el$19, _el$22);
-    _$setProp(_el$19, "width", '100%');
-    _$setProp(_el$19, "flexDirection", 'row');
-    _$setProp(_el$19, "justifyContent", 'space-between');
-    _$insertNode(_el$20, _el$21);
-    _$insert(_el$21, () => props.account.label);
+    _$setProp(_el$18, "flexShrink", 0);
+    _$setProp(_el$18, "wrapMode", 'none');
+    _$insert(_el$19, label);
+    _$insert(_el$17, _$createComponent(Show, {
+      get when() {
+        return ageInline();
+      },
+      get children() {
+        var _el$20 = _$createElement("text");
+        _$setProp(_el$20, "flexShrink", 0);
+        _$setProp(_el$20, "wrapMode", 'none');
+        _$insert(_el$20, () => ` · ${age()}`);
+        _$effect(_$p => _$setProp(_el$20, "fg", props.theme().textMuted, _$p));
+        return _el$20;
+      }
+    }), _el$21);
+    _$setProp(_el$21, "flexGrow", 1);
     _$insertNode(_el$22, _el$23);
+    _$setProp(_el$22, "flexShrink", 0);
+    _$setProp(_el$22, "wrapMode", 'none');
     _$insert(_el$23, statusWord);
-    _$insert(_el$18, _$createComponent(For, {
-      each: QUOTA_ORDER,
-      children: key => {
-        const poolEntry = props.account.quota[key];
-        const windows = poolEntry?.windows;
-        // Legacy: no windows array — render a single row with the pool label.
-        const hasWindows = windows && windows.length > 0;
-        if (!hasWindows) {
-          return _$createComponent(QuotaRow, {
-            get theme() {
-              return props.theme;
-            },
-            get appearance() {
-              return props.appearance;
-            },
-            get label() {
-              return QUOTA_LABELS[key];
-            },
-            entry: poolEntry,
-            get now() {
-              return props.now;
-            }
-          });
-        }
-        return _$memo(() => windows.map(w => _$createComponent(QuotaRow, {
-          get theme() {
-            return props.theme;
-          },
-          get appearance() {
-            return props.appearance;
-          },
-          get label() {
-            return `${QUOTA_LABELS[key]} ${WINDOW_GUTTER[w.window] ?? w.window}`;
-          },
-          get entry() {
-            return {
-              remainingPercent: w.remainingPercent,
-              resetAt: w.resetAt,
-              checkedAt: w.checkedAt
-            };
+    _$insert(_el$16, _$createComponent(Show, {
+      get when() {
+        return _$memo(() => age() !== '')() && !ageInline();
+      },
+      get children() {
+        var _el$24 = _$createElement("text");
+        _$setProp(_el$24, "wrapMode", 'none');
+        _$insert(_el$24, age);
+        _$effect(_$p => _$setProp(_el$24, "fg", props.theme().textMuted, _$p));
+        return _el$24;
+      }
+    }), null);
+    _$insert(_el$16, _$createComponent(Show, {
+      get when() {
+        return groups().length > 0;
+      },
+      get fallback() {
+        return (() => {
+          var _el$25 = _$createElement("text");
+          _$setProp(_el$25, "wrapMode", 'none');
+          _$insert(_el$25, NO_QUOTA_READING);
+          _$effect(_$p => _$setProp(_el$25, "fg", props.theme().textMuted, _$p));
+          return _el$25;
+        })();
+      },
+      get children() {
+        return _$createComponent(For, {
+          get each() {
+            return groups();
           },
-          get now() {
-            return props.now;
-          }
-        })));
+          children: group => [(() => {
+            var _el$26 = _$createElement("text");
+            _$setProp(_el$26, "wrapMode", 'none');
+            _$insert(_el$26, () => GROUP_NAMES[group.key]);
+            _$effect(_$p => _$setProp(_el$26, "fg", props.theme().textMuted, _$p));
+            return _el$26;
+          })(), _$createComponent(For, {
+            get each() {
+              return group.windows;
+            },
+            children: window => _$createComponent(WindowRow, {
+              get theme() {
+                return props.theme;
+              },
+              get appearance() {
+                return props.appearance;
+              },
+              window: window,
+              get layout() {
+                return layoutFor(window);
+              }
+            })
+          })]
+        });
       }
-    }), _el$24);
-    _$insertNode(_el$24, _el$25);
-    _$setProp(_el$24, "width", '100%');
-    _$setProp(_el$24, "flexDirection", 'row');
-    _$insert(_el$25, () => `   ${healthText()}`);
+    }), null);
     _$effect(_p$ => {
-      var _v$8 = props.marginTop ?? 0,
-        _v$9 = props.theme().text,
-        _v$0 = toneColor(props.theme(), statusTone()),
-        _v$1 = props.theme().textMuted;
-      _v$8 !== _p$.e && (_p$.e = _$setProp(_el$18, "marginTop", _v$8, _p$.e));
-      _v$9 !== _p$.t && (_p$.t = _$setProp(_el$20, "fg", _v$9, _p$.t));
-      _v$0 !== _p$.a && (_p$.a = _$setProp(_el$22, "fg", _v$0, _p$.a));
-      _v$1 !== _p$.o && (_p$.o = _$setProp(_el$25, "fg", _v$1, _p$.o));
+      var _v$3 = props.marginTop ?? 0,
+        _v$4 = props.theme().text,
+        _v$5 = toneColor(props.theme(), statusTone());
+      _v$3 !== _p$.e && (_p$.e = _$setProp(_el$16, "marginTop", _v$3, _p$.e));
+      _v$4 !== _p$.t && (_p$.t = _$setProp(_el$18, "fg", _v$4, _p$.t));
+      _v$5 !== _p$.a && (_p$.a = _$setProp(_el$22, "fg", _v$5, _p$.a));
       return _p$;
     }, {
       e: undefined,
       t: undefined,
-      a: undefined,
-      o: undefined
+      a: undefined
     });
-    return _el$18;
+    return _el$16;
   })();
 }
+// The collapsed row's figure: the lowest current window across both groups.
+// A window that reset since its reading is not current and never binds.
+function collapsedQuota(account, now) {
+  if (account.quota.gemini == null && account.quota['non-gemini'] == null) return {
+    prefix: '',
+    text: '—',
+    remaining: null
+  };
+  const windows = accountWindows(account, now);
+  let lowest;
+  for (const window of windows) {
+    if (!showsFigure(window)) continue;
+    if (lowest === undefined || (window.text.remaining ?? 100) < (lowest.text.remaining ?? 100)) lowest = window;
+  }
+  if (lowest) {
+    const name = lowest.text.name;
+    return {
+      prefix: `${COLLAPSED_GROUP_NAMES[lowest.key]}${name ? ` ${name}` : ''} `,
+      text: lowest.text.figure,
+      remaining: lowest.text.remaining
+    };
+  }
+  return {
+    prefix: '',
+    text: windows.some(window => window.text.resetSinceReading) ? RESET_SINCE_READING : NO_QUOTA_READING,
+    remaining: null
+  };
+}
 function formatWait(ms) {
   const seconds = Math.ceil(ms / 1000);
   if (seconds < 60) return `${seconds}s`;
@@ -714,6 +846,24 @@ export function SidebarPanel(props) {
     };
   };
 
+  // The route on one `Route <value>` line when it fits, else one line per
+  // part with the strategy last.
+  const routeValue = route => `${route.strategy ? `${route.strategy} · ` : ''}${route.family}: ${route.style}`;
+  const routeLines = route => [`${route.family}: ${route.style}`, route.strategy ?? ''].filter(line => line !== '');
+
+  // The width available to content: the header row spans the panel inside
+  // its border and padding. Layout reports it during a render pass, so the
+  // signal is updated afterwards rather than rebuilding rows mid-pass.
+  const [contentWidth, setContentWidth] = createSignal(ASSUMED_CONTENT_WIDTH);
+  let headerRow;
+  const measureContentWidth = () => {
+    const width = headerRow?.width;
+    if (typeof width !== 'number' || width <= 0) return;
+    queueMicrotask(() => {
+      if (width !== contentWidth()) setContentWidth(width);
+    });
+  };
+
   // Header badge: ▼/▶ {label}. The fleet shows the version string on the
   // right when no degraded state is present; the antigravity adapter keeps
   // that right-alignment and surfaces `degraded` as a "LIMITED" badge
@@ -723,36 +873,40 @@ export function SidebarPanel(props) {
     return !hasData() ? name : collapsed() ? `\u25b6 ${name}` : `\u25bc ${name}`;
   };
   return (() => {
-    var _el$26 = _$createElement("box"),
-      _el$27 = _$createElement("box"),
+    var _el$27 = _$createElement("box"),
       _el$28 = _$createElement("box"),
-      _el$29 = _$createElement("text"),
-      _el$30 = _$createElement("b");
-    _$insertNode(_el$26, _el$27);
-    _$setProp(_el$26, "width", '100%');
-    _$setProp(_el$26, "flexDirection", 'column');
-    _$setProp(_el$26, "border", SINGLE_BORDER);
-    _$setProp(_el$26, "paddingTop", 1);
-    _$setProp(_el$26, "paddingBottom", 1);
-    _$setProp(_el$26, "paddingLeft", 1);
-    _$setProp(_el$26, "paddingRight", 1);
+      _el$29 = _$createElement("box"),
+      _el$30 = _$createElement("text"),
+      _el$31 = _$createElement("b");
     _$insertNode(_el$27, _el$28);
     _$setProp(_el$27, "width", '100%');
-    _$setProp(_el$27, "flexDirection", 'row');
-    _$setProp(_el$27, "justifyContent", 'space-between');
-    _$setProp(_el$27, "alignItems", 'center');
-    _$setProp(_el$27, "onMouseDown", () => {
+    _$setProp(_el$27, "flexDirection", 'column');
+    _$setProp(_el$27, "border", SINGLE_BORDER);
+    _$setProp(_el$27, "paddingTop", 1);
+    _$setProp(_el$27, "paddingBottom", 1);
+    _$setProp(_el$27, "paddingLeft", 1);
+    _$setProp(_el$27, "paddingRight", 1);
+    _$insertNode(_el$28, _el$29);
+    _$use(element => {
+      headerRow = element;
+    }, _el$28);
+    _$setProp(_el$28, "onSizeChange", measureContentWidth);
+    _$setProp(_el$28, "width", '100%');
+    _$setProp(_el$28, "flexDirection", 'row');
+    _$setProp(_el$28, "justifyContent", 'space-between');
+    _$setProp(_el$28, "alignItems", 'center');
+    _$setProp(_el$28, "onMouseDown", () => {
       // Mirror the fleet guard: only toggle when there is data to expand
       // into. Without this a click on the empty-awaiting header would just
       // toggle the affordance for nothing.
       if (hasData()) controller.toggleCollapsed();
     });
-    _$insertNode(_el$28, _el$29);
-    _$setProp(_el$28, "paddingLeft", 1);
-    _$setProp(_el$28, "paddingRight", 1);
     _$insertNode(_el$29, _el$30);
-    _$insert(_el$30, headerLabel);
-    _$insert(_el$27, _$createComponent(Show, {
+    _$setProp(_el$29, "paddingLeft", 1);
+    _$setProp(_el$29, "paddingRight", 1);
+    _$insertNode(_el$30, _el$31);
+    _$insert(_el$31, headerLabel);
+    _$insert(_el$28, _$createComponent(Show, {
       get when() {
         return degraded();
       },
@@ -762,59 +916,42 @@ export function SidebarPanel(props) {
             return prefs().header.showVersion && PLUGIN_VERSION !== '';
           },
           get children() {
-            var _el$35 = _$createElement("text");
-            _$insert(_el$35, `v${PLUGIN_VERSION}`);
-            _$effect(_$p => _$setProp(_el$35, "fg", theme().textMuted, _$p));
-            return _el$35;
+            var _el$36 = _$createElement("text");
+            _$insert(_el$36, `v${PLUGIN_VERSION}`);
+            _$effect(_$p => _$setProp(_el$36, "fg", theme().textMuted, _$p));
+            return _el$36;
           }
         });
       },
       get children() {
-        var _el$31 = _$createElement("box"),
-          _el$32 = _$createElement("text"),
-          _el$33 = _$createElement("b");
-        _$insertNode(_el$31, _el$32);
-        _$setProp(_el$31, "paddingLeft", 1);
-        _$setProp(_el$31, "paddingRight", 1);
+        var _el$32 = _$createElement("box"),
+          _el$33 = _$createElement("text"),
+          _el$34 = _$createElement("b");
         _$insertNode(_el$32, _el$33);
-        _$insertNode(_el$33, _$createTextNode(`LIMITED`));
+        _$setProp(_el$32, "paddingLeft", 1);
+        _$setProp(_el$32, "paddingRight", 1);
+        _$insertNode(_el$33, _el$34);
+        _$insertNode(_el$34, _$createTextNode(`LIMITED`));
         _$effect(_p$ => {
-          var _v$10 = theme().warning,
-            _v$11 = theme().background;
-          _v$10 !== _p$.e && (_p$.e = _$setProp(_el$31, "backgroundColor", _v$10, _p$.e));
-          _v$11 !== _p$.t && (_p$.t = _$setProp(_el$32, "fg", _v$11, _p$.t));
+          var _v$6 = theme().warning,
+            _v$7 = theme().background;
+          _v$6 !== _p$.e && (_p$.e = _$setProp(_el$32, "backgroundColor", _v$6, _p$.e));
+          _v$7 !== _p$.t && (_p$.t = _$setProp(_el$33, "fg", _v$7, _p$.t));
           return _p$;
         }, {
           e: undefined,
           t: undefined
         });
-        return _el$31;
+        return _el$32;
       }
     }), null);
-    _$insert(_el$26, _$createComponent(Show, {
+    _$insert(_el$27, _$createComponent(Show, {
       get when() {
         return _$memo(() => !!collapsed())() && hasData();
       },
       get children() {
         return (() => {
           const account = () => visibleAccounts().find(entry => entry.current) ?? visibleAccounts()[0];
-          const remaining = () => {
-            const q = account()?.quota;
-            // The lowest remaining percentage among dated readings determines the warning tone.
-            const gemini = quotaReadingParts('Gm', q?.gemini, now()).remaining;
-            const nonGemini = quotaReadingParts('NG', q?.['non-gemini'], now()).remaining;
-            if (gemini === null && nonGemini === null) return null;
-            return Math.min(gemini ?? 100, nonGemini ?? 100);
-          };
-          const poolText = key => {
-            const entry = account()?.quota[key];
-            if (!entry) return `${QUOTA_LABELS[key]}: ${formatQuotaReading(QUOTA_LABELS[key], undefined, now())}`;
-            // Show binding window when available, else just pool label.
-            const bindingWindow = entry.windows?.reduce((best, w) => best === null || w.remainingPercent < best.remainingPercent ? w : best, null);
-            const gutter = bindingWindow ? ` ${WINDOW_GUTTER[bindingWindow.window] ?? bindingWindow.window}` : '';
-            const text = formatQuotaReading(`${QUOTA_LABELS[key]}${gutter}`, bindingWindow ?? entry, now());
-            return bindingWindow ? `${QUOTA_LABELS[key]} ${text}` : text;
-          };
           const unavailable = () => {
             const selected = account();
             return selected != null && (!selected.enabled || selected.cooldownUntil != null && selected.cooldownUntil > now());
@@ -823,43 +960,63 @@ export function SidebarPanel(props) {
             get when() {
               return account();
             },
-            children: selected => _$createComponent(CollapsedRow, {
-              theme: theme,
-              get label() {
-                return selected().label;
-              },
-              get children() {
-                var _el$36 = _$createElement("box"),
-                  _el$37 = _$createElement("text"),
-                  _el$38 = _$createElement("b"),
-                  _el$39 = _$createElement("text");
-                _$insertNode(_el$36, _el$37);
-                _$insertNode(_el$36, _el$39);
-                _$setProp(_el$36, "flexDirection", 'row');
-                _$insertNode(_el$37, _el$38);
-                _$insert(_el$38, (() => {
-                  var _c$ = _$memo(() => !!(account()?.quota.gemini == null && account()?.quota['non-gemini'] == null));
-                  return () => _c$() ? '—' : `${poolText('gemini')} · ${poolText('non-gemini')}`;
-                })());
-                _$insert(_el$39, () => unavailable() ? ' ⊘' : ' ●');
-                _$effect(_p$ => {
-                  var _v$15 = toneColor(theme(), remaining() == null ? 'muted' : quotaTone(100 - (remaining() ?? 100), prefs().appearance)),
-                    _v$16 = toneColor(theme(), unavailable() ? 'err' : remaining() == null ? 'muted' : quotaTone(100 - (remaining() ?? 100), prefs().appearance));
-                  _v$15 !== _p$.e && (_p$.e = _$setProp(_el$37, "fg", _v$15, _p$.e));
-                  _v$16 !== _p$.t && (_p$.t = _$setProp(_el$39, "fg", _v$16, _p$.t));
-                  return _p$;
-                }, {
-                  e: undefined,
-                  t: undefined
-                });
-                return _el$36;
-              }
-            })
+            children: selected => {
+              const quota = () => collapsedQuota(selected(), now());
+              const tone = () => {
+                const remaining = quota().remaining;
+                return remaining == null ? 'muted' : quotaTone(100 - remaining, prefs().appearance);
+              };
+              // Label, one space, the figure and the two-cell dot. The
+              // group prefix goes first when narrow; then the label is cut.
+              const figure = () => {
+                const {
+                  prefix,
+                  text
+                } = quota();
+                const full = `${prefix}${text}`;
+                return selected().label.length + 1 + full.length + 2 <= contentWidth() ? full : text;
+              };
+              const label = () => fitLabel(selected().label, contentWidth() - 1 - figure().length - 2);
+              return _$createComponent(CollapsedRow, {
+                theme: theme,
+                get label() {
+                  return label();
+                },
+                get children() {
+                  var _el$37 = _$createElement("box"),
+                    _el$38 = _$createElement("text"),
+                    _el$39 = _$createElement("b"),
+                    _el$40 = _$createElement("text");
+                  _$insertNode(_el$37, _el$38);
+                  _$insertNode(_el$37, _el$40);
+                  _$setProp(_el$37, "flexDirection", 'row');
+                  _$setProp(_el$37, "flexShrink", 0);
+                  _$insertNode(_el$38, _el$39);
+                  _$setProp(_el$38, "flexShrink", 0);
+                  _$setProp(_el$38, "wrapMode", 'none');
+                  _$insert(_el$39, figure);
+                  _$setProp(_el$40, "flexShrink", 0);
+                  _$setProp(_el$40, "wrapMode", 'none');
+                  _$insert(_el$40, () => unavailable() ? ' ⊘' : ' ●');
+                  _$effect(_p$ => {
+                    var _v$1 = toneColor(theme(), tone()),
+                      _v$10 = toneColor(theme(), unavailable() ? 'err' : tone());
+                    _v$1 !== _p$.e && (_p$.e = _$setProp(_el$38, "fg", _v$1, _p$.e));
+                    _v$10 !== _p$.t && (_p$.t = _$setProp(_el$40, "fg", _v$10, _p$.t));
+                    return _p$;
+                  }, {
+                    e: undefined,
+                    t: undefined
+                  });
+                  return _el$37;
+                }
+              });
+            }
           });
         })();
       }
     }), null);
-    _$insert(_el$26, _$createComponent(Show, {
+    _$insert(_el$27, _$createComponent(Show, {
       get when() {
         return !collapsed() || !hasData();
       },
@@ -870,14 +1027,14 @@ export function SidebarPanel(props) {
           },
           get fallback() {
             return (() => {
-              var _el$40 = _$createElement("box"),
-                _el$41 = _$createElement("text");
-              _$insertNode(_el$40, _el$41);
-              _$setProp(_el$40, "marginTop", 1);
-              _$setProp(_el$40, "width", '100%');
-              _$insertNode(_el$41, _$createTextNode(`Waiting for quota…`));
-              _$effect(_$p => _$setProp(_el$41, "fg", theme().textMuted, _$p));
-              return _el$40;
+              var _el$41 = _$createElement("box"),
+                _el$42 = _$createElement("text");
+              _$insertNode(_el$41, _el$42);
+              _$setProp(_el$41, "marginTop", 1);
+              _$setProp(_el$41, "width", '100%');
+              _$insertNode(_el$42, _$createTextNode(`Waiting for quota…`));
+              _$effect(_$p => _$setProp(_el$42, "fg", theme().textMuted, _$p));
+              return _el$41;
             })();
           },
           get children() {
@@ -900,6 +1057,7 @@ export function SidebarPanel(props) {
                     },
                     account: account,
                     now: now,
+                    width: contentWidth,
                     get marginTop() {
                       return index() === 0 ? 0 : 1;
                     }
@@ -919,20 +1077,44 @@ export function SidebarPanel(props) {
                     return currentRoute();
                   },
                   get fallback() {
-                    return _$createComponent(StatRow, {
-                      theme: theme,
-                      label: "Route",
-                      value: "\u2014",
-                      tone: "muted"
-                    });
+                    return (() => {
+                      var _el$44 = _$createElement("text");
+                      _$insertNode(_el$44, _$createTextNode(`No request yet`));
+                      _$setProp(_el$44, "wrapMode", 'none');
+                      _$effect(_$p => _$setProp(_el$44, "fg", theme().textMuted, _$p));
+                      return _el$44;
+                    })();
                   },
-                  children: route => _$createComponent(StatRow, {
-                    theme: theme,
-                    label: "Route",
-                    get value() {
-                      return `${route().strategy ? `${route().strategy} · ` : ''}${route().family}: ${route().style}`;
+                  children: route => _$createComponent(Show, {
+                    get when() {
+                      return 'Route'.length + 1 + routeValue(route()).length <= contentWidth();
                     },
-                    tone: "accent"
+                    get fallback() {
+                      return _$createComponent(For, {
+                        get each() {
+                          return routeLines(route());
+                        },
+                        children: line => (() => {
+                          var _el$46 = _$createElement("text"),
+                            _el$47 = _$createElement("b");
+                          _$insertNode(_el$46, _el$47);
+                          _$setProp(_el$46, "wrapMode", 'none');
+                          _$insert(_el$47, line);
+                          _$effect(_$p => _$setProp(_el$46, "fg", toneColor(theme(), 'accent'), _$p));
+                          return _el$46;
+                        })()
+                      });
+                    },
+                    get children() {
+                      return _$createComponent(StatRow, {
+                        theme: theme,
+                        label: "Route",
+                        get value() {
+                          return routeValue(route());
+                        },
+                        tone: "accent"
+                      });
+                    }
                   })
                 })];
               }
@@ -980,19 +1162,19 @@ export function SidebarPanel(props) {
       }
     }), null);
     _$effect(_p$ => {
-      var _v$12 = theme().borderActive,
-        _v$13 = theme().accent,
-        _v$14 = theme().background;
-      _v$12 !== _p$.e && (_p$.e = _$setProp(_el$26, "borderColor", _v$12, _p$.e));
-      _v$13 !== _p$.t && (_p$.t = _$setProp(_el$28, "backgroundColor", _v$13, _p$.t));
-      _v$14 !== _p$.a && (_p$.a = _$setProp(_el$29, "fg", _v$14, _p$.a));
+      var _v$8 = theme().borderActive,
+        _v$9 = theme().accent,
+        _v$0 = theme().background;
+      _v$8 !== _p$.e && (_p$.e = _$setProp(_el$27, "borderColor", _v$8, _p$.e));
+      _v$9 !== _p$.t && (_p$.t = _$setProp(_el$29, "backgroundColor", _v$9, _p$.t));
+      _v$0 !== _p$.a && (_p$.a = _$setProp(_el$30, "fg", _v$0, _p$.a));
       return _p$;
     }, {
       e: undefined,
       t: undefined,
       a: undefined
     });
-    return _el$26;
+    return _el$27;
   })();
 }