@cortexkit/opencode-anthropic-auth 1.10.2 → 1.11.0

package/src/tui/command-dialogs.tsx

@@ -5,7 +5,7 @@ import type { OpenDialogPayload } from '../rpc/protocol.js'
 type ApplyFn = (
   command: OpenDialogPayload['command'],
   args: string,
-) => Promise<{ text: string }>
+) => Promise<{ text: string; knobs: Record<string, unknown> }>
 
 function showText(api: TuiPluginApi, text: string) {
   api.ui.dialog.setSize('xlarge')
@@ -224,6 +224,483 @@ export function openCommandDialog(
     return
   }
 
+  if (payload.command === 'claude-account') {
+    const accounts =
+      (payload.knobs.accounts as Array<{
+        id: string
+        label: string
+        role: string
+        enabled: boolean
+        quotaPercent: number | null
+      }>) ?? []
+
+    const updateAccounts = (r: {
+      text: string
+      knobs: Record<string, unknown>
+    }) => {
+      const updated = r.knobs.accounts as typeof accounts
+      if (updated && updated.length > 0) {
+        accounts.length = 0
+        accounts.push(...updated)
+      }
+    }
+
+    const buildL1 = () => {
+      const DialogSelect = api.ui.DialogSelect<string>
+      const l1Options: Array<{
+        title: string
+        value: string
+        description?: string
+      }> = [
+        {
+          title: 'Add account\u2026',
+          value: '__add__',
+          description: 'Add an API key or OAuth fallback account',
+        },
+        ...accounts.map((a) => {
+          const pct =
+            a.quotaPercent != null
+              ? ` ${Math.round(a.quotaPercent)}%`
+              : ' \u2013%'
+          const status = !a.enabled ? ' (disabled)' : ''
+          return {
+            title: `${a.label} [${a.role}]${status}${pct}`,
+            value: a.id,
+          }
+        }),
+      ]
+      api.ui.dialog.setSize('xlarge')
+      api.ui.dialog.replace(() => (
+        <DialogSelect
+          title='Claude accounts'
+          options={l1Options}
+          onSelect={(option) => {
+            if (option.value === '__add__') {
+              openAddType()
+              return
+            }
+            const account = accounts.find((a) => a.id === option.value)
+            if (!account) return
+            if (account.role === 'main') {
+              const pct =
+                account.quotaPercent != null
+                  ? ` ${Math.round(account.quotaPercent)}%`
+                  : ' \u2013%'
+              showText(
+                api,
+                `${account.label}\nRole: main (read-only)\nQuota:${pct}`,
+              )
+              return
+            }
+            openManage(account, false)
+          }}
+        />
+      ))
+    }
+
+    // -- Add type selection (OAuth vs API key) ------------------------------
+    const openAddType = () => {
+      const DialogSelect = api.ui.DialogSelect<string>
+      api.ui.dialog.setSize('xlarge')
+      api.ui.dialog.replace(() => (
+        <DialogSelect
+          title='Add account'
+          options={[
+            {
+              title: 'OAuth (login)',
+              value: 'oauth',
+              description:
+                'Sign in to Claude via browser — works with Pro, Max, and Team plans',
+            },
+            {
+              title: 'API key',
+              value: 'apikey',
+              description:
+                'Provide an API key for an Anthropic-compatible endpoint',
+            },
+            { title: 'Back', value: 'back' },
+          ]}
+          onSelect={(option) => {
+            if (option.value === 'back') {
+              buildL1()
+              return
+            }
+            if (option.value === 'apikey') {
+              openAddApiKey()
+              return
+            }
+            openAddOAuthStart()
+          }}
+        />
+      ))
+    }
+
+    // -- Add API key (multi-step: key → baseURL → authHeader → label) ------
+    const openAddApiKey = () => {
+      const collected: {
+        apiKey?: string
+        baseURL?: string
+        authHeader?: string
+        label?: string
+      } = {}
+
+      const openApiKeyPrompt = () => {
+        const DialogPrompt = api.ui.DialogPrompt
+        api.ui.dialog.setSize('xlarge')
+        api.ui.dialog.replace(() => (
+          <DialogPrompt
+            title='Add API key account \u2014 API key'
+            description={() => <text>Paste your API key (required).</text>}
+            placeholder='sk-ant-...'
+            value=''
+            onConfirm={(value: string) => {
+              const trimmed = value.trim()
+              if (!trimmed) {
+                openAddType()
+                return
+              }
+              collected.apiKey = trimmed
+              openBaseURLPrompt()
+            }}
+            onCancel={() => openAddType()}
+          />
+        ))
+      }
+
+      const openBaseURLPrompt = () => {
+        const DialogPrompt = api.ui.DialogPrompt
+        api.ui.dialog.setSize('xlarge')
+        api.ui.dialog.replace(() => (
+          <DialogPrompt
+            title='Add API key account \u2014 base URL'
+            description={() => (
+              <text>
+                Anthropic-compatible API base URL. Default:
+                https://api.kie.ai/claude
+              </text>
+            )}
+            placeholder='https://api.kie.ai/claude'
+            value=''
+            onConfirm={(value: string) => {
+              const trimmed = value.trim()
+              collected.baseURL = trimmed || 'https://api.kie.ai/claude'
+              openAuthHeaderSelect()
+            }}
+            onCancel={() => openApiKeyPrompt()}
+          />
+        ))
+      }
+
+      const openAuthHeaderSelect = () => {
+        const DialogSelect = api.ui.DialogSelect<string>
+        api.ui.dialog.setSize('xlarge')
+        api.ui.dialog.replace(() => (
+          <DialogSelect
+            title='Add API key account \u2014 auth header'
+            options={[
+              {
+                title: 'Authorization: Bearer (default)',
+                value: 'authorization-bearer',
+                description: 'Standard bearer token authentication',
+              },
+              {
+                title: 'X-API-Key',
+                value: 'x-api-key',
+                description: 'Custom header-based API key',
+              },
+            ]}
+            onSelect={(option) => {
+              collected.authHeader = option.value as
+                | 'authorization-bearer'
+                | 'x-api-key'
+              openLabelPrompt()
+            }}
+          />
+        ))
+      }
+
+      const openLabelPrompt = () => {
+        const DialogPrompt = api.ui.DialogPrompt
+        api.ui.dialog.setSize('xlarge')
+        api.ui.dialog.replace(() => (
+          <DialogPrompt
+            title='Add API key account \u2014 label'
+            description={() => (
+              <text>A short name for this account (optional).</text>
+            )}
+            placeholder='e.g. Work API'
+            value=''
+            onConfirm={(value: string) => {
+              const trimmed = value.trim()
+              collected.label = trimmed || undefined
+              const apiKey = collected.apiKey
+              if (!apiKey) return
+              let args = `add-apikey ${apiKey}`
+              if (
+                collected.baseURL &&
+                collected.baseURL !== 'https://api.kie.ai/claude'
+              ) {
+                args += ` --base-url ${collected.baseURL}`
+              }
+              if (
+                collected.authHeader &&
+                collected.authHeader !== 'authorization-bearer'
+              ) {
+                args += ` --auth-header ${collected.authHeader}`
+              }
+              if (collected.label) {
+                args += ` --label ${collected.label}`
+              }
+              void apply('claude-account', args).then((r) => {
+                api.ui.toast({ message: r.text })
+                updateAccounts(r)
+                buildL1()
+              })
+            }}
+            onCancel={() => openAuthHeaderSelect()}
+          />
+        ))
+      }
+
+      openApiKeyPrompt()
+    }
+
+    // -- Add OAuth (OSC-52 copy + code entry) ------------------------------
+    const openAddOAuthStart = () => {
+      void apply('claude-account', 'add-oauth-start').then((r) => {
+        const oauthUrl = r.knobs.oauthUrl as string | undefined
+        updateAccounts(r)
+        if (oauthUrl) {
+          openOAuthUrlScreen(oauthUrl)
+        } else {
+          api.ui.toast({ message: r.text })
+          buildL1()
+        }
+      })
+    }
+
+    const openOAuthUrlScreen = (oauthUrl: string) => {
+      const DialogSelect = api.ui.DialogSelect<string>
+      api.ui.dialog.setSize('xlarge')
+      api.ui.dialog.replace(() => (
+        <DialogSelect
+          title='OAuth sign-in'
+          options={[
+            {
+              title: 'Copy URL to clipboard',
+              value: 'copy',
+              description: oauthUrl,
+            },
+            {
+              title: 'Enter sign-in code',
+              value: 'code',
+              description:
+                'Open the URL in your browser, sign in, then paste the callback URL or code',
+            },
+            { title: 'Cancel', value: 'cancel' },
+          ]}
+          onSelect={(option) => {
+            if (option.value === 'cancel') {
+              buildL1()
+              return
+            }
+            if (option.value === 'copy') {
+              const ok = api.renderer.copyToClipboardOSC52(oauthUrl)
+              if (ok) {
+                api.ui.toast({ message: 'URL copied to clipboard' })
+              } else {
+                api.ui.toast({
+                  message:
+                    'Copy unavailable \u2014 select the URL text above to copy',
+                })
+              }
+              openOAuthUrlScreen(oauthUrl)
+              return
+            }
+            openOAuthCodePrompt(oauthUrl)
+          }}
+        />
+      ))
+    }
+
+    const openOAuthCodePrompt = (oauthUrl: string) => {
+      const DialogPrompt = api.ui.DialogPrompt
+      api.ui.dialog.setSize('xlarge')
+      api.ui.dialog.replace(() => (
+        <DialogPrompt
+          title='OAuth sign-in \u2014 enter code'
+          description={() => (
+            <text>
+              After signing in you will be redirected. Paste the full callback
+              URL or authorization code below.
+            </text>
+          )}
+          placeholder='Paste callback URL or code here'
+          value=''
+          onConfirm={(value: string) => {
+            const trimmed = value.trim()
+            if (!trimmed) {
+              buildL1()
+              return
+            }
+            openOAuthLabelPrompt(trimmed, oauthUrl)
+          }}
+          // Step BACK to the sign-in URL screen, not L1: the OAuth session
+          // (PKCE verifier/state) is already minted. Returning to L1 would let a
+          // retry re-run add-oauth-start and re-mint it, invalidating the URL the
+          // user is mid-sign-in with. Same session → same URL is preserved.
+          onCancel={() => openOAuthUrlScreen(oauthUrl)}
+        />
+      ))
+    }
+
+    const openOAuthLabelPrompt = (code: string, oauthUrl: string) => {
+      const DialogPrompt = api.ui.DialogPrompt
+      api.ui.dialog.setSize('xlarge')
+      api.ui.dialog.replace(() => (
+        <DialogPrompt
+          title='OAuth sign-in \u2014 label'
+          description={() => (
+            <text>A short name for this account (optional).</text>
+          )}
+          placeholder='e.g. work'
+          value=''
+          onConfirm={(value: string) => {
+            const label = value.trim()
+            const args = label
+              ? `add-oauth-finish ${code} --label ${label}`
+              : `add-oauth-finish ${code}`
+            void apply('claude-account', args).then((r) => {
+              api.ui.toast({ message: r.text })
+              updateAccounts(r)
+              buildL1()
+            })
+          }}
+          // Step BACK to the code prompt, not L1: the user already obtained an
+          // auth code to reach this step. Returning to L1 would let a retry
+          // re-run add-oauth-start, minting a new PKCE verifier/state that
+          // invalidates the code they already have and forces a full re-auth.
+          onCancel={() => openOAuthCodePrompt(oauthUrl)}
+        />
+      ))
+    }
+
+    // -- Manage existing account -------------------------------------------
+    const openManage = (
+      account: (typeof accounts)[number],
+      isMain: boolean,
+    ) => {
+      const DialogSelect = api.ui.DialogSelect<string>
+      const DialogConfirm = api.ui.DialogConfirm
+      api.ui.dialog.setSize('xlarge')
+
+      const options: Array<{
+        title: string
+        value: string
+        description?: string
+      }> = []
+      if (!isMain) {
+        const toggleLabel = account.enabled ? 'Disable' : 'Enable'
+        options.push({
+          title: toggleLabel,
+          value: account.enabled ? 'disable' : 'enable',
+          description: account.enabled
+            ? 'Stop using this fallback account'
+            : 'Allow this fallback account to be used',
+        })
+        options.push({
+          title: 'Move up',
+          value: 'move-up',
+          description: 'Higher priority in fallback order',
+        })
+        options.push({
+          title: 'Move down',
+          value: 'move-down',
+          description: 'Lower priority in fallback order',
+        })
+        options.push({
+          title: 'Remove\u2026',
+          value: 'remove',
+          description: 'Delete this account permanently',
+        })
+      }
+      options.push({ title: 'Back', value: 'back' })
+
+      api.ui.dialog.replace(() => (
+        <DialogSelect
+          title={`Manage ${account.label}`}
+          options={options}
+          onSelect={(option) => {
+            if (option.value === 'back') {
+              buildL1()
+              return
+            }
+
+            if (option.value === 'remove') {
+              api.ui.dialog.replace(() => (
+                <DialogConfirm
+                  title={`Remove ${account.label}?`}
+                  message={`Are you sure you want to remove the fallback account "${account.label}"?`}
+                  onConfirm={() => {
+                    void apply('claude-account', `remove ${account.id}`).then(
+                      (r) => {
+                        api.ui.toast({ message: r.text })
+                        updateAccounts(r)
+                        buildL1()
+                      },
+                    )
+                  }}
+                  onCancel={() => openManage(account, isMain)}
+                />
+              ))
+              return
+            }
+
+            void apply('claude-account', `${option.value} ${account.id}`).then(
+              (r) => {
+                api.ui.toast({ message: r.text })
+                updateAccounts(r)
+                const updatedList = r.knobs.accounts as typeof accounts
+                const refreshed =
+                  (updatedList && updatedList.length > 0
+                    ? updatedList.find((a) => a.id === account.id)
+                    : undefined) ?? account
+                openManage(refreshed, isMain)
+              },
+            )
+          }}
+        />
+      ))
+    }
+
+    buildL1()
+    return
+  }
+
+  if (payload.command === 'claude-logging') {
+    const current = (payload.knobs.level as string) ?? 'info'
+    const levels = ['error', 'warn', 'info', 'debug', 'trace']
+    const DialogSelect = api.ui.DialogSelect<string>
+    api.ui.dialog.setSize('xlarge')
+    api.ui.dialog.replace(() => (
+      <DialogSelect
+        title='Claude log level'
+        current={current}
+        options={levels.map((level) => ({
+          title: level === current ? `\u2022 ${level}` : level,
+          value: level,
+        }))}
+        onSelect={(option) => {
+          void apply('claude-logging', String(option.value)).then((r) => {
+            api.ui.toast({ message: r.text })
+            api.ui.dialog.clear()
+          })
+        }}
+      />
+    ))
+    return
+  }
+
   // fallback for quota (display-only)
   showText(api, payload.text)
 }

package/src/tui-preferences.ts

@@ -2,6 +2,10 @@ import { watch } from 'node:fs'
 import { mkdir, readFile, rename, writeFile } from 'node:fs/promises'
 import { homedir } from 'node:os'
 import { basename, dirname, join } from 'node:path'
+import {
+  clearTimeout as nativeClearTimeout,
+  setTimeout as nativeSetTimeout,
+} from 'node:timers'
 import { applyEdits, modify, type ParseError, parse } from 'jsonc-parser'
 
 export const TUI_PREFS_FILE_ENV = 'OPENCODE_TUI_PREFERENCES_FILE'
@@ -268,6 +272,7 @@ export function queueTuiPreferenceUpdate(
 }
 
 const WATCH_DEBOUNCE_MS = 150
+const WATCH_POLL_MS = 100
 
 // Watches the directory rather than the file: editors and our own atomic
 // writes replace the file via rename, which kills file-level watchers.
@@ -290,16 +295,37 @@ const WATCH_DEBOUNCE_MS = 150
 export function watchTuiPreferences(onChange: () => void): () => void {
   const file = getTuiPreferencesFile()
   const name = basename(file)
-  let timer: ReturnType<typeof setTimeout> | null = null
+  let timer: ReturnType<typeof nativeSetTimeout> | null = null
   let lastSeen: string | null = null
-  // Seed asynchronously; a real change that fires before the seed resolves
-  // still wins because the debounce re-reads the file fresh and compares
-  // against `lastSeen` (which will be `null` → does not match → fires).
+  let observedEvent = false
+  let disposed = false
+
+  const checkForChange = async () => {
+    const text = await readFile(file, 'utf8').catch(() => null)
+    if (disposed || text === null) return
+    if (text === lastSeen) return
+    lastSeen = text
+    onChange()
+  }
+
+  const scheduleCheck = () => {
+    observedEvent = true
+    if (timer) nativeClearTimeout(timer)
+    timer = nativeSetTimeout(() => {
+      timer = null
+      void checkForChange()
+    }, WATCH_DEBOUNCE_MS)
+  }
+
+  // Seed asynchronously. If a real file event arrives before the read resolves,
+  // do not let the seed overwrite that pending change; the debounced re-read
+  // will compare against the previous value and fire.
   void readFile(file, 'utf8')
     .then((text) => {
-      if (lastSeen === null) lastSeen = text
+      if (!observedEvent && lastSeen === null) lastSeen = text
     })
     .catch(() => {})
+
   try {
     const watcher = watch(dirname(file), (_event, filename) => {
       // Exact match against the preferences file name, plus the temp file
@@ -308,21 +334,34 @@ export function watchTuiPreferences(onChange: () => void): () => void {
         filename === name ||
         (filename?.startsWith(`${name}.`) && filename.endsWith('.tmp'))
       if (filename != null && !isOurs) return
-      if (timer) clearTimeout(timer)
-      timer = setTimeout(() => {
-        timer = null
-        void readFile(file, 'utf8')
-          .catch(() => null)
-          .then((text) => {
-            if (text === null) return
-            if (text === lastSeen) return
-            lastSeen = text
-            onChange()
-          })
-      }, WATCH_DEBOUNCE_MS)
+      scheduleCheck()
     })
+
+    // Bun's fs.watch can miss atomic temp-file rename updates on some
+    // backends, so keep a low-cost polling loop as the correctness path.
+    // Use recursive timers instead of fs.watchFile because watchFile can keep
+    // Bun test processes alive long after unwatchFile().
+    let pollTimer: ReturnType<typeof nativeSetTimeout> | null = null
+    let pollInFlight = false
+    const schedulePoll = () => {
+      if (disposed || pollTimer) return
+      pollTimer = nativeSetTimeout(() => {
+        pollTimer = null
+        if (disposed || pollInFlight) return
+        pollInFlight = true
+        void checkForChange().finally(() => {
+          pollInFlight = false
+          schedulePoll()
+        })
+      }, WATCH_POLL_MS)
+      pollTimer.unref?.()
+    }
+    schedulePoll()
+
     return () => {
-      if (timer) clearTimeout(timer)
+      disposed = true
+      if (timer) nativeClearTimeout(timer)
+      if (pollTimer) nativeClearTimeout(pollTimer)
       watcher.close()
     }
   } catch {