fix: spawn agents via resolved absolute path on Windows (#10)

Detection in `/api/agents` resolves each agent's full executable path,
but `/api/chat` was spawning the bare `def.bin` ("claude"). On Windows
the child process's PATH often doesn't include the user's npm-global
shim directory, so spawn() failed with ENOENT despite the picker
showing the agent as available.

Use the resolved path at spawn time, and pass `shell: true` when the
resolved bin is a `.cmd`/`.bat` shim so Node ≥21 doesn't refuse to
execute it (CVE-2024-27980).

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

daemon/agents.js

@@ -6,82 +6,25 @@ import path from 'node:path';
 
 const execFileP = promisify(execFile);
 
-// 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
+// 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
 // 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'],
-    // `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 = {}) => {
+    buildArgs: (prompt, _imagePaths, extraAllowedDirs = []) => {
       const args = [
         '-p',
         prompt,
@@ -90,9 +33,6 @@ 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,
       );
@@ -108,35 +48,7 @@ export const AGENT_DEFS = [
     name: 'Codex CLI',
     bin: 'codex',
     versionArgs: ['--version'],
-    // 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;
-    },
+    buildArgs: (prompt) => ['exec', prompt],
     streamFormat: 'plain',
   },
   {
@@ -144,19 +56,7 @@ export const AGENT_DEFS = [
     name: 'Gemini CLI',
     bin: 'gemini',
     versionArgs: ['--version'],
-    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;
-    },
+    buildArgs: (prompt) => ['-p', prompt],
     streamFormat: 'plain',
   },
   {
@@ -164,26 +64,7 @@ export const AGENT_DEFS = [
     name: 'OpenCode',
     bin: 'opencode',
     versionArgs: ['--version'],
-    // `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;
-    },
+    buildArgs: (prompt) => ['run', prompt],
     streamFormat: 'plain',
   },
   {
@@ -191,33 +72,7 @@ export const AGENT_DEFS = [
     name: 'Cursor Agent',
     bin: 'cursor-agent',
     versionArgs: ['--version'],
-    // `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;
-    },
+    buildArgs: (prompt) => ['-p', prompt],
     streamFormat: 'plain',
   },
   {
@@ -225,19 +80,7 @@ export const AGENT_DEFS = [
     name: 'Qwen Code',
     bin: 'qwen',
     versionArgs: ['--version'],
-    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;
-    },
+    buildArgs: (prompt) => ['-p', prompt],
     streamFormat: 'plain',
   },
 ];
@@ -257,36 +100,9 @@ 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),
-      models: def.fallbackModels ?? [DEFAULT_MODEL_OPTION],
-      available: false,
-    };
-  }
+  if (!resolved) return { ...stripFns(def), available: false };
   let version = null;
   try {
     const { stdout } = await execFileP(resolved, def.versionArgs, { timeout: 3000 });
@@ -294,75 +110,28 @@ async function probe(def) {
   } catch {
     // binary exists but --version failed; still mark available
   }
-  const models = await fetchModels(def, resolved);
-  return {
-    ...stripFns(def),
-    models,
-    available: true,
-    path: resolved,
-    version,
-  };
+  return { ...stripFns(def), available: true, path: resolved, version };
 }
 
 function stripFns(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;
+  const { buildArgs, ...rest } = def;
   return rest;
 }
 
 export async function detectAgents() {
-  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;
+  return Promise.all(AGENT_DEFS.map(probe));
 }
 
 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;
+// Resolve the absolute path of an agent's binary on the current PATH.
+// Used by the chat handler so spawn() gets the same executable that
+// detection reported as available — fixes Windows ENOENT when the bare
+// bin name isn't on the child process's PATH (issue #10).
+export function resolveAgentBin(id) {
+  const def = getAgentDef(id);
+  if (!def?.bin) return null;
+  return resolveOnPath(def.bin);
 }

daemon/server.js

@@ -6,12 +6,7 @@ import { fileURLToPath } from 'node:url';
 import path from 'node:path';
 import fs from 'node:fs';
 import os from 'node:os';
-import {
-  detectAgents,
-  getAgentDef,
-  isKnownModel,
-  sanitizeCustomModel,
-} from './agents.js';
+import { detectAgents, getAgentDef, resolveAgentBin } from './agents.js';
 import { listSkills } from './skills.js';
 import { listDesignSystems, readDesignSystem } from './design-systems.js';
 import { createClaudeStreamHandler } from './claude-stream.js';
@@ -695,8 +690,6 @@ 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}` });
@@ -786,23 +779,7 @@ export async function startServer({ port = 7456 } = {}) {
     const extraAllowedDirs = [SKILLS_DIR, DESIGN_SYSTEMS_DIR].filter(
       (d) => fs.existsSync(d),
     );
-    // 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);
+    const args = def.buildArgs(composed, safeImages, extraAllowedDirs);
 
     res.setHeader('Content-Type', 'text/event-stream');
     res.setHeader('Cache-Control', 'no-cache, no-transform');
@@ -815,22 +792,32 @@ export async function startServer({ port = 7456 } = {}) {
       res.write(`data: ${JSON.stringify(data)}\n\n`);
     };
 
+    // Resolve the agent's bin to its absolute path. Detection (`/api/agents`)
+    // already locates the executable via PATH, but spawning the bare name here
+    // fails on Windows (ENOENT) when the child process's PATH doesn't contain
+    // the user's npm-global / shim directory — see issue #10.
+    const resolvedBin = resolveAgentBin(agentId) || def.bin;
+    // npm shims on Windows are .cmd/.bat files; Node ≥21 refuses to spawn
+    // those without `shell: true` (CVE-2024-27980). When `shell: true` is set
+    // on Windows, Node escapes args automatically for the cmd.exe shell.
+    const useShell =
+      process.platform === 'win32' && /\.(cmd|bat)$/i.test(resolvedBin);
+
     send('start', {
       agentId,
-      bin: def.bin,
+      bin: resolvedBin,
       streamFormat: def.streamFormat ?? 'plain',
       projectId: typeof projectId === 'string' ? projectId : null,
       cwd,
-      model: safeModel,
-      reasoning: safeReasoning,
     });
 
     let child;
     try {
-      child = spawn(def.bin, args, {
+      child = spawn(resolvedBin, args, {
         env: { ...process.env },
         stdio: ['ignore', 'pipe', 'pipe'],
         cwd: cwd || undefined,
+        shell: useShell,
       });
     } catch (err) {
       send('error', { message: `spawn failed: ${err.message}` });

src/App.tsx

@@ -137,18 +137,6 @@ 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 };
@@ -284,7 +272,6 @@ export function App() {
           daemonLive={daemonLive}
           onModeChange={handleModeChange}
           onAgentChange={handleAgentChange}
-          onAgentModelChange={handleAgentModelChange}
           onRefreshAgents={refreshAgents}
           onOpenSettings={openSettings}
           onBack={handleBack}

src/components/AvatarMenu.tsx

@@ -2,7 +2,6 @@ import { useEffect, useMemo, useRef, useState } from 'react';
 import { useT } from '../i18n';
 import { AgentIcon } from './AgentIcon';
 import { Icon } from './Icon';
-import { renderModelOptions } from './modelOptions';
 import type { AgentInfo, AppConfig, ExecMode } from '../types';
 
 interface Props {
@@ -11,10 +10,6 @@ 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;
@@ -31,7 +26,6 @@ export function AvatarMenu({
   daemonLive,
   onModeChange,
   onAgentChange,
-  onAgentModelChange,
   onOpenSettings,
   onRefreshAgents,
   onBack,
@@ -64,19 +58,6 @@ 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
@@ -107,7 +88,7 @@ export function AvatarMenu({
               {config.mode === 'api'
                 ? safeHost(config.baseUrl)
                 : currentAgent
-                  ? `${currentAgent.name}${currentAgent.version ? ` · ${currentAgent.version}` : ''}${currentModelLabel && currentModelId !== 'default' ? ` · ${currentModelLabel}` : ''}`
+                  ? `${currentAgent.name}${currentAgent.version ? ` · ${currentAgent.version}` : ''}`
                   : t('avatar.noAgentSelected')}
             </span>
           </div>
@@ -152,7 +133,18 @@ export function AvatarMenu({
 
           {config.mode === 'daemon' && installedAgents.length > 0 ? (
             <>
-              <div className="avatar-section-label">{t('avatar.codeAgent')}</div>
+              <div
+                style={{
+                  fontSize: 10.5,
+                  textTransform: 'uppercase',
+                  letterSpacing: '0.06em',
+                  color: 'var(--text-faint)',
+                  fontWeight: 600,
+                  padding: '8px 10px 4px',
+                }}
+              >
+                {t('avatar.codeAgent')}
+              </div>
               {installedAgents.map((a) => (
                 <button
                   type="button"
@@ -160,8 +152,7 @@ export function AvatarMenu({
                   className="avatar-item"
                   onClick={() => {
                     onAgentChange(a.id);
-                    // Keep the popover open so the user can immediately
-                    // pick a model for the agent they just chose.
+                    setOpen(false);
                   }}
                 >
                   <AgentIcon id={a.id} size={18} />
@@ -175,71 +166,6 @@ 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"

src/components/ProjectView.tsx

@@ -53,10 +53,6 @@ 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;
@@ -76,7 +72,6 @@ export function ProjectView({
   daemonLive,
   onModeChange,
   onAgentChange,
-  onAgentModelChange,
   onRefreshAgents,
   onOpenSettings,
   onBack,
@@ -495,7 +490,6 @@ 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,
@@ -504,8 +498,6 @@ 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 });
@@ -736,7 +728,6 @@ export function ProjectView({
             daemonLive={daemonLive}
             onModeChange={onModeChange}
             onAgentChange={onAgentChange}
-            onAgentModelChange={onAgentModelChange}
             onOpenSettings={onOpenSettings}
             onRefreshAgents={onRefreshAgents}
             onBack={onBack}

src/components/SettingsDialog.tsx

@@ -2,11 +2,6 @@ import { useEffect, useMemo, useState } from 'react';
 import { LOCALE_LABEL, LOCALES, useI18n } from '../i18n';
 import type { Locale } from '../i18n';
 import { AgentIcon } from './AgentIcon';
-import {
-  CUSTOM_MODEL_SENTINEL,
-  isCustomModel,
-  renderModelOptions,
-} from './modelOptions';
 import type { AgentInfo, AppConfig, ExecMode } from '../types';
 
 interface Props {
@@ -188,108 +183,6 @@ 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">

src/components/modelOptions.tsx

@@ -1,71 +0,0 @@
-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__';

src/i18n/locales/en.ts

@@ -83,13 +83,6 @@ export const en: Dict = {
   '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',
@@ -218,10 +211,6 @@ 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',

src/i18n/locales/zh-CN.ts

@@ -82,13 +82,6 @@ export const zhCN: Dict = {
   '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': '示例',
@@ -215,10 +208,6 @@ export const zhCN: Dict = {
   'avatar.metaOffline': '未运行',
   'avatar.metaSelected': '已选',
   'avatar.noAgentSelected': '尚未选择代理',
-  'avatar.modelSection': '模型',
-  'avatar.modelLabel': '模型',
-  'avatar.reasoningLabel': '推理',
-  'avatar.customSuffix': '（自定义）',
 
   'project.backToProjects': '返回项目列表',
   'project.metaFreeform': '自由设计',

src/i18n/types.ts

@@ -93,12 +93,6 @@ 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;
@@ -230,10 +224,6 @@ 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;

src/index.css

@@ -293,45 +293,6 @@ 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 {
@@ -866,23 +827,6 @@ 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%;

src/providers/daemon.ts

@@ -30,11 +30,6 @@ 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({
@@ -45,8 +40,6 @@ 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
@@ -60,8 +53,6 @@ export async function streamViaDaemon({
     message: transcript,
     projectId: projectId ?? null,
     attachments: attachments ?? [],
-    model: model ?? null,
-    reasoning: reasoning ?? null,
   });
 
   let acc = '';

src/state/config.ts

@@ -11,7 +11,6 @@ export const DEFAULT_CONFIG: AppConfig = {
   skillId: null,
   designSystemId: null,
   onboardingCompleted: false,
-  agentModels: {},
 };
 
 export function loadConfig(): AppConfig {

src/types.ts

@@ -1,14 +1,5 @@
 export type ExecMode = 'daemon' | 'api';
 
-// 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;
   apiKey: string;
@@ -21,10 +12,6 @@ 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 =
@@ -76,11 +63,6 @@ export interface ExamplePreview {
   html: string;
 }
 
-export interface AgentModelOption {
-  id: string;
-  label: string;
-}
-
 export interface AgentInfo {
   id: string;
   name: string;
@@ -88,12 +70,6 @@ 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 {