@cortexkit/opencode-anthropic-auth 1.22.0 → 2.0.0

package/src/tui/entry.mjs

@@ -12,26 +12,52 @@ function isMissingRuntimeRegistry(error) {
   )
 }
 
-let mod
-try {
-  await import(runtimeProbe)
-} catch (error) {
-  if (!isMissingRuntimeRegistry(error)) {
-    console.error('Anthropic Auth TUI runtime registry probe failed', error)
-    throw error
-  }
-  // Older hosts and bare Bun do not provide the virtual registry. Their source
-  // loader still applies the Solid transform, so retain the raw TSX fallback.
-  mod = await import('../tui.tsx')
-}
-
-if (!mod) {
+async function loadLegacyTui() {
+  let mod
   try {
-    mod = await import('../tui-compiled/tui.tsx')
+    await import(runtimeProbe)
   } catch (error) {
-    console.error('Anthropic Auth compiled TUI failed to load', error)
-    throw error
+    if (!isMissingRuntimeRegistry(error)) {
+      console.error('Anthropic Auth TUI runtime registry probe failed', error)
+      throw error
+    }
+    // Older hosts and bare Bun do not provide the virtual registry. Their source
+    // loader still applies the Solid transform, so retain the raw TSX fallback.
+    mod = await import('../tui.tsx')
   }
+
+  if (!mod) {
+    try {
+      mod = await import('../tui-compiled/tui.tsx')
+    } catch (error) {
+      console.error('Anthropic Auth compiled TUI failed to load', error)
+      throw error
+    }
+  }
+  return mod.default
+}
+
+let legacyModule
+
+// OpenCode 1 reads id and tui from the default definition; OpenCode 2 reads
+// its setup method. Both use this package subpath, so these methods must be
+// on the default export, not only exported as separate named bindings.
+export const id = 'cortexkit.anthropic-auth'
+
+/** @type {import('@opencode-ai/plugin/tui').TuiPlugin} */
+export const tui = async (...args) => {
+  legacyModule ??= loadLegacyTui()
+  const plugin = await legacyModule
+  return plugin.tui(...args)
+}
+
+/** @type {import('@opencode/plugin/tui').Plugin.Definition['setup']} */
+export const setup = async (context) => {
+  // OpenCode 2 already routes RPC through the active project. Importing its
+  // TUI must not load the OpenCode 1 renderer or start that renderer's separate
+  // loopback notification poller.
+  const { setupAnthropicTui } = await import('../../dist/v2/tui.js')
+  return setupAnthropicTui(context)
 }
 
-export default mod.default
+export default { id, tui, setup }

package/src/tui-compiled/rpc/protocol.ts

@@ -1,3 +1,8 @@
+import type {
+  ClaustrumEnrollmentStatus,
+  CommandDialogPayload,
+} from '@cortexkit/anthropic-auth-core'
+
 export const COMMAND_MODAL_NAMES = [
   'claude-account',
   'claude-cache',
@@ -17,17 +22,31 @@ export type CommandModalName = (typeof COMMAND_MODAL_NAMES)[number]
 export interface AccountDialogAccount {
   id: string
   label: string
-  role: string
+  role: 'main' | 'fallback'
   enabled: boolean
   quotaPercent: number | null
   tierLabel?: string
   claustrumGate: 'on' | 'off' | 'na'
   vaultServed: boolean
+  vaultReauth: boolean
+  custodyState:
+    | 'na'
+    | 'off'
+    | 'on-vault-served'
+    | 'on-vault-reauth'
+    | 'on-cold'
+    | 'unknown-identity'
+    | 'on-identity-mismatch'
+    | 'on-corrupt-binding'
 }
 
 export interface AccountDialogKnobs {
   accounts: AccountDialogAccount[]
   claustrumDetection: string
+  custodyMode?: 'local' | 'claustrum'
+  custodyModeKnown?: boolean
+  enrollmentStatus?: string
+  claustrumEnrollment?: ClaustrumEnrollmentStatus
   [key: string]: unknown
 }
 
@@ -37,12 +56,10 @@ export interface OpenDialogPayload {
   knobs: Record<string, unknown>
 }
 
-export interface RpcNotification {
-  id: number
-  type: 'open-dialog'
-  payload: OpenDialogPayload
-  sessionId?: string
-}
+export type RpcNotification = { id: number; sessionId: string } & (
+  | { type: 'open-dialog'; payload: OpenDialogPayload }
+  | { type: 'open-menu'; payload: CommandDialogPayload }
+)
 
 export interface ApplyRequest {
   command: CommandModalName

package/src/tui-compiled/rpc/rpc-client.ts

@@ -1,12 +1,17 @@
+import type {
+  CommandApplyRequest,
+  CommandApplyResult,
+} from '@cortexkit/anthropic-auth-core'
 import { discoverPortFile } from './port-file'
 import type { ApplyRequest, ApplyResult, RpcNotification } from './protocol'
 
 export interface RpcClient {
   pending: (
     lastReceivedId: number,
-    sessionId?: string,
+    sessionId: string,
   ) => Promise<RpcNotification[]>
   apply: (request: ApplyRequest) => Promise<ApplyResult>
+  applyMenu: (request: CommandApplyRequest) => Promise<CommandApplyResult>
 }
 
 async function call<T>(
@@ -58,5 +63,17 @@ export function createRpcClient(dir: string, expectedPid?: number): RpcClient {
       )
       return out ?? { text: 'apply failed', knobs: {} }
     },
+    async applyMenu(request) {
+      if (request.command !== 'claude' || !request.sessionId?.trim())
+        throw new TypeError('A claude menu sessionId is required')
+      const out = await call<CommandApplyResult>(
+        dir,
+        'apply-menu',
+        { ...request },
+        expectedPid,
+      )
+      if (!out) throw new Error('Menu apply unavailable; outcome unknown')
+      return out
+    },
   }
 }

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

@@ -36,6 +36,16 @@ export interface SidebarAccountState {
   needsReauth: boolean
   // True when the vault copy needs re-importing while the sidecar remains usable.
   vaultReauth?: boolean
+  // A gate alone does not prove the sidecar can serve a request.
+  vaultServed?: boolean
+  custodyState?:
+    | 'off'
+    | 'on-vault-served'
+    | 'on-vault-reauth'
+    | 'on-cold'
+    | 'unknown-identity'
+    | 'on-identity-mismatch'
+    | 'on-corrupt-binding'
   tierLabel?: string
 }
 
@@ -59,7 +69,7 @@ export interface PrimeSidebarAccountState {
   label: string
   nextDueAt?: number | null
   lastPrimedAt?: number | null
-  lastResult?: 'ok' | 'error'
+  lastResult?: 'ok' | 'error' | 'skipped'
   usage?: PrimeUsageCounters
   estimatedCostUsd?: number
 }
@@ -180,7 +190,11 @@ function normalizePrimeAccount(
   } else if (isFiniteNumber(value.lastPrimedAt)) {
     account.lastPrimedAt = value.lastPrimedAt
   }
-  if (value.lastResult === 'ok' || value.lastResult === 'error') {
+  if (
+    value.lastResult === 'ok' ||
+    value.lastResult === 'error' ||
+    value.lastResult === 'skipped'
+  ) {
     account.lastResult = value.lastResult
   }
   const usage = normalizePrimeUsage(value.usage)
@@ -338,6 +352,11 @@ export function normalizeSidebarState(raw: unknown): SidebarState {
           needsReauth:
             typeof entry.needsReauth === 'boolean' ? entry.needsReauth : false,
           ...(entry.vaultReauth === true && { vaultReauth: true }),
+          ...(entry.vaultServed === true && { vaultServed: true }),
+          ...(typeof entry.custodyState === 'string' && {
+            custodyState:
+              entry.custodyState as SidebarAccountState['custodyState'],
+          }),
           tierLabel:
             typeof entry.tierLabel === 'string' && entry.tierLabel.trim()
               ? entry.tierLabel.trim()
@@ -817,6 +836,8 @@ export function formatFallbackModelLabel(modelId: string | undefined): string {
     return 'Fable 5.1'
   if (modelId === 'claude-fable-5' || modelId?.startsWith('claude-fable-5-'))
     return 'Fable 5'
+  if (modelId === 'claude-opus-5-5' || modelId?.startsWith('claude-opus-5-5-'))
+    return 'Opus 5.5'
   if (modelId === 'claude-opus-5' || modelId?.startsWith('claude-opus-5-'))
     return 'Opus 5'
   if (modelId === 'claude-opus-4-8' || modelId?.startsWith('claude-opus-4-8-'))
@@ -844,6 +865,9 @@ export function formatPrimeAccountValue(account: PrimeSidebarAccountState): {
   if (account.lastResult === 'error') {
     return { text: 'err', hasError: true }
   }
+  if (account.lastResult === 'skipped') {
+    return { text: 'skip', hasError: false }
+  }
   if (account.nextDueAt && account.nextDueAt > Date.now()) {
     return { text: formatPrimeTime(account.nextDueAt), hasError: false }
   }