@cortexkit/opencode-openai-auth 0.8.0 → 0.9.1

package/src/tui-compiled/runtime/sidebar-state.ts

@@ -6,10 +6,25 @@ export interface QuotaWindow {
   windowMinutes?: number
 }
 
+export interface SpendControlReading {
+  limit: number
+  used: number
+  remaining: number
+  usedPercent: number
+  remainingPercent: number
+  resetsAt?: string
+  unit?: string
+  source?: string
+  reached: boolean
+}
+
 export interface AccountQuota {
   checkedAt?: number
   primary?: QuotaWindow
   secondary?: QuotaWindow
+  spendControl?: SpendControlReading
+  // The source reported that no credit budget exists; see OAuthQuotaSnapshot.
+  spendControlCleared?: true
   resetCreditsAvailable?: number
 }
 
@@ -88,6 +103,17 @@ export interface SidebarAccountState {
   killed: boolean
   enabled: boolean
   resetCredits?: number
+  custody?: SidebarAccountCustody
+}
+
+export type SidebarCustodyState = 'vault' | 'needsLogin' | 'local' | 'inert'
+
+export type SidebarCustodyReason = CustodyInertReason | 'corrupt'
+
+export interface SidebarAccountCustody {
+  state: SidebarCustodyState
+  reason?: SidebarCustodyReason
+  recordVersion?: number
 }
 
 export interface ActiveRoutingEntry {
@@ -132,6 +158,7 @@ export interface SidebarState {
     quota: AccountQuota | null
     /** ChatGPT identity of the main account this quota belongs to. */
     mainAccountId?: string
+    custody?: SidebarAccountCustody
     killed: boolean
     quotaBackedOff?: boolean
     quotaBackoffUntil?: number
@@ -156,6 +183,11 @@ import { chmod, mkdir, readFile, rename, rm, writeFile } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { dirname, join } from 'node:path'
 import { acquireRefreshFileLock } from '../shared/internal.ts'
+import {
+  CUSTODY_INERT_REASONS,
+  type CustodyInertReason,
+  type CustodyVerdict,
+} from './core-custody-state.ts'
 import { createLogger } from './logger.ts'
 
 const logSb = createLogger('sidebar')
@@ -183,6 +215,49 @@ function resetCreditsField(value: unknown): { resetCredits?: number } {
   return credits !== undefined ? { resetCredits: credits } : {}
 }
 
+const CUSTODY_STATES = new Set<SidebarCustodyState>([
+  'vault',
+  'needsLogin',
+  'local',
+  'inert',
+])
+
+const CUSTODY_REASONS = new Set<SidebarCustodyReason>([
+  ...CUSTODY_INERT_REASONS,
+  'corrupt',
+])
+
+/**
+ * Tolerant reader for the per-fallback `custody` projection. Unknown state
+ * or reason values are dropped (NOT replaced with a default — a stale state
+ * file with an experimental `vaultHealing` value must not silently render
+ * as `local`, it must render as no-projection-at-all). Valid values round-
+ * trip byte-identical. The output contains only `state` and `reason`.
+ */
+function normalizeSidebarCustody(
+  value: unknown,
+): SidebarAccountCustody | undefined {
+  if (value === null || typeof value !== 'object' || Array.isArray(value)) {
+    return undefined
+  }
+  const c = value as Record<string, unknown>
+  if (
+    typeof c.state !== 'string' ||
+    !CUSTODY_STATES.has(c.state as SidebarCustodyState)
+  ) {
+    return undefined
+  }
+  const state = c.state as SidebarCustodyState
+  const out: SidebarAccountCustody = { state }
+  if (
+    typeof c.reason === 'string' &&
+    CUSTODY_REASONS.has(c.reason as SidebarCustodyReason)
+  ) {
+    out.reason = c.reason as SidebarCustodyReason
+  }
+  return out
+}
+
 function normalizeActiveRouting(value: unknown): ActiveRoutingMap | undefined {
   if (value === null || typeof value !== 'object' || Array.isArray(value)) {
     return undefined
@@ -276,6 +351,23 @@ export function getSidebarStateFile(): string {
   return process.env[STATE_FILE_ENV] || DEFAULT_STATE_FILE
 }
 
+export function projectCustodyForSidebar(
+  verdict: CustodyVerdict,
+): SidebarAccountCustody {
+  switch (verdict.kind) {
+    case 'LOCAL':
+      return { state: 'local' }
+    case 'VAULT':
+      return { state: 'vault' }
+    case 'INERT':
+      return { state: 'inert', reason: verdict.reason }
+    case 'NEEDS_LOGIN':
+      return verdict.reason === 'corrupt'
+        ? { state: 'needsLogin', reason: 'corrupt' }
+        : { state: 'needsLogin' }
+  }
+}
+
 export const DEFAULT_SIDEBAR_STATE: SidebarState = {
   main: { quota: null, killed: false },
   fallbacks: [],
@@ -315,6 +407,10 @@ export function normalizeSidebarState(raw: unknown): SidebarState {
       ...(typeof m.mainAccountId === 'string'
         ? { mainAccountId: m.mainAccountId }
         : {}),
+      ...(() => {
+        const custody = normalizeSidebarCustody(m.custody)
+        return custody ? { custody } : {}
+      })(),
       // Preserve optional backoff fields if present
       ...(typeof m.quotaBackedOff === 'boolean'
         ? { quotaBackedOff: m.quotaBackedOff }
@@ -347,17 +443,21 @@ export function normalizeSidebarState(raw: unknown): SidebarState {
             !Array.isArray(entry) &&
             typeof (entry as Record<string, unknown>).id === 'string',
         )
-        .map((e) => ({
-          id: e.id as string,
-          label: typeof e.label === 'string' ? e.label : undefined,
-          ...(typeof e.accountId === 'string'
-            ? { accountId: e.accountId }
-            : {}),
-          quota: ('quota' in e ? e.quota : null) as AccountQuota | null,
-          killed: typeof e.killed === 'boolean' ? e.killed : false,
-          enabled: typeof e.enabled === 'boolean' ? e.enabled : true,
-          ...resetCreditsField(e.resetCredits),
-        }))
+        .map((e) => {
+          const custody = normalizeSidebarCustody(e.custody)
+          return {
+            id: e.id as string,
+            label: typeof e.label === 'string' ? e.label : undefined,
+            ...(typeof e.accountId === 'string'
+              ? { accountId: e.accountId }
+              : {}),
+            quota: ('quota' in e ? e.quota : null) as AccountQuota | null,
+            killed: typeof e.killed === 'boolean' ? e.killed : false,
+            enabled: typeof e.enabled === 'boolean' ? e.enabled : true,
+            ...resetCreditsField(e.resetCredits),
+            ...(custody ? { custody } : {}),
+          }
+        })
     : []
 
   // activeId — string or undefined
@@ -428,6 +528,27 @@ export function isUsableRoutingEntry(
   )
 }
 
+// The credit budget's own exhaustion signal, shared by admission and sticky
+// migration so both agree on what "spent" means. `reached` is the provider's
+// authoritative boolean — the percentage is only a display approximation — and
+// the check fails open on a missing or lapsed reset exactly like a rate-limit
+// window, so a stale or corrupt reading never blocks.
+export function spendControlExhaustedResetAt(
+  quota: AccountQuota | null | undefined,
+  now = Date.now(),
+): { resetsAt: string; resetAtMs: number } | undefined {
+  const spendControl = quota?.spendControl
+  if (
+    spendControl?.reached !== true ||
+    typeof spendControl.resetsAt !== 'string'
+  ) {
+    return undefined
+  }
+  const resetAtMs = Date.parse(spendControl.resetsAt)
+  if (!Number.isFinite(resetAtMs) || resetAtMs <= now) return undefined
+  return { resetsAt: spendControl.resetsAt, resetAtMs }
+}
+
 // Earliest future reset among the quota's exhausted windows, or undefined when
 // no present window is exhausted. Every present window is evaluated — matching
 // the admission policy, which rejects an account when ANY live window is below
@@ -454,6 +575,12 @@ export function exhaustedQuotaResetAt(
       earliest = { resetsAt: window.resetsAt, resetAtMs }
     }
   }
+  // The credit budget is a third axis on its own reset clock (a month, not
+  // 5h/7d), judged by the same shared signal sticky migration uses.
+  const spendReset = spendControlExhaustedResetAt(quota, now)
+  if (spendReset && (!earliest || spendReset.resetAtMs < earliest.resetAtMs)) {
+    earliest = spendReset
+  }
   return earliest
 }
 
@@ -979,6 +1106,19 @@ function freshestWindow(
 // of the merged result. Only safe when both snapshots share an account identity
 // (sameAccountIdentity) — an identity switch must whole-pick (freshestQuota) so
 // windows from two accounts are never combined.
+// The fresher side decides the budget when it knows anything about it: its own
+// reading, or its report that no budget exists. Only when it says nothing (a
+// header or WebSocket push, which never carries spend control) does the other
+// side's reading survive, and even then not if that side reported none.
+function mergeSpendControl(
+  fresher: AccountQuota,
+  older: AccountQuota,
+): SpendControlReading | undefined {
+  if (fresher.spendControl !== undefined) return fresher.spendControl
+  if (fresher.spendControlCleared === true) return undefined
+  return older.spendControl
+}
+
 function mergeQuotaByWindow(
   incoming: AccountQuota | null,
   existing: AccountQuota | null,
@@ -1004,6 +1144,13 @@ function mergeQuotaByWindow(
     incoming.checkedAt,
     existing.checkedAt,
   )
+  const spendControl = existingSnapshotIsFresher
+    ? mergeSpendControl(existing, incoming)
+    : mergeSpendControl(incoming, existing)
+  const spendControlCleared =
+    spendControl === undefined &&
+    (incoming.spendControlCleared === true ||
+      existing.spendControlCleared === true)
   let checkedAt: number | undefined
   for (const stamp of [
     finiteWindowCheckedAt(primary),
@@ -1013,10 +1160,19 @@ function mergeQuotaByWindow(
       checkedAt = checkedAt === undefined ? stamp : Math.max(checkedAt, stamp)
     }
   }
+  // Both budget fields are decided above, so neither may leak in from the
+  // spread: an older incoming budget must not survive a fresher "no budget".
+  const {
+    spendControl: _incomingSpendControl,
+    spendControlCleared: _incomingCleared,
+    ...incomingRest
+  } = incoming
   return {
-    ...incoming,
+    ...incomingRest,
     primary,
     secondary,
+    ...(spendControl !== undefined ? { spendControl } : {}),
+    ...(spendControlCleared ? { spendControlCleared: true as const } : {}),
     checkedAt: checkedAt ?? incoming.checkedAt,
   }
 }

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

@@ -466,7 +466,7 @@ export function openCommandDialog(api, payload, apply, sessionId) {
     return;
   }
   if (payload.command === 'openai-account') {
-    openAccountDialog(api, apply, sessionId);
+    openAccountDialog(api, apply, sessionId, payload);
     return;
   }
 
@@ -507,8 +507,49 @@ export function buildAccountDialogRows(state, sessionId) {
     description: formatQuotaWindows(fb.quota)
   }))];
 }
-function openAccountDialog(api, apply, sessionId) {
+export function accountDialogModeOption(mode) {
+  const claustrum = mode === 'claustrum';
+  return {
+    title: claustrum ? 'Leave Claustrum' : 'Enter Claustrum',
+    value: claustrum ? '__local__' : '__claustrum__',
+    description: claustrum ? 'Require fresh local logins before local refresh resumes' : 'Verify every enabled account before custody takes over'
+  };
+}
+export function buildFallbackAccountOptions(input) {
+  const name = input.label ?? input.id;
+  const options = [{
+    title: input.enabled ? 'Disable' : 'Enable',
+    value: input.enabled ? 'disable' : 'enable',
+    description: `${input.enabled ? 'Disable' : 'Enable'} ${name}`
+  }, {
+    title: 'Remove',
+    value: 'remove',
+    description: `Remove ${name}`
+  }];
+  if (input.index > 0) {
+    options.push({
+      title: 'Move up',
+      value: 'move_up',
+      description: 'Swap with the preceding fallback'
+    });
+  }
+  if (input.index < input.count - 1) {
+    options.push({
+      title: 'Move down',
+      value: 'move_down',
+      description: 'Swap with the following fallback'
+    });
+  }
+  options.push({
+    title: 'Back',
+    value: 'back',
+    description: 'Return to account list'
+  });
+  return options;
+}
+function openAccountDialog(api, apply, sessionId, payload) {
   const DialogConfirm = api.ui.DialogConfirm;
+  let claustrumMode = payload?.knobs.claustrumMode;
   function showL1() {
     void getSidebarState().then(state => {
       const DialogSelectInner = api.ui.DialogSelect;
@@ -516,13 +557,24 @@ function openAccountDialog(api, apply, sessionId) {
       api.ui.dialog.replace(() => _$createComponent(DialogSelectInner, {
         title: "OpenAI Accounts",
         get options() {
-          return [...buildAccountDialogRows(state, sessionId), {
+          return [accountDialogModeOption(claustrumMode), ...buildAccountDialogRows(state, sessionId), {
             title: 'Add account\u2026',
             value: '__add__',
             description: 'Sign in to a new OpenAI account'
           }];
         },
         onSelect: option => {
+          if (option.value === '__claustrum__' || option.value === '__local__') {
+            const args = option.value === '__claustrum__' ? 'claustrum' : 'local';
+            void apply('openai-account', args).then(r => {
+              api.ui.toast({
+                message: r.text
+              });
+              claustrumMode = r.knobs.claustrumMode;
+              showL1();
+            });
+            return;
+          }
           if (option.value === '__add__') {
             showAddFlow();
             return;
@@ -544,36 +596,12 @@ function openAccountDialog(api, apply, sessionId) {
         showL1();
         return;
       }
-      const options = [];
-      options.push({
-        title: 'Remove',
-        value: 'remove',
-        description: `Remove ${fb.label ?? fb.id}`
-      });
-      if (fbIndex > 0) {
-        const neighbor = state.fallbacks[fbIndex - 1];
-        if (neighbor) {
-          options.push({
-            title: 'Move up',
-            value: 'move_up',
-            description: `Swap with ${neighbor.label ?? neighbor.id}`
-          });
-        }
-      }
-      if (fbIndex < state.fallbacks.length - 1) {
-        const neighbor = state.fallbacks[fbIndex + 1];
-        if (neighbor) {
-          options.push({
-            title: 'Move down',
-            value: 'move_down',
-            description: `Swap with ${neighbor.label ?? neighbor.id}`
-          });
-        }
-      }
-      options.push({
-        title: 'Back',
-        value: 'back',
-        description: 'Return to account list'
+      const options = buildFallbackAccountOptions({
+        id: fb.id,
+        label: fb.label,
+        enabled: fb.enabled,
+        index: fbIndex,
+        count: state.fallbacks.length
       });
       api.ui.dialog.setSize('xlarge');
       api.ui.dialog.replace(() => _$createComponent(DialogSelectInner, {
@@ -601,6 +629,15 @@ function openAccountDialog(api, apply, sessionId) {
             }));
             return;
           }
+          if (option.value === 'enable' || option.value === 'disable') {
+            void apply('openai-account', `${option.value} ${id}`).then(r => {
+              api.ui.toast({
+                message: r.text
+              });
+              showL1();
+            });
+            return;
+          }
           if (option.value === 'move_up') {
             const neighbor = state.fallbacks[fbIndex - 1];
             if (neighbor) {