@cortexkit/opencode-openai-auth 0.3.4 → 0.4.1

package/src/tui-compiled/tui.tsx

@@ -15,7 +15,7 @@ import { createEffect, createSignal, For, onCleanup, Show } from "opentui:runtim
 import { createLogger } from "./logger.js";
 import { createRpcClient } from "./rpc/rpc-client.js";
 import { getRpcDir } from "./rpc/rpc-dir.js";
-import { computeQuotaPacing, DEFAULT_SIDEBAR_STATE, FIVE_HOUR_MS, getCollapsedQuotaSummary, getSidebarState, resolveActiveAccount, SEVEN_DAY_MS } from "./sidebar-state.js";
+import { computeQuotaPacing, DEFAULT_SIDEBAR_STATE, getCollapsedQuotaSummary, getPresentQuotaWindows, getSidebarState, resolveActiveAccount, resolveSessionSidebarRouting } from "./sidebar-state.js";
 import { openCommandDialog } from "./tui/command-dialogs.js";
 import { computeEffectiveOrder, DEFAULT_SLOT_ORDER, PLUGIN_KEY, queueTuiPreferenceUpdate, readTuiPreferencesFile, resolveOpenaiAuthPrefs, watchTuiPreferences } from "./tui-preferences.js";
 const RPC_POLL_MS = 500;
@@ -200,6 +200,39 @@ function CollapsedRow(props) {
     return _el$8;
   })();
 }
+// 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 => ({
+    key: row.key,
+    label: row.label,
+    window: row.window,
+    pacing: pacingEnabled && row.windowMs !== null ? computeQuotaPacing(row.window, row.windowMs, now) : null
+  }));
+}
+export function isQuotaLoaded(quota) {
+  return quota !== null;
+}
+export function getQuotaMetadataRows(state) {
+  const rows = [];
+  if (state.planType) rows.push({
+    label: 'Plan',
+    value: state.planType
+  });
+  if (state.credits !== undefined) {
+    rows.push({
+      label: 'Credits',
+      value: String(state.credits)
+    });
+  }
+  return rows;
+}
+export function getAccountMetadataRows(resetCredits) {
+  return resetCredits === undefined ? [] : [{
+    label: 'resets',
+    value: String(resetCredits)
+  }];
+}
 
 // Quota window row: muted label left, tone-colored bar + percentage right,
 // with an optional muted reset suffix. When pacing data is present, the bar
@@ -328,7 +361,7 @@ 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 pacingFor = (window, windowMs) => props.pacingEnabled && window ? computeQuotaPacing(window, windowMs, Date.now()) : null;
+  const rows = () => buildQuotaRowsForDisplay(props.quota, Date.now(), props.pacingEnabled);
   return (() => {
     var _el$22 = _$createElement("box"),
       _el$23 = _$createElement("box"),
@@ -350,7 +383,7 @@ function AccountBlock(props) {
     _$insert(_el$27, statusWord);
     _$insert(_el$22, _$createComponent(Show, {
       get when() {
-        return props.quota;
+        return isQuotaLoaded(props.quota);
       },
       get fallback() {
         return (() => {
@@ -361,37 +394,62 @@ function AccountBlock(props) {
         })();
       },
       get children() {
-        return [_$createComponent(QuotaRow, {
-          get theme() {
-            return props.theme;
-          },
-          get appearance() {
-            return props.appearance;
-          },
-          label: "5h",
-          get window() {
-            return props.quota?.primary;
-          },
-          get pacing() {
-            return pacingFor(props.quota?.primary, FIVE_HOUR_MS);
-          }
-        }), _$createComponent(QuotaRow, {
-          get theme() {
-            return props.theme;
-          },
-          get appearance() {
-            return props.appearance;
+        return _$createComponent(Show, {
+          get when() {
+            return rows().length > 0;
           },
-          label: "7d",
-          get window() {
-            return props.quota?.secondary;
+          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;
+            })();
           },
-          get pacing() {
-            return pacingFor(props.quota?.secondary, SEVEN_DAY_MS);
+          get children() {
+            return _$createComponent(For, {
+              get each() {
+                return rows();
+              },
+              children: row => _$createComponent(QuotaRow, {
+                get theme() {
+                  return props.theme;
+                },
+                get appearance() {
+                  return props.appearance;
+                },
+                get label() {
+                  return row.label;
+                },
+                get window() {
+                  return row.window;
+                },
+                get pacing() {
+                  return row.pacing;
+                }
+              })
+            });
           }
-        })];
+        });
       }
     }), null);
+    _$insert(_el$22, _$createComponent(For, {
+      get each() {
+        return getAccountMetadataRows(props.resetCredits);
+      },
+      children: row => _$createComponent(StatRow, {
+        get theme() {
+          return props.theme;
+        },
+        get label() {
+          return row.label;
+        },
+        get value() {
+          return row.value;
+        },
+        tone: "text"
+      })
+    }), null);
     _$effect(_p$ => {
       var _v$1 = props.marginTop ?? 0,
         _v$10 = props.theme.text,
@@ -431,27 +489,28 @@ function QuotaDialogContent(props) {
   setTimeout(refresh, 0);
   const theme = () => props.api.theme.current;
   const enabledFallbacks = () => (state().fallbacks ?? []).filter(f => f.enabled);
+  const activeId = () => resolveQuotaDialogActiveId(state(), props.sessionId);
   return (() => {
-    var _el$30 = _$createElement("box"),
-      _el$31 = _$createElement("box"),
-      _el$32 = _$createElement("box"),
-      _el$33 = _$createElement("text"),
-      _el$34 = _$createElement("b");
-    _$insertNode(_el$30, _el$31);
-    _$setProp(_el$30, "flexDirection", 'column');
-    _$setProp(_el$30, "padding", 2);
-    _$setProp(_el$30, "width", '100%');
-    _$setProp(_el$30, "alignItems", 'center');
-    _$insertNode(_el$31, _el$32);
-    _$setProp(_el$31, "flexDirection", 'column');
-    _$setProp(_el$31, "width", 58);
+    var _el$32 = _$createElement("box"),
+      _el$33 = _$createElement("box"),
+      _el$34 = _$createElement("box"),
+      _el$35 = _$createElement("text"),
+      _el$36 = _$createElement("b");
     _$insertNode(_el$32, _el$33);
+    _$setProp(_el$32, "flexDirection", 'column');
+    _$setProp(_el$32, "padding", 2);
     _$setProp(_el$32, "width", '100%');
-    _$setProp(_el$32, "justifyContent", 'center');
-    _$setProp(_el$32, "marginBottom", 1);
+    _$setProp(_el$32, "alignItems", 'center');
     _$insertNode(_el$33, _el$34);
-    _$insertNode(_el$34, _$createTextNode(`Codex Quota`));
-    _$insert(_el$31, _$createComponent(AccountBlock, {
+    _$setProp(_el$33, "flexDirection", 'column');
+    _$setProp(_el$33, "width", 58);
+    _$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, {
       get theme() {
         return theme();
       },
@@ -466,13 +525,16 @@ function QuotaDialogContent(props) {
         return state().main?.killed ?? false;
       },
       get active() {
-        return state().activeId === 'main';
+        return activeId() === 'main';
       },
       get pacingEnabled() {
         return prefs().sections.pacing;
+      },
+      get resetCredits() {
+        return state().main?.resetCredits;
       }
     }), null);
-    _$insert(_el$31, _$createComponent(Show, {
+    _$insert(_el$33, _$createComponent(Show, {
       get when() {
         return prefs().sections.fallbackAccounts;
       },
@@ -498,18 +560,21 @@ function QuotaDialogContent(props) {
               return fb.killed;
             },
             get active() {
-              return state().activeId === fb.id;
+              return activeId() === fb.id;
             },
             get pacingEnabled() {
               return prefs().sections.pacing;
             },
+            get resetCredits() {
+              return fb.resetCredits;
+            },
             marginTop: 1
           })
         });
       }
     }), null);
-    _$effect(_$p => _$setProp(_el$33, "fg", theme().text, _$p));
-    return _el$30;
+    _$effect(_$p => _$setProp(_el$35, "fg", theme().text, _$p));
+    return _el$32;
   })();
 }
 
@@ -518,6 +583,9 @@ function QuotaDialogContent(props) {
 export async function readStateFromFile() {
   return getSidebarState();
 }
+export function resolveQuotaDialogActiveId(state, sessionId, now = Date.now()) {
+  return sessionId ? resolveSessionSidebarRouting(state, sessionId, now).activeId : state.activeId;
+}
 // The TUI may unmount and remount sidebar_content when the user switches
 // views (e.g. main -> subagent -> main). A remount re-runs the component
 // body, so any signal created inside the component would reset to its
@@ -607,15 +675,17 @@ function QuotaSidebar(props) {
     const name = prefs().header.label;
     return !hasData() ? name : collapsed() ? `\u25b6 ${name}` : `\u25bc ${name}`;
   };
-  const activeAccount = () => resolveActiveAccount(state());
+  const sessionRouting = () => resolveSessionSidebarRouting(state(), props.sessionId);
+  const sessionState = () => ({
+    ...state(),
+    activeId: sessionRouting().activeId,
+    route: sessionRouting().route
+  });
+  const activeAccount = () => resolveActiveAccount(sessionState());
   const activeQuotaSummary = () => getCollapsedQuotaSummary(activeAccount().quota);
   const activePacingDeficit = () => {
     if (!prefs().sections.pacing) return false;
-    const quota = activeAccount().quota;
-    if (!quota) return false;
-    const now = Date.now();
-    const windows = [[quota.primary, FIVE_HOUR_MS], [quota.secondary, SEVEN_DAY_MS]];
-    return windows.some(([w, ms]) => w != null && computeQuotaPacing(w, ms, now)?.state === 'deficit');
+    return buildQuotaRowsForDisplay(activeAccount().quota, Date.now(), true).some(row => row.pacing?.state === 'deficit');
   };
   const activeQuotaTone = () => {
     const summary = activeQuotaSummary();
@@ -632,33 +702,33 @@ function QuotaSidebar(props) {
   const refreshBackedOff = () => state().main?.refreshBackedOff === true;
   const degraded = () => killedNames().length > 0 || quotaBackedOff() || refreshBackedOff();
   return (() => {
-    var _el$36 = _$createElement("box"),
-      _el$37 = _$createElement("box"),
-      _el$38 = _$createElement("box"),
-      _el$39 = _$createElement("text"),
-      _el$40 = _$createElement("b");
-    _$insertNode(_el$36, _el$37);
-    _$setProp(_el$36, "width", '100%');
-    _$setProp(_el$36, "flexDirection", 'column');
-    _$setProp(_el$36, "border", SINGLE_BORDER);
-    _$setProp(_el$36, "paddingTop", 1);
-    _$setProp(_el$36, "paddingBottom", 1);
-    _$setProp(_el$36, "paddingLeft", 1);
-    _$setProp(_el$36, "paddingRight", 1);
-    _$insertNode(_el$37, _el$38);
-    _$setProp(_el$37, "width", '100%');
-    _$setProp(_el$37, "flexDirection", 'row');
-    _$setProp(_el$37, "justifyContent", 'space-between');
-    _$setProp(_el$37, "alignItems", 'center');
-    _$setProp(_el$37, "onMouseDown", () => {
-      if (hasData()) props.controller.toggleCollapsed();
-    });
+    var _el$38 = _$createElement("box"),
+      _el$39 = _$createElement("box"),
+      _el$40 = _$createElement("box"),
+      _el$41 = _$createElement("text"),
+      _el$42 = _$createElement("b");
     _$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);
-    _$insert(_el$40, headerLabel);
-    _$insert(_el$37, _$createComponent(Show, {
+    _$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", () => {
+      if (hasData()) props.controller.toggleCollapsed();
+    });
+    _$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, {
       get when() {
         return degraded();
       },
@@ -668,36 +738,36 @@ function QuotaSidebar(props) {
             return prefs().header.showVersion && PLUGIN_VERSION !== '';
           },
           get children() {
-            var _el$49 = _$createElement("text");
-            _$insert(_el$49, `v${PLUGIN_VERSION}`);
-            _$effect(_$p => _$setProp(_el$49, "fg", theme().textMuted, _$p));
-            return _el$49;
+            var _el$51 = _$createElement("text");
+            _$insert(_el$51, `v${PLUGIN_VERSION}`);
+            _$effect(_$p => _$setProp(_el$51, "fg", theme().textMuted, _$p));
+            return _el$51;
           }
         });
       },
       get children() {
-        var _el$41 = _$createElement("box"),
-          _el$42 = _$createElement("text"),
-          _el$43 = _$createElement("b");
-        _$insertNode(_el$41, _el$42);
-        _$setProp(_el$41, "paddingLeft", 1);
-        _$setProp(_el$41, "paddingRight", 1);
-        _$insertNode(_el$42, _el$43);
-        _$insertNode(_el$43, _$createTextNode(`LIMITED`));
+        var _el$43 = _$createElement("box"),
+          _el$44 = _$createElement("text"),
+          _el$45 = _$createElement("b");
+        _$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`));
         _$effect(_p$ => {
           var _v$12 = theme().warning,
             _v$13 = theme().background;
-          _v$12 !== _p$.e && (_p$.e = _$setProp(_el$41, "backgroundColor", _v$12, _p$.e));
-          _v$13 !== _p$.t && (_p$.t = _$setProp(_el$42, "fg", _v$13, _p$.t));
+          _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));
           return _p$;
         }, {
           e: undefined,
           t: undefined
         });
-        return _el$41;
+        return _el$43;
       }
     }), null);
-    _$insert(_el$36, _$createComponent(Show, {
+    _$insert(_el$38, _$createComponent(Show, {
       get when() {
         return _$memo(() => !!collapsed())() && hasData();
       },
@@ -716,41 +786,41 @@ function QuotaSidebar(props) {
               },
               get fallback() {
                 return (() => {
-                  var _el$50 = _$createElement("text");
-                  _$insertNode(_el$50, _$createTextNode(`—`));
-                  _$effect(_$p => _$setProp(_el$50, "fg", theme().textMuted, _$p));
-                  return _el$50;
+                  var _el$52 = _$createElement("text");
+                  _$insertNode(_el$52, _$createTextNode(`—`));
+                  _$effect(_$p => _$setProp(_el$52, "fg", theme().textMuted, _$p));
+                  return _el$52;
                 })();
               },
               get children() {
-                var _el$45 = _$createElement("box"),
-                  _el$46 = _$createElement("text"),
-                  _el$47 = _$createElement("b"),
-                  _el$48 = _$createElement("text");
-                _$insertNode(_el$45, _el$46);
-                _$insertNode(_el$45, _el$48);
-                _$setProp(_el$45, "flexDirection", 'row');
-                _$insertNode(_el$46, _el$47);
-                _$insert(_el$47, () => activeQuotaSummary().text);
-                _$insert(_el$48, () => activeAccount().killed ? ' \u2298' : ' \u25cf');
+                var _el$47 = _$createElement("box"),
+                  _el$48 = _$createElement("text"),
+                  _el$49 = _$createElement("b"),
+                  _el$50 = _$createElement("text");
+                _$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');
                 _$effect(_p$ => {
                   var _v$14 = toneColor(theme(), activeQuotaTone()),
                     _v$15 = toneColor(theme(), activeAccount().killed ? 'err' : activeQuotaTone());
-                  _v$14 !== _p$.e && (_p$.e = _$setProp(_el$46, "fg", _v$14, _p$.e));
-                  _v$15 !== _p$.t && (_p$.t = _$setProp(_el$48, "fg", _v$15, _p$.t));
+                  _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));
                   return _p$;
                 }, {
                   e: undefined,
                   t: undefined
                 });
-                return _el$45;
+                return _el$47;
               }
             });
           }
         });
       }
     }), null);
-    _$insert(_el$36, _$createComponent(Show, {
+    _$insert(_el$38, _$createComponent(Show, {
       get when() {
         return !collapsed() || !hasData();
       },
@@ -761,14 +831,14 @@ function QuotaSidebar(props) {
           },
           get fallback() {
             return (() => {
-              var _el$52 = _$createElement("box"),
-                _el$53 = _$createElement("text");
-              _$insertNode(_el$52, _el$53);
-              _$setProp(_el$52, "marginTop", 1);
-              _$setProp(_el$52, "width", '100%');
-              _$insertNode(_el$53, _$createTextNode(`Waiting for quota…`));
-              _$effect(_$p => _$setProp(_el$53, "fg", theme().textMuted, _$p));
-              return _el$52;
+              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;
             })();
           },
           get children() {
@@ -797,10 +867,13 @@ function QuotaSidebar(props) {
                     return state().main?.killed ?? false;
                   },
                   get active() {
-                    return state().activeId === 'main';
+                    return sessionRouting().activeId === 'main';
                   },
                   get pacingEnabled() {
                     return prefs().sections.pacing;
+                  },
+                  get resetCredits() {
+                    return state().main?.resetCredits;
                   }
                 }), _$createComponent(Show, {
                   get when() {
@@ -828,11 +901,14 @@ function QuotaSidebar(props) {
                           return fb.killed;
                         },
                         get active() {
-                          return state().activeId === fb.id;
+                          return sessionRouting().activeId === fb.id;
                         },
                         get pacingEnabled() {
                           return prefs().sections.pacing;
                         },
+                        get resetCredits() {
+                          return fb.resetCredits;
+                        },
                         marginTop: 1
                       })
                     });
@@ -857,50 +933,27 @@ function QuotaSidebar(props) {
               },
               label: "Route",
               get value() {
-                return state().route;
+                return sessionRouting().route;
               },
               tone: "accent"
             })];
           }
-        }), _$createComponent(Show, {
-          get when() {
-            return state().planType || state().credits != null;
+        }), _$createComponent(For, {
+          get each() {
+            return getQuotaMetadataRows(state());
           },
-          get children() {
-            return [_$createComponent(Show, {
-              get when() {
-                return state().planType;
-              },
-              get children() {
-                return _$createComponent(StatRow, {
-                  get theme() {
-                    return theme();
-                  },
-                  label: "Plan",
-                  get value() {
-                    return state().planType ?? '\u2014';
-                  },
-                  tone: "text"
-                });
-              }
-            }), _$createComponent(Show, {
-              get when() {
-                return state().credits != null;
-              },
-              get children() {
-                return _$createComponent(StatRow, {
-                  get theme() {
-                    return theme();
-                  },
-                  label: "Credits",
-                  get value() {
-                    return String(state().credits);
-                  },
-                  tone: "text"
-                });
-              }
-            })];
-          }
+          children: row => _$createComponent(StatRow, {
+            get theme() {
+              return theme();
+            },
+            get label() {
+              return row.label;
+            },
+            get value() {
+              return row.value;
+            },
+            tone: "text"
+          })
         }), _$createComponent(Show, {
           get when() {
             return _$memo(() => !!degraded())() && prefs().sections.health;
@@ -968,16 +1021,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$36, "borderColor", _v$16, _p$.e));
-      _v$17 !== _p$.t && (_p$.t = _$setProp(_el$38, "backgroundColor", _v$17, _p$.t));
-      _v$18 !== _p$.a && (_p$.a = _$setProp(_el$39, "fg", _v$18, _p$.a));
+      _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));
       return _p$;
     }, {
       e: undefined,
       t: undefined,
       a: undefined
     });
-    return _el$36;
+    return _el$38;
   })();
 }
 const tui = async api => {
@@ -986,10 +1039,13 @@ const tui = async api => {
   api.slots.register({
     order: computeEffectiveOrder(root, PLUGIN_KEY, DEFAULT_SLOT_ORDER),
     slots: {
-      sidebar_content(_ctx, _props) {
+      sidebar_content(_ctx, props) {
         return _$createComponent(QuotaSidebar, {
           api: api,
-          controller: controller
+          controller: controller,
+          get sessionId() {
+            return props.session_id;
+          }
         });
       }
     }
@@ -1019,14 +1075,15 @@ const tui = async api => {
             api.ui.dialog.setSize('xlarge');
             api.ui.dialog.replace(() => _$createComponent(QuotaDialogContent, {
               api: api,
-              controller: controller
+              controller: controller,
+              sessionId: sessionId
             }));
             continue;
           }
           openCommandDialog(api, message.payload, (command, args) => rpcClient.apply({
             command,
             arguments: args
-          }));
+          }), sessionId);
         }
       }).catch(() => {}).finally(() => {
         rpcInFlight = false;