ethagent 1.1.2 → 2.0.0

package/src/models/ModelPicker.tsx

@@ -51,6 +51,7 @@ import {
   buildLocalModelCatalogOptions,
   buildModelPickerOptions,
   catalogOptionValue,
+  cloudProviderDisplayName,
   LOCAL_MODEL_LINK_EXAMPLE,
   LOCAL_MODEL_LINK_HINT,
   MODEL_PICKER_CLOUD_PROVIDERS,
@@ -153,7 +154,6 @@ export const ModelPicker: React.FC<ModelPickerProps> = ({
         }
       }
       setState({ kind: 'list', data })
-      // If a featured repo was provided (first-run local flow), auto-inspect it
       if (featuredHfRepo) {
         await inspectHfInput({ kind: 'hfInput', data }, featuredHfRepo, setState)
       }
@@ -168,7 +168,7 @@ export const ModelPicker: React.FC<ModelPickerProps> = ({
   if (state.kind === 'loading') {
     return (
       <Surface title={contextFit ? 'Switch to Larger-Context Model' : 'Switch Provider · Model'} subtitle="Loading providers and models.">
-        <Spinner label="Loading providers..." />
+        <Spinner label="loading providers..." />
       </Surface>
     )
   }
@@ -186,7 +186,7 @@ export const ModelPicker: React.FC<ModelPickerProps> = ({
           onSubmit={value => void inspectHfInput(state, value, setState)}
           onCancel={() => setState({ kind: 'list', data: state.data })}
         />
-        {state.error ? <Text color="#e87070">{state.error}</Text> : null}
+        {state.error ? <Text color={theme.accentError}>{state.error}</Text> : null}
       </Surface>
     )
   }
@@ -194,7 +194,7 @@ export const ModelPicker: React.FC<ModelPickerProps> = ({
   if (state.kind === 'hfLoading') {
     return (
       <Surface title="Checking Model Link" subtitle={state.input}>
-        <Spinner label="Reading model page..." />
+        <Spinner label="reading model page..." />
       </Surface>
     )
   }
@@ -266,7 +266,7 @@ export const ModelPicker: React.FC<ModelPickerProps> = ({
     return (
       <Surface title="Downloading Model" subtitle={state.plan.displayName}>
         <Text color={theme.dim}>{state.progress.status}</Text>
-        <ProgressBar progress={progress} suffix={suffix} variant="rainbow" />
+        <ProgressBar progress={progress} suffix={suffix} />
       </Surface>
     )
   }
@@ -441,7 +441,7 @@ export const ModelPicker: React.FC<ModelPickerProps> = ({
     return (
       <Surface title="Installing Local Runner" subtitle="This may take a few minutes.">
         <ElapsedSpinner startedAt={state.startedAt} label={state.progress.label} />
-        <ProgressBar progress={state.progress.progress} variant="rainbow" />
+        <ProgressBar progress={state.progress.progress} />
       </Surface>
     )
   }
@@ -481,7 +481,7 @@ export const ModelPicker: React.FC<ModelPickerProps> = ({
             onCancel={() => setState({ kind: 'localRunnerSetup', data: state.data, model: state.model })}
           />
         )}
-        {state.error ? <Text color="#e87070">{state.error}</Text> : null}
+        {state.error ? <Text color={theme.accentError}>{state.error}</Text> : null}
       </Surface>
     )
   }
@@ -489,7 +489,7 @@ export const ModelPicker: React.FC<ModelPickerProps> = ({
   if (state.kind === 'localRunnerStarting') {
     return (
       <Surface title="Starting Local Model" subtitle={state.model.displayName}>
-        <ElapsedSpinner startedAt={state.startedAt} label="Starting local runner" />
+        <ElapsedSpinner startedAt={state.startedAt} label="starting local runner..." />
       </Surface>
     )
   }
@@ -518,38 +518,41 @@ export const ModelPicker: React.FC<ModelPickerProps> = ({
 
   if (state.kind === 'keyEntry') {
     const { provider, action, submitting, error } = state
+    const providerName = cloudProviderDisplayName(provider)
+    const actionLabel = action === 'set' ? 'Add' : 'Replace'
     return (
       <Surface
-        title={`${capitalize(action)} ${provider} API Key`}
+        title={`${actionLabel} ${providerName} API Key`}
         subtitle="Stored in your OS keyring when available; never written to config in plaintext."
         footer="enter save · esc back"
       >
         {submitting ? (
-          <Spinner label={`saving ${provider} key...`} />
+          <Spinner label={`saving ${providerName} key...`} />
         ) : (
           <TextInput
-            label={`${provider} key`}
+            label={`${providerName} key`}
             placeholder={providerKeyPlaceholder(provider)}
             isSecret
             onSubmit={(value) => void submitKey(state, value, currentConfig, setState)}
             onCancel={() => setState({ kind: 'list', data: state.data })}
           />
         )}
-        {error ? <Text color="#e87070">{error}</Text> : null}
+        {error ? <Text color={theme.accentError}>{error}</Text> : null}
       </Surface>
     )
   }
 
   if (state.kind === 'keyManage') {
     const { provider, submitting, error } = state
+    const providerName = cloudProviderDisplayName(provider)
     return (
       <Surface
-        title={`${capitalize(provider)} API Key`}
+        title={`${providerName} API Key`}
         subtitle="Manage the stored key for this provider."
         footer="enter select · esc back"
       >
         {submitting ? (
-          <Spinner label={`removing ${provider} key...`} />
+          <Spinner label={`removing ${providerName} key...`} />
         ) : (
           <Select
             options={[
@@ -571,13 +574,11 @@ export const ModelPicker: React.FC<ModelPickerProps> = ({
             onCancel={() => setState({ kind: 'list', data: state.data })}
           />
         )}
-        {error ? <Text color="#e87070">{error}</Text> : null}
+        {error ? <Text color={theme.accentError}>{error}</Text> : null}
       </Surface>
     )
   }
 
-
-
   if (state.kind === 'catalog') {
     const catalog = state.data.cloudCatalogs[state.provider]
     const options = buildCatalogOptions(state.provider, catalog, currentProvider, currentModel, contextFit)
@@ -588,7 +589,7 @@ export const ModelPicker: React.FC<ModelPickerProps> = ({
     })
     return (
       <Surface
-        title={`${capitalize(state.provider)} Full Catalog`}
+        title={`${cloudProviderDisplayName(state.provider)} Full Catalog`}
         subtitle={contextFit ? contextFitSubtitle(contextFit) : 'All discovered models for this provider'}
         footer="enter select · esc back"
       >
@@ -609,7 +610,7 @@ export const ModelPicker: React.FC<ModelPickerProps> = ({
   if (state.kind === 'localCatalogLoading') {
     return (
       <Surface title="View Full Catalog" subtitle="Loading curated local GGUF files.">
-        <Spinner label="Reading Hugging Face files..." />
+        <Spinner label="reading hugging face files..." />
       </Surface>
     )
   }
@@ -647,7 +648,7 @@ export const ModelPicker: React.FC<ModelPickerProps> = ({
           options={options}
           initialIndex={initialIndex === -1 ? 0 : initialIndex}
           maxVisible={12}
-          onSubmit={(value) => handleSubmit(value, state, setState, onPick)}
+          onSubmit={(value) => handleSubmit(value, state, setState, onPick, onCancel)}
           onCancel={() => setState({ kind: 'list', data: state.data })}
         />
       </Surface>
@@ -668,7 +669,7 @@ export const ModelPicker: React.FC<ModelPickerProps> = ({
         options={options}
         initialIndex={initialIndex === -1 ? 0 : initialIndex}
         maxVisible={10}
-        onSubmit={(value) => handleSubmit(value, state, setState, onPick)}
+        onSubmit={(value) => handleSubmit(value, state, setState, onPick, onCancel)}
         onCancel={onCancel}
       />
     </Surface>
@@ -680,8 +681,17 @@ function handleSubmit(
   state: Extract<State, { kind: 'list' | 'localCatalog' }>,
   setState: (s: State) => void,
   onPick: (sel: ModelPickerSelection) => void,
+  onCancel: () => void,
 ): void {
   if (value.startsWith('hdr:')) return
+  if (value === 'cancel') {
+    onCancel()
+    return
+  }
+  if (value === 'back' && state.kind === 'localCatalog') {
+    setState({ kind: 'list', data: state.data })
+    return
+  }
   if (value.startsWith('hf:')) {
     const id = value.slice(3)
     if (id === 'download') {
@@ -1256,7 +1266,7 @@ async function runRunnerSetup(
   const startedAt = Date.now()
   const initialProgress: LlamaCppInstallProgress = {
     phase: 'checking',
-    label: 'Preparing local runner',
+    label: 'preparing local runner...',
     progress: 0.04,
   }
   const updateProgress = (progress: LlamaCppInstallProgress): void => {
@@ -1361,14 +1371,14 @@ function modelMetadataSubtext(size: string, indicators: string[]): string | unde
 }
 
 function riskColor(risk: string): string {
-  if (risk === 'high') return '#e87070'
+  if (risk === 'high') return theme.accentError
   if (risk === 'medium') return theme.dim
-  return theme.accentSecondary
+  return theme.accentPeriwinkle
 }
 
 function fitColor(fit: GgufMachineFit): string {
-  if (fit === 'too-large') return '#e87070'
-  if (fit === 'tight') return theme.accentWarm
+  if (fit === 'too-large') return theme.accentError
+  if (fit === 'tight') return theme.accentPeriwinkle
   return theme.dim
 }
 
@@ -1433,10 +1443,6 @@ function runnerPathPlaceholder(): string {
   return '/path/to/llama-server'
 }
 
-function capitalize(value: string): string {
-  return value.charAt(0).toUpperCase() + value.slice(1)
-}
-
 function isCloudProvider(value: string | undefined): value is CloudProviderId {
   return value === 'openai' || value === 'anthropic' || value === 'gemini'
 }

package/src/models/catalog.ts

@@ -236,10 +236,13 @@ async function discoverGeminiModels(
   apiKey: string,
 ): Promise<ModelCatalogEntry[]> {
   const response = await fetchImpl(
-    `https://generativelanguage.googleapis.com/v1beta/models?key=${encodeURIComponent(apiKey)}`,
+    'https://generativelanguage.googleapis.com/v1beta/models',
     {
       method: 'GET',
-      headers: { Accept: 'application/json' },
+      headers: {
+        Accept: 'application/json',
+        'x-goog-api-key': apiKey.trim(),
+      },
     },
   )
   if (!response.ok) throw new Error(`HTTP ${response.status}`)

package/src/models/huggingface.ts

@@ -182,7 +182,7 @@ export async function uninstallLocalHfModel(
   const modelPath = path.resolve(model.localPath)
   const partialPath = path.resolve(`${model.localPath}.partial`)
   if (!isPathInside(cacheRoot, modelPath) || !isPathInside(cacheRoot, partialPath)) {
-    throw new Error('refusing to uninstall a local model outside EthAgent model cache')
+    throw new Error('Refusing to uninstall a local model outside EthAgent model cache')
   }
 
   const unlink = deps.unlink ?? ((target: string) => fs.unlink(target))
@@ -203,10 +203,10 @@ export function parseHuggingFaceRef(input: string): HuggingFaceRef {
     const url = new URL(trimmed)
     const host = url.hostname.toLowerCase()
     if (host !== 'huggingface.co' && host !== 'www.huggingface.co') {
-      throw new Error('expected a huggingface.co model link')
+      throw new Error('Expected a huggingface.co model link')
     }
     const parts = url.pathname.split('/').filter(Boolean)
-    if (parts.length < 2) throw new Error('expected a Hugging Face repo link')
+    if (parts.length < 2) throw new Error('Expected a Hugging Face repo link')
     const repoId = `${decodeURIComponent(parts[0]!)}/${decodeURIComponent(parts[1]!)}`
     const mode = parts[2]
     if (mode === 'blob' || mode === 'resolve' || mode === 'tree') {
@@ -221,7 +221,7 @@ export function parseHuggingFaceRef(input: string): HuggingFaceRef {
 
   const withoutPrefix = trimmed.replace(/^hf:\/\//i, '')
   const parts = withoutPrefix.split('/').filter(Boolean)
-  if (parts.length < 2) throw new Error('expected repo id like org/model or a huggingface.co link')
+  if (parts.length < 2) throw new Error('Expected repo id like org/model or a huggingface.co link')
   const repoId = `${parts[0]!}/${parts[1]!}`
   let fileParts = parts.slice(2)
   const mode = fileParts[0]
@@ -242,7 +242,7 @@ export async function fetchHuggingFaceRepoInfo(
   const response = await fetchImpl(url, { headers: { Accept: 'application/json' } })
   if (!response.ok) {
     if (response.status === 401 || response.status === 403) {
-      throw new Error('repo is gated or private')
+      throw new Error('Repo is gated or private')
     }
     if (response.status === 404) throw new Error('Hugging Face repo not found')
     throw new Error(`Hugging Face API HTTP ${response.status}`)
@@ -301,7 +301,7 @@ export async function createHfDownloadPlan(
   const repo = await fetchHuggingFaceRepoInfo(ref, deps.fetchImpl)
   const files = ggufFiles(repo)
   if (files.length === 0) {
-    throw new Error('no compatible local model files found for this link')
+    throw new Error('No compatible local model files found for this link')
   }
   const selected = selectedFilename
     ? files.find(file => file.filename === selectedFilename)
@@ -388,7 +388,7 @@ export async function* downloadHfModel(
   fetchImpl: FetchImpl = fetch,
 ): AsyncIterable<HfDownloadProgress> {
   if (plan.review.runtime !== 'llama.cpp runnable') {
-    throw new Error('selected file is not compatible with local chat')
+    throw new Error('Selected file is not compatible with local chat')
   }
 
   await fs.mkdir(path.dirname(plan.localPath), { recursive: true })
@@ -411,7 +411,7 @@ export async function* downloadHfModel(
     while (true) {
       const { done, value } = await reader.read()
       if (done) break
-      if (signal?.aborted) throw new Error('cancelled')
+      if (signal?.aborted) throw new Error('Cancelled')
       const buffer = Buffer.from(value)
       hash.update(buffer)
       await handle.write(buffer)
@@ -513,7 +513,7 @@ async function unlinkIfPresent(
     const code = (err as NodeJS.ErrnoException).code
     if (code === 'ENOENT') return
     if (code === 'EBUSY' || code === 'EPERM' || code === 'EACCES') {
-      throw new Error('that model file is currently in use. stop the local runner and try uninstall again.')
+      throw new Error('That model file is currently in use. Stop the local runner and try uninstall again.')
     }
     throw err
   }

package/src/models/llamacpp.ts

@@ -278,12 +278,12 @@ export async function installLlamaCppRunner(
 ): Promise<LlamaCppInstallResult> {
   const plans = llamaCppInstallPlans(platform)
   const failures: string[] = []
-  onProgress?.({ phase: 'checking', label: 'checking local runner installers', progress: 0.08 })
+  onProgress?.({ phase: 'checking', label: 'checking local runner installers...', progress: 0.08 })
   for (const plan of plans) {
     onProgress?.({ phase: 'installing', label: installerProgressLabel(plan), progress: 0.34 })
     const result = await runInstallCommand(plan, plan.timeoutMs ?? 10 * 60_000)
     if (result.ok) {
-      onProgress?.({ phase: 'finding', label: 'finding llama-server', progress: 0.78 })
+      onProgress?.({ phase: 'finding', label: 'finding llama-server...', progress: 0.78 })
       const binary = await findAndPersistLlamaCppServer(platform)
       if (binary.path) return { ok: true, serverPath: binary.path }
       const cliPaths = await discoverLlamaCppCliPaths(process.env, platform)
@@ -679,11 +679,11 @@ function cleanInstallLine(line: string): string {
 }
 
 function installerProgressLabel(plan: LlamaCppInstallPlan): string {
-  if (plan.command === 'winget') return 'installing with Windows package manager'
-  if (plan.command === 'brew') return 'installing with Homebrew'
-  if (plan.command === 'nix') return 'installing with Nix'
-  if (plan.command === 'port') return 'installing with MacPorts'
-  return `installing with ${plan.label}`
+  if (plan.command === 'winget') return 'installing with Windows package manager...'
+  if (plan.command === 'brew') return 'installing with Homebrew...'
+  if (plan.command === 'nix') return 'installing with Nix...'
+  if (plan.command === 'port') return 'installing with MacPorts...'
+  return `installing with ${plan.label}...`
 }
 
 function formatInstallFailure(label: string, result: RunInstallResult): string {
@@ -735,7 +735,7 @@ async function installLlamaCppFromSource(
   await ensureConfigDir()
   await fs.mkdir(root, { recursive: true })
 
-  onProgress?.({ phase: 'checking', label: 'checking build tools', progress: 0.08 })
+  onProgress?.({ phase: 'checking', label: 'checking build tools...', progress: 0.08 })
   const hasGit = await runCommand('git', ['--version'])
   if (!hasGit || hasGit.code !== 0) {
     return {
@@ -757,14 +757,14 @@ async function installLlamaCppFromSource(
 
   try {
     await fs.access(path.join(repoDir, '.git'))
-    onProgress?.({ phase: 'building', label: 'updating local runner source', progress: 0.22 })
+    onProgress?.({ phase: 'building', label: 'updating local runner source...', progress: 0.22 })
     const update = await runInstallCommand(
       { label: 'update llama.cpp source', command: 'git', args: ['-C', repoDir, 'pull', '--ff-only'], timeoutMs: 5 * 60_000 },
       5 * 60_000,
     )
     if (!update.ok) return buildFailure(update)
   } catch {
-    onProgress?.({ phase: 'building', label: 'downloading local runner source', progress: 0.22 })
+    onProgress?.({ phase: 'building', label: 'downloading local runner source...', progress: 0.22 })
     const clone = await runInstallCommand(
       { label: 'clone llama.cpp source', command: 'git', args: ['clone', '--depth', '1', 'https://github.com/ggml-org/llama.cpp.git', repoDir], timeoutMs: 10 * 60_000 },
       10 * 60_000,
@@ -772,14 +772,14 @@ async function installLlamaCppFromSource(
     if (!clone.ok) return buildFailure(clone)
   }
 
-  onProgress?.({ phase: 'building', label: 'configuring local runner', progress: 0.48 })
+  onProgress?.({ phase: 'building', label: 'configuring local runner...', progress: 0.48 })
   const configure = await runInstallCommand(
     { label: 'configure llama.cpp', command: 'cmake', args: ['-S', repoDir, '-B', buildDir, '-DCMAKE_BUILD_TYPE=Release'], timeoutMs: 5 * 60_000 },
     5 * 60_000,
   )
   if (!configure.ok) return buildFailure(configure)
 
-  onProgress?.({ phase: 'building', label: 'building local runner', progress: 0.68 })
+  onProgress?.({ phase: 'building', label: 'building local runner...', progress: 0.68 })
   const build = await runInstallCommand(
     {
       label: 'build llama-server',
@@ -795,7 +795,7 @@ async function installLlamaCppFromSource(
     ?? (await discoverLlamaCppServerPaths(process.env, platform))[0]
   if (builtServerPath) {
     await setLlamaCppServerPath(builtServerPath)
-    onProgress?.({ phase: 'finding', label: 'local runner ready', progress: 1 })
+    onProgress?.({ phase: 'finding', label: 'local runner ready...', progress: 1 })
     return { ok: true, serverPath: builtServerPath }
   }
 

package/src/models/modelDisplay.ts

@@ -74,6 +74,18 @@ function formatRepoAndFile(repoId: string, filename: string, maxLength: number):
   const full = `${repoId}${HF_SEPARATOR}${file}`
   if (full.length <= maxLength) return full
 
+  const compactFile = compactModelFilename(file, maxLength)
+  if (maxLength <= 32 || compactFile.length >= maxLength - HF_SEPARATOR.length - 6) {
+    return truncateEndClean(compactFile, maxLength)
+  }
+
+  const repoBudget = maxLength - HF_SEPARATOR.length - compactFile.length
+  const compactRepo = compactRepoId(repoId, repoBudget)
+  if (compactRepo) {
+    const compact = `${compactRepo}${HF_SEPARATOR}${compactFile}`
+    if (compact.length <= maxLength) return compact
+  }
+
   const separatorBudget = HF_SEPARATOR.length
   const partBudget = maxLength - separatorBudget
   if (partBudget <= 8) return truncateMiddle(full, maxLength)
@@ -103,3 +115,66 @@ function formatRepoAndFile(repoId: string, filename: string, maxLength: number):
 function friendlyFilename(filename: string): string {
   return filename.split('/').pop() ?? filename
 }
+
+function compactRepoId(repoId: string, maxLength: number): string {
+  if (maxLength <= 0) return ''
+  if (repoId.length <= maxLength) return repoId
+  const parts = repoId.split('/').filter(Boolean)
+  const owner = parts.length > 1 ? parts[0] ?? '' : ''
+  const repoName = parts.at(-1) ?? repoId
+  if (owner.length > 0) {
+    const nameBudget = maxLength - owner.length - 1
+    if (nameBudget >= 6) {
+      const compactName = compactModelCore(repoName, nameBudget)
+      const withOwner = `${owner}/${compactName}`
+      if (withOwner.length <= maxLength) return withOwner
+    }
+  }
+  return compactModelCore(repoName, maxLength)
+}
+
+function compactModelFilename(filename: string, maxLength: number): string {
+  const withoutExtension = filename.replace(/\.gguf$/i, '')
+  const compact = compactModelCore(withoutExtension, maxLength)
+  if (compact.length <= maxLength) return compact
+  return truncateEndClean(compact, maxLength)
+}
+
+function compactModelCore(value: string, maxLength: number): string {
+  if (maxLength <= 0) return ''
+  const cleaned = value
+    .replace(/\.gguf$/i, '')
+    .replace(/[_-]+/g, ' ')
+    .replace(/(^|[^0-9])\./g, '$1 ')
+    .replace(/\.(?=[^0-9]|$)/g, ' ')
+    .replace(/\bgguf\b/gi, '')
+    .replace(/\s+/g, ' ')
+    .trim()
+  if (!cleaned) return truncateEndClean(value, maxLength)
+
+  const tokens = cleaned.split(' ')
+  const sizeIndex = tokens.findIndex(token => /^\d+(?:\.\d+)?[bm]$/i.test(token))
+  const familyTokens = sizeIndex > 0 ? tokens.slice(0, Math.min(sizeIndex, 3)) : tokens.slice(0, Math.min(tokens.length, 3))
+  const size = sizeIndex >= 0 ? tokens[sizeIndex] : undefined
+  const context = tokens.find(token => /^\d+k$/i.test(token))
+  const quant = quantizationLabel(value)
+  const parts = [familyTokens.join(' '), size, context, quant]
+    .filter((part): part is string => Boolean(part))
+    .filter((part, index, all) => all.findIndex(other => other.toLowerCase() === part.toLowerCase()) === index)
+  const compact = parts.join(' ').trim() || cleaned
+  if (compact.length <= maxLength) return compact
+  return truncateEndClean(compact, maxLength)
+}
+
+function quantizationLabel(value: string): string | undefined {
+  const match = value.match(/(?:^|[-_.\s])((?:Q\d(?:_[A-Za-z0-9]+)*)|BF16|F16|FP16)(?:$|[-_.\s])/i)
+  return match?.[1]?.toUpperCase()
+}
+
+function truncateEndClean(value: string, maxLength: number): string {
+  if (maxLength <= 0) return ''
+  if (value.length <= maxLength) return value
+  if (maxLength <= 3) return value.slice(0, maxLength)
+  const sliced = value.slice(0, maxLength - 3).replace(/[\s._/-]+$/g, '')
+  return `${sliced || value.slice(0, maxLength - 3)}...`
+}

package/src/models/modelPickerOptions.ts

@@ -14,6 +14,14 @@ export const MODEL_PICKER_CLOUD_PROVIDERS: CloudProviderId[] = ['openai', 'anthr
 export const LOCAL_MODEL_LINK_HINT = 'Paste a GGUF link'
 export const LOCAL_MODEL_LINK_EXAMPLE = 'e.g. https://huggingface.co/Qwen/Qwen3-8B-GGUF'
 
+export function cloudProviderDisplayName(provider: CloudProviderId): string {
+  switch (provider) {
+    case 'openai': return 'OpenAI'
+    case 'anthropic': return 'Anthropic'
+    case 'gemini': return 'Gemini'
+  }
+}
+
 export type LocalHfPickerModel = {
   id: string
   displayName: string
@@ -67,10 +75,10 @@ export function buildModelPickerOptions(
 
   options.push(sectionOption('hdr:cloud', 'Cloud'))
   for (const provider of MODEL_PICKER_CLOUD_PROVIDERS) {
-    options.push(groupOption(`hdr:cloud:${provider}`, provider))
+    options.push(groupOption(`hdr:cloud:${provider}`, cloudProviderDisplayName(provider)))
     const keySet = data.cloudKeys[provider] === true
     if (!keySet) {
-      options.push(utilityOption(`key:set:${provider}`, 'API Key · Add'))
+      options.push(utilityOption(`key:set:${provider}`, 'Add API Key'))
       continue
     }
 
@@ -97,9 +105,12 @@ export function buildModelPickerOptions(
       ))
     }
     options.push(utilityOption(`catalog:${provider}`, 'Full Catalog'))
-    options.push(utilityOption(`key:manage:${provider}`, 'API Key · Manage'))
+    options.push(utilityOption(`key:manage:${provider}`, 'Manage API Key'))
   }
 
+  options.push(sectionOption('hdr:exit', 'Exit'))
+  options.push(utilityOption('cancel', 'Close Model Picker', 'Return to chat without changing model'))
+
   return options
 }
 
@@ -139,6 +150,8 @@ export function buildLocalModelCatalogOptions(
   if (data.hfModels.length > 0) {
     options.push(utilityOption('local:uninstall', 'Uninstall Downloaded GGUF'))
   }
+  options.push(sectionOption('hdr:navigation', 'Navigation'))
+  options.push(utilityOption('back', 'Back To Picker', 'Return to model picker'))
   return options
 }
 

package/src/models/modelRecommendation.ts

@@ -8,7 +8,6 @@ import type { SpecSnapshot } from './runtimeDetection.js'
 
 const GB = 1024 * 1024 * 1024
 
-/** Featured local model repo for first-run setup and the model picker catalog. */
 export const FEATURED_HF_REPO = 'HauhauCS/Qwen3.5-9B-Uncensored-HauhauCS-Aggressive'
 export const FEATURED_HF_REPO_URL = `https://huggingface.co/${FEATURED_HF_REPO}`
 

package/src/providers/errors.ts

@@ -1,5 +1,6 @@
 import type { ProviderId } from '../storage/config.js'
 import { ProviderError } from './contracts.js'
+import { formatGeminiRateLimitMessage } from './gemini.js'
 
 type ErrorBody =
   | string
@@ -16,8 +17,23 @@ export async function providerErrorFromResponse(
   provider: ProviderId,
   response: Response,
 ): Promise<ProviderError> {
+  if (provider === 'gemini' && response.status === 429) {
+    const short = await formatGeminiRateLimitMessage(response.clone())
+    if (short) return new ProviderError(short, { transient: true })
+  }
+
   const detail = await readErrorDetail(response)
 
+  if (
+    provider === 'gemini'
+    && response.status === 400
+    && /API[_ ]?key( not valid| not found|_invalid)|invalid api key/i.test(detail)
+  ) {
+    return new ProviderError(
+      'gemini: API key rejected — verify your key at https://aistudio.google.com/app/apikey, then run /key gemini to set it again',
+    )
+  }
+
   if (provider !== 'llamacpp') {
     if (response.status === 401 || response.status === 403) {
       return new ProviderError(`auth failed: check your ${provider} key (/doctor to verify)`)