@cortexkit/opencode-anthropic-auth 2.0.1 → 2.0.3

package/src/sidebar-state.ts

@@ -2,6 +2,7 @@ export interface QuotaWindow {
   usedPercent: number
   remainingPercent: number
   resetsAt?: string
+  checkedAt?: number
 }
 
 export interface ScopedQuotaWindow extends QuotaWindow {
@@ -12,6 +13,7 @@ export interface ScopedQuotaWindow extends QuotaWindow {
 }
 
 export interface AccountQuota {
+  checkedAt?: number
   five_hour?: QuotaWindow
   seven_day?: QuotaWindow
   scoped?: ScopedQuotaWindow[]
@@ -31,10 +33,12 @@ export interface SidebarAccountState {
   label: string | undefined
   quota: AccountQuota | null
   enabled: boolean
+  stateLine?: string
+  quotaDated?: boolean
   // True when the account's refresh token is permanently dead (400
   // invalid_grant) and it needs a re-login — distinct from a transient backoff.
   needsReauth: boolean
-  // True when the vault copy needs re-importing while the sidecar remains usable.
+  // True when the vault credential needs a new sign-in.
   vaultReauth?: boolean
   // A gate alone does not prove the sidecar can serve a request.
   vaultServed?: boolean
@@ -77,7 +81,10 @@ export interface PrimeSidebarAccountState {
 export interface SidebarState {
   main: {
     quota: AccountQuota | null
+    enabled?: boolean
     tierLabel?: string
+    stateLine?: string
+    quotaDated?: boolean
     quotaBackedOff?: boolean
     quotaBackoffUntil?: number
     refreshBackedOff?: boolean
@@ -120,7 +127,11 @@ import {
 import { tmpdir } from 'node:os'
 import { dirname, join } from 'node:path'
 import type { PrimeUsageCounters } from '@cortexkit/anthropic-auth-core'
-import { logger } from '@cortexkit/anthropic-auth-core'
+import {
+  logger,
+  quotaDisplayProjection,
+  quotaWindowParts,
+} from '@cortexkit/anthropic-auth-core'
 
 const STATE_FILE_ENV = 'OPENCODE_ANTHROPIC_AUTH_SIDEBAR_STATE_FILE'
 const DEFAULT_STATE_DIR = join(tmpdir(), 'opencode-anthropic-auth')
@@ -229,12 +240,14 @@ function normalizeQuotaWindow(value: unknown): QuotaWindow | undefined {
     usedPercent,
     remainingPercent,
     resetsAt: typeof value.resetsAt === 'string' ? value.resetsAt : undefined,
+    ...(isFiniteNumber(value.checkedAt) && { checkedAt: value.checkedAt }),
   }
 }
 
 function normalizeAccountQuota(value: unknown): AccountQuota | null {
   if (!isRecord(value)) return null
   const quota: AccountQuota = {}
+  if (isFiniteNumber(value.checkedAt)) quota.checkedAt = value.checkedAt
   const fiveHour = normalizeQuotaWindow(value.five_hour)
   const sevenDay = normalizeQuotaWindow(value.seven_day)
   if (fiveHour) quota.five_hour = fiveHour
@@ -327,6 +340,9 @@ export function normalizeSidebarState(raw: unknown): SidebarState {
   if (isRecord(raw.main)) {
     const m = raw.main
     main.quota = normalizeAccountQuota(m.quota)
+    if (typeof m.enabled === 'boolean') main.enabled = m.enabled
+    if (typeof m.stateLine === 'string') main.stateLine = m.stateLine
+    if (m.quotaDated === true) main.quotaDated = true
     if (typeof m.tierLabel === 'string' && m.tierLabel.trim()) {
       main.tierLabel = m.tierLabel.trim()
     }
@@ -349,6 +365,10 @@ export function normalizeSidebarState(raw: unknown): SidebarState {
           label: typeof entry.label === 'string' ? entry.label : undefined,
           quota: normalizeAccountQuota(entry.quota),
           enabled: typeof entry.enabled === 'boolean' ? entry.enabled : false,
+          ...(typeof entry.stateLine === 'string' && {
+            stateLine: entry.stateLine,
+          }),
+          ...(entry.quotaDated === true && { quotaDated: true }),
           needsReauth:
             typeof entry.needsReauth === 'boolean' ? entry.needsReauth : false,
           ...(entry.vaultReauth === true && { vaultReauth: true }),
@@ -792,13 +812,13 @@ export function resolveActiveAccount(state: SidebarState): {
   id: string
   name: string
   quota: AccountQuota | null
+  stateLine?: string
+  quotaDated?: boolean
 } {
   const activeId = state.activeId
   if (activeId && activeId !== 'main') {
-    // `account.enabled` is defensive: writeSidebarState already filters disabled
-    // accounts out of state.fallbacks, so in normal operation every entry is
-    // enabled. Kept so this pure helper stays correct for any caller and is
-    // exercised directly by the unit tests.
+    // A disabled fallback cannot remain the active route, even though vault
+    // accounts stay visible in the expanded inventory while turned off.
     const fallback = state.fallbacks?.find(
       (account) => account.enabled && account.id === activeId,
     )
@@ -807,15 +827,22 @@ export function resolveActiveAccount(state: SidebarState): {
         id: fallback.id,
         name: fallback.label ?? fallback.id,
         quota: fallback.quota,
+        ...(fallback.stateLine && {
+          stateLine: fallback.stateLine,
+          quotaDated: fallback.quotaDated,
+        }),
       }
     }
   }
-  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
+  return {
+    id: 'main',
+    name: 'main',
+    quota: state.main?.quota ?? null,
+    ...(state.main?.stateLine && {
+      stateLine: state.main.stateLine,
+      quotaDated: state.main.quotaDated,
+    }),
+  }
 }
 
 /**
@@ -903,49 +930,158 @@ export function getFableRecoverySummary(
   return `Opus 4.8 · ${recovery.remaining} left`
 }
 
-export function getCollapsedQuotaSummary(quota: AccountQuota | null): {
+/** Keep full shared names when they fit; truncate only to preserve row columns. */
+export function formatQuotaRowLabel(name: string, width = 10): string {
+  if (width <= 0) return ''
+  let label = name
+  if (Bun.stringWidth(label) > width) {
+    label = ''
+    for (const character of name) {
+      if (Bun.stringWidth(label + character) > width - 1) break
+      label += character
+    }
+    label += '…'
+  }
+  return label + ' '.repeat(Math.max(0, width - Bun.stringWidth(label)))
+}
+
+// common-auth 0.18.0 has no narrow form, so keep its one-line quota wording here.
+// Once supported, replace this body with formatQuota(quotaDisplayProjection(quota, now),
+// { now, form: 'narrow' }) from common-auth.
+function formatNarrowQuota(quota: AccountQuota, now: number): string {
+  const parts = quotaWindowParts(quotaDisplayProjection(quota, now), { now })
+  const percent = (remaining: number | undefined) =>
+    remaining === undefined ? '—' : `${Math.round(remaining)}%`
+  const values = ['5h', '7d'].map((name) => {
+    const part = parts.windows.find(
+      (part) => part.name === name && part.kind === 'window',
+    )
+    return `${name} ${percent(part?.remainingPercent)}`
+  })
+  const scoped = quota.scoped ?? []
+  const names = [...new Set(scoped.map((window) => window.modelName))]
+  const lengths = names.map(() => 2)
+  while (true) {
+    const aliases = names.map((name, index) =>
+      [...name].slice(0, lengths[index]).join(''),
+    )
+    let extended = false
+    for (const [index, alias] of aliases.entries()) {
+      const length = lengths[index] ?? 2
+      if (
+        aliases.some(
+          (other, otherIndex) => otherIndex !== index && other === alias,
+        ) &&
+        length < [...(names[index] ?? '')].length
+      ) {
+        lengths[index] = length + 1
+        extended = true
+      }
+    }
+    if (!extended) break
+  }
+  const tightest = scoped.reduce<ScopedQuotaWindow | undefined>(
+    (lowest, window) =>
+      !lowest || window.remainingPercent < lowest.remainingPercent
+        ? window
+        : lowest,
+    undefined,
+  )
+  const budget = parts.windows.find((part) => part.kind === 'budget')
+  const budgetRemaining = quota.extraUsage?.exhausted
+    ? 0
+    : budget?.remainingPercent
+  // Monetary ratios can land a few floating-point bits below an equal model reading.
+  const budgetTighter =
+    budget &&
+    (!tightest ||
+      (budgetRemaining !== undefined &&
+        tightest.remainingPercent - budgetRemaining > 1e-9))
+  if (budgetTighter) {
+    values.push(`cr ${percent(budgetRemaining)}`)
+  } else if (tightest) {
+    const index = names.indexOf(tightest.modelName)
+    const name = [...tightest.modelName].slice(0, lengths[index]).join('')
+    const part = parts.windows.find(
+      (part) => part.kind === 'window' && part.name === tightest.title,
+    )
+    values.push(`${name} ${percent(part?.remainingPercent)}`)
+  }
+  return `${values.join(' · ')} left`
+}
+
+export function getCollapsedQuotaSummary(
+  quota: AccountQuota | null,
+  now = Date.now(),
+): {
   fiveHourUsedPercent: number | null
   sevenDayUsedPercent: number | null
   scopedUsedPercents: number[]
   text: string | null
+  stale: boolean
 } {
   const fiveHourUsedPercent = quota?.five_hour?.usedPercent ?? null
   const sevenDayUsedPercent = quota?.seven_day?.usedPercent ?? null
   const scoped = quota?.scoped ?? []
   const scopedUsedPercents = scoped.map((window) => window.usedPercent)
   if (
-    fiveHourUsedPercent == null &&
-    sevenDayUsedPercent == null &&
-    scoped.length === 0
+    !quota ||
+    (fiveHourUsedPercent == null &&
+      sevenDayUsedPercent == null &&
+      scoped.length === 0 &&
+      !quota.extraUsage)
   ) {
     return {
       fiveHourUsedPercent,
       sevenDayUsedPercent,
       scopedUsedPercents,
       text: null,
+      stale: false,
     }
   }
 
-  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,
     scopedUsedPercents,
-    text: [...primarySegments, ...scopedSegments].join(' '),
+    text: formatNarrowQuota(quota, now),
+    stale:
+      quotaWindowParts(quotaDisplayProjection(quota, now), { now }).age !==
+      undefined,
   }
 }
 
+export function getCollapsedAccounts(
+  state: SidebarState,
+  showFallbacks = true,
+) {
+  const activeId = resolveActiveAccount(state).id
+  return [
+    {
+      id: 'main',
+      name: 'main',
+      quota: state.main?.quota ?? null,
+      quotaDated: state.main?.quotaDated,
+      active: activeId === 'main',
+    },
+    ...(showFallbacks
+      ? (state.fallbacks ?? [])
+          .filter(
+            (account) =>
+              account.enabled ||
+              (account.custodyState && account.custodyState !== 'off'),
+          )
+          .map((account) => ({
+            id: account.id,
+            name: account.label ?? account.id,
+            quota: account.quota,
+            quotaDated: account.quotaDated,
+            active: activeId === account.id,
+          }))
+      : []),
+  ]
+}
+
 export const FIVE_HOUR_MS = 5 * 60 * 60 * 1000
 export const SEVEN_DAY_MS = 7 * 24 * 60 * 60 * 1000
 

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

@@ -2,6 +2,7 @@ export interface QuotaWindow {
   usedPercent: number
   remainingPercent: number
   resetsAt?: string
+  checkedAt?: number
 }
 
 export interface ScopedQuotaWindow extends QuotaWindow {
@@ -12,6 +13,7 @@ export interface ScopedQuotaWindow extends QuotaWindow {
 }
 
 export interface AccountQuota {
+  checkedAt?: number
   five_hour?: QuotaWindow
   seven_day?: QuotaWindow
   scoped?: ScopedQuotaWindow[]
@@ -31,10 +33,12 @@ export interface SidebarAccountState {
   label: string | undefined
   quota: AccountQuota | null
   enabled: boolean
+  stateLine?: string
+  quotaDated?: boolean
   // True when the account's refresh token is permanently dead (400
   // invalid_grant) and it needs a re-login — distinct from a transient backoff.
   needsReauth: boolean
-  // True when the vault copy needs re-importing while the sidecar remains usable.
+  // True when the vault credential needs a new sign-in.
   vaultReauth?: boolean
   // A gate alone does not prove the sidecar can serve a request.
   vaultServed?: boolean
@@ -77,7 +81,10 @@ export interface PrimeSidebarAccountState {
 export interface SidebarState {
   main: {
     quota: AccountQuota | null
+    enabled?: boolean
     tierLabel?: string
+    stateLine?: string
+    quotaDated?: boolean
     quotaBackedOff?: boolean
     quotaBackoffUntil?: number
     refreshBackedOff?: boolean
@@ -120,7 +127,11 @@ import {
 import { tmpdir } from 'node:os'
 import { dirname, join } from 'node:path'
 import type { PrimeUsageCounters } from '@cortexkit/anthropic-auth-core'
-import { logger } from '@cortexkit/anthropic-auth-core'
+import {
+  logger,
+  quotaDisplayProjection,
+  quotaWindowParts,
+} from '@cortexkit/anthropic-auth-core'
 
 const STATE_FILE_ENV = 'OPENCODE_ANTHROPIC_AUTH_SIDEBAR_STATE_FILE'
 const DEFAULT_STATE_DIR = join(tmpdir(), 'opencode-anthropic-auth')
@@ -229,12 +240,14 @@ function normalizeQuotaWindow(value: unknown): QuotaWindow | undefined {
     usedPercent,
     remainingPercent,
     resetsAt: typeof value.resetsAt === 'string' ? value.resetsAt : undefined,
+    ...(isFiniteNumber(value.checkedAt) && { checkedAt: value.checkedAt }),
   }
 }
 
 function normalizeAccountQuota(value: unknown): AccountQuota | null {
   if (!isRecord(value)) return null
   const quota: AccountQuota = {}
+  if (isFiniteNumber(value.checkedAt)) quota.checkedAt = value.checkedAt
   const fiveHour = normalizeQuotaWindow(value.five_hour)
   const sevenDay = normalizeQuotaWindow(value.seven_day)
   if (fiveHour) quota.five_hour = fiveHour
@@ -327,6 +340,9 @@ export function normalizeSidebarState(raw: unknown): SidebarState {
   if (isRecord(raw.main)) {
     const m = raw.main
     main.quota = normalizeAccountQuota(m.quota)
+    if (typeof m.enabled === 'boolean') main.enabled = m.enabled
+    if (typeof m.stateLine === 'string') main.stateLine = m.stateLine
+    if (m.quotaDated === true) main.quotaDated = true
     if (typeof m.tierLabel === 'string' && m.tierLabel.trim()) {
       main.tierLabel = m.tierLabel.trim()
     }
@@ -349,6 +365,10 @@ export function normalizeSidebarState(raw: unknown): SidebarState {
           label: typeof entry.label === 'string' ? entry.label : undefined,
           quota: normalizeAccountQuota(entry.quota),
           enabled: typeof entry.enabled === 'boolean' ? entry.enabled : false,
+          ...(typeof entry.stateLine === 'string' && {
+            stateLine: entry.stateLine,
+          }),
+          ...(entry.quotaDated === true && { quotaDated: true }),
           needsReauth:
             typeof entry.needsReauth === 'boolean' ? entry.needsReauth : false,
           ...(entry.vaultReauth === true && { vaultReauth: true }),
@@ -792,13 +812,13 @@ export function resolveActiveAccount(state: SidebarState): {
   id: string
   name: string
   quota: AccountQuota | null
+  stateLine?: string
+  quotaDated?: boolean
 } {
   const activeId = state.activeId
   if (activeId && activeId !== 'main') {
-    // `account.enabled` is defensive: writeSidebarState already filters disabled
-    // accounts out of state.fallbacks, so in normal operation every entry is
-    // enabled. Kept so this pure helper stays correct for any caller and is
-    // exercised directly by the unit tests.
+    // A disabled fallback cannot remain the active route, even though vault
+    // accounts stay visible in the expanded inventory while turned off.
     const fallback = state.fallbacks?.find(
       (account) => account.enabled && account.id === activeId,
     )
@@ -807,15 +827,22 @@ export function resolveActiveAccount(state: SidebarState): {
         id: fallback.id,
         name: fallback.label ?? fallback.id,
         quota: fallback.quota,
+        ...(fallback.stateLine && {
+          stateLine: fallback.stateLine,
+          quotaDated: fallback.quotaDated,
+        }),
       }
     }
   }
-  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
+  return {
+    id: 'main',
+    name: 'main',
+    quota: state.main?.quota ?? null,
+    ...(state.main?.stateLine && {
+      stateLine: state.main.stateLine,
+      quotaDated: state.main.quotaDated,
+    }),
+  }
 }
 
 /**
@@ -903,49 +930,158 @@ export function getFableRecoverySummary(
   return `Opus 4.8 · ${recovery.remaining} left`
 }
 
-export function getCollapsedQuotaSummary(quota: AccountQuota | null): {
+/** Keep full shared names when they fit; truncate only to preserve row columns. */
+export function formatQuotaRowLabel(name: string, width = 10): string {
+  if (width <= 0) return ''
+  let label = name
+  if (Bun.stringWidth(label) > width) {
+    label = ''
+    for (const character of name) {
+      if (Bun.stringWidth(label + character) > width - 1) break
+      label += character
+    }
+    label += '…'
+  }
+  return label + ' '.repeat(Math.max(0, width - Bun.stringWidth(label)))
+}
+
+// common-auth 0.18.0 has no narrow form, so keep its one-line quota wording here.
+// Once supported, replace this body with formatQuota(quotaDisplayProjection(quota, now),
+// { now, form: 'narrow' }) from common-auth.
+function formatNarrowQuota(quota: AccountQuota, now: number): string {
+  const parts = quotaWindowParts(quotaDisplayProjection(quota, now), { now })
+  const percent = (remaining: number | undefined) =>
+    remaining === undefined ? '—' : `${Math.round(remaining)}%`
+  const values = ['5h', '7d'].map((name) => {
+    const part = parts.windows.find(
+      (part) => part.name === name && part.kind === 'window',
+    )
+    return `${name} ${percent(part?.remainingPercent)}`
+  })
+  const scoped = quota.scoped ?? []
+  const names = [...new Set(scoped.map((window) => window.modelName))]
+  const lengths = names.map(() => 2)
+  while (true) {
+    const aliases = names.map((name, index) =>
+      [...name].slice(0, lengths[index]).join(''),
+    )
+    let extended = false
+    for (const [index, alias] of aliases.entries()) {
+      const length = lengths[index] ?? 2
+      if (
+        aliases.some(
+          (other, otherIndex) => otherIndex !== index && other === alias,
+        ) &&
+        length < [...(names[index] ?? '')].length
+      ) {
+        lengths[index] = length + 1
+        extended = true
+      }
+    }
+    if (!extended) break
+  }
+  const tightest = scoped.reduce<ScopedQuotaWindow | undefined>(
+    (lowest, window) =>
+      !lowest || window.remainingPercent < lowest.remainingPercent
+        ? window
+        : lowest,
+    undefined,
+  )
+  const budget = parts.windows.find((part) => part.kind === 'budget')
+  const budgetRemaining = quota.extraUsage?.exhausted
+    ? 0
+    : budget?.remainingPercent
+  // Monetary ratios can land a few floating-point bits below an equal model reading.
+  const budgetTighter =
+    budget &&
+    (!tightest ||
+      (budgetRemaining !== undefined &&
+        tightest.remainingPercent - budgetRemaining > 1e-9))
+  if (budgetTighter) {
+    values.push(`cr ${percent(budgetRemaining)}`)
+  } else if (tightest) {
+    const index = names.indexOf(tightest.modelName)
+    const name = [...tightest.modelName].slice(0, lengths[index]).join('')
+    const part = parts.windows.find(
+      (part) => part.kind === 'window' && part.name === tightest.title,
+    )
+    values.push(`${name} ${percent(part?.remainingPercent)}`)
+  }
+  return `${values.join(' · ')} left`
+}
+
+export function getCollapsedQuotaSummary(
+  quota: AccountQuota | null,
+  now = Date.now(),
+): {
   fiveHourUsedPercent: number | null
   sevenDayUsedPercent: number | null
   scopedUsedPercents: number[]
   text: string | null
+  stale: boolean
 } {
   const fiveHourUsedPercent = quota?.five_hour?.usedPercent ?? null
   const sevenDayUsedPercent = quota?.seven_day?.usedPercent ?? null
   const scoped = quota?.scoped ?? []
   const scopedUsedPercents = scoped.map((window) => window.usedPercent)
   if (
-    fiveHourUsedPercent == null &&
-    sevenDayUsedPercent == null &&
-    scoped.length === 0
+    !quota ||
+    (fiveHourUsedPercent == null &&
+      sevenDayUsedPercent == null &&
+      scoped.length === 0 &&
+      !quota.extraUsage)
   ) {
     return {
       fiveHourUsedPercent,
       sevenDayUsedPercent,
       scopedUsedPercents,
       text: null,
+      stale: false,
     }
   }
 
-  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,
     scopedUsedPercents,
-    text: [...primarySegments, ...scopedSegments].join(' '),
+    text: formatNarrowQuota(quota, now),
+    stale:
+      quotaWindowParts(quotaDisplayProjection(quota, now), { now }).age !==
+      undefined,
   }
 }
 
+export function getCollapsedAccounts(
+  state: SidebarState,
+  showFallbacks = true,
+) {
+  const activeId = resolveActiveAccount(state).id
+  return [
+    {
+      id: 'main',
+      name: 'main',
+      quota: state.main?.quota ?? null,
+      quotaDated: state.main?.quotaDated,
+      active: activeId === 'main',
+    },
+    ...(showFallbacks
+      ? (state.fallbacks ?? [])
+          .filter(
+            (account) =>
+              account.enabled ||
+              (account.custodyState && account.custodyState !== 'off'),
+          )
+          .map((account) => ({
+            id: account.id,
+            name: account.label ?? account.id,
+            quota: account.quota,
+            quotaDated: account.quotaDated,
+            active: activeId === account.id,
+          }))
+      : []),
+  ]
+}
+
 export const FIVE_HOUR_MS = 5 * 60 * 60 * 1000
 export const SEVEN_DAY_MS = 7 * 24 * 60 * 60 * 1000