@brimveyn/aimux 1.22.7 → 1.22.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brimveyn/aimux",
-  "version": "1.22.7",
+  "version": "1.22.9",
   "description": "A terminal multiplexer for AI CLIs. Run Claude, Codex, OpenCode, Kimi side-by-side with tabbed navigation, split panes, and persistent sessions.",
   "keywords": [
     "ai",

package/src/git/gh-auth.ts

@@ -0,0 +1,54 @@
+import { runCli } from '../services/ai-usage/spawn'
+
+export interface GhAccount {
+  host: string
+  user: string
+  active: boolean
+}
+
+/**
+ * `gh auth status` has no `--json`, so its human output is the API: one
+ * "Logged in to <host> account <user>" line per account, each followed by the
+ * "Active account:" line that belongs to it.
+ */
+export function parseGhAuthStatus(output: string): GhAccount[] {
+  const accounts: GhAccount[] = []
+  for (const line of output.split('\n')) {
+    const login = /Logged in to (\S+) account (\S+)/.exec(line)
+    if (login !== null) {
+      accounts.push({ active: false, host: login[1] ?? '', user: login[2] ?? '' })
+      continue
+    }
+    const current = accounts.at(-1)
+    if (current !== undefined && /Active account:\s*true/i.test(line)) current.active = true
+  }
+  return accounts
+}
+
+export async function listGhAccounts(): Promise<GhAccount[]> {
+  const gh = Bun.which('gh')
+  if (gh === null) return []
+  // Non-zero exit when nothing is logged in, and the report has lived on both
+  // streams across gh versions — read both and let the parser decide.
+  const result = await runCli(gh, ['auth', 'status'], 10_000)
+  return parseGhAuthStatus(`${result.stdout}\n${result.stderr}`)
+}
+
+/** Where a "switch account" button goes next: the following account, cycling. */
+export function nextGhAccount(accounts: readonly GhAccount[]): GhAccount | null {
+  if (accounts.length < 2) return null
+  const index = accounts.findIndex((account) => account.active)
+  return accounts[(index + 1) % accounts.length] ?? null
+}
+
+/** Returns an error message, or null when the switch landed. */
+export async function switchGhAccount(account: GhAccount): Promise<string | null> {
+  const gh = Bun.which('gh')
+  if (gh === null) return 'gh CLI not found'
+  // --user is what keeps this non-interactive: with three accounts on a host,
+  // a bare `gh auth switch` opens a prompt no widget can answer.
+  const args = ['auth', 'switch', '--hostname', account.host, '--user', account.user]
+  const result = await runCli(gh, args, 15_000)
+  if (result.ok) return null
+  return result.stderr.trim().split('\n')[0] ?? 'gh auth switch failed'
+}

package/src/git/pr-status.ts

@@ -231,6 +231,23 @@ export function clampPrBody(body: string, maxLines = 5, maxChars = 260): Clamped
   return { text, truncated: text.length < full.length }
 }
 
+/**
+ * `gh`'s failure in one line. The raw spawn error is a binary path, an exit
+ * code and a GraphQL dump — accurate, unreadable, and far wider than the pane.
+ */
+export function ghErrorMessage(detail: string): string {
+  const repo = /could not resolve to a repository with the name '([^']+)'/i.exec(detail)
+  if (repo !== null) return `No access to ${repo[1]}`
+  if (/gh auth login|not logged in|authentication failed|bad credentials/i.test(detail)) {
+    return 'Not logged in to GitHub'
+  }
+  const first = detail
+    .split('\n')
+    .map((line) => line.trim())
+    .find((line) => line !== '')
+  return (first ?? 'gh failed').replace(/^(error|gh):\s*/i, '').slice(0, 160)
+}
+
 export async function collectPrStatus(cwd: string): Promise<PrStatusResult> {
   const gh = Bun.which('gh')
   if (gh === null) return { kind: 'no-gh' }
@@ -242,7 +259,9 @@ export async function collectPrStatus(cwd: string): Promise<PrStatusResult> {
     // at all (aimux projects can point anywhere). None of those is an error.
     const stderr = result.stderr.toLowerCase()
     if (NOT_AN_ERROR.some((needle) => stderr.includes(needle))) return { kind: 'no-pr' }
-    return { kind: 'error', message: (result.error ?? 'gh failed').slice(0, 200) }
+    // A spawn that never started (missing cwd) reports on `error`, not stderr.
+    const detail = result.stderr.trim() !== '' ? result.stderr : (result.error ?? '')
+    return { kind: 'error', message: ghErrorMessage(detail) }
   }
 
   try {

package/src/services/ai-usage/adapters/claude.ts

@@ -1,5 +1,9 @@
 import type { AIUsageToolConfig } from '@brimveyn/aimux-config'
 
+import { readFile } from 'node:fs/promises'
+import { homedir } from 'node:os'
+import { join } from 'node:path'
+
 import type { UsageSnapshot, UsageWindow, UsageWindowKind } from '../types'
 
 import { computePace, formatTimeRemaining } from '../pace'
@@ -11,7 +15,7 @@ interface ClaudeOAuthCreds {
   planTier: string | null
 }
 
-interface ClaudeKeychainPayload {
+interface ClaudeCredentialsPayload {
   claudeAiOauth?: {
     accessToken?: string
     expiresAt?: number
@@ -59,7 +63,7 @@ function normalizePlanTier(raw: string | undefined | null): string | null {
   return trimmed.charAt(0).toUpperCase() + trimmed.slice(1)
 }
 
-function planTierFromPayload(payload: ClaudeKeychainPayload): string | null {
+function planTierFromPayload(payload: ClaudeCredentialsPayload): string | null {
   const o = payload.claudeAiOauth
   if (!o) return null
   const raw = o.rateLimitTier ?? o.rate_limit_tier ?? o.subscriptionType
@@ -77,6 +81,33 @@ function planTierFromPayload(payload: ClaudeKeychainPayload): string | null {
   return null
 }
 
+function claudeConfigDir(): string {
+  const env = process.env.CLAUDE_CONFIG_DIR?.trim()
+  if (env != null && env !== '') return env
+  return join(homedir(), '.claude')
+}
+
+async function readCredsFromFile(): Promise<string | null> {
+  try {
+    const raw = await readFile(join(claudeConfigDir(), '.credentials.json'), 'utf8')
+    return raw.trim() || null
+  } catch {
+    return null
+  }
+}
+
+async function readCredsFromKeychain(): Promise<string | null> {
+  if (process.platform !== 'darwin') return null
+  const result = await runCli('security', [
+    'find-generic-password',
+    '-s',
+    'Claude Code-credentials',
+    '-w',
+  ])
+  if (!result.ok) return null
+  return result.stdout.trim() || null
+}
+
 async function readClaudeCreds(): Promise<ClaudeOAuthCreds> {
   const now = Date.now()
   if (
@@ -87,22 +118,27 @@ async function readClaudeCreds(): Promise<ClaudeOAuthCreds> {
     return cachedCreds
   }
 
-  if (process.platform !== 'darwin') {
-    throw new Error('claude usage requires macOS keychain (darwin only)')
+  // macOS keeps the OAuth blob in the keychain; Linux (incl. WSL) and Windows
+  // write the same JSON to ~/.claude/.credentials.json. Try the platform's
+  // primary store first, then the other one — a macOS install with the keychain
+  // unavailable falls back to the file too.
+  const raw =
+    process.platform === 'darwin'
+      ? ((await readCredsFromKeychain()) ?? (await readCredsFromFile()))
+      : ((await readCredsFromFile()) ?? (await readCredsFromKeychain()))
+  if (raw === null) {
+    throw new Error('no Claude credentials found — run `claude` to sign in')
   }
-  const result = await runCli('security', [
-    'find-generic-password',
-    '-s',
-    'Claude Code-credentials',
-    '-w',
-  ])
-  if (!result.ok) {
-    throw new Error(`keychain read failed — run \`claude\` to sign in`)
+
+  let parsed: ClaudeCredentialsPayload
+  try {
+    parsed = JSON.parse(raw) as ClaudeCredentialsPayload
+  } catch {
+    throw new Error('claude credentials unreadable — run `claude` to sign in')
   }
-  const parsed = JSON.parse(result.stdout.trim()) as ClaudeKeychainPayload
   const access = parsed.claudeAiOauth?.accessToken
   if (!(access != null && access !== '')) {
-    throw new Error('no accessToken in Claude Code keychain')
+    throw new Error('no accessToken in Claude credentials — run `claude` to sign in')
   }
   cachedCreds = {
     accessToken: access,

package/src/ui/components/git/pane/git-pane-widget.tsx

@@ -57,7 +57,7 @@ export const GitPaneWidget = memo(function GitPaneWidget({
     <box flexDirection="column" flexGrow={1} flexShrink={1} flexBasis={0} overflow="hidden">
       <GitPaneHeader gitPanel={display} onTabChange={setTab} projectPath={projectPath} tab={tab} />
       {tab === 'github' ? (
-        <PrChecksPanel contentWidth={contentWidth} />
+        <PrChecksPanel contentWidth={contentWidth} projectPath={projectPath} />
       ) : (
         <GitPanel
           collapsedFolders={gitMode.collapsedFolders}

package/src/ui/components/git/pane/pr-checks-panel.tsx

@@ -1,13 +1,21 @@
-import { memo, useCallback, useState } from 'react'
+import { memo, useCallback, useEffect, useState } from 'react'
 
+import {
+  type GhAccount,
+  listGhAccounts,
+  nextGhAccount,
+  switchGhAccount,
+} from '../../../../git/gh-auth'
 import {
   clampPrBody,
   type PrCheck,
   type PrCheckState,
   type PrStatusResult,
 } from '../../../../git/pr-status'
+import { refreshPrStatus } from '../../../../git/pr-status-poller'
 import { openUrl } from '../../../../platform/open-url'
 import { usePrStatusStore } from '../../../../state/pr-status-store'
+import { toast } from '../../../../state/toast-store'
 import { useBusySpinner } from '../../../hooks/use-busy-spinner'
 import { type ResolvedTuiTheme, useTheme, useTransparent } from '../../../theme'
 
@@ -47,10 +55,93 @@ function placeholder(
   if (result === null) return { color: t.textMuted, label: '…' }
   if (result.kind === 'no-gh') return { color: t.textMuted, label: 'gh CLI not found' }
   if (result.kind === 'no-pr') return { color: t.textMuted, label: 'No pull request' }
-  if (result.kind === 'error') return { color: t.error, label: result.message }
   return null
 }
 
+/**
+ * Nearly every `gh` failure the pane can hit is really "the active account
+ * can't see this repo", so the error state carries the one fix worth a click:
+ * cycle to the next authenticated account and refetch.
+ */
+const GhErrorState = memo(function GhErrorState({
+  bg,
+  message,
+  projectPath,
+}: {
+  bg: string | undefined
+  message: string
+  projectPath: string | undefined
+}) {
+  const t = useTheme()
+  const [accounts, setAccounts] = useState<readonly GhAccount[]>([])
+  const [switching, setSwitching] = useState(false)
+  const spinner = useBusySpinner(switching)
+
+  useEffect(() => {
+    let cancelled = false
+    void (async () => {
+      const list = await listGhAccounts()
+      if (!cancelled) setAccounts(list)
+    })()
+    return () => {
+      cancelled = true
+    }
+  }, [])
+
+  const active = accounts.find((account) => account.active)
+  const next = nextGhAccount(accounts)
+
+  const onSwitch = useCallback(() => {
+    if (next === null || switching) return
+    setSwitching(true)
+    void (async () => {
+      const error = await switchGhAccount(next)
+      setSwitching(false)
+      if (error !== null) {
+        toast.error(error)
+        return
+      }
+      setAccounts(await listGhAccounts())
+      // The poller backs off to two minutes on errors; don't make the user wait
+      // it out to find out whether the account they picked was the right one.
+      if (projectPath != null && projectPath !== '') await refreshPrStatus(projectPath)
+    })()
+  }, [next, projectPath, switching])
+
+  return (
+    <box
+      flexGrow={1}
+      flexDirection="column"
+      alignItems="center"
+      gap={1}
+      backgroundColor={bg}
+      padding={1}
+    >
+      <box flexDirection="column" alignItems="center">
+        <text selectable={false} fg={t.error} bg={bg}>
+          ✗ {message}
+        </text>
+        {active !== undefined ? (
+          <text selectable={false} fg={t.textMuted} bg={bg}>
+            signed in as {active.user}
+          </text>
+        ) : null}
+      </box>
+      {next !== null ? (
+        <text
+          selectable={false}
+          fg={switching ? t.warning : t.primary}
+          bg={bg}
+          wrapMode="none"
+          onMouseDown={onSwitch}
+        >
+          {switching ? `${spinner} switching…` : `↺ Switch to ${next.user}`}
+        </text>
+      ) : null}
+    </box>
+  )
+})
+
 const CheckRow = memo(function CheckRow({
   bg,
   check,
@@ -97,8 +188,10 @@ const CheckRow = memo(function CheckRow({
 
 export const PrChecksPanel = memo(function PrChecksPanel({
   contentWidth,
+  projectPath,
 }: {
   contentWidth: number
+  projectPath: string | undefined
 }) {
   const t = useTheme()
   // A tone apart from the PR state row above, so the two zones read as
@@ -113,6 +206,10 @@ export const PrChecksPanel = memo(function PrChecksPanel({
   const checks = result?.kind === 'ok' ? result.checks : []
   const spinner = useBusySpinner(checks.some((c) => c.state === 'pending'))
 
+  if (result?.kind === 'error') {
+    return <GhErrorState bg={bg} message={result.message} projectPath={projectPath} />
+  }
+
   const status = placeholder(result, t)
   if (status !== null || result?.kind !== 'ok') {
     return (