feat(models): fetch live model lists from CLIs, allow custom ids

Each agent definition now declares an optional `listModels` spec; the daemon runs the CLI's own list-models command (e.g. `opencode models`, `cursor-agent models`) during agent detection and uses the result as the dropdown options. Hardcoded entries shrink to a `fallbackModels` hint that only kicks in when the CLI has no listing command (Claude, Codex, Gemini, Qwen) or when the listing fails (e.g. unauth'd cursor-agent). UI groups `provider/model` ids by provider via <optgroup> so opencode's ~175 live models stay navigable, and the Settings dialog gains a "Custom…" entry that opens a free-text input for any model id the listing didn't surface yet. Daemon validates picks against the live cache + fallback, with a permissive sanitizer for custom ids.
feat: per-CLI model picker for local agents (closes #8 )
2026-04-29 00:32:03 +08:00 · 2026-04-28 22:54:18 +08:00
22 changed files with 739 additions and 665 deletions
@@ -39,7 +39,7 @@ OD stands on four open-source shoulders:

 | | What you get |
 |---|---|
-| **Coding agents supported** | Claude Code · Codex CLI · Cursor Agent · Gemini CLI · OpenCode · Qwen Code · Hosted-API BYOK fallback (Anthropic · OpenAI-compatible · Azure · Google Gemini, plus AWS Bedrock & GCP Vertex via proxy) |
+| **Coding agents supported** | Claude Code · Codex CLI · Cursor Agent · Gemini CLI · OpenCode · Qwen Code · Anthropic API (BYOK fallback) |
 | **Design systems built-in** | **71** — 2 hand-authored starters + 69 product systems (Linear, Stripe, Vercel, Airbnb, Tesla, Notion, Anthropic, Apple, Cursor, Supabase, Figma, …) imported from [`awesome-design-md`][acd2] |
 | **Skills built-in** | **19** — prototype, deck, mobile, dashboard, pricing, docs, blog, SaaS landing, plus 10 document/work-product templates (PM spec, weekly update, OKRs, runbook, kanban, …) |
 | **Visual directions** | 5 curated schools (Editorial Monocle · Modern Minimal · Tech Utility · Brutalist · Soft Warm) — each ships a deterministic OKLch palette + font stack |
@@ -180,7 +180,7 @@ Adding a skill takes one folder. Read [`docs/skills-protocol.md`](docs/skills-pr

 ### 1 · We don't ship an agent. Yours is good enough.

-The daemon scans your `PATH` for [`claude`](https://docs.anthropic.com/en/docs/claude-code), [`codex`](https://github.com/openai/codex), [`cursor-agent`](https://www.cursor.com/cli), [`gemini`](https://github.com/google-gemini/gemini-cli), [`opencode`](https://opencode.ai/), and [`qwen`](https://github.com/QwenLM/qwen-code) on startup. Whichever it finds becomes the design engine — driven via stdio, with one adapter per CLI. Inspired by [`multica`](https://github.com/multica-ai/multica) and [`cc-switch`](https://github.com/farion1231/cc-switch). No CLI? The `Hosted API · BYOK` fallback streams directly from the browser to **Anthropic**, any **OpenAI-compatible** endpoint (OpenRouter / LiteLLM / DeepSeek / Groq / Together / Mistral …), **Azure OpenAI**, or **Google Gemini** — pick the provider in Settings, paste a key, go. AWS Bedrock and GCP Vertex Anthropic models work the same way through a server-side LiteLLM (or equivalent) proxy pointed at the `Anthropic` provider, since SigV4 / GCP JWT signing belongs on the server, not the browser.
+The daemon scans your `PATH` for [`claude`](https://docs.anthropic.com/en/docs/claude-code), [`codex`](https://github.com/openai/codex), [`cursor-agent`](https://www.cursor.com/cli), [`gemini`](https://github.com/google-gemini/gemini-cli), [`opencode`](https://opencode.ai/), and [`qwen`](https://github.com/QwenLM/qwen-code) on startup. Whichever it finds becomes the design engine — driven via stdio, with one adapter per CLI. Inspired by [`multica`](https://github.com/multica-ai/multica) and [`cc-switch`](https://github.com/farion1231/cc-switch). No CLI? `Anthropic API · BYOK` is the same pipeline minus the spawn.

 ### 2 · Skills are files, not plugins.

@@ -227,10 +227,8 @@ Every layer is composable. Every layer is a file you can edit. Read [`src/prompt
               │ /api/* (proxied in dev)           │ direct (BYOK)
               ▼                                   ▼
   ┌──────────────────────┐              ┌──────────────────────┐
-   │   Local daemon       │              │  Hosted-API router   │
-   │   (Express + SQLite) │              │  Anthropic · OpenAI- │
-   │                      │              │  compatible · Azure  │
-   │                      │              │  · Google Gemini     │
+   │   Local daemon       │              │   Anthropic SDK      │
+   │   (Express + SQLite) │              │   (browser fallback) │
   │                      │              └──────────────────────┘
   │   /api/agents        │
   │   /api/skills        │
@@ -270,7 +268,7 @@ The first load:

 1. Detects which agent CLIs you have on `PATH` and picks one automatically.
 2. Loads 19 skills + 71 design systems.
-3. Pops the welcome dialog so you can pick a hosted-API provider — **Anthropic**, **OpenAI-compatible** (OpenRouter / LiteLLM / DeepSeek / Groq / Together / Mistral / OpenAI), **Azure OpenAI**, or **Google Gemini** — and paste the matching key (only needed for the BYOK fallback path; for AWS Bedrock or GCP Vertex Anthropic models, run a server-side LiteLLM proxy and point the `Anthropic` provider at it).
+3. Pops the welcome dialog so you can paste an Anthropic key (only needed for the BYOK fallback path).
 4. **Auto-creates `./.od/`** — the local runtime folder for the SQLite project DB, per-project artifacts, and saved renders. There is no `od init` step; the daemon `mkdir`s everything it needs on boot.

 Type a prompt, hit **Send**, watch the question form arrive, fill it, watch the todo card stream, watch the artifact render. Click **Save to disk** or download as a project ZIP.
@@ -336,12 +334,7 @@ open-design/
 │   │   └── zip.ts                 ← project archive
 │   ├── providers/
 │   │   ├── daemon.ts              ← /api/chat SSE stream consumer
-│   │   ├── model.ts               ← BYOK provider router (anthropic / openai / azure / google)
-│   │   ├── anthropic.ts           ← Anthropic SDK path (also covers any Anthropic-compatible proxy)
-│   │   ├── openai.ts              ← OpenAI-compatible SSE (OpenRouter / LiteLLM / DeepSeek / Groq / Together)
-│   │   ├── azure.ts               ← Azure OpenAI deployment URLs + api-key header
-│   │   ├── google.ts              ← Google Generative Language streamGenerateContent
-│   │   ├── presets.ts             ← per-provider defaults shown in Settings
+│   │   ├── anthropic.ts           ← BYOK Anthropic SDK path
 │   │   └── registry.ts            ← /api/agents, /api/skills, /api/design-systems
 │   └── state/                     ← config + projects (localStorage + daemon-backed)
 │
@@ -506,25 +499,10 @@ Auto-detected from `PATH` on daemon boot. No config required.
 | [Gemini CLI](https://github.com/google-gemini/gemini-cli) | `gemini` | line-buffered | `gemini -p` |
 | [OpenCode](https://opencode.ai/) | `opencode` | line-buffered | `opencode run` |
 | [Qwen Code](https://github.com/QwenLM/qwen-code) | `qwen` | line-buffered | `qwen -p` |
-| Hosted API · BYOK | n/a | SSE direct | Browser fallback when no CLI is on PATH — pick any of the providers below |
+| Anthropic API · BYOK | n/a | SSE direct | Browser fallback when no CLI is on PATH |

 Adding a new CLI is one entry in [`daemon/agents.js`](daemon/agents.js). Streaming format is one of `claude-stream-json` (typed events) or `plain` (raw text).

-### Hosted-API providers (BYOK fallback)
-
-When no CLI is detected, OD streams directly from the browser to a hosted endpoint. Pick one in **Settings → Hosted API**, paste a key, optionally tweak the base URL.
-
-| Provider | Wire format | What it covers |
-|---|---|---|
-| **Anthropic** | `@anthropic-ai/sdk` | `api.anthropic.com`, plus any Anthropic-compatible proxy (LiteLLM, custom gateways, **AWS Bedrock** & **GCP Vertex** via a server-side proxy) |
-| **OpenAI-compatible** | `/chat/completions` SSE | OpenAI proper, [OpenRouter](https://openrouter.ai), [LiteLLM proxy](https://docs.litellm.ai/), [DeepSeek](https://platform.deepseek.com/), [Groq](https://groq.com/), [Together](https://together.ai/), [Mistral](https://mistral.ai/), and any other OpenAI-shaped endpoint |
-| **Azure OpenAI** | `/openai/deployments/<deployment>/chat/completions` SSE + `api-key` header | Azure-hosted OpenAI deployments. Base URL is the resource endpoint, Model is the deployment name, plus the Azure `api-version` |
-| **Google Gemini** | `:streamGenerateContent?alt=sse` | Google Generative Language API direct (Gemini family) |
-
-**On AWS Bedrock & GCP Vertex with Anthropic models:** Both require credential signing (SigV4 / GCP service-account JWT) which is unsafe to do from a browser with long-lived BYOK credentials. The recommended path is to run a server-side proxy ([LiteLLM](https://docs.litellm.ai/) works well — it speaks Anthropic-compatible *and* OpenAI-compatible) and point either the `Anthropic` or `OpenAI-compatible` provider at the proxy URL. The signing stays on the server where it belongs.
-
-Adding a fifth wire format is mechanical: a row in `ModelProvider`, an entry in [`src/providers/presets.ts`](src/providers/presets.ts), a `stream<X>` function alongside [`anthropic.ts` / `openai.ts` / `azure.ts` / `google.ts`](src/providers/), one more `case` in [`src/providers/model.ts`](src/providers/model.ts).
-
 ## References & lineage

 Every external project this repo borrows from. Each link goes to the source so you can verify the provenance.
@@ -39,7 +39,7 @@ OD 站在四个开源项目的肩膀上：

 | | 你拿到的 |
 |---|---|
-| **支持的 coding agent** | Claude Code · Codex CLI · Cursor Agent · Gemini CLI · OpenCode · Qwen Code · 托管 API · BYOK 兜底（Anthropic · OpenAI 兼容 · Azure · Google Gemini，AWS Bedrock 与 GCP Vertex 通过代理接入） |
+| **支持的 coding agent** | Claude Code · Codex CLI · Cursor Agent · Gemini CLI · OpenCode · Qwen Code · Anthropic API（BYOK 兜底） |
 | **内置 design system** | **71 套** —— 2 套手写起手 + 69 套从 [`awesome-design-md`][acd2] 导入的产品系统（Linear、Stripe、Vercel、Airbnb、Tesla、Notion、Anthropic、Apple、Cursor、Supabase、Figma…） |
 | **内置 skill** | **19 个** —— 原型 / deck / 移动端 / dashboard / pricing / docs / blog / SaaS landing，外加 10 个文档与办公产物模板（PM 规范、周报、OKR、runbook、看板…） |
 | **视觉方向** | 5 套精选流派（Editorial Monocle · Modern Minimal · Tech Utility · Brutalist · Soft Warm），每一套自带 OKLch 色板 + 字体栈 |
@@ -180,7 +180,7 @@ OD 站在四个开源项目的肩膀上：

 ### 1 · 我们不带 agent，你的就够好

-Daemon 启动时扫 `PATH`，找 [`claude`](https://docs.anthropic.com/en/docs/claude-code)、[`codex`](https://github.com/openai/codex)、[`cursor-agent`](https://www.cursor.com/cli)、[`gemini`](https://github.com/google-gemini/gemini-cli)、[`opencode`](https://opencode.ai/)、[`qwen`](https://github.com/QwenLM/qwen-code)。哪个在就用哪个 —— 通过 stdio 驱动，每个 CLI 一个 adapter。灵感来自 [`multica`](https://github.com/multica-ai/multica) 和 [`cc-switch`](https://github.com/farion1231/cc-switch)。一个 CLI 都没有？`托管 API · BYOK` 就是同一条管线减去 spawn —— 浏览器直连 **Anthropic**、任意 **OpenAI 兼容**端点（OpenRouter / LiteLLM / DeepSeek / Groq / Together / Mistral …）、**Azure OpenAI**、或 **Google Gemini**。在 Settings 里选渠道、贴 Key、走起。AWS Bedrock 和 GCP Vertex 上的 Anthropic 模型按同样的方式接入：服务端跑一个 LiteLLM（或同类）代理，再把 `Anthropic` 渠道指向它 —— SigV4 / GCP JWT 签名应留在服务器，不放进浏览器。
+Daemon 启动时扫 `PATH`，找 [`claude`](https://docs.anthropic.com/en/docs/claude-code)、[`codex`](https://github.com/openai/codex)、[`cursor-agent`](https://www.cursor.com/cli)、[`gemini`](https://github.com/google-gemini/gemini-cli)、[`opencode`](https://opencode.ai/)、[`qwen`](https://github.com/QwenLM/qwen-code)。哪个在就用哪个 —— 通过 stdio 驱动，每个 CLI 一个 adapter。灵感来自 [`multica`](https://github.com/multica-ai/multica) 和 [`cc-switch`](https://github.com/farion1231/cc-switch)。一个 CLI 都没有？`Anthropic API · BYOK` 就是同一条管线减去 spawn。

 ### 2 · Skill 是文件，不是插件

@@ -227,10 +227,8 @@ DISCOVERY 指令         （turn-1 表单、turn-2 品牌分支、TodoWrite、
               │ /api/* （dev 走代理）             │ direct (BYOK)
               ▼                                   ▼
   ┌──────────────────────┐              ┌──────────────────────┐
-   │   本地 daemon         │              │  托管 API 路由器       │
-   │   （Express + SQLite）│              │  Anthropic · OpenAI   │
-   │                      │              │  兼容 · Azure · Google│
-   │                      │              │  Gemini               │
+   │   本地 daemon         │              │   Anthropic SDK      │
+   │   （Express + SQLite）│              │   （浏览器兜底）      │
   │                      │              └──────────────────────┘
   │   /api/agents        │
   │   /api/skills        │
@@ -270,7 +268,7 @@ open http://localhost:5173

 1. 检测你 `PATH` 上有哪些 agent CLI，自动选一个。
 2. 加载 19 个 skill + 71 套 design system。
-3. 弹欢迎对话框，让你挑一个托管 API 渠道 —— **Anthropic**、**OpenAI 兼容**（OpenRouter / LiteLLM / DeepSeek / Groq / Together / Mistral / OpenAI）、**Azure OpenAI** 或 **Google Gemini** —— 并贴上对应的 Key（仅 BYOK 兜底路径需要；要在浏览器里调 AWS Bedrock / GCP Vertex 上的 Anthropic 模型，建议在服务器跑一个 LiteLLM 代理，再把 `Anthropic` 渠道指向它）。
+3. 弹欢迎对话框，让你贴 Anthropic key（仅 BYOK 兜底路径需要）。
 4. **自动创建 `./.od/`** —— 本地运行时目录，存放 SQLite 项目库、各项目工作区、保存下来的 artifact。**没有** `od init` 这一步，daemon 启动时会自己 `mkdir`。

 输入需求，回车，看 question form 跳出来，填，看 todo 卡片流动，看 artifact 渲染。点 **Save to disk** 或导出整个项目 ZIP。
@@ -336,12 +334,7 @@ open-design/
 │   │   └── zip.ts                 ← 项目打包
 │   ├── providers/
 │   │   ├── daemon.ts              ← /api/chat SSE 流消费者
-│   │   ├── model.ts               ← BYOK 渠道路由（anthropic / openai / azure / google）
-│   │   ├── anthropic.ts           ← Anthropic SDK 路径（也涵盖任意 Anthropic 兼容代理）
-│   │   ├── openai.ts              ← OpenAI 兼容 SSE（OpenRouter / LiteLLM / DeepSeek / Groq / Together）
-│   │   ├── azure.ts               ← Azure OpenAI 部署 URL + api-key 头
-│   │   ├── google.ts              ← Google Generative Language streamGenerateContent
-│   │   ├── presets.ts             ← Settings 中各渠道的默认值
+│   │   ├── anthropic.ts           ← BYOK Anthropic SDK 路径
 │   │   └── registry.ts            ← /api/agents、/api/skills、/api/design-systems
 │   └── state/                     ← config + projects（localStorage + daemon 持久化）
 │
@@ -506,25 +499,10 @@ Daemon 启动时从 `PATH` 自动检测，无需配置。
 | [Gemini CLI](https://github.com/google-gemini/gemini-cli) | `gemini` | line-buffered | `gemini -p` |
 | [OpenCode](https://opencode.ai/) | `opencode` | line-buffered | `opencode run` |
 | [Qwen Code](https://github.com/QwenLM/qwen-code) | `qwen` | line-buffered | `qwen -p` |
-| 托管 API · BYOK | n/a | SSE 直连 | 没装任何 CLI 时的浏览器兜底 —— 在下方任意一个渠道里挑一个 |
+| Anthropic API · BYOK | n/a | SSE 直连 | 没装任何 CLI 时的浏览器兜底 |

 加一个新 CLI = 在 [`daemon/agents.js`](daemon/agents.js) 里加一项。流式格式从 `claude-stream-json`（类型化事件）和 `plain`（原始文本）两种里选一个。

-### 托管 API 渠道（BYOK 兜底）
-
-没检测到 CLI 时，OD 会从浏览器直连一个托管端点。在 **Settings → 托管 API** 里挑一个渠道，贴 Key，按需改 Base URL。
-
-| 渠道 | 报文格式 | 覆盖范围 |
-|---|---|---|
-| **Anthropic** | `@anthropic-ai/sdk` | `api.anthropic.com`，以及任意 Anthropic 兼容代理（LiteLLM、自建网关、**AWS Bedrock** 与 **GCP Vertex** 通过服务端代理接入） |
-| **OpenAI 兼容** | `/chat/completions` SSE | OpenAI 官方、[OpenRouter](https://openrouter.ai)、[LiteLLM 代理](https://docs.litellm.ai/)、[DeepSeek](https://platform.deepseek.com/)、[Groq](https://groq.com/)、[Together](https://together.ai/)、[Mistral](https://mistral.ai/)，以及任意 OpenAI 形态的端点 |
-| **Azure OpenAI** | `/openai/deployments/<deployment>/chat/completions` SSE + `api-key` 头 | Azure 托管的 OpenAI 部署。Base URL 是资源终结点，Model 是部署名，再加 Azure 的 `api-version` |
-| **Google Gemini** | `:streamGenerateContent?alt=sse` | Google Generative Language API 直连（Gemini 系列） |
-
-**关于 AWS Bedrock 与 GCP Vertex 上的 Anthropic 模型：**两者都需要凭证签名（SigV4 / GCP service-account JWT），用浏览器里长期存放的 BYOK 凭证去签是不安全的。推荐做法：在服务器端跑一个代理（[LiteLLM](https://docs.litellm.ai/) 同时支持 Anthropic 兼容和 OpenAI 兼容），把 `Anthropic` 或 `OpenAI 兼容` 渠道的 Base URL 指向代理，签名留在服务器端。
-
-加第五种报文格式很机械：`ModelProvider` 里加一行、[`src/providers/presets.ts`](src/providers/presets.ts) 里加一项、和 [`anthropic.ts` / `openai.ts` / `azure.ts` / `google.ts`](src/providers/) 一起放一个 `stream<X>` 函数、[`src/providers/model.ts`](src/providers/model.ts) 里再加一个 `case`。
-
 ## 引用与师承

 每一个被借鉴的开源项目都列在这里。点链接可以验证师承。
@@ -6,25 +6,82 @@ import path from 'node:path';

 const execFileP = promisify(execFile);

-// Each entry defines how to invoke the agent in non-interactive "one-shot" mode.
-// `buildArgs(prompt, imagePaths, extraAllowedDirs)` returns argv for the child
-// process. `extraAllowedDirs` is a list of absolute directories the agent must
-// be permitted to read files from (skill seeds, design-system specs) that live
+// Per-agent model picker.
+//
+//   - `listModels`         : optional spec for fetching the model list from
+//                            the CLI itself ({ args, parse, timeoutMs }).
+//                            When defined we run it during agent detection
+//                            (best-effort, with a timeout) and use the
+//                            result. If the listing fails we fall back to
+//                            `fallbackModels` so the UI still has something
+//                            to show.
+//   - `fallbackModels`     : static hint list. Used as the source of truth
+//                            for CLIs that don't expose a listing command
+//                            (Claude Code, Codex, Gemini CLI, Qwen Code)
+//                            and as the fallback for the others.
+//   - `reasoningOptions`   : optional reasoning-effort presets (currently
+//                            only Codex exposes this knob).
+//   - `buildArgs(prompt, imagePaths, extraAllowedDirs, options)` returns
+//     argv for the child process. `options = { model, reasoning }` carries
+//     whatever the user picked in the model menu — agents that don't take a
+//     model flag ignore them.
+//
+// Every model list is prefixed with a synthetic `'default'` entry meaning
+// "let the CLI pick" — the agent runs with no `--model` flag, so the
+// user's local CLI config wins.
+//
+// `extraAllowedDirs` is a list of absolute directories the agent must be
+// permitted to read files from (skill seeds, design-system specs) that live
 // outside the project cwd. Currently only Claude Code wires this through
 // (`--add-dir`); other agents either inherit broader access or run with cwd
 // boundaries we can't widen via flags.
+//
 // `streamFormat` hints to the daemon how to interpret stdout:
 //   - 'claude-stream-json' : line-delimited JSON emitted by Claude Code's
 //     `--output-format stream-json`. Daemon parses it into typed events
 //     (text / thinking / tool_use / tool_result / status) for the UI.
 //   - 'plain' (default)    : raw text, forwarded chunk-by-chunk.
+
+const DEFAULT_MODEL_OPTION = { id: 'default', label: 'Default (CLI config)' };
+
+// Parse one-id-per-line stdout from `<cli> models` and prepend the synthetic
+// default option. Used by opencode / cursor-agent.
+function parseLineSeparatedModels(stdout) {
+  const ids = String(stdout || '')
+    .split('\n')
+    .map((line) => line.trim())
+    .filter((line) => line.length > 0 && !line.startsWith('#'));
+  // De-dupe while preserving order — some CLIs print near-duplicates.
+  const seen = new Set();
+  const out = [DEFAULT_MODEL_OPTION];
+  for (const id of ids) {
+    if (seen.has(id)) continue;
+    seen.add(id);
+    out.push({ id, label: id });
+  }
+  return out;
+}
+
 export const AGENT_DEFS = [
  {
    id: 'claude',
    name: 'Claude Code',
    bin: 'claude',
    versionArgs: ['--version'],
-    buildArgs: (prompt, _imagePaths, extraAllowedDirs = []) => {
+    // `claude` has no list-models subcommand; the CLI accepts both short
+    // aliases (sonnet/opus/haiku) and the full ids, so we ship both as
+    // hints. Users who want a non-shipped model can paste it via the
+    // Settings dialog's custom-model input.
+    fallbackModels: [
+      DEFAULT_MODEL_OPTION,
+      { id: 'sonnet', label: 'Sonnet (alias)' },
+      { id: 'opus', label: 'Opus (alias)' },
+      { id: 'haiku', label: 'Haiku (alias)' },
+      { id: 'claude-opus-4-5', label: 'claude-opus-4-5' },
+      { id: 'claude-sonnet-4-5', label: 'claude-sonnet-4-5' },
+      { id: 'claude-haiku-4-5', label: 'claude-haiku-4-5' },
+    ],
+    buildArgs: (prompt, _imagePaths, extraAllowedDirs = [], options = {}) => {
      const args = [
        '-p',
        prompt,
@@ -33,6 +90,9 @@ export const AGENT_DEFS = [
        '--verbose',
        '--include-partial-messages',
      ];
+      if (options.model && options.model !== 'default') {
+        args.push('--model', options.model);
+      }
      const dirs = (extraAllowedDirs || []).filter(
        (d) => typeof d === 'string' && d.length > 0,
      );
@@ -48,7 +108,35 @@ export const AGENT_DEFS = [
    name: 'Codex CLI',
    bin: 'codex',
    versionArgs: ['--version'],
-    buildArgs: (prompt) => ['exec', prompt],
+    // Codex doesn't have a `models` subcommand; ship the most common ids
+    // as a hint. Users can supply other ids via the custom-model input.
+    fallbackModels: [
+      DEFAULT_MODEL_OPTION,
+      { id: 'gpt-5-codex', label: 'gpt-5-codex' },
+      { id: 'gpt-5', label: 'gpt-5' },
+      { id: 'o3', label: 'o3' },
+      { id: 'o4-mini', label: 'o4-mini' },
+    ],
+    reasoningOptions: [
+      { id: 'default', label: 'Default' },
+      { id: 'minimal', label: 'Minimal' },
+      { id: 'low', label: 'Low' },
+      { id: 'medium', label: 'Medium' },
+      { id: 'high', label: 'High' },
+    ],
+    buildArgs: (prompt, _imagePaths, _extra, options = {}) => {
+      const args = ['exec'];
+      if (options.model && options.model !== 'default') {
+        args.push('--model', options.model);
+      }
+      if (options.reasoning && options.reasoning !== 'default') {
+        // Codex accepts `-c key=value` config overrides; reasoning effort
+        // is exposed as `model_reasoning_effort`.
+        args.push('-c', `model_reasoning_effort="${options.reasoning}"`);
+      }
+      args.push(prompt);
+      return args;
+    },
    streamFormat: 'plain',
  },
  {
@@ -56,7 +144,19 @@ export const AGENT_DEFS = [
    name: 'Gemini CLI',
    bin: 'gemini',
    versionArgs: ['--version'],
-    buildArgs: (prompt) => ['-p', prompt],
+    fallbackModels: [
+      DEFAULT_MODEL_OPTION,
+      { id: 'gemini-2.5-pro', label: 'gemini-2.5-pro' },
+      { id: 'gemini-2.5-flash', label: 'gemini-2.5-flash' },
+    ],
+    buildArgs: (prompt, _imagePaths, _extra, options = {}) => {
+      const args = [];
+      if (options.model && options.model !== 'default') {
+        args.push('--model', options.model);
+      }
+      args.push('-p', prompt);
+      return args;
+    },
    streamFormat: 'plain',
  },
  {
@@ -64,7 +164,26 @@ export const AGENT_DEFS = [
    name: 'OpenCode',
    bin: 'opencode',
    versionArgs: ['--version'],
-    buildArgs: (prompt) => ['run', prompt],
+    // `opencode models` prints `provider/model` per line.
+    listModels: {
+      args: ['models'],
+      parse: parseLineSeparatedModels,
+      timeoutMs: 8000,
+    },
+    fallbackModels: [
+      DEFAULT_MODEL_OPTION,
+      { id: 'anthropic/claude-sonnet-4-5', label: 'anthropic/claude-sonnet-4-5' },
+      { id: 'openai/gpt-5', label: 'openai/gpt-5' },
+      { id: 'google/gemini-2.5-pro', label: 'google/gemini-2.5-pro' },
+    ],
+    buildArgs: (prompt, _imagePaths, _extra, options = {}) => {
+      const args = ['run'];
+      if (options.model && options.model !== 'default') {
+        args.push('--model', options.model);
+      }
+      args.push(prompt);
+      return args;
+    },
    streamFormat: 'plain',
  },
  {
@@ -72,7 +191,33 @@ export const AGENT_DEFS = [
    name: 'Cursor Agent',
    bin: 'cursor-agent',
    versionArgs: ['--version'],
-    buildArgs: (prompt) => ['-p', prompt],
+    // `cursor-agent models` prints account-bound model ids per line. When
+    // the user isn't authed it prints "No models available for this
+    // account." — that's not a model list, so we detect it and fall back.
+    listModels: {
+      args: ['models'],
+      timeoutMs: 5000,
+      parse: (stdout) => {
+        const trimmed = String(stdout || '').trim();
+        if (!trimmed || /no models available/i.test(trimmed)) return null;
+        return parseLineSeparatedModels(trimmed);
+      },
+    },
+    fallbackModels: [
+      DEFAULT_MODEL_OPTION,
+      { id: 'auto', label: 'auto' },
+      { id: 'sonnet-4', label: 'sonnet-4' },
+      { id: 'sonnet-4-thinking', label: 'sonnet-4-thinking' },
+      { id: 'gpt-5', label: 'gpt-5' },
+    ],
+    buildArgs: (prompt, _imagePaths, _extra, options = {}) => {
+      const args = [];
+      if (options.model && options.model !== 'default') {
+        args.push('--model', options.model);
+      }
+      args.push('-p', prompt);
+      return args;
+    },
    streamFormat: 'plain',
  },
  {
@@ -80,7 +225,19 @@ export const AGENT_DEFS = [
    name: 'Qwen Code',
    bin: 'qwen',
    versionArgs: ['--version'],
-    buildArgs: (prompt) => ['-p', prompt],
+    fallbackModels: [
+      DEFAULT_MODEL_OPTION,
+      { id: 'qwen3-coder-plus', label: 'qwen3-coder-plus' },
+      { id: 'qwen3-coder-flash', label: 'qwen3-coder-flash' },
+    ],
+    buildArgs: (prompt, _imagePaths, _extra, options = {}) => {
+      const args = [];
+      if (options.model && options.model !== 'default') {
+        args.push('--model', options.model);
+      }
+      args.push('-p', prompt);
+      return args;
+    },
    streamFormat: 'plain',
  },
 ];
@@ -100,9 +257,36 @@ function resolveOnPath(bin) {
  return null;
 }

+async function fetchModels(def, resolvedBin) {
+  if (!def.listModels) return def.fallbackModels;
+  try {
+    const { stdout } = await execFileP(resolvedBin, def.listModels.args, {
+      timeout: def.listModels.timeoutMs ?? 5000,
+      // Models lists from popular CLIs (e.g. opencode) easily exceed the
+      // default 1MB buffer once you include every openrouter model. Bump
+      // it so we don't truncate the listing.
+      maxBuffer: 8 * 1024 * 1024,
+    });
+    const parsed = def.listModels.parse(stdout);
+    // Empty / null parse result means the CLI didn't actually return a
+    // usable list (e.g. cursor-agent's "No models available"); fall back
+    // to the static hint so the picker isn't stuck on Default-only.
+    if (!parsed || parsed.length === 0) return def.fallbackModels;
+    return parsed;
+  } catch {
+    return def.fallbackModels;
+  }
+}
+
 async function probe(def) {
  const resolved = resolveOnPath(def.bin);
-  if (!resolved) return { ...stripFns(def), available: false };
+  if (!resolved) {
+    return {
+      ...stripFns(def),
+      models: def.fallbackModels ?? [DEFAULT_MODEL_OPTION],
+      available: false,
+    };
+  }
  let version = null;
  try {
    const { stdout } = await execFileP(resolved, def.versionArgs, { timeout: 3000 });
@@ -110,18 +294,75 @@ async function probe(def) {
  } catch {
    // binary exists but --version failed; still mark available
  }
-  return { ...stripFns(def), available: true, path: resolved, version };
+  const models = await fetchModels(def, resolved);
+  return {
+    ...stripFns(def),
+    models,
+    available: true,
+    path: resolved,
+    version,
+  };
 }

 function stripFns(def) {
-  const { buildArgs, ...rest } = def;
+  // Drop the buildArgs / listModels closures but keep declarative metadata
+  // (reasoningOptions, streamFormat, name, bin, etc.). `models` is
+  // populated separately by `fetchModels`, so we strip the static
+  // `fallbackModels` slot here too.
+  const { buildArgs, listModels, fallbackModels, ...rest } = def;
  return rest;
 }

 export async function detectAgents() {
-  return Promise.all(AGENT_DEFS.map(probe));
+  const results = await Promise.all(AGENT_DEFS.map(probe));
+  // Refresh the validation cache from whatever we just surfaced to the UI
+  // so /api/chat can accept any model the user could have just picked,
+  // including ones that only showed up after a CLI re-auth.
+  for (const agent of results) {
+    rememberLiveModels(agent.id, agent.models);
+  }
+  return results;
 }

 export function getAgentDef(id) {
  return AGENT_DEFS.find((a) => a.id === id) || null;
 }
+
+// Daemon's /api/chat needs to validate the user's model pick against the
+// list we last surfaced to the UI. We keep a per-agent cache of the most
+// recent live list (refreshed every detectAgents() call) and additionally
+// trust any value present in the static fallback. A model that's neither
+// gets rejected so a stale or hostile value can't smuggle arbitrary flags.
+const liveModelCache = new Map();
+
+export function rememberLiveModels(agentId, models) {
+  if (!Array.isArray(models)) return;
+  liveModelCache.set(
+    agentId,
+    new Set(models.map((m) => m && m.id).filter((id) => typeof id === 'string')),
+  );
+}
+
+export function isKnownModel(def, modelId) {
+  if (!modelId) return false;
+  const live = liveModelCache.get(def.id);
+  if (live && live.has(modelId)) return true;
+  if (Array.isArray(def.fallbackModels)) {
+    return def.fallbackModels.some((m) => m.id === modelId);
+  }
+  return false;
+}
+
+// Permit user-typed model ids that didn't appear in either the live
+// listing or the static fallback (e.g. the user is on a brand-new model
+// the CLI's `models` command hasn't surfaced yet). The CLI gets the value
+// as a child-process arg — not a shell string — so injection isn't a
+// concern, but we still reject anything that could be misread as a flag
+// by a downstream CLI or that contains whitespace / control chars.
+export function sanitizeCustomModel(id) {
+  if (typeof id !== 'string') return null;
+  const trimmed = id.trim();
+  if (trimmed.length === 0 || trimmed.length > 200) return null;
+  if (!/^[A-Za-z0-9][A-Za-z0-9._/:@-]*$/.test(trimmed)) return null;
+  return trimmed;
+}
@@ -6,7 +6,12 @@ import { fileURLToPath } from 'node:url';
 import path from 'node:path';
 import fs from 'node:fs';
 import os from 'node:os';
-import { detectAgents, getAgentDef } from './agents.js';
+import {
+  detectAgents,
+  getAgentDef,
+  isKnownModel,
+  sanitizeCustomModel,
+} from './agents.js';
 import { listSkills } from './skills.js';
 import { listDesignSystems, readDesignSystem } from './design-systems.js';
 import { createClaudeStreamHandler } from './claude-stream.js';
@@ -690,6 +695,8 @@ export async function startServer({ port = 7456 } = {}) {
      imagePaths = [],
      projectId,
      attachments = [],
+      model,
+      reasoning,
    } = req.body || {};
    const def = getAgentDef(agentId);
    if (!def) return res.status(400).json({ error: `unknown agent: ${agentId}` });
@@ -779,7 +786,23 @@ export async function startServer({ port = 7456 } = {}) {
    const extraAllowedDirs = [SKILLS_DIR, DESIGN_SYSTEMS_DIR].filter(
      (d) => fs.existsSync(d),
    );
-    const args = def.buildArgs(composed, safeImages, extraAllowedDirs);
+    // Per-agent model + reasoning the user picked in the model menu.
+    // Trust the value when it matches the most recent /api/agents listing
+    // (live or fallback). Otherwise allow it through if it passes a
+    // permissive sanitizer — that's the path for user-typed custom model
+    // ids the CLI's listing didn't surface yet.
+    const safeModel =
+      typeof model === 'string'
+        ? isKnownModel(def, model)
+          ? model
+          : sanitizeCustomModel(model)
+        : null;
+    const safeReasoning =
+      typeof reasoning === 'string' && Array.isArray(def.reasoningOptions)
+        ? def.reasoningOptions.find((r) => r.id === reasoning)?.id ?? null
+        : null;
+    const agentOptions = { model: safeModel, reasoning: safeReasoning };
+    const args = def.buildArgs(composed, safeImages, extraAllowedDirs, agentOptions);

    res.setHeader('Content-Type', 'text/event-stream');
    res.setHeader('Cache-Control', 'no-cache, no-transform');
@@ -798,6 +821,8 @@ export async function startServer({ port = 7456 } = {}) {
      streamFormat: def.streamFormat ?? 'plain',
      projectId: typeof projectId === 'string' ? projectId : null,
      cwd,
+      model: safeModel,
+      reasoning: safeReasoning,
    });

    let child;
@@ -137,6 +137,18 @@ export function App() {
    [config],
  );

+  const handleAgentModelChange = useCallback(
+    (agentId: string, choice: { model?: string; reasoning?: string }) => {
+      const prev = config.agentModels?.[agentId] ?? {};
+      const merged = { ...prev, ...choice };
+      const nextAgentModels = { ...(config.agentModels ?? {}), [agentId]: merged };
+      const next = { ...config, agentModels: nextAgentModels };
+      saveConfig(next);
+      setConfig(next);
+    },
+    [config],
+  );
+
  const handleChangeDefaultDesignSystem = useCallback(
    (designSystemId: string) => {
      const next = { ...config, designSystemId };
@@ -272,6 +284,7 @@ export function App() {
          daemonLive={daemonLive}
          onModeChange={handleModeChange}
          onAgentChange={handleAgentChange}
+          onAgentModelChange={handleAgentModelChange}
          onRefreshAgents={refreshAgents}
          onOpenSettings={openSettings}
          onBack={handleBack}
@@ -1,8 +1,8 @@
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { useT } from '../i18n';
-import { providerLabel } from '../providers/presets';
 import { AgentIcon } from './AgentIcon';
 import { Icon } from './Icon';
+import { renderModelOptions } from './modelOptions';
 import type { AgentInfo, AppConfig, ExecMode } from '../types';

 interface Props {
@@ -11,6 +11,10 @@ interface Props {
  daemonLive: boolean;
  onModeChange: (mode: ExecMode) => void;
  onAgentChange: (id: string) => void;
+  onAgentModelChange: (
+    id: string,
+    choice: { model?: string; reasoning?: string },
+  ) => void;
  onOpenSettings: () => void;
  onRefreshAgents: () => void;
  onBack?: () => void;
@@ -27,6 +31,7 @@ export function AvatarMenu({
  daemonLive,
  onModeChange,
  onAgentChange,
+  onAgentModelChange,
  onOpenSettings,
  onRefreshAgents,
  onBack,
@@ -59,6 +64,19 @@ export function AvatarMenu({

  const installedAgents = agents.filter((a) => a.available);

+  // Resolve the user's model + reasoning pick for the active agent. Falls
+  // back to the agent's first declared option (`'default'`) when the user
+  // hasn't touched the picker yet so the labels don't read as empty.
+  const currentChoice =
+    (config.agentId && config.agentModels?.[config.agentId]) || {};
+  const currentModelId =
+    currentChoice.model ?? currentAgent?.models?.[0]?.id ?? null;
+  const currentReasoningId =
+    currentChoice.reasoning ?? currentAgent?.reasoningOptions?.[0]?.id ?? null;
+  const currentModelLabel = currentAgent?.models?.find(
+    (m) => m.id === currentModelId,
+  )?.label;
+
  return (
    <div className="avatar-menu" ref={wrapRef}>
      <button
@@ -83,13 +101,13 @@ export function AvatarMenu({
            <span className="who">
              {config.mode === 'daemon'
                ? t('avatar.localCli')
-                : providerLabel(config.provider)}
+                : t('avatar.anthropicApi')}
            </span>
            <span className="where">
              {config.mode === 'api'
-                ? `${config.model}${config.baseUrl ? ` · ${safeHost(config.baseUrl)}` : ''}`
+                ? safeHost(config.baseUrl)
                : currentAgent
-                  ? `${currentAgent.name}${currentAgent.version ? ` · ${currentAgent.version}` : ''}`
+                  ? `${currentAgent.name}${currentAgent.version ? ` · ${currentAgent.version}` : ''}${currentModelLabel && currentModelId !== 'default' ? ` · ${currentModelLabel}` : ''}`
                  : t('avatar.noAgentSelected')}
            </span>
          </div>
@@ -134,18 +152,7 @@ export function AvatarMenu({

          {config.mode === 'daemon' && installedAgents.length > 0 ? (
            <>
-              <div
-                style={{
-                  fontSize: 10.5,
-                  textTransform: 'uppercase',
-                  letterSpacing: '0.06em',
-                  color: 'var(--text-faint)',
-                  fontWeight: 600,
-                  padding: '8px 10px 4px',
-                }}
-              >
-                {t('avatar.codeAgent')}
-              </div>
+              <div className="avatar-section-label">{t('avatar.codeAgent')}</div>
              {installedAgents.map((a) => (
                <button
                  type="button"
@@ -153,7 +160,8 @@ export function AvatarMenu({
                  className="avatar-item"
                  onClick={() => {
                    onAgentChange(a.id);
-                    setOpen(false);
+                    // Keep the popover open so the user can immediately
+                    // pick a model for the agent they just chose.
                  }}
                >
                  <AgentIcon id={a.id} size={18} />
@@ -167,6 +175,71 @@ export function AvatarMenu({
                  ) : null}
                </button>
              ))}
+              {currentAgent &&
+              currentAgent.available &&
+              ((currentAgent.models && currentAgent.models.length > 0) ||
+                (currentAgent.reasoningOptions &&
+                  currentAgent.reasoningOptions.length > 0)) ? (
+                <div className="avatar-model-section">
+                  <div className="avatar-section-label">
+                    {t('avatar.modelSection')}
+                  </div>
+                  {currentAgent.models && currentAgent.models.length > 0 ? (
+                    <label className="avatar-select-row">
+                      <span className="avatar-select-label">
+                        {t('avatar.modelLabel')}
+                      </span>
+                      <select
+                        className="avatar-select"
+                        value={currentModelId ?? ''}
+                        onChange={(e) =>
+                          onAgentModelChange(currentAgent.id, {
+                            model: e.target.value,
+                          })
+                        }
+                      >
+                        {renderModelOptions(currentAgent.models)}
+                        {/* When the user has typed a custom id in
+                            Settings, surface it here too so the dropdown
+                            actually shows the active selection rather
+                            than collapsing to "Default". */}
+                        {currentModelId &&
+                        !currentAgent.models.some(
+                          (m) => m.id === currentModelId,
+                        ) ? (
+                          <option value={currentModelId}>
+                            {currentModelId}{' '}
+                            {t('avatar.customSuffix')}
+                          </option>
+                        ) : null}
+                      </select>
+                    </label>
+                  ) : null}
+                  {currentAgent.reasoningOptions &&
+                  currentAgent.reasoningOptions.length > 0 ? (
+                    <label className="avatar-select-row">
+                      <span className="avatar-select-label">
+                        {t('avatar.reasoningLabel')}
+                      </span>
+                      <select
+                        className="avatar-select"
+                        value={currentReasoningId ?? ''}
+                        onChange={(e) =>
+                          onAgentModelChange(currentAgent.id, {
+                            reasoning: e.target.value,
+                          })
+                        }
+                      >
+                        {currentAgent.reasoningOptions.map((r) => (
+                          <option key={r.id} value={r.id}>
+                            {r.label}
+                          </option>
+                        ))}
+                      </select>
+                    </label>
+                  ) : null}
+                </div>
+              ) : null}
              <button
                type="button"
                className="avatar-item"
@@ -1,6 +1,5 @@
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { useT } from '../i18n';
-import { providerLabel } from '../providers/presets';
 import type {
  AgentInfo,
  AppConfig,
@@ -83,17 +82,16 @@ export function EntryView({

  const envMetaLine = useMemo(() => {
    if (config.mode === 'api') {
-      const provider = providerLabel(config.provider);
      try {
-        return `${provider} · ${config.model} · ${new URL(config.baseUrl).host}`;
+        return `${config.model} · ${new URL(config.baseUrl).host}`;
      } catch {
-        return `${provider} · ${config.model}`;
+        return config.model;
      }
    }
    return currentAgent
      ? `${currentAgent.name}${currentAgent.version ? ` · ${currentAgent.version}` : ''}`
      : t('settings.noAgentSelected');
-  }, [config.mode, config.model, config.baseUrl, config.provider, currentAgent, t]);
+  }, [config.mode, config.model, config.baseUrl, currentAgent, t]);

  // 'Use this prompt' on an example card is a fast path — skip the form and
  // create the project immediately with sane defaults derived from the skill,
@@ -1,8 +1,8 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { createArtifactParser } from '../artifacts/parser';
 import { useT } from '../i18n';
+import { streamMessage } from '../providers/anthropic';
 import { streamViaDaemon } from '../providers/daemon';
-import { streamModel } from '../providers/model';
 import {
  fetchDesignSystem,
  fetchProjectFiles,
@@ -53,6 +53,10 @@ interface Props {
  daemonLive: boolean;
  onModeChange: (mode: AppConfig['mode']) => void;
  onAgentChange: (id: string) => void;
+  onAgentModelChange: (
+    id: string,
+    choice: { model?: string; reasoning?: string },
+  ) => void;
  onRefreshAgents: () => void;
  onOpenSettings: () => void;
  onBack: () => void;
@@ -72,6 +76,7 @@ export function ProjectView({
  daemonLive,
  onModeChange,
  onAgentChange,
+  onAgentModelChange,
  onRefreshAgents,
  onOpenSettings,
  onBack,
@@ -490,6 +495,7 @@ export function ProjectView({
          handlers.onError(new Error('Pick a local agent first (top bar).'));
          return;
        }
+        const choice = config.agentModels?.[config.agentId];
        void streamViaDaemon({
          agentId: config.agentId,
          history: nextHistory,
@@ -498,10 +504,12 @@ export function ProjectView({
          handlers,
          projectId: project.id,
          attachments: attachments.map((a) => a.path),
+          model: choice?.model ?? null,
+          reasoning: choice?.reasoning ?? null,
        });
      } else {
        pushEvent({ kind: 'status', label: 'requesting', detail: config.model });
-        void streamModel(config, systemPrompt, nextHistory, controller.signal, {
+        void streamMessage(config, systemPrompt, nextHistory, controller.signal, {
          onDelta: (delta) => {
            handlers.onDelta(delta);
            handlers.onAgentEvent({ kind: 'text', text: delta });
@@ -728,6 +736,7 @@ export function ProjectView({
            daemonLive={daemonLive}
            onModeChange={onModeChange}
            onAgentChange={onAgentChange}
+            onAgentModelChange={onAgentModelChange}
            onOpenSettings={onOpenSettings}
            onRefreshAgents={onRefreshAgents}
            onBack={onBack}
@@ -1,9 +1,13 @@
 import { useEffect, useMemo, useState } from 'react';
 import { LOCALE_LABEL, LOCALES, useI18n } from '../i18n';
 import type { Locale } from '../i18n';
-import { PROVIDER_ORDER, PROVIDER_PRESETS } from '../providers/presets';
 import { AgentIcon } from './AgentIcon';
-import type { AgentInfo, AppConfig, ExecMode, ModelProvider } from '../types';
+import {
+  CUSTOM_MODEL_SENTINEL,
+  isCustomModel,
+  renderModelOptions,
+} from './modelOptions';
+import type { AgentInfo, AppConfig, ExecMode } from '../types';

 interface Props {
  initial: AppConfig;
@@ -15,6 +19,12 @@ interface Props {
  onRefreshAgents: () => void;
 }

+const SUGGESTED_MODELS = [
+  'claude-opus-4-5',
+  'claude-sonnet-4-5',
+  'claude-haiku-4-5',
+];
+
 export function SettingsDialog({
  initial,
  agents,
@@ -43,38 +53,10 @@ export function SettingsDialog({

  const setMode = (mode: ExecMode) => setCfg((c) => ({ ...c, mode }));

-  // Switching providers swaps in that provider's defaults, but preserves
-  // any non-empty values the user already typed — they may have a custom
-  // baseUrl (e.g. an OpenRouter URL while staying on the openai provider)
-  // they don't want clobbered. Empty fields fall back to the preset.
-  const setProvider = (provider: ModelProvider) => {
-    setCfg((c) => {
-      if (c.provider === provider) return c;
-      const preset = PROVIDER_PRESETS[provider];
-      return {
-        ...c,
-        provider,
-        baseUrl: c.baseUrl?.trim() ? c.baseUrl : preset.baseUrl,
-        model: c.model?.trim() ? c.model : preset.defaultModel,
-      };
-    });
-  };
-
-  const activePreset = PROVIDER_PRESETS[cfg.provider];
-
  const canSave =
    cfg.mode === 'daemon'
      ? Boolean(cfg.agentId && agents.find((a) => a.id === cfg.agentId)?.available)
-      : Boolean(
-          cfg.apiKey.trim() &&
-            cfg.model.trim() &&
-            // Azure has no global default base URL — require the user to
-            // paste their resource endpoint. Other providers ship a usable
-            // default so a blank field falls back to the preset.
-            (cfg.provider === 'azure'
-              ? cfg.baseUrl.trim().length > 0
-              : true),
-        );
+      : Boolean(cfg.apiKey.trim() && cfg.model.trim() && cfg.baseUrl.trim());

  return (
    <div className="modal-backdrop" onClick={onClose}>
@@ -206,45 +188,120 @@ export function SettingsDialog({
                })}
              </div>
            )}
+            {(() => {
+              const selected = agents.find(
+                (a) => a.id === cfg.agentId && a.available,
+              );
+              if (!selected) return null;
+              const hasModels =
+                Array.isArray(selected.models) && selected.models.length > 0;
+              const hasReasoning =
+                Array.isArray(selected.reasoningOptions) &&
+                selected.reasoningOptions.length > 0;
+              if (!hasModels && !hasReasoning) return null;
+              const choice = cfg.agentModels?.[selected.id] ?? {};
+              const setChoice = (
+                next: { model?: string; reasoning?: string },
+              ) => {
+                setCfg((c) => {
+                  const prev = c.agentModels?.[selected.id] ?? {};
+                  return {
+                    ...c,
+                    agentModels: {
+                      ...(c.agentModels ?? {}),
+                      [selected.id]: { ...prev, ...next },
+                    },
+                  };
+                });
+              };
+              const modelValue =
+                choice.model ?? selected.models?.[0]?.id ?? '';
+              const reasoningValue =
+                choice.reasoning ??
+                selected.reasoningOptions?.[0]?.id ?? '';
+              const customActive =
+                hasModels && isCustomModel(modelValue, selected.models!);
+              const selectValue = customActive
+                ? CUSTOM_MODEL_SENTINEL
+                : modelValue;
+              return (
+                <div className="agent-model-row">
+                  {hasModels ? (
+                    <label className="field">
+                      <span className="field-label">
+                        {t('settings.modelPicker')}
+                      </span>
+                      <select
+                        value={selectValue}
+                        onChange={(e) => {
+                          if (e.target.value === CUSTOM_MODEL_SENTINEL) {
+                            // Switching to "Custom…" should clear the
+                            // value so the input below opens empty for
+                            // typing — keeping the previous live id
+                            // would defeat the point.
+                            setChoice({ model: '' });
+                          } else {
+                            setChoice({ model: e.target.value });
+                          }
+                        }}
+                      >
+                        {renderModelOptions(selected.models!)}
+                        <option value={CUSTOM_MODEL_SENTINEL}>
+                          {t('settings.modelCustom')}
+                        </option>
+                      </select>
+                    </label>
+                  ) : null}
+                  {customActive ? (
+                    <label className="field">
+                      <span className="field-label">
+                        {t('settings.modelCustomLabel')}
+                      </span>
+                      <input
+                        type="text"
+                        value={modelValue}
+                        placeholder={t('settings.modelCustomPlaceholder')}
+                        onChange={(e) =>
+                          setChoice({ model: e.target.value.trim() })
+                        }
+                      />
+                    </label>
+                  ) : null}
+                  {hasReasoning ? (
+                    <label className="field">
+                      <span className="field-label">
+                        {t('settings.reasoningPicker')}
+                      </span>
+                      <select
+                        value={reasoningValue}
+                        onChange={(e) =>
+                          setChoice({ reasoning: e.target.value })
+                        }
+                      >
+                        {selected.reasoningOptions!.map((r) => (
+                          <option key={r.id} value={r.id}>
+                            {r.label}
+                          </option>
+                        ))}
+                      </select>
+                    </label>
+                  ) : null}
+                  <p className="hint">{t('settings.modelPickerHint')}</p>
+                </div>
+              );
+            })()}
          </section>
        ) : (
          <section className="settings-section">
            <div className="section-head">
-              <div>
-                <h3>{t('settings.apiSection')}</h3>
-                <p className="hint">{t('settings.providerHint')}</p>
-              </div>
-            </div>
-            <div
-              className="seg-control"
-              role="tablist"
-              aria-label={t('settings.providerLabel')}
-            >
-              {PROVIDER_ORDER.map((id) => {
-                const preset = PROVIDER_PRESETS[id];
-                const active = cfg.provider === id;
-                return (
-                  <button
-                    key={id}
-                    type="button"
-                    role="tab"
-                    aria-selected={active}
-                    className={'seg-btn' + (active ? ' active' : '')}
-                    onClick={() => setProvider(id)}
-                    title={preset.blurb}
-                  >
-                    <span className="seg-title">{preset.label}</span>
-                    <span className="seg-meta">{preset.blurb}</span>
-                  </button>
-                );
-              })}
+              <h3>{t('settings.apiSection')}</h3>
            </div>
            <label className="field">
              <span className="field-label">{t('settings.apiKey')}</span>
              <div className="field-row">
                <input
                  type={showApiKey ? 'text' : 'password'}
-                  placeholder={activePreset.apiKeyPlaceholder}
+                  placeholder="sk-ant-..."
                  value={cfg.apiKey}
                  onChange={(e) => setCfg({ ...cfg, apiKey: e.target.value })}
                  autoFocus
@@ -267,11 +324,10 @@ export function SettingsDialog({
                type="text"
                value={cfg.model}
                list="suggested-models"
-                placeholder={activePreset.defaultModel}
                onChange={(e) => setCfg({ ...cfg, model: e.target.value })}
              />
              <datalist id="suggested-models">
-                {activePreset.modelSuggestions.map((m) => (
+                {SUGGESTED_MODELS.map((m) => (
                  <option value={m} key={m} />
                ))}
              </datalist>
@@ -281,26 +337,10 @@ export function SettingsDialog({
              <input
                type="text"
                value={cfg.baseUrl}
-                placeholder={activePreset.baseUrl || 'https://...'}
                onChange={(e) => setCfg({ ...cfg, baseUrl: e.target.value })}
              />
            </label>
-            {activePreset.needsApiVersion ? (
-              <label className="field">
-                <span className="field-label">{t('settings.apiVersion')}</span>
-                <input
-                  type="text"
-                  value={cfg.apiVersion ?? ''}
-                  placeholder="2024-08-01-preview"
-                  onChange={(e) =>
-                    setCfg({ ...cfg, apiVersion: e.target.value })
-                  }
-                />
-                <span className="hint">{t('settings.apiVersionHint')}</span>
-              </label>
-            ) : null}
            <p className="hint">{t('settings.apiHint')}</p>
-            <p className="hint">{t('settings.proxyHint')}</p>
          </section>
        )}

@@ -0,0 +1,71 @@
+import type { AgentModelOption } from '../types';
+
+// Render the `<option>` children for a model `<select>`. When the list
+// contains `provider/model` ids (opencode's listing has hundreds), we
+// group them under `<optgroup>` so the dropdown is navigable. Flat lists
+// (Claude, Codex, Gemini, Qwen) are emitted as plain options.
+//
+// `'default'` is always pinned first (no group), so the user can return
+// to "let the CLI decide" with one click.
+export function renderModelOptions(models: AgentModelOption[]) {
+  const groups = new Map<string, AgentModelOption[]>();
+  const flat: AgentModelOption[] = [];
+  for (const m of models) {
+    const slash = m.id.indexOf('/');
+    if (m.id === 'default' || slash <= 0) {
+      flat.push(m);
+      continue;
+    }
+    const provider = m.id.slice(0, slash);
+    const arr = groups.get(provider) ?? [];
+    arr.push(m);
+    groups.set(provider, arr);
+  }
+  if (groups.size === 0) {
+    return (
+      <>
+        {flat.map((m) => (
+          <option key={m.id} value={m.id}>
+            {m.label}
+          </option>
+        ))}
+      </>
+    );
+  }
+  return (
+    <>
+      {flat.map((m) => (
+        <option key={m.id} value={m.id}>
+          {m.label}
+        </option>
+      ))}
+      {Array.from(groups.entries()).map(([provider, items]) => (
+        <optgroup key={provider} label={provider}>
+          {items.map((m) => (
+            <option key={m.id} value={m.id}>
+              {/* Strip the redundant `provider/` prefix from the label
+                  inside its own optgroup; keep it in the value so the
+                  CLI sees the fully-qualified id. */}
+              {m.label.startsWith(`${provider}/`)
+                ? m.label.slice(provider.length + 1)
+                : m.label}
+            </option>
+          ))}
+        </optgroup>
+      ))}
+    </>
+  );
+}
+
+// True when the picked model id isn't one of the listed options — i.e.
+// the user has typed a custom id and we should keep the custom input
+// visible / the dropdown showing "Custom…".
+export function isCustomModel(
+  modelId: string | null | undefined,
+  models: AgentModelOption[],
+): boolean {
+  if (!modelId) return false;
+  return !models.some((m) => m.id === modelId);
+}
+
+export const CUSTOM_MODEL_SENTINEL = '__custom__';
@@ -49,15 +49,15 @@ export const en: Dict = {
  'settings.kicker': 'Settings',
  'settings.title': 'Execution & model',
  'settings.subtitle':
-    'Choose between a local code-agent CLI and a hosted model provider (BYOK). Anthropic, OpenAI-compatible (OpenRouter / LiteLLM / DeepSeek / Groq …), Azure OpenAI, and Google Gemini are supported. Your API key is stored only in this browser.',
+    'Choose between a local code-agent CLI and the Anthropic API (BYOK). Your API key is stored only in this browser.',
  'settings.modeAria': 'Execution mode',
  'settings.modeDaemon': 'Local CLI',
  'settings.modeDaemonHelp': 'Run via a code-agent CLI on your machine',
  'settings.modeDaemonOffline': 'Daemon is not running',
  'settings.modeDaemonOfflineMeta': 'daemon offline',
  'settings.modeDaemonInstalledMeta': '{count} installed',
-  'settings.modeApi': 'Hosted API',
-  'settings.modeApiMeta': 'BYOK · multi-provider',
+  'settings.modeApi': 'Anthropic API',
+  'settings.modeApiMeta': 'BYOK',
  'settings.codeAgent': 'Code agent',
  'settings.codeAgentHint':
    'Detected by scanning your PATH. Pick the CLI you want generations to flow through.',
@@ -65,7 +65,7 @@ export const en: Dict = {
  'settings.rescanTitle': 'Re-scan PATH',
  'settings.noAgentsDetected':
    'No agents detected yet. Install one of Claude Code, Codex, Gemini CLI, OpenCode, Cursor Agent, or Qwen, then click Rescan.',
-  'settings.apiSection': 'Model endpoint',
+  'settings.apiSection': 'Anthropic API',
  'settings.apiKey': 'API key',
  'settings.showKey': 'Show key',
  'settings.hideKey': 'Hide key',
@@ -75,22 +75,21 @@ export const en: Dict = {
  'settings.baseUrl': 'Base URL',
  'settings.apiHint':
    'Calls go directly from this browser to the base URL you set. No proxy. The key never leaves localStorage.',
-  'settings.providerLabel': 'Provider',
-  'settings.providerHint':
-    'Pick the wire format. Anthropic also covers any Anthropic-compatible proxy. OpenAI-compatible covers OpenRouter, LiteLLM, DeepSeek, Groq, Together, etc.',
-  'settings.apiVersion': 'API version',
-  'settings.apiVersionHint':
-    'Azure REST api-version (e.g. 2024-08-01-preview). Leave blank to use the default.',
-  'settings.proxyHint':
-    'Tip: For AWS Bedrock or Google Vertex with Anthropic models, run a server-side proxy (LiteLLM works well) and point the Anthropic provider at it — credential signing belongs on the server, not the browser.',
  'settings.skipForNow': 'Skip for now',
  'settings.getStarted': 'Get started',
  'settings.envConfigure': 'Configure execution mode',
  'settings.localCli': 'Local CLI',
-  'settings.anthropicApi': 'Hosted API',
+  'settings.anthropicApi': 'Anthropic API',
  'settings.noAgentSelected': 'no agent selected',
  'settings.language': 'Language',
  'settings.languageHint': 'Switch the interface language. Saved to this browser.',
+  'settings.modelPicker': 'Model',
+  'settings.reasoningPicker': 'Reasoning effort',
+  'settings.modelPickerHint':
+    'Fetched from the CLI when it exposes a `models` command. "Default" leaves the choice to the CLI’s own config; "Custom…" lets you type any model id the CLI accepts.',
+  'settings.modelCustom': 'Custom (type below)…',
+  'settings.modelCustomLabel': 'Custom model id',
+  'settings.modelCustomPlaceholder': 'e.g. anthropic/claude-sonnet-4-6',

  'entry.tabDesigns': 'Designs',
  'entry.tabExamples': 'Examples',
@@ -208,9 +207,9 @@ export const en: Dict = {

  'avatar.title': 'Account & settings',
  'avatar.localCli': 'Local CLI',
-  'avatar.anthropicApi': 'Hosted API',
+  'avatar.anthropicApi': 'Anthropic API',
  'avatar.useLocal': 'Use Local CLI',
-  'avatar.useApi': 'Use hosted API',
+  'avatar.useApi': 'Use Anthropic API',
  'avatar.codeAgent': 'Code agent',
  'avatar.rescan': 'Rescan PATH',
  'avatar.settings': 'Settings',
@@ -219,6 +218,10 @@ export const en: Dict = {
  'avatar.metaOffline': 'offline',
  'avatar.metaSelected': 'selected',
  'avatar.noAgentSelected': 'no agent selected',
+  'avatar.modelSection': 'Model',
+  'avatar.modelLabel': 'Model',
+  'avatar.reasoningLabel': 'Reasoning',
+  'avatar.customSuffix': '(custom)',

  'project.backToProjects': 'Back to projects',
  'project.metaFreeform': 'freeform',
@@ -419,7 +422,7 @@ export const en: Dict = {
  'agentPicker.modeChoose': 'Choose execution mode',
  'agentPicker.localCli': 'Local CLI',
  'agentPicker.daemonOff': 'daemon off',
-  'agentPicker.byok': 'Hosted API · BYOK',
+  'agentPicker.byok': 'Anthropic API · BYOK',
  'agentPicker.selectAgent': 'Select a detected code-agent CLI',
  'agentPicker.noAgents': 'no agents on PATH',
  'agentPicker.notInstalled': 'not installed',
@@ -49,22 +49,22 @@ export const zhCN: Dict = {
  'settings.kicker': '设置',
  'settings.title': '执行模式与模型',
  'settings.subtitle':
-    '在本机的代码代理 CLI 与托管模型 API（自带 Key）之间切换。支持 Anthropic、OpenAI 兼容（OpenRouter / LiteLLM / DeepSeek / Groq 等）、Azure OpenAI 与 Google Gemini。API Key 只保存在当前浏览器中。',
+    '在本机的代码代理 CLI 与 Anthropic API（自带 Key）之间切换。API Key 只保存在当前浏览器中。',
  'settings.modeAria': '执行模式',
  'settings.modeDaemon': '本机 CLI',
  'settings.modeDaemonHelp': '通过本机的代码代理 CLI 执行',
  'settings.modeDaemonOffline': '后台守护进程未运行',
  'settings.modeDaemonOfflineMeta': '守护进程未运行',
  'settings.modeDaemonInstalledMeta': '已安装 {count} 个',
-  'settings.modeApi': '托管 API',
-  'settings.modeApiMeta': '自带 Key · 多渠道',
+  'settings.modeApi': 'Anthropic API',
+  'settings.modeApiMeta': '自带 Key',
  'settings.codeAgent': '代码代理',
  'settings.codeAgentHint': '通过扫描 PATH 自动检测，选择你希望使用的 CLI。',
  'settings.rescan': '↻ 重新扫描',
  'settings.rescanTitle': '重新扫描 PATH',
  'settings.noAgentsDetected':
    '尚未检测到任何代理。请安装 Claude Code、Codex、Gemini CLI、OpenCode、Cursor Agent 或 Qwen 中的一个，然后点击「重新扫描」。',
-  'settings.apiSection': '模型端点',
+  'settings.apiSection': 'Anthropic API',
  'settings.apiKey': 'API Key',
  'settings.showKey': '显示 Key',
  'settings.hideKey': '隐藏 Key',
@@ -74,22 +74,21 @@ export const zhCN: Dict = {
  'settings.baseUrl': 'Base URL',
  'settings.apiHint':
    '请求会从当前浏览器直连你设置的 Base URL，无中转代理。Key 只存放在 localStorage。',
-  'settings.providerLabel': '渠道',
-  'settings.providerHint':
-    '选择请求格式。Anthropic 也涵盖任意 Anthropic 兼容代理；OpenAI 兼容涵盖 OpenRouter、LiteLLM、DeepSeek、Groq、Together 等。',
-  'settings.apiVersion': 'API version',
-  'settings.apiVersionHint':
-    'Azure 的 api-version 查询参数（如 2024-08-01-preview）。留空则使用默认值。',
-  'settings.proxyHint':
-    '提示：若要在浏览器里使用 AWS Bedrock 或 Google Vertex 上的 Anthropic 模型，建议在服务器端跑一个 LiteLLM 代理，再把 Anthropic 渠道指向它 —— 凭证签名应留在服务器，不放进浏览器。',
  'settings.skipForNow': '暂时跳过',
  'settings.getStarted': '开始使用',
  'settings.envConfigure': '配置执行模式',
  'settings.localCli': '本机 CLI',
-  'settings.anthropicApi': '托管 API',
+  'settings.anthropicApi': 'Anthropic API',
  'settings.noAgentSelected': '尚未选择代理',
  'settings.language': '界面语言',
  'settings.languageHint': '切换界面语言，设置仅保存在当前浏览器。',
+  'settings.modelPicker': '模型',
+  'settings.reasoningPicker': '推理强度',
+  'settings.modelPickerHint':
+    '当 CLI 提供 `models` 命令时会自动拉取。选择「默认」则沿用 CLI 自身的配置；选择「自定义」可手动输入任何 CLI 支持的模型 id。',
+  'settings.modelCustom': '自定义（在下方填写）…',
+  'settings.modelCustomLabel': '自定义模型 id',
+  'settings.modelCustomPlaceholder': '例如 anthropic/claude-sonnet-4-6',

  'entry.tabDesigns': '我的设计',
  'entry.tabExamples': '示例',
@@ -205,9 +204,9 @@ export const zhCN: Dict = {

  'avatar.title': '账户与设置',
  'avatar.localCli': '本机 CLI',
-  'avatar.anthropicApi': '托管 API',
+  'avatar.anthropicApi': 'Anthropic API',
  'avatar.useLocal': '使用本机 CLI',
-  'avatar.useApi': '使用托管 API',
+  'avatar.useApi': '使用 Anthropic API',
  'avatar.codeAgent': '代码代理',
  'avatar.rescan': '重新扫描 PATH',
  'avatar.settings': '设置',
@@ -216,6 +215,10 @@ export const zhCN: Dict = {
  'avatar.metaOffline': '未运行',
  'avatar.metaSelected': '已选',
  'avatar.noAgentSelected': '尚未选择代理',
+  'avatar.modelSection': '模型',
+  'avatar.modelLabel': '模型',
+  'avatar.reasoningLabel': '推理',
+  'avatar.customSuffix': '（自定义）',

  'project.backToProjects': '返回项目列表',
  'project.metaFreeform': '自由设计',
@@ -408,7 +411,7 @@ export const zhCN: Dict = {
  'agentPicker.modeChoose': '选择执行模式',
  'agentPicker.localCli': '本机 CLI',
  'agentPicker.daemonOff': '守护进程未运行',
-  'agentPicker.byok': '托管 API · 自带 Key',
+  'agentPicker.byok': 'Anthropic API · 自带 Key',
  'agentPicker.selectAgent': '选择已检测到的代码代理 CLI',
  'agentPicker.noAgents': 'PATH 中未发现代理',
  'agentPicker.notInstalled': '未安装',
@@ -85,11 +85,6 @@ export interface Dict {
  'settings.model': string;
  'settings.baseUrl': string;
  'settings.apiHint': string;
-  'settings.providerLabel': string;
-  'settings.providerHint': string;
-  'settings.apiVersion': string;
-  'settings.apiVersionHint': string;
-  'settings.proxyHint': string;
  'settings.skipForNow': string;
  'settings.getStarted': string;
  'settings.envConfigure': string;
@@ -98,6 +93,12 @@ export interface Dict {
  'settings.noAgentSelected': string;
  'settings.language': string;
  'settings.languageHint': string;
+  'settings.modelPicker': string;
+  'settings.reasoningPicker': string;
+  'settings.modelPickerHint': string;
+  'settings.modelCustom': string;
+  'settings.modelCustomLabel': string;
+  'settings.modelCustomPlaceholder': string;

  // Entry view / tabs
  'entry.tabDesigns': string;
@@ -229,6 +230,10 @@ export interface Dict {
  'avatar.metaOffline': string;
  'avatar.metaSelected': string;
  'avatar.noAgentSelected': string;
+  'avatar.modelSection': string;
+  'avatar.modelLabel': string;
+  'avatar.reasoningLabel': string;
+  'avatar.customSuffix': string;

  // Project view / chat pane / composer
  'project.backToProjects': string;
@@ -293,6 +293,45 @@ code {
  font-variant-numeric: tabular-nums;
  white-space: nowrap;
 }
+.avatar-section-label {
+  font-size: 10.5px;
+  text-transform: uppercase;
+  letter-spacing: 0.06em;
+  color: var(--text-faint);
+  font-weight: 600;
+  padding: 8px 10px 4px;
+}
+.avatar-model-section {
+  padding: 2px 10px 6px;
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  border-top: 1px dashed var(--border-soft);
+  margin-top: 4px;
+}
+.avatar-select-row {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  font-size: 12px;
+  color: var(--text-muted);
+}
+.avatar-select-label {
+  flex-shrink: 0;
+  min-width: 64px;
+}
+.avatar-select {
+  flex: 1;
+  min-width: 0;
+  font-size: 12px;
+  padding: 4px 6px;
+  border-radius: var(--radius-sm);
+  border: 1px solid var(--border);
+  background: var(--bg-panel);
+  color: var(--text);
+  cursor: pointer;
+}
+.avatar-select:focus { outline: 2px solid var(--accent-soft, var(--border-strong)); }

 /* Environment pill — only used in entry view header now */
 .env-pill {
@@ -827,6 +866,23 @@ code {
  white-space: nowrap; overflow: hidden; text-overflow: ellipsis;
 }
 .agent-card-meta .muted { color: var(--text-soft); font-style: italic; }
+.agent-model-row {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  padding: 12px;
+  border: 1px solid var(--border-soft);
+  border-radius: var(--radius-sm);
+  background: var(--bg-subtle);
+}
+.agent-model-row .field { gap: 4px; }
+.agent-model-row .field-label {
+  font-size: 11.5px;
+  text-transform: uppercase;
+  letter-spacing: 0.04em;
+  color: var(--text-muted);
+}
+.agent-model-row .hint { margin: 0; font-size: 11.5px; }
 .status-dot {
  width: 8px; height: 8px;
  border-radius: 50%;
@@ -1,56 +0,0 @@
-/**
- * Azure OpenAI streaming client. Wire format is OpenAI's (chat.completions
- * SSE), but the URL embeds the deployment name and an api-version query
- * string, and auth uses the `api-key` header rather than `Authorization:
- * Bearer`. We reuse streamChatCompletions() from openai.ts for the SSE
- * pump and only diverge on URL + headers.
- */
-import type { AppConfig, ChatMessage } from '../types';
-import type { StreamHandlers } from './anthropic';
-import { streamChatCompletions } from './openai';
-
-const DEFAULT_API_VERSION = '2024-08-01-preview';
-
-export async function streamAzure(
-  cfg: AppConfig,
-  system: string,
-  history: ChatMessage[],
-  signal: AbortSignal,
-  handlers: StreamHandlers,
-): Promise<void> {
-  if (!cfg.apiKey) {
-    handlers.onError(new Error('Missing Azure key — open Settings and paste one in.'));
-    return;
-  }
-  if (!cfg.baseUrl) {
-    handlers.onError(
-      new Error('Missing Azure endpoint — set Base URL to https://<resource>.openai.azure.com.'),
-    );
-    return;
-  }
-  if (!cfg.model) {
-    handlers.onError(
-      new Error('Missing Azure deployment — set Model to your deployment name.'),
-    );
-    return;
-  }
-
-  const apiVersion = (cfg.apiVersion?.trim() || DEFAULT_API_VERSION);
-  const url = buildAzureUrl(cfg.baseUrl, cfg.model, apiVersion);
-
-  const body = {
-    stream: true,
-    max_tokens: 8192,
-    messages: [
-      ...(system ? [{ role: 'system', content: system }] : []),
-      ...history.map((m) => ({ role: m.role, content: m.content })),
-    ],
-  };
-
-  await streamChatCompletions(url, cfg.apiKey, body, signal, handlers, 'azure');
-}
-
-function buildAzureUrl(baseUrl: string, deployment: string, apiVersion: string): string {
-  const base = baseUrl.replace(/\/+$/, '');
-  return `${base}/openai/deployments/${encodeURIComponent(deployment)}/chat/completions?api-version=${encodeURIComponent(apiVersion)}`;
-}
@@ -30,6 +30,11 @@ export interface DaemonStreamOptions {
  // daemon resolves them inside the project folder, validates they
  // exist, and stitches them into the user message as `@<path>` hints.
  attachments?: string[];
+  // Per-CLI model + reasoning the user picked in the model menu. Both are
+  // optional; the daemon validates them against the agent's declared
+  // options and falls back to the CLI default when missing.
+  model?: string | null;
+  reasoning?: string | null;
 }

 export async function streamViaDaemon({
@@ -40,6 +45,8 @@ export async function streamViaDaemon({
  handlers,
  projectId,
  attachments,
+  model,
+  reasoning,
 }: DaemonStreamOptions): Promise<void> {
  // Local CLIs are single-turn print-mode programs, so we collapse the whole
  // chat into one string. If this becomes too noisy for long histories, the
@@ -53,6 +60,8 @@ export async function streamViaDaemon({
    message: transcript,
    projectId: projectId ?? null,
    attachments: attachments ?? [],
+    model: model ?? null,
+    reasoning: reasoning ?? null,
  });

  let acc = '';
@@ -1,105 +0,0 @@
-/**
- * Google Generative Language API streaming client (Gemini direct). The
- * REST surface is at generativelanguage.googleapis.com and accepts an
- * api key in the query string. We hit `:streamGenerateContent` with
- * `alt=sse` so the response arrives as a server-sent event stream we
- * can pump like the OpenAI one.
- */
-import type { AppConfig, ChatMessage } from '../types';
-import type { StreamHandlers } from './anthropic';
-
-export async function streamGoogle(
-  cfg: AppConfig,
-  system: string,
-  history: ChatMessage[],
-  signal: AbortSignal,
-  handlers: StreamHandlers,
-): Promise<void> {
-  if (!cfg.apiKey) {
-    handlers.onError(new Error('Missing API key — open Settings and paste one in.'));
-    return;
-  }
-  if (!cfg.model) {
-    handlers.onError(new Error('Missing model — set one in Settings.'));
-    return;
-  }
-
-  const base = (cfg.baseUrl || 'https://generativelanguage.googleapis.com').replace(/\/+$/, '');
-  const url = `${base}/v1beta/models/${encodeURIComponent(cfg.model)}:streamGenerateContent?alt=sse&key=${encodeURIComponent(cfg.apiKey)}`;
-
-  const contents = history.map((m) => ({
-    role: m.role === 'assistant' ? 'model' : 'user',
-    parts: [{ text: m.content }],
-  }));
-
-  const body: Record<string, unknown> = { contents };
-  if (system) {
-    body.systemInstruction = { role: 'system', parts: [{ text: system }] };
-  }
-
-  let acc = '';
-  try {
-    const resp = await fetch(url, {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify(body),
-      signal,
-    });
-
-    if (!resp.ok || !resp.body) {
-      const text = await resp.text().catch(() => '');
-      handlers.onError(new Error(`upstream ${resp.status}: ${text || 'no body'}`));
-      return;
-    }
-
-    const reader = resp.body.getReader();
-    const decoder = new TextDecoder();
-    let buf = '';
-
-    while (true) {
-      const { value, done } = await reader.read();
-      if (done) break;
-      buf += decoder.decode(value, { stream: true });
-      let idx: number;
-      while ((idx = buf.indexOf('\n\n')) !== -1) {
-        const frame = buf.slice(0, idx).trim();
-        buf = buf.slice(idx + 2);
-        if (!frame) continue;
-        for (const line of frame.split('\n')) {
-          if (!line.startsWith('data:')) continue;
-          const payload = line.slice(5).trim();
-          if (!payload) continue;
-          let parsed: unknown;
-          try {
-            parsed = JSON.parse(payload);
-          } catch {
-            continue;
-          }
-          const delta = extractGeminiText(parsed);
-          if (delta) {
-            acc += delta;
-            handlers.onDelta(delta);
-          }
-        }
-      }
-    }
-    handlers.onDone(acc);
-  } catch (err) {
-    if ((err as Error).name === 'AbortError') return;
-    handlers.onError(err instanceof Error ? err : new Error(String(err)));
-  }
-}
-
-function extractGeminiText(payload: unknown): string {
-  if (!payload || typeof payload !== 'object') return '';
-  const candidates = (payload as { candidates?: unknown }).candidates;
-  if (!Array.isArray(candidates) || candidates.length === 0) return '';
-  const first = candidates[0] as { content?: { parts?: Array<{ text?: unknown }> } };
-  const parts = first?.content?.parts;
-  if (!Array.isArray(parts)) return '';
-  let out = '';
-  for (const p of parts) {
-    if (typeof p?.text === 'string') out += p.text;
-  }
-  return out;
-}
@@ -1,32 +0,0 @@
-/**
- * BYOK model router. Picks a streaming client based on cfg.provider so
- * the rest of the app can stay provider-agnostic. Adding a fifth provider
- * later means: add an entry to ModelProvider, add a presets row, add a
- * `stream<X>` function, and one more `case` here.
- */
-import type { AppConfig, ChatMessage } from '../types';
-import type { StreamHandlers } from './anthropic';
-import { streamMessage as streamAnthropic } from './anthropic';
-import { streamAzure } from './azure';
-import { streamGoogle } from './google';
-import { streamOpenAI } from './openai';
-
-export async function streamModel(
-  cfg: AppConfig,
-  system: string,
-  history: ChatMessage[],
-  signal: AbortSignal,
-  handlers: StreamHandlers,
-): Promise<void> {
-  switch (cfg.provider) {
-    case 'openai':
-      return streamOpenAI(cfg, system, history, signal, handlers);
-    case 'azure':
-      return streamAzure(cfg, system, history, signal, handlers);
-    case 'google':
-      return streamGoogle(cfg, system, history, signal, handlers);
-    case 'anthropic':
-    default:
-      return streamAnthropic(cfg, system, history, signal, handlers);
-  }
-}
@@ -1,135 +0,0 @@
-/**
- * OpenAI-compatible streaming client. Covers any endpoint that speaks the
- * `/chat/completions` SSE wire format — OpenAI proper, OpenRouter,
- * LiteLLM proxy, DeepSeek, Groq, Together, Mistral. Azure has its own
- * URL shape and lives in azure.ts.
- *
- * Browser fetch is fine here for the same BYOK reason streamMessage()
- * uses dangerouslyAllowBrowser: this is a local-first tool, the key is
- * the user's, it never leaves their machine. Move to a server proxy if
- * you ever ship a hosted build.
- */
-import type { AppConfig, ChatMessage } from '../types';
-import type { StreamHandlers } from './anthropic';
-
-export async function streamOpenAI(
-  cfg: AppConfig,
-  system: string,
-  history: ChatMessage[],
-  signal: AbortSignal,
-  handlers: StreamHandlers,
-): Promise<void> {
-  if (!cfg.apiKey) {
-    handlers.onError(new Error('Missing API key — open Settings and paste one in.'));
-    return;
-  }
-  if (!cfg.baseUrl) {
-    handlers.onError(new Error('Missing base URL — open Settings and set one.'));
-    return;
-  }
-
-  const url = joinUrl(cfg.baseUrl, '/chat/completions');
-  const body = {
-    model: cfg.model,
-    stream: true,
-    max_tokens: 8192,
-    messages: [
-      ...(system ? [{ role: 'system', content: system }] : []),
-      ...history.map((m) => ({ role: m.role, content: m.content })),
-    ],
-  };
-
-  await streamChatCompletions(url, cfg.apiKey, body, signal, handlers, 'bearer');
-}
-
-// Shared SSE pump between the OpenAI and Azure clients — they only differ
-// in URL shape and auth header.
-export async function streamChatCompletions(
-  url: string,
-  apiKey: string,
-  body: Record<string, unknown>,
-  signal: AbortSignal,
-  handlers: StreamHandlers,
-  auth: 'bearer' | 'azure',
-): Promise<void> {
-  let acc = '';
-  try {
-    const headers: Record<string, string> = {
-      'Content-Type': 'application/json',
-    };
-    if (auth === 'bearer') headers['Authorization'] = `Bearer ${apiKey}`;
-    else headers['api-key'] = apiKey;
-
-    const resp = await fetch(url, {
-      method: 'POST',
-      headers,
-      body: JSON.stringify(body),
-      signal,
-    });
-
-    if (!resp.ok || !resp.body) {
-      const text = await resp.text().catch(() => '');
-      handlers.onError(new Error(`upstream ${resp.status}: ${text || 'no body'}`));
-      return;
-    }
-
-    const reader = resp.body.getReader();
-    const decoder = new TextDecoder();
-    let buf = '';
-
-    while (true) {
-      const { value, done } = await reader.read();
-      if (done) break;
-      buf += decoder.decode(value, { stream: true });
-      // Frames are separated by a blank line. Split on \n\n; the trailing
-      // partial frame stays in buf for the next iteration.
-      let idx: number;
-      while ((idx = buf.indexOf('\n\n')) !== -1) {
-        const frame = buf.slice(0, idx).trim();
-        buf = buf.slice(idx + 2);
-        if (!frame) continue;
-        // Each frame is one or more `data: ...` lines plus optional
-        // `event:` / comments. We only care about `data:` payloads.
-        for (const line of frame.split('\n')) {
-          if (!line.startsWith('data:')) continue;
-          const payload = line.slice(5).trim();
-          if (!payload || payload === '[DONE]') continue;
-          let parsed: unknown;
-          try {
-            parsed = JSON.parse(payload);
-          } catch {
-            continue;
-          }
-          const delta = extractDelta(parsed);
-          if (delta) {
-            acc += delta;
-            handlers.onDelta(delta);
-          }
-        }
-      }
-    }
-    handlers.onDone(acc);
-  } catch (err) {
-    if ((err as Error).name === 'AbortError') return;
-    handlers.onError(err instanceof Error ? err : new Error(String(err)));
-  }
-}
-
-function extractDelta(payload: unknown): string {
-  if (!payload || typeof payload !== 'object') return '';
-  const choices = (payload as { choices?: unknown }).choices;
-  if (!Array.isArray(choices) || choices.length === 0) return '';
-  const first = choices[0] as { delta?: { content?: unknown }; text?: unknown };
-  if (first?.delta && typeof first.delta.content === 'string') {
-    return first.delta.content;
-  }
-  // Some legacy / completion-style proxies emit `text` instead of delta.
-  if (typeof first?.text === 'string') return first.text;
-  return '';
-}
-
-function joinUrl(base: string, path: string): string {
-  const b = base.replace(/\/+$/, '');
-  const p = path.startsWith('/') ? path : `/${path}`;
-  return `${b}${p}`;
-}
@@ -1,108 +0,0 @@
-/**
- * Provider presets — the BYOK side of the app supports four wire formats
- * (Anthropic-native, OpenAI-compatible, Azure OpenAI, Google Generative
- * Language). Each one ships with a default base URL and a short list of
- * suggested model ids so the SettingsDialog datalist gives the user a
- * head-start. The presets stay deliberately conservative: a user pointing
- * an `openai` provider at LiteLLM / OpenRouter / DeepSeek just types a
- * different baseUrl + model, no code change required.
- *
- * AWS Bedrock and Google Vertex aren't first-class providers here. Both
- * require credential signing (SigV4 for AWS, GCP service-account JWT for
- * Vertex) which is unsafe to do from the browser with long-lived BYOK
- * credentials. The recommended path is to run LiteLLM (or a similar
- * proxy) server-side and point the `anthropic` or `openai` provider at
- * that proxy's URL — the provider chooser surfaces this guidance.
- */
-import type { ModelProvider } from '../types';
-
-export interface ProviderPreset {
-  id: ModelProvider;
-  // Display name shown in the chooser and the env meta line.
-  label: string;
-  // Short marketing-style line shown under the provider card.
-  blurb: string;
-  // Default base URL preloaded into the form when the user picks this
-  // provider for the first time. Empty string means "the user must fill
-  // it in" (Azure has no global default).
-  baseUrl: string;
-  // Suggested model id (datalist anchor). The user can type anything.
-  defaultModel: string;
-  // Suggestions surfaced in the model field's <datalist>.
-  modelSuggestions: string[];
-  // Placeholder hint for the api key field.
-  apiKeyPlaceholder: string;
-  // Whether the provider requires the Azure-specific apiVersion field.
-  needsApiVersion?: boolean;
-}
-
-export const PROVIDER_PRESETS: Record<ModelProvider, ProviderPreset> = {
-  anthropic: {
-    id: 'anthropic',
-    label: 'Anthropic',
-    blurb: 'Direct to api.anthropic.com or any Anthropic-compatible proxy (LiteLLM, AWS Bedrock / GCP Vertex via proxy).',
-    baseUrl: 'https://api.anthropic.com',
-    defaultModel: 'claude-sonnet-4-5',
-    modelSuggestions: [
-      'claude-opus-4-5',
-      'claude-sonnet-4-5',
-      'claude-haiku-4-5',
-      'claude-3-5-sonnet-latest',
-    ],
-    apiKeyPlaceholder: 'sk-ant-...',
-  },
-  openai: {
-    id: 'openai',
-    label: 'OpenAI-compatible',
-    blurb: 'Any OpenAI /chat/completions endpoint — OpenAI, OpenRouter, LiteLLM proxy, DeepSeek, Groq, Together, Mistral.',
-    baseUrl: 'https://api.openai.com/v1',
-    defaultModel: 'gpt-4o-mini',
-    modelSuggestions: [
-      'gpt-4o',
-      'gpt-4o-mini',
-      'anthropic/claude-3.5-sonnet',
-      'google/gemini-2.0-flash',
-      'deepseek/deepseek-chat',
-      'meta-llama/llama-3.3-70b-instruct',
-    ],
-    apiKeyPlaceholder: 'sk-...',
-  },
-  azure: {
-    id: 'azure',
-    label: 'Azure OpenAI',
-    blurb: 'Azure-hosted deployments. Base URL is your resource endpoint; Model is the deployment name.',
-    baseUrl: '',
-    defaultModel: '',
-    modelSuggestions: [],
-    apiKeyPlaceholder: 'azure key',
-    needsApiVersion: true,
-  },
-  google: {
-    id: 'google',
-    label: 'Google Gemini',
-    blurb: 'Google Generative Language API — Gemini family, key from aistudio.google.com.',
-    baseUrl: 'https://generativelanguage.googleapis.com',
-    defaultModel: 'gemini-2.0-flash',
-    modelSuggestions: [
-      'gemini-2.0-flash',
-      'gemini-2.0-flash-lite',
-      'gemini-1.5-pro',
-      'gemini-1.5-flash',
-    ],
-    apiKeyPlaceholder: 'AIza...',
-  },
-};
-
-export const PROVIDER_ORDER: ModelProvider[] = [
-  'anthropic',
-  'openai',
-  'azure',
-  'google',
-];
-
-// True when the provider's wire format expects a deployment-specific URL
-// rather than a generic baseUrl + path. Today only Azure qualifies — kept
-// as a helper so callers don't have to memorize that.
-export function providerLabel(provider: ModelProvider): string {
-  return PROVIDER_PRESETS[provider]?.label ?? provider;
-}
@@ -4,15 +4,14 @@ const STORAGE_KEY = 'open-design:config';

 export const DEFAULT_CONFIG: AppConfig = {
  mode: 'daemon',
-  provider: 'anthropic',
  apiKey: '',
  baseUrl: 'https://api.anthropic.com',
  model: 'claude-sonnet-4-5',
-  apiVersion: '',
  agentId: null,
  skillId: null,
  designSystemId: null,
  onboardingCompleted: false,
+  agentModels: {},
 };

 export function loadConfig(): AppConfig {
@@ -1,25 +1,19 @@
 export type ExecMode = 'daemon' | 'api';

-// Which BYOK model endpoint to talk to in `mode === 'api'`. Each provider
-// has its own request shape — see src/providers/{anthropic,openai,azure,
-// google}.ts for the wire details. AWS Bedrock and Google Vertex are
-// reached via the `anthropic` provider pointed at an Anthropic-compatible
-// proxy (e.g. LiteLLM), which keeps signing on the server where the
-// long-lived AWS / GCP credentials belong.
-export type ModelProvider = 'anthropic' | 'openai' | 'azure' | 'google';
+// Per-CLI model + reasoning the user picked in the model menu. Each agent
+// keeps its own slot so flipping between Codex and Gemini doesn't reset the
+// other one's choice. Missing entries fall back to the agent's first
+// declared model (`'default'` — let the CLI pick).
+export interface AgentModelChoice {
+  model?: string;
+  reasoning?: string;
+}

 export interface AppConfig {
  mode: ExecMode;
-  // Active provider when `mode === 'api'`. Older configs that predate the
-  // multi-provider rework default to 'anthropic' on load.
-  provider: ModelProvider;
  apiKey: string;
  baseUrl: string;
  model: string;
-  // Azure OpenAI only — the api-version query string the Azure REST
-  // surface requires (e.g. '2024-08-01-preview'). Ignored by every other
-  // provider so the same config can round-trip through localStorage.
-  apiVersion?: string;
  agentId: string | null;
  skillId: string | null;
  designSystemId: string | null;
@@ -27,6 +21,10 @@ export interface AppConfig {
  // least once (saved or skipped). Bootstrap skips the auto-popup when
  // this is set so refreshing the page doesn't re-prompt.
  onboardingCompleted?: boolean;
+  // Per-CLI model picker state, keyed by agent id (e.g. `gemini`, `codex`).
+  // Pre-existing configs without this field fall through to the agent's
+  // declared default.
+  agentModels?: Record<string, AgentModelChoice>;
 }

 export type AgentEvent =
@@ -78,6 +76,11 @@ export interface ExamplePreview {
  html: string;
 }

+export interface AgentModelOption {
+  id: string;
+  label: string;
+}
+
 export interface AgentInfo {
  id: string;
  name: string;
@@ -85,6 +88,12 @@ export interface AgentInfo {
  available: boolean;
  path?: string;
  version?: string | null;
+  // Models surfaced in the model picker for this CLI. The first entry is
+  // treated as the default (typically the synthetic `'default'` option,
+  // meaning "let the CLI use whatever's in its own config").
+  models?: AgentModelOption[];
+  // Reasoning-effort presets — currently only Codex exposes this.
+  reasoningOptions?: AgentModelOption[];
 }

 export interface SkillSummary {