@cortexkit/opencode-anthropic-auth 1.12.2 → 1.14.0

package/src/sidebar-state.ts

@@ -4,9 +4,17 @@ export interface QuotaWindow {
   resetsAt?: string
 }
 
+export interface ScopedQuotaWindow extends QuotaWindow {
+  id: string
+  title: string
+  modelId?: string
+  modelName: string
+}
+
 export interface AccountQuota {
   five_hour?: QuotaWindow
   seven_day?: QuotaWindow
+  scoped?: ScopedQuotaWindow[]
 }
 
 export interface SidebarAccountState {
@@ -65,13 +73,71 @@ function isRecord(v: unknown): v is Record<string, unknown> {
   return v !== null && typeof v === 'object' && !Array.isArray(v)
 }
 
+function normalizeQuotaWindow(value: unknown): QuotaWindow | undefined {
+  if (!isRecord(value)) return undefined
+  const usedPercent = Number(value.usedPercent)
+  const remainingPercent = Number(value.remainingPercent)
+  if (!Number.isFinite(usedPercent) || !Number.isFinite(remainingPercent)) {
+    return undefined
+  }
+  return {
+    usedPercent,
+    remainingPercent,
+    resetsAt: typeof value.resetsAt === 'string' ? value.resetsAt : undefined,
+  }
+}
+
+function normalizeAccountQuota(value: unknown): AccountQuota | null {
+  if (!isRecord(value)) return null
+  const quota: AccountQuota = {}
+  const fiveHour = normalizeQuotaWindow(value.five_hour)
+  const sevenDay = normalizeQuotaWindow(value.seven_day)
+  if (fiveHour) quota.five_hour = fiveHour
+  if (sevenDay) quota.seven_day = sevenDay
+
+  if (Array.isArray(value.scoped)) {
+    const scoped = value.scoped
+      .map((entry): ScopedQuotaWindow | undefined => {
+        if (!isRecord(entry)) return undefined
+        const window = normalizeQuotaWindow(entry)
+        if (!window) return undefined
+        if (typeof entry.id !== 'string' || !entry.id.trim()) return undefined
+        if (typeof entry.title !== 'string' || !entry.title.trim()) {
+          return undefined
+        }
+        if (typeof entry.modelName !== 'string' || !entry.modelName.trim()) {
+          return undefined
+        }
+        const modelId =
+          typeof entry.modelId === 'string' && entry.modelId.trim()
+            ? entry.modelId.trim()
+            : undefined
+        return {
+          ...window,
+          id: entry.id.trim(),
+          title: entry.title.trim(),
+          ...(modelId && { modelId }),
+          modelName: entry.modelName.trim(),
+        }
+      })
+      .filter((entry): entry is ScopedQuotaWindow => entry != null)
+    // Preserve empty `[]` so a sidebar reader can distinguish "scoped owned
+    // by anthropic-auth, none visible" from "no quota data at all". The OUTER
+    // Array.isArray guard means pre-feature inputs without a `scoped` key are
+    // not affected — only inputs that already carried an array reach this line.
+    quota.scoped = scoped
+  }
+
+  return Object.keys(quota).length ? quota : null
+}
+
 export function normalizeSidebarState(raw: unknown): SidebarState {
   if (!isRecord(raw)) return { ...DEFAULT_SIDEBAR_STATE }
 
   const main: SidebarState['main'] = { quota: null }
   if (isRecord(raw.main)) {
     const m = raw.main
-    main.quota = isRecord(m.quota) ? (m.quota as AccountQuota) : null
+    main.quota = normalizeAccountQuota(m.quota)
     if (typeof m.quotaBackedOff === 'boolean')
       main.quotaBackedOff = m.quotaBackedOff
     if (typeof m.quotaBackoffUntil === 'number')
@@ -89,7 +155,7 @@ export function normalizeSidebarState(raw: unknown): SidebarState {
         .map((entry) => ({
           id: entry.id as string,
           label: typeof entry.label === 'string' ? entry.label : undefined,
-          quota: isRecord(entry.quota) ? (entry.quota as AccountQuota) : null,
+          quota: normalizeAccountQuota(entry.quota),
           enabled: typeof entry.enabled === 'boolean' ? entry.enabled : false,
           needsReauth:
             typeof entry.needsReauth === 'boolean' ? entry.needsReauth : false,
@@ -194,21 +260,51 @@ export function resolveActiveAccount(state: SidebarState): {
   return { id: 'main', name: 'main', quota: state.main?.quota ?? null }
 }
 
+export function formatScopedQuotaLabel(title: string) {
+  const label = title.replace(/\s+only$/i, '').trim()
+  return /^fable$/i.test(label) ? 'Fa' : label
+}
+
 export function getCollapsedQuotaSummary(quota: AccountQuota | null): {
   fiveHourUsedPercent: number | null
   sevenDayUsedPercent: number | null
+  scopedUsedPercents: number[]
   text: string | null
 } {
   const fiveHourUsedPercent = quota?.five_hour?.usedPercent ?? null
   const sevenDayUsedPercent = quota?.seven_day?.usedPercent ?? null
-  if (fiveHourUsedPercent == null && sevenDayUsedPercent == null) {
-    return { fiveHourUsedPercent, sevenDayUsedPercent, text: null }
+  const scoped = quota?.scoped ?? []
+  const scopedUsedPercents = scoped.map((window) => window.usedPercent)
+  if (
+    fiveHourUsedPercent == null &&
+    sevenDayUsedPercent == null &&
+    scoped.length === 0
+  ) {
+    return {
+      fiveHourUsedPercent,
+      sevenDayUsedPercent,
+      scopedUsedPercents,
+      text: null,
+    }
   }
 
+  const scopedSegments = scoped.map(
+    (window) =>
+      `${formatScopedQuotaLabel(window.title)}: ${Math.round(window.usedPercent)}%`,
+  )
+  const primarySegments =
+    fiveHourUsedPercent == null && sevenDayUsedPercent == null
+      ? []
+      : [
+          `5h: ${fiveHourUsedPercent == null ? '—' : `${Math.round(fiveHourUsedPercent)}%`}`,
+          `7d: ${sevenDayUsedPercent == null ? '—' : `${Math.round(sevenDayUsedPercent)}%`}`,
+        ]
+
   return {
     fiveHourUsedPercent,
     sevenDayUsedPercent,
-    text: `5h: ${fiveHourUsedPercent == null ? '—' : `${Math.round(fiveHourUsedPercent)}%`} 7d: ${sevenDayUsedPercent == null ? '—' : `${Math.round(sevenDayUsedPercent)}%`}`,
+    scopedUsedPercents,
+    text: [...primarySegments, ...scopedSegments].join(' '),
   }
 }
 

package/src/tui/command-dialogs.tsx

@@ -7,6 +7,31 @@ type ApplyFn = (
   args: string,
 ) => Promise<{ text: string; knobs: Record<string, unknown> }>
 
+type KillswitchDialogConfig = {
+  enabled?: boolean
+  main?: Record<string, number>
+  accounts?: Record<string, Record<string, number>>
+}
+
+export function buildKillswitchThresholdSeed(
+  config: KillswitchDialogConfig,
+  accountIds: string[],
+) {
+  const readT = (t: Record<string, number> | undefined) => {
+    const fh = t?.five_hour ?? t?.['5h'] ?? 5
+    const sd = t?.seven_day ?? t?.['1w'] ?? 10
+    const scoped = t?.scoped ?? 0
+    return { fh, sd, scoped }
+  }
+  const mainT = readT(config.main)
+  const seedParts = [`main:${mainT.fh},${mainT.sd},${mainT.scoped}`]
+  for (const id of accountIds) {
+    const t = readT(config.accounts?.[id] ?? config.main)
+    seedParts.push(`${id}:${t.fh},${t.sd},${t.scoped}`)
+  }
+  return seedParts.join(' ')
+}
+
 function showText(api: TuiPluginApi, text: string) {
   api.ui.dialog.setSize('xlarge')
   api.ui.dialog.replace(() => (
@@ -150,25 +175,10 @@ export function openCommandDialog(
   }
 
   if (payload.command === 'claude-killswitch') {
-    const config = (payload.knobs.config ?? {}) as {
-      enabled?: boolean
-      main?: Record<string, number>
-      accounts?: Record<string, Record<string, number>>
-    }
+    const config = (payload.knobs.config ?? {}) as KillswitchDialogConfig
     const accountIds = (payload.knobs.accountIds as string[]) ?? []
     const enabled = config.enabled === true
-    const readT = (t: Record<string, number> | undefined) => {
-      const fh = t?.five_hour ?? t?.['5h'] ?? 5
-      const sd = t?.seven_day ?? t?.['1w'] ?? 10
-      return { fh, sd }
-    }
-    const mainT = readT(config.main)
-    const seedParts = [`main:${mainT.fh},${mainT.sd}`]
-    for (const id of accountIds) {
-      const t = readT(config.accounts?.[id] ?? config.main)
-      seedParts.push(`${id}:${t.fh},${t.sd}`)
-    }
-    const seed = seedParts.join(' ')
+    const seed = buildKillswitchThresholdSeed(config, accountIds)
 
     const openEdit = () => {
       const DialogPrompt = api.ui.DialogPrompt
@@ -177,7 +187,7 @@ export function openCommandDialog(
         <DialogPrompt
           title='Killswitch thresholds'
           description={() => <text>{payload.text}</text>}
-          placeholder='main:5,10 work-alt:5,10'
+          placeholder='main:5,10,0 work-alt:5,10,0'
           value={seed}
           onConfirm={(value: string) => {
             void apply('claude-killswitch', `set ${value.trim()}`).then((r) => {
@@ -206,7 +216,7 @@ export function openCommandDialog(
           {
             title: 'Edit thresholds…',
             value: 'edit',
-            description: 'Set per-account 5h,1w cutoffs',
+            description: 'Set per-account 5h,1w,scoped cutoffs',
           },
         ]}
         onSelect={(option) => {

package/src/tui.tsx

@@ -23,6 +23,7 @@ import {
   computeQuotaPacing,
   DEFAULT_SIDEBAR_STATE,
   FIVE_HOUR_MS,
+  formatScopedQuotaLabel,
   getCollapsedQuotaSummary,
   getSidebarState,
   type QuotaPacing,
@@ -348,6 +349,17 @@ function AccountBlock(props: {
           window={props.quota?.seven_day}
           pacing={pacingFor(props.quota?.seven_day, SEVEN_DAY_MS)}
         />
+        <For each={props.quota?.scoped ?? []}>
+          {(window) => (
+            <QuotaRow
+              theme={props.theme}
+              appearance={props.appearance}
+              label={formatScopedQuotaLabel(window.title)}
+              window={window}
+              pacing={pacingFor(window, SEVEN_DAY_MS)}
+            />
+          )}
+        </For>
       </Show>
     </box>
   )
@@ -548,9 +560,21 @@ function QuotaSidebar(props: {
     const quota = activeAccount().quota
     if (!quota) return false
     const now = Date.now()
-    const windows: Array<[typeof quota.five_hour, number]> = [
+    const windows: Array<
+      [
+        (
+          | { usedPercent: number; remainingPercent: number; resetsAt?: string }
+          | undefined
+        ),
+        number,
+      ]
+    > = [
       [quota.five_hour, FIVE_HOUR_MS],
       [quota.seven_day, SEVEN_DAY_MS],
+      ...(quota.scoped ?? []).map((window): [typeof window, number] => [
+        window,
+        SEVEN_DAY_MS,
+      ]),
     ]
     return windows.some(
       ([w, ms]) =>
@@ -562,6 +586,7 @@ function QuotaSidebar(props: {
     const values = [
       summary.fiveHourUsedPercent,
       summary.sevenDayUsedPercent,
+      ...summary.scopedUsedPercents,
     ].filter((value): value is number => value != null)
     // Pacing deficit is an advisory projection, not actual quota exhaustion,
     // so it can only BUMP the usage tone up to warn at most — never soften a