@cortexkit/opencode-openai-auth 0.8.0 → 0.9.0

package/src/tui-compiled/runtime/tui.tsx

@@ -207,15 +207,72 @@ function CollapsedRow(props) {
     return _el$8;
   })();
 }
+const SPEND_CONTROL_LABEL = 'credits';
+
+// Labels a quota snapshot contributes to the sidebar, independent of pacing or
+// the wall clock — the label column is sized from these alone.
+function quotaRowLabels(quota) {
+  const labels = getPresentQuotaWindows(quota).map(row => row.label);
+  if (quota?.spendControl) labels.push(SPEND_CONTROL_LABEL);
+  return labels;
+}
+
+// The label column is a property of the whole sidebar, not of one account's row
+// set: every account's bars must start at the same column, so the width is
+// derived once from every account rendered (main plus fallbacks) and threaded
+// into each account's rows. The +1 keeps a separator before the longest label's
+// bar; 3 is the floor the short 5h/7d labels already relied on.
+/**
+ * Every quota the sidebar will draw, in one list.
+ *
+ * The label column is shared by all of them, so the width has to be measured
+ * over this exact set — measuring a subset is what made stacked accounts
+ * disagree about where the bar starts. Named rather than inlined at each call
+ * site because the set is the part that can be got wrong, and a call site
+ * cannot be tested without the host's rendering runtime.
+ */
+export function renderedQuotas(state) {
+  return [state.main?.quota ?? null, ...(state.fallbacks ?? []).filter(fallback => fallback.enabled).map(fallback => fallback.quota)];
+}
+export function computeQuotaLabelWidth(quotas) {
+  let width = 3;
+  for (const quota of quotas) {
+    for (const label of quotaRowLabels(quota ?? null)) {
+      width = Math.max(width, label.length + 1);
+    }
+  }
+  return width;
+}
+
 // Maps present quota windows onto display rows and computes pacing against each
 // dynamic duration or the historical 5h/7d duration for legacy snapshots.
-export function buildQuotaRowsForDisplay(quota, now, pacingEnabled) {
-  return getPresentQuotaWindows(quota).map(row => ({
+// `labelWidth` comes from computeQuotaLabelWidth for rendered sidebars; callers
+// that only inspect pacing may omit it and get this row set's own width.
+export function buildQuotaRowsForDisplay(quota, now, pacingEnabled, labelWidth) {
+  const rows = getPresentQuotaWindows(quota).map(row => ({
     key: row.key,
     label: row.label,
     window: row.window,
     pacing: pacingEnabled && row.windowMs !== null ? computeQuotaPacing(row.window, row.windowMs, now) : null
   }));
+  const spendControl = quota?.spendControl;
+  if (spendControl) {
+    rows.push({
+      key: 'spendControl',
+      label: SPEND_CONTROL_LABEL,
+      window: {
+        usedPercent: spendControl.usedPercent,
+        remainingPercent: spendControl.remainingPercent,
+        resetsAt: spendControl.resetsAt
+      },
+      pacing: null
+    });
+  }
+  const width = labelWidth ?? Math.max(3, ...rows.map(row => row.label.length + 1));
+  return rows.map(row => ({
+    ...row,
+    labelWidth: width
+  }));
 }
 export function isQuotaLoaded(quota) {
   return quota !== null;
@@ -234,11 +291,35 @@ export function getQuotaMetadataRows(state) {
   }
   return rows;
 }
-export function getAccountMetadataRows(resetCredits) {
-  return resetCredits === undefined ? [] : [{
-    label: 'resets',
-    value: String(resetCredits)
-  }];
+function formatGroupedAmount(value) {
+  return Math.round(value).toLocaleString('en-US');
+}
+
+// The unit names the budget the amounts are counted in, so it agrees with the
+// total rather than staying singular against a plural quantity.
+function pluralizeUnit(unit, count) {
+  if (count === 1) return unit;
+  return unit.endsWith('s') ? unit : `${unit}s`;
+}
+export function formatSpendControlAmounts(spendControl) {
+  const unit = pluralizeUnit(spendControl.unit ?? 'unit', spendControl.limit);
+  return `${formatGroupedAmount(spendControl.used)} / ${formatGroupedAmount(spendControl.limit)} ${unit}`;
+}
+export function getAccountMetadataRows(resetCredits, spendControl) {
+  const rows = [];
+  if (spendControl) {
+    rows.push({
+      label: 'credits',
+      value: formatSpendControlAmounts(spendControl)
+    });
+  }
+  if (resetCredits !== undefined) {
+    rows.push({
+      label: 'resets',
+      value: String(resetCredits)
+    });
+  }
+  return rows;
 }
 
 // Quota window row: muted label left, tone-colored bar + percentage right,
@@ -261,26 +342,26 @@ function QuotaRow(props) {
     },
     get fallback() {
       return (() => {
-        var _el$17 = _$createElement("box"),
-          _el$18 = _$createElement("text"),
-          _el$19 = _$createElement("text");
-        _$insertNode(_el$17, _el$18);
-        _$insertNode(_el$17, _el$19);
-        _$setProp(_el$17, "width", '100%');
-        _$setProp(_el$17, "flexDirection", 'row');
-        _$insert(_el$18, () => props.label.padEnd(3));
-        _$insertNode(_el$19, _$createTextNode(`—`));
+        var _el$16 = _$createElement("box"),
+          _el$17 = _$createElement("text"),
+          _el$18 = _$createElement("text");
+        _$insertNode(_el$16, _el$17);
+        _$insertNode(_el$16, _el$18);
+        _$setProp(_el$16, "width", '100%');
+        _$setProp(_el$16, "flexDirection", 'row');
+        _$insert(_el$17, () => props.label.padEnd(props.labelWidth));
+        _$insertNode(_el$18, _$createTextNode(`—`));
         _$effect(_p$ => {
           var _v$9 = props.theme.textMuted,
             _v$0 = props.theme.textMuted;
-          _v$9 !== _p$.e && (_p$.e = _$setProp(_el$18, "fg", _v$9, _p$.e));
-          _v$0 !== _p$.t && (_p$.t = _$setProp(_el$19, "fg", _v$0, _p$.t));
+          _v$9 !== _p$.e && (_p$.e = _$setProp(_el$17, "fg", _v$9, _p$.e));
+          _v$0 !== _p$.t && (_p$.t = _$setProp(_el$18, "fg", _v$0, _p$.t));
           return _p$;
         }, {
           e: undefined,
           t: undefined
         });
-        return _el$17;
+        return _el$16;
       })();
     },
     get children() {
@@ -296,16 +377,16 @@ function QuotaRow(props) {
         _$insertNode(_el$1, _el$10);
         _$insertNode(_el$1, _el$11);
         _$setProp(_el$1, "flexDirection", 'row');
-        _$insert(_el$10, () => props.label.padEnd(3));
+        _$insert(_el$10, () => props.label.padEnd(props.labelWidth));
         _$insert(_el$1, _$createComponent(For, {
           get each() {
             return quotaBarSegments(used(), props.appearance, props.pacing);
           },
           children: segment => (() => {
-            var _el$21 = _$createElement("text");
-            _$insert(_el$21, () => segment.text);
-            _$effect(_$p => _$setProp(_el$21, "fg", toneColor(props.theme, segment.tone), _$p));
-            return _el$21;
+            var _el$20 = _$createElement("text");
+            _$insert(_el$20, () => segment.text);
+            _$effect(_$p => _$setProp(_el$20, "fg", toneColor(props.theme, segment.tone), _$p));
+            return _el$20;
           })()
         }), _el$11);
         _$insert(_el$11, () => ` ${String(Math.round(used())).padStart(3)}%`);
@@ -338,18 +419,18 @@ function QuotaRow(props) {
         get children() {
           var _el$13 = _$createElement("box"),
             _el$14 = _$createElement("text"),
-            _el$16 = _$createElement("text");
+            _el$15 = _$createElement("text");
           _$insertNode(_el$13, _el$14);
-          _$insertNode(_el$13, _el$16);
+          _$insertNode(_el$13, _el$15);
           _$setProp(_el$13, "width", '100%');
           _$setProp(_el$13, "flexDirection", 'row');
-          _$insertNode(_el$14, _$createTextNode(`   `));
-          _$insert(_el$16, paceLine);
+          _$insert(_el$14, () => ''.padEnd(props.labelWidth));
+          _$insert(_el$15, paceLine);
           _$effect(_p$ => {
             var _v$7 = props.theme.textMuted,
               _v$8 = toneColor(props.theme, props.pacing?.state === 'deficit' ? 'warn' : 'muted');
             _v$7 !== _p$.e && (_p$.e = _$setProp(_el$14, "fg", _v$7, _p$.e));
-            _v$8 !== _p$.t && (_p$.t = _$setProp(_el$16, "fg", _v$8, _p$.t));
+            _v$8 !== _p$.t && (_p$.t = _$setProp(_el$15, "fg", _v$8, _p$.t));
             return _p$;
           }, {
             e: undefined,
@@ -368,36 +449,36 @@ function QuotaRow(props) {
 function AccountBlock(props) {
   const statusWord = () => props.killed ? 'blocked' : props.active ? 'active' : 'idle';
   const statusTone = () => props.killed ? 'err' : props.active ? 'ok' : 'muted';
-  const rows = () => buildQuotaRowsForDisplay(props.quota, Date.now(), props.pacingEnabled);
+  const rows = () => buildQuotaRowsForDisplay(props.quota, Date.now(), props.pacingEnabled, props.labelWidth);
   return (() => {
-    var _el$22 = _$createElement("box"),
-      _el$23 = _$createElement("box"),
-      _el$24 = _$createElement("text"),
-      _el$25 = _$createElement("b"),
-      _el$26 = _$createElement("text"),
-      _el$27 = _$createElement("b");
+    var _el$21 = _$createElement("box"),
+      _el$22 = _$createElement("box"),
+      _el$23 = _$createElement("text"),
+      _el$24 = _$createElement("b"),
+      _el$25 = _$createElement("text"),
+      _el$26 = _$createElement("b");
+    _$insertNode(_el$21, _el$22);
+    _$setProp(_el$21, "width", '100%');
+    _$setProp(_el$21, "flexDirection", 'column');
     _$insertNode(_el$22, _el$23);
+    _$insertNode(_el$22, _el$25);
     _$setProp(_el$22, "width", '100%');
-    _$setProp(_el$22, "flexDirection", 'column');
+    _$setProp(_el$22, "flexDirection", 'row');
+    _$setProp(_el$22, "justifyContent", 'space-between');
     _$insertNode(_el$23, _el$24);
-    _$insertNode(_el$23, _el$26);
-    _$setProp(_el$23, "width", '100%');
-    _$setProp(_el$23, "flexDirection", 'row');
-    _$setProp(_el$23, "justifyContent", 'space-between');
-    _$insertNode(_el$24, _el$25);
-    _$insert(_el$25, () => props.name);
-    _$insertNode(_el$26, _el$27);
-    _$insert(_el$27, statusWord);
-    _$insert(_el$22, _$createComponent(Show, {
+    _$insert(_el$24, () => props.name);
+    _$insertNode(_el$25, _el$26);
+    _$insert(_el$26, statusWord);
+    _$insert(_el$21, _$createComponent(Show, {
       get when() {
         return isQuotaLoaded(props.quota);
       },
       get fallback() {
         return (() => {
-          var _el$28 = _$createElement("text");
-          _$insertNode(_el$28, _$createTextNode(`checking…`));
-          _$effect(_$p => _$setProp(_el$28, "fg", props.theme.textMuted, _$p));
-          return _el$28;
+          var _el$27 = _$createElement("text");
+          _$insertNode(_el$27, _$createTextNode(`checking…`));
+          _$effect(_$p => _$setProp(_el$27, "fg", props.theme.textMuted, _$p));
+          return _el$27;
         })();
       },
       get children() {
@@ -407,10 +488,10 @@ function AccountBlock(props) {
           },
           get fallback() {
             return (() => {
-              var _el$30 = _$createElement("text");
-              _$insertNode(_el$30, _$createTextNode(`—`));
-              _$effect(_$p => _$setProp(_el$30, "fg", props.theme.textMuted, _$p));
-              return _el$30;
+              var _el$29 = _$createElement("text");
+              _$insertNode(_el$29, _$createTextNode(`—`));
+              _$effect(_$p => _$setProp(_el$29, "fg", props.theme.textMuted, _$p));
+              return _el$29;
             })();
           },
           get children() {
@@ -428,6 +509,9 @@ function AccountBlock(props) {
                 get label() {
                   return row.label;
                 },
+                get labelWidth() {
+                  return row.labelWidth;
+                },
                 get window() {
                   return row.window;
                 },
@@ -440,9 +524,9 @@ function AccountBlock(props) {
         });
       }
     }), null);
-    _$insert(_el$22, _$createComponent(For, {
+    _$insert(_el$21, _$createComponent(For, {
       get each() {
-        return getAccountMetadataRows(props.resetCredits);
+        return getAccountMetadataRows(props.resetCredits, props.quota?.spendControl);
       },
       children: row => _$createComponent(StatRow, {
         get theme() {
@@ -461,16 +545,16 @@ function AccountBlock(props) {
       var _v$1 = props.marginTop ?? 0,
         _v$10 = props.theme.text,
         _v$11 = toneColor(props.theme, statusTone());
-      _v$1 !== _p$.e && (_p$.e = _$setProp(_el$22, "marginTop", _v$1, _p$.e));
-      _v$10 !== _p$.t && (_p$.t = _$setProp(_el$24, "fg", _v$10, _p$.t));
-      _v$11 !== _p$.a && (_p$.a = _$setProp(_el$26, "fg", _v$11, _p$.a));
+      _v$1 !== _p$.e && (_p$.e = _$setProp(_el$21, "marginTop", _v$1, _p$.e));
+      _v$10 !== _p$.t && (_p$.t = _$setProp(_el$23, "fg", _v$10, _p$.t));
+      _v$11 !== _p$.a && (_p$.a = _$setProp(_el$25, "fg", _v$11, _p$.a));
       return _p$;
     }, {
       e: undefined,
       t: undefined,
       a: undefined
     });
-    return _el$22;
+    return _el$21;
   })();
 }
 
@@ -497,27 +581,28 @@ function QuotaDialogContent(props) {
   const theme = () => props.api.theme.current;
   const enabledFallbacks = () => (state().fallbacks ?? []).filter(f => f.enabled);
   const activeId = () => resolveQuotaDialogActiveId(state(), props.sessionId);
+  const quotaLabelWidth = () => computeQuotaLabelWidth(renderedQuotas(state()));
   return (() => {
-    var _el$32 = _$createElement("box"),
+    var _el$31 = _$createElement("box"),
+      _el$32 = _$createElement("box"),
       _el$33 = _$createElement("box"),
-      _el$34 = _$createElement("box"),
-      _el$35 = _$createElement("text"),
-      _el$36 = _$createElement("b");
+      _el$34 = _$createElement("text"),
+      _el$35 = _$createElement("b");
+    _$insertNode(_el$31, _el$32);
+    _$setProp(_el$31, "flexDirection", 'column');
+    _$setProp(_el$31, "padding", 2);
+    _$setProp(_el$31, "width", '100%');
+    _$setProp(_el$31, "alignItems", 'center');
     _$insertNode(_el$32, _el$33);
     _$setProp(_el$32, "flexDirection", 'column');
-    _$setProp(_el$32, "padding", 2);
-    _$setProp(_el$32, "width", '100%');
-    _$setProp(_el$32, "alignItems", 'center');
+    _$setProp(_el$32, "width", 58);
     _$insertNode(_el$33, _el$34);
-    _$setProp(_el$33, "flexDirection", 'column');
-    _$setProp(_el$33, "width", 58);
+    _$setProp(_el$33, "width", '100%');
+    _$setProp(_el$33, "justifyContent", 'center');
+    _$setProp(_el$33, "marginBottom", 1);
     _$insertNode(_el$34, _el$35);
-    _$setProp(_el$34, "width", '100%');
-    _$setProp(_el$34, "justifyContent", 'center');
-    _$setProp(_el$34, "marginBottom", 1);
-    _$insertNode(_el$35, _el$36);
-    _$insertNode(_el$36, _$createTextNode(`Codex Quota`));
-    _$insert(_el$33, _$createComponent(AccountBlock, {
+    _$insertNode(_el$35, _$createTextNode(`Codex Quota`));
+    _$insert(_el$32, _$createComponent(AccountBlock, {
       get theme() {
         return theme();
       },
@@ -537,11 +622,14 @@ function QuotaDialogContent(props) {
       get pacingEnabled() {
         return prefs().sections.pacing;
       },
+      get labelWidth() {
+        return quotaLabelWidth();
+      },
       get resetCredits() {
         return state().main?.resetCredits;
       }
     }), null);
-    _$insert(_el$33, _$createComponent(Show, {
+    _$insert(_el$32, _$createComponent(Show, {
       get when() {
         return prefs().sections.fallbackAccounts;
       },
@@ -572,6 +660,9 @@ function QuotaDialogContent(props) {
             get pacingEnabled() {
               return prefs().sections.pacing;
             },
+            get labelWidth() {
+              return quotaLabelWidth();
+            },
             get resetCredits() {
               return fb.resetCredits;
             },
@@ -580,8 +671,8 @@ function QuotaDialogContent(props) {
         });
       }
     }), null);
-    _$effect(_$p => _$setProp(_el$35, "fg", theme().text, _$p));
-    return _el$32;
+    _$effect(_$p => _$setProp(_el$34, "fg", theme().text, _$p));
+    return _el$31;
   })();
 }
 
@@ -710,6 +801,7 @@ function QuotaSidebar(props) {
     route: sessionRouting().route
   });
   const activeAccount = () => resolveActiveAccount(sessionState());
+  const quotaLabelWidth = () => computeQuotaLabelWidth(renderedQuotas(state()));
   const activeQuotaSummary = () => getCollapsedQuotaSummary(activeAccount().quota);
   const activePacingDeficit = () => {
     if (!prefs().sections.pacing) return false;
@@ -730,33 +822,33 @@ function QuotaSidebar(props) {
   const refreshBackedOff = () => state().main?.refreshBackedOff === true;
   const degraded = () => killedNames().length > 0 || quotaBackedOff() || refreshBackedOff();
   return (() => {
-    var _el$38 = _$createElement("box"),
+    var _el$37 = _$createElement("box"),
+      _el$38 = _$createElement("box"),
       _el$39 = _$createElement("box"),
-      _el$40 = _$createElement("box"),
-      _el$41 = _$createElement("text"),
-      _el$42 = _$createElement("b");
+      _el$40 = _$createElement("text"),
+      _el$41 = _$createElement("b");
+    _$insertNode(_el$37, _el$38);
+    _$setProp(_el$37, "width", '100%');
+    _$setProp(_el$37, "flexDirection", 'column');
+    _$setProp(_el$37, "border", SINGLE_BORDER);
+    _$setProp(_el$37, "paddingTop", 1);
+    _$setProp(_el$37, "paddingBottom", 1);
+    _$setProp(_el$37, "paddingLeft", 1);
+    _$setProp(_el$37, "paddingRight", 1);
     _$insertNode(_el$38, _el$39);
     _$setProp(_el$38, "width", '100%');
-    _$setProp(_el$38, "flexDirection", 'column');
-    _$setProp(_el$38, "border", SINGLE_BORDER);
-    _$setProp(_el$38, "paddingTop", 1);
-    _$setProp(_el$38, "paddingBottom", 1);
-    _$setProp(_el$38, "paddingLeft", 1);
-    _$setProp(_el$38, "paddingRight", 1);
-    _$insertNode(_el$39, _el$40);
-    _$setProp(_el$39, "width", '100%');
-    _$setProp(_el$39, "flexDirection", 'row');
-    _$setProp(_el$39, "justifyContent", 'space-between');
-    _$setProp(_el$39, "alignItems", 'center');
-    _$setProp(_el$39, "onMouseDown", () => {
+    _$setProp(_el$38, "flexDirection", 'row');
+    _$setProp(_el$38, "justifyContent", 'space-between');
+    _$setProp(_el$38, "alignItems", 'center');
+    _$setProp(_el$38, "onMouseDown", () => {
       if (hasData()) props.controller.toggleCollapsed();
     });
+    _$insertNode(_el$39, _el$40);
+    _$setProp(_el$39, "paddingLeft", 1);
+    _$setProp(_el$39, "paddingRight", 1);
     _$insertNode(_el$40, _el$41);
-    _$setProp(_el$40, "paddingLeft", 1);
-    _$setProp(_el$40, "paddingRight", 1);
-    _$insertNode(_el$41, _el$42);
-    _$insert(_el$42, headerLabel);
-    _$insert(_el$39, _$createComponent(Show, {
+    _$insert(_el$41, headerLabel);
+    _$insert(_el$38, _$createComponent(Show, {
       get when() {
         return degraded();
       },
@@ -766,36 +858,36 @@ function QuotaSidebar(props) {
             return prefs().header.showVersion && PLUGIN_VERSION !== '';
           },
           get children() {
-            var _el$51 = _$createElement("text");
-            _$insert(_el$51, `v${PLUGIN_VERSION}`);
-            _$effect(_$p => _$setProp(_el$51, "fg", theme().textMuted, _$p));
-            return _el$51;
+            var _el$50 = _$createElement("text");
+            _$insert(_el$50, `v${PLUGIN_VERSION}`);
+            _$effect(_$p => _$setProp(_el$50, "fg", theme().textMuted, _$p));
+            return _el$50;
           }
         });
       },
       get children() {
-        var _el$43 = _$createElement("box"),
-          _el$44 = _$createElement("text"),
-          _el$45 = _$createElement("b");
+        var _el$42 = _$createElement("box"),
+          _el$43 = _$createElement("text"),
+          _el$44 = _$createElement("b");
+        _$insertNode(_el$42, _el$43);
+        _$setProp(_el$42, "paddingLeft", 1);
+        _$setProp(_el$42, "paddingRight", 1);
         _$insertNode(_el$43, _el$44);
-        _$setProp(_el$43, "paddingLeft", 1);
-        _$setProp(_el$43, "paddingRight", 1);
-        _$insertNode(_el$44, _el$45);
-        _$insertNode(_el$45, _$createTextNode(`LIMITED`));
+        _$insertNode(_el$44, _$createTextNode(`LIMITED`));
         _$effect(_p$ => {
           var _v$12 = theme().warning,
             _v$13 = theme().background;
-          _v$12 !== _p$.e && (_p$.e = _$setProp(_el$43, "backgroundColor", _v$12, _p$.e));
-          _v$13 !== _p$.t && (_p$.t = _$setProp(_el$44, "fg", _v$13, _p$.t));
+          _v$12 !== _p$.e && (_p$.e = _$setProp(_el$42, "backgroundColor", _v$12, _p$.e));
+          _v$13 !== _p$.t && (_p$.t = _$setProp(_el$43, "fg", _v$13, _p$.t));
           return _p$;
         }, {
           e: undefined,
           t: undefined
         });
-        return _el$43;
+        return _el$42;
       }
     }), null);
-    _$insert(_el$38, _$createComponent(Show, {
+    _$insert(_el$37, _$createComponent(Show, {
       get when() {
         return _$memo(() => !!collapsed())() && hasData();
       },
@@ -814,41 +906,41 @@ function QuotaSidebar(props) {
               },
               get fallback() {
                 return (() => {
-                  var _el$52 = _$createElement("text");
-                  _$insertNode(_el$52, _$createTextNode(`—`));
-                  _$effect(_$p => _$setProp(_el$52, "fg", theme().textMuted, _$p));
-                  return _el$52;
+                  var _el$51 = _$createElement("text");
+                  _$insertNode(_el$51, _$createTextNode(`—`));
+                  _$effect(_$p => _$setProp(_el$51, "fg", theme().textMuted, _$p));
+                  return _el$51;
                 })();
               },
               get children() {
-                var _el$47 = _$createElement("box"),
-                  _el$48 = _$createElement("text"),
-                  _el$49 = _$createElement("b"),
-                  _el$50 = _$createElement("text");
+                var _el$46 = _$createElement("box"),
+                  _el$47 = _$createElement("text"),
+                  _el$48 = _$createElement("b"),
+                  _el$49 = _$createElement("text");
+                _$insertNode(_el$46, _el$47);
+                _$insertNode(_el$46, _el$49);
+                _$setProp(_el$46, "flexDirection", 'row');
                 _$insertNode(_el$47, _el$48);
-                _$insertNode(_el$47, _el$50);
-                _$setProp(_el$47, "flexDirection", 'row');
-                _$insertNode(_el$48, _el$49);
-                _$insert(_el$49, () => activeQuotaSummary().text);
-                _$insert(_el$50, () => activeAccount().killed ? ' \u2298' : ' \u25cf');
+                _$insert(_el$48, () => activeQuotaSummary().text);
+                _$insert(_el$49, () => activeAccount().killed ? ' \u2298' : ' \u25cf');
                 _$effect(_p$ => {
                   var _v$14 = toneColor(theme(), activeQuotaTone()),
                     _v$15 = toneColor(theme(), activeAccount().killed ? 'err' : activeQuotaTone());
-                  _v$14 !== _p$.e && (_p$.e = _$setProp(_el$48, "fg", _v$14, _p$.e));
-                  _v$15 !== _p$.t && (_p$.t = _$setProp(_el$50, "fg", _v$15, _p$.t));
+                  _v$14 !== _p$.e && (_p$.e = _$setProp(_el$47, "fg", _v$14, _p$.e));
+                  _v$15 !== _p$.t && (_p$.t = _$setProp(_el$49, "fg", _v$15, _p$.t));
                   return _p$;
                 }, {
                   e: undefined,
                   t: undefined
                 });
-                return _el$47;
+                return _el$46;
               }
             });
           }
         });
       }
     }), null);
-    _$insert(_el$38, _$createComponent(Show, {
+    _$insert(_el$37, _$createComponent(Show, {
       get when() {
         return !collapsed() || !hasData();
       },
@@ -859,14 +951,14 @@ function QuotaSidebar(props) {
           },
           get fallback() {
             return (() => {
-              var _el$54 = _$createElement("box"),
-                _el$55 = _$createElement("text");
-              _$insertNode(_el$54, _el$55);
-              _$setProp(_el$54, "marginTop", 1);
-              _$setProp(_el$54, "width", '100%');
-              _$insertNode(_el$55, _$createTextNode(`Waiting for quota…`));
-              _$effect(_$p => _$setProp(_el$55, "fg", theme().textMuted, _$p));
-              return _el$54;
+              var _el$53 = _$createElement("box"),
+                _el$54 = _$createElement("text");
+              _$insertNode(_el$53, _el$54);
+              _$setProp(_el$53, "marginTop", 1);
+              _$setProp(_el$53, "width", '100%');
+              _$insertNode(_el$54, _$createTextNode(`Waiting for quota…`));
+              _$effect(_$p => _$setProp(_el$54, "fg", theme().textMuted, _$p));
+              return _el$53;
             })();
           },
           get children() {
@@ -900,6 +992,9 @@ function QuotaSidebar(props) {
                   get pacingEnabled() {
                     return prefs().sections.pacing;
                   },
+                  get labelWidth() {
+                    return quotaLabelWidth();
+                  },
                   get resetCredits() {
                     return state().main?.resetCredits;
                   }
@@ -934,6 +1029,9 @@ function QuotaSidebar(props) {
                         get pacingEnabled() {
                           return prefs().sections.pacing;
                         },
+                        get labelWidth() {
+                          return quotaLabelWidth();
+                        },
                         get resetCredits() {
                           return fb.resetCredits;
                         },
@@ -1058,16 +1156,16 @@ function QuotaSidebar(props) {
       var _v$16 = theme().borderActive,
         _v$17 = theme().accent,
         _v$18 = theme().background;
-      _v$16 !== _p$.e && (_p$.e = _$setProp(_el$38, "borderColor", _v$16, _p$.e));
-      _v$17 !== _p$.t && (_p$.t = _$setProp(_el$40, "backgroundColor", _v$17, _p$.t));
-      _v$18 !== _p$.a && (_p$.a = _$setProp(_el$41, "fg", _v$18, _p$.a));
+      _v$16 !== _p$.e && (_p$.e = _$setProp(_el$37, "borderColor", _v$16, _p$.e));
+      _v$17 !== _p$.t && (_p$.t = _$setProp(_el$39, "backgroundColor", _v$17, _p$.t));
+      _v$18 !== _p$.a && (_p$.a = _$setProp(_el$40, "fg", _v$18, _p$.a));
       return _p$;
     }, {
       e: undefined,
       t: undefined,
       a: undefined
     });
-    return _el$38;
+    return _el$37;
   })();
 }
 const tui = async api => {

package/src/tui-compiled/shared/logger.ts

@@ -85,12 +85,19 @@ function isSecretKey(key: string): boolean {
   // needed for debugging — so it is intentionally NOT redacted by name. The genuine
   // ChatGPT id is kept out of logs at the source instead.
   if (k === 'chatgptaccountid') return true
+  // Operator identity carried on a served vault credential. These arrived with
+  // the client widening that added `accountId`/`email`/`orgName`/`projectId`;
+  // they are personal data with no diagnostic value, so they never reach a log
+  // file. The structural guard is not logging a served credential wholesale —
+  // this list only closes the fields that exist today.
+  if (k === 'email' || k === 'orgname' || k === 'organizationname') return true
   if (k.includes('apikey')) return true
   if (k.endsWith('secret') || k.endsWith('password')) return true
   if (k.endsWith('token') && !k.endsWith('tokens')) return true
   return false
 }
-const TOKEN_VALUE = /\b(Bearer\s+[\w.-]+|sk-[\w-]+|eyJ[\w.-]+)\b/g
+const TOKEN_VALUE =
+  /\b(Bearer\s+[\w.-]+|sk-[\w-]+|eyJ[\w.-]+)\b|ckh_[A-Za-z0-9_-]{20,}/g
 export function redact(value: unknown): unknown {
   return redactInner(value, new WeakSet<object>())
 }
@@ -219,7 +226,7 @@ function emit(channel: string, level: Level, message: string, data?: unknown) {
   if (logFileSource === undefined) return
   if (ORDER[level] > ORDER[configuredLevel()]) return
   const line =
-    `[${new Date().toISOString()}] ${level.toUpperCase()} [${channel}] ${message}` +
+    `[${new Date().toISOString()}] ${level.toUpperCase()} [${channel}] ${redactStrings(message)}` +
     (data === undefined ? '' : safeSerialize(data)) +
     '\n'
   buffer.push(line)