amicus 1.0.0 → 1.2.0

package/.claude-plugin/marketplace.json

@@ -0,0 +1,14 @@
+{
+  "name": "bourbondog-amicus",
+  "owner": { "name": "Christian Wagner", "url": "https://github.com/BourbonDog" },
+  "metadata": { "description": "Amicus — multi-model LLM Council + parallel AI window for Claude Code." },
+  "plugins": [
+    {
+      "name": "amicus",
+      "source": "./",
+      "description": "Multi-model LLM Council + parallel AI window. Run structured council reviews across Gemini, GPT, DeepSeek and more — or fork a conversation to any model and fold the results back.",
+      "author": { "name": "Christian Wagner" },
+      "keywords": ["claude-code", "multi-model", "llm", "council", "second-opinion"]
+    }
+  ]
+}

package/.claude-plugin/plugin.json

@@ -0,0 +1,19 @@
+{
+  "name": "amicus",
+  "version": "1.2.0",
+  "description": "Multi-model LLM Council + parallel AI window for Claude Code. Run structured council reviews across Gemini, GPT, DeepSeek and more — or fork a conversation to any model and fold the results back.",
+  "author": { "name": "Christian Wagner" },
+  "homepage": "https://bourbondog.github.io/amicus/",
+  "repository": "https://github.com/BourbonDog/amicus",
+  "bugs": "https://github.com/BourbonDog/amicus/issues",
+  "license": "MIT",
+  "keywords": ["claude-code", "multi-model", "llm", "council", "second-opinion", "sidecar", "gemini", "gpt", "deepseek"],
+  "skills": ["./skills/sidecar", "./skills/second-opinion"],
+  "mcpServers": {
+    "amicus": {
+      "command": "npx",
+      "args": ["-y", "amicus@latest", "mcp"],
+      "env": { "AMICUS_SKIP_POSTINSTALL": "1" }
+    }
+  }
+}

package/CHANGELOG.md

@@ -5,6 +5,92 @@ All notable changes to Amicus are documented here. Format follows
 
 ## [Unreleased]
 
+## [1.2.0] - 2026-06-24
+
+A post-launch enhancement program: reliability and cost made real, the council's
+trust machinery turned from hand-math into deterministic code, plus first-run
+diagnostics, a Claude Code plugin, and an observable interactive surface.
+
+### Added
+- **`amicus doctor`**: a one-screen first-run health check — configured providers, default-model
+  resolution vs. the live catalog, catalog freshness, the OpenCode binary, Electron, installed
+  skills, and MCP registration. Each red line carries the exact fix command; `--json` lets skills
+  self-diagnose.
+- **Claude Code plugin**: Amicus is now installable from the marketplace —
+  `/plugin marketplace add BourbonDog/amicus` then `/plugin install amicus`. The plugin ships both
+  skills and the MCP server; npm stays the engine/CLI. (The plugin channel skips the global
+  postinstall via `AMICUS_SKIP_POSTINSTALL` so it can't double-register.)
+- **Per-leg cost & token telemetry**: the run/wave schema (now `schemaVersion: 2`) carries a
+  `usage` block — input/output/reasoning tokens and a `$` cost tagged by source (reported >
+  estimated > unknown). Surfaced in `fanout --json` and council run-stats.
+- **Enforced budget gate**: a per-`$/Mtok` threshold (on by default — blocks o3-pro-class models
+  before a wave launches) plus an optional `--max-cost` total ceiling. `--no-cost-gate` is the
+  explicit escape hatch.
+- **`amicus council tally|stats`**: deterministic council scoring — a structured findings
+  contract, a peers-only tier cascade with self-vote-corrected street-cred, a compounding
+  reviewer-reliability ledger, and a machine-readable `verdict.json`. The council stays a skill;
+  the engine owns only the arithmetic and schemas.
+- **Structured `--json` error envelope**: pre-flight failures now emit a typed
+  `{ ok: false, error: { code, message, hint } }` document on stdout (stable codes like
+  `MISSING_KEY`, `BAD_MODEL`, `BUDGET_EXCEEDED`) instead of bare text on stderr.
+
+### Changed
+- **Interactive GUI sessions now persist live**: `conversation.jsonl` and `progress.json` are
+  written as the session runs, so the CLI heartbeat, `amicus status`, and
+  `amicus read --conversation` work for GUI sessions — and **closing the window without folding no
+  longer loses the transcript**. Interactive runs also record token/cost usage. (Headless and
+  interactive now share one persistence transform.)
+- **Reliability**: a single source of truth for terminal state (exit code and `metadata.status`
+  always agree; the idle backstop no longer exits 0 with `running` metadata), and an
+  activity-driven interactive watchdog that won't kill an actively-working-but-quiet GUI session.
+- **CI**: a real matrix (Ubuntu / Windows / macOS × Node 18 / 20 / 22) plus lint, secret-scan, and
+  size-gate now gate every push and the publish.
+- Repo layout: the chat skill moved to `skills/sidecar/` (both skills live under `skills/`); npm
+  `homepage` now points at the live site; README and the landing page gained a "Prerequisites &
+  cost" section.
+
+### Fixed
+- **MCP stderr fd leak**: `spawnSidecarProcess` opened a `debug.log` descriptor for the child's
+  stderr but never closed the parent's copy — a descriptor leak that, on Windows, also held the
+  file open and blocked session-dir cleanup.
+- Platform-correct missing-key guidance (PowerShell `$PROFILE`/`setx` on Windows; leads with
+  `amicus key`); the committed-secret scan now knows all five providers; `amicus models` marks
+  your **actual** aliases (not curated defaults); OpenRouter's `-1` "variable pricing" sentinel
+  renders as `—` instead of a nonsense negative price.
+
+## [1.1.0] - 2026-06-11
+
+### Added
+- **DeepSeek as a direct API provider**: DeepSeek card and API key step in the setup wizard,
+  live model fetch from DeepSeek's `/models`, and a direct `deepseek/...` route used
+  automatically when no OpenRouter key is configured.
+- **`amicus key`**: headless API key management — `amicus key` lists configured providers with
+  masked hints, `amicus key <provider> <key>` validates and saves, `--remove` deletes. No GUI
+  required.
+- **Live quick picks in the setup wizard (Step 2)**: recommended models resolve per family
+  against the live catalog when the window opens (no stale pinned ids), with always-visible
+  labeled search and a write-preview showing exactly which alias will change.
+
+### Changed
+- **Setup wizard finish is now read-modify-write**: picking a model sets the default and
+  upgrades only that one alias; untouched aliases are never rewritten and deleted aliases stay
+  deleted. (Previously, finishing setup could silently rewrite every card alias.)
+- Readline (no-Electron) setup parity: free-form model ids and the same no-clobber behavior.
+  `amicus models --check` now also warns when a curated pinned fallback drifts from the live
+  catalog.
+- Council skill (Stage 6): the proposed MODEL-NOTES diff is written to a run-folder file and
+  the approval prompt carries the file path — approval dialogs can hide chat text.
+- Chat skill docs: single-model sidecars default to interactive (GUI) mode; headless remains
+  the default for fanouts and bulk runs.
+- Attribution: npm package author is Christian Wagner; "Inspired by" fork wording in
+  CONTRIBUTING.
+
+### Fixed
+- **Electron preload crash on every page**: `window.sidecar` (contextBridge) is now exposed
+  before DOM injection, and the injected CSS guards against a null `documentElement` — the
+  silent TypeError previously killed both the bridge and the anti-white-flash styling.
+- DeepSeek provider pill showed `undefined` in the wizard model step.
+
 ## [1.0.0] - 2026-06-10
 
 Everything since the fork from upstream `claude-sidecar` v0.5.2 — the Amicus launch line.

package/LICENSE

@@ -1,6 +1,27 @@
 MIT License
 
-Copyright (c) 2025 John Renaldi
+Copyright (c) 2025 John Renaldi Claude Sidecar
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+Copyright (c) 2026 Christian Wagner Amicus
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -6,7 +6,7 @@
 
 ![Amicus: an LLM Council and a parallel AI window for Claude](./docs/hero.png)
 
-Hand Claude a document and say *council review this*: Amicus routes it through several models from different families, has them anonymously cross-review each other, and a non-Claude chair synthesizes a verdict you turn into accept/deny edits. Or skip the ceremony and **fork** a single conversation to Gemini, GPT, DeepSeek, or any other model — it works in parallel with full context, and you **fold** the result back when you're ready. Claude orchestrates throughout; you stay in your editor.
+Hand Claude a plan, a design, a diff, an architecture decision, a manuscript — anything — and say *council review this*: Amicus routes it through several models from different families, has them anonymously cross-review each other, and a non-Claude chair synthesizes a verdict you turn into accept/deny edits. Or skip the ceremony and **fork** a single conversation to Gemini, GPT, DeepSeek, or any other model — it works in parallel with full context, and you **fold** the result back when you're ready. Claude orchestrates throughout; you stay in your editor.
 
 [![npm version](https://img.shields.io/npm/v/amicus?color=D97757&labelColor=1A1C29)](https://www.npmjs.com/package/amicus)
 [![License: MIT](https://img.shields.io/badge/license-MIT-blue?labelColor=1A1C29)](./LICENSE)
@@ -67,6 +67,16 @@ The postinstall step auto-configures everything — no manual registration:
 - Registers the **MCP server** in Claude Code and in Claude Desktop / Cowork, so the Amicus tools appear natively.
 - Installs **both skills** into `~/.claude/skills/` — `second-opinion` (the council) and `sidecar` (the chat skill).
 
+## Prerequisites & what it costs you
+
+Before your first run:
+
+- **Node.js ≥ 18** — `node --version` to check.
+- **An active Claude Code or Cowork session** — Amicus is orchestrated by Claude; it is not a standalone chatbot.
+- **At least one paid model API key** — OpenRouter (covers the most models) or a direct Google / OpenAI / Anthropic / DeepSeek key. Add one with `amicus setup` or `amicus key <provider> <key>`.
+
+**What a run costs.** A sidecar is a single model call. A full council is typically **~5–8 paid model calls** (e.g. 3 reviewers across 2 fan-out waves + 1 chair). Amicus shows an estimate before each council and enforces a built-in budget gate that refuses ultra-expensive models (o3-pro class) unless you opt in with `--no-cost-gate`. You pay your providers directly for the tokens; Amicus itself is free and open-source.
+
 **Configure:**
 
 ```bash
@@ -420,6 +430,7 @@ Most Claude-adjacent tooling assumes macOS/Linux; Amicus doesn't.
 | Symptom | Likely cause | Fix |
 |---------|--------------|-----|
 | "council review this" does nothing | The `second-opinion` skill isn't installed | Check `~/.claude/skills/second-opinion/SKILL.md` exists; re-run `npm install -g amicus` (postinstall installs both skills) |
+| `npm install -g amicus` fails with `EEXIST: … claude-sidecar` | The old upstream `claude-sidecar` package is still installed globally; npm won't overwrite another package's bin shims | `npm uninstall -g claude-sidecar`, then `npm install -g amicus`. Your config and sessions carry over (legacy paths are still read). |
 | `401` / auth error | API key missing, or the model prefix doesn't match the key you have | Run `amicus setup`; make sure the prefix (`openrouter/…` vs `google/…` vs `openai/…` vs `anthropic/…`) matches the credentials you configured. |
 | Session not found | No session matches the given ID | Run `amicus list`, or omit `--session-id` to use the most recent. |
 | No conversation history found | Project-path encoding | Check `~/.claude/projects/`; `/` and `_` in the project path are encoded as `-` in the directory name. |
@@ -451,7 +462,7 @@ LOG_LEVEL=debug amicus start --model gemini --prompt "test" --no-ui
 | [docs/publishing.md](./docs/publishing.md) | Release and publish process. |
 | [docs/SHIMS.md](./docs/SHIMS.md) | Legacy `SIDECAR_*` → `AMICUS_*` compatibility shims. |
 | [skills/second-opinion/SKILL.md](./skills/second-opinion/SKILL.md) | The LLM Council skill. |
-| [skill/SKILL.md](./skill/SKILL.md) | The `sidecar` chat skill. |
+| [skills/sidecar/SKILL.md](./skills/sidecar/SKILL.md) | The `sidecar` chat skill. |
 | [evals/README.md](./evals/README.md) | End-to-end eval harness for LLM interactions. |
 
 ---
@@ -472,6 +483,6 @@ Amicus is a harness built on top of [**OpenCode**](https://opencode.ai), the ope
 
 ## Attribution & License
 
-Amicus is an independent fork of [**Claude Sidecar**](https://github.com/jrenaldi79/sidecar) by [John Renaldi](https://github.com/jrenaldi79), used under the MIT License. The original copyright (© 2025 John Renaldi) is preserved in full in [LICENSE](./LICENSE). The engine modifications, the multi-model council, and the skill bundling are © 2026 BourbonDog, also under the MIT License. See [LICENSE](./LICENSE) and [NOTICE](./NOTICE) for the complete attribution.
+Amicus is inspired by [**Claude Sidecar**](https://github.com/jrenaldi79/sidecar) by [John Renaldi](https://github.com/jrenaldi79), used under the MIT License. The original copyright (© 2025 John Renaldi) is preserved in full in [LICENSE](./LICENSE). The engine modifications, the multi-model council, and the skill bundling are © 2026 Christian Wagner, also under the MIT License. See [LICENSE](./LICENSE) and [NOTICE](./NOTICE) for the complete attribution.
 
 **MIT.**

package/bin/amicus.js

@@ -11,10 +11,11 @@
 const { loadCredentials } = require('../src/utils/env-loader');
 loadCredentials();
 
-const { parseArgs, validateStartArgs, getUsage } = require('../src/cli');
+const { parseArgs, getUsage } = require('../src/cli');
 const { validateTaskId } = require('../src/utils/validators');
 const { resolveModelFromArgs, validateFallbackModel } = require('../src/utils/start-helpers');
-const { handleSetup, handleAbort, handleUpdate, handleMcp } = require('../src/cli-handlers');
+const { handleSetup, handleAbort, handleUpdate, handleMcp, handleKey } = require('../src/cli-handlers');
+const { handleStart, handleFanout, handleRead } = require('../src/cli-handlers-run');
 const { isOneShotCommand, armExitWatchdog } = require('../src/utils/lifecycle');
 const { logger } = require('../src/utils/logger');
 
@@ -73,7 +74,7 @@ async function main() {
   try {
     switch (command) {
       case 'start':
-        await handleStart(args);
+        exitCode = await handleStart(args);
         break;
       case 'fanout':
         exitCode = await handleFanout(args);
@@ -95,9 +96,22 @@ async function main() {
         exitCode = await handleModels(args);
         break;
       }
+      case 'council': {
+        const { handleCouncil } = require('../src/cli-handlers-council');
+        exitCode = await handleCouncil(args);
+        break;
+      }
+      case 'doctor': {
+        const { handleDoctor } = require('../src/cli-handlers-doctor');
+        exitCode = await handleDoctor(args);
+        break;
+      }
       case 'setup':
         await handleSetup(args);
         break;
+      case 'key':
+        await handleKey(args);
+        break;
       case 'abort':
         await handleAbort(args);
         break;
@@ -126,135 +140,6 @@ async function main() {
   }
 }
 
-/**
- * Handle 'sidecar start' command
- * Spec Reference: §4.1
- */
-async function handleStart(args) {
-  // F4: --prompt-file support (XOR --prompt) and --json gating
-  if (args.prompt !== undefined || args['prompt-file'] !== undefined) {
-    const { resolvePromptSource } = require('../src/utils/prompt-source');
-    const promptRes = resolvePromptSource(args);
-    if (promptRes.error) {
-      console.error(promptRes.error);
-      process.exit(1);
-    }
-    args.prompt = promptRes.prompt;
-  }
-  if (args.json && !args['no-ui']) {
-    console.error('Error: --json requires --no-ui');
-    process.exit(1);
-  }
-
-  const { model, alias } = resolveModelFromArgs(args);
-  args.model = model;
-  args.model = await validateFallbackModel(args, alias);
-
-  // Normalize agent: --agent takes precedence, otherwise use --mode
-  args.agent = args.agent || args.mode;
-
-  const validation = validateStartArgs(args);
-  if (!validation.valid) {
-    console.error(validation.error);
-    process.exit(1);
-  }
-
-  const { startSidecar } = require('../src/index');
-
-  await startSidecar({
-    taskId: args['task-id'],
-    model: args.model,
-    prompt: args.prompt,
-    sessionId: args['session-id'],
-    cwd: args.cwd,
-    contextTurns: args['context-turns'],
-    contextSince: args['context-since'],
-    contextMaxTokens: args['context-max-tokens'],
-    noUi: args['no-ui'],
-    timeout: args.timeout,
-    agent: args.agent,
-    mcp: args.mcp,
-    mcpConfig: args['mcp-config'],
-    thinking: args.thinking,
-    summaryLength: args['summary-length'],
-    client: args.client,
-    sessionDir: args['session-dir'],
-    foldShortcut: args['fold-shortcut'],
-    opencodePort: args['opencode-port'],
-    noMcp: args['no-mcp'],
-    excludeMcp: args['exclude-mcp'],
-    coworkProcess: args['cowork-process'],
-    position: args.position,
-    json: !!args.json,
-    modelInput: alias || null,
-  });
-}
-
-/**
- * Handle 'amicus fanout' command (F4).
- * Returns the wave exit code: 0 all complete, 2 partial, 1 none/hard failure,
- * 130/143 when the wave was signal-aborted.
- */
-async function handleFanout(args) {
-  const { resolvePromptSource } = require('../src/utils/prompt-source');
-  const promptRes = resolvePromptSource(args);
-  if (promptRes.error) {
-    console.error(promptRes.error);
-    process.exit(1);
-  }
-  if (typeof args.models !== 'string' || !args.models.trim()) {
-    console.error('Error: --models is required (comma-separated aliases or provider/model IDs)');
-    process.exit(1);
-  }
-  if (args['wave-id']) {
-    const check = validateTaskId(String(args['wave-id']));
-    if (!check.valid) {
-      console.error(check.error);
-      process.exit(1);
-    }
-  }
-  if (args.agent && String(args.agent).toLowerCase() === 'chat') {
-    console.error('Error: --agent chat is interactive-only; fanout is headless');
-    process.exit(1);
-  }
-  if (args.timeout !== undefined && args.timeout <= 0) {
-    console.error('Error: --timeout must be a positive number');
-    process.exit(1);
-  }
-  const { parseModelsList } = require('../src/sidecar/fanout');
-  if (parseModelsList(args.models).length === 0) {
-    console.error('Error: --models must contain at least one non-empty entry');
-    process.exit(1);
-  }
-
-  // Direct require — the src/index.js public re-export is added later (Task 13)
-  const { runFanout } = require('../src/sidecar/fanout');
-  const { exitCode } = await runFanout({
-    models: args.models,
-    prompt: promptRes.prompt,
-    promptMeta: promptRes.promptMeta,
-    waveId: args['wave-id'],
-    project: args.cwd || process.cwd(),
-    agent: args.agent || args.mode,
-    thinking: args.thinking,
-    timeout: args.timeout,
-    summaryLength: args['summary-length'],
-    includeContext: !args['no-context'],
-    sessionId: args['session-id'],
-    contextTurns: args['context-turns'],
-    contextSince: args['context-since'],
-    contextMaxTokens: args['context-max-tokens'],
-    mcp: args.mcp,
-    mcpConfig: args['mcp-config'],
-    noMcp: args['no-mcp'],
-    excludeMcp: args['exclude-mcp'],
-    noValidateModel: args['no-validate-model'],
-    json: !!args.json,
-    client: args.client,
-  });
-  return exitCode;
-}
-
 /**
  * Handle 'sidecar list' command
  * Spec Reference: §4.2
@@ -345,36 +230,6 @@ async function handleContinue(args) {
   });
 }
 
-/**
- * Handle 'sidecar read' command
- * Spec Reference: §4.5
- */
-async function handleRead(args) {
-  const taskId = args._[1];
-
-  if (!taskId) {
-    console.error('Error: task_id is required for read');
-    console.error('Usage: sidecar read <task_id> [--summary|--conversation]');
-    process.exit(1);
-  }
-
-  const taskIdCheck = validateTaskId(taskId);
-  if (!taskIdCheck.valid) {
-    console.error(taskIdCheck.error);
-    process.exit(1);
-  }
-
-  const { readSidecar } = require('../src/index');
-
-  await readSidecar({
-    taskId,
-    conversation: args.conversation,
-    metadata: args.metadata,
-    json: args.json,
-    project: args.cwd
-  });
-}
-
 // Run main
 main().catch(err => {
   console.error(`Fatal error: ${err.message}`);

package/electron/ipc-setup.js

@@ -7,14 +7,14 @@
  * fetch-models, get-catalog, and refresh-catalog.
  */
 
+const { ipcMain } = require('electron');
 const { logger } = require('../src/utils/logger');
 
 /**
  * Register all setup-related IPC handlers
- * @param {Electron.IpcMain} ipcMain - Electron IPC main
  * @param {function} getMainWindow - Returns the current main BrowserWindow
  */
-function registerSetupHandlers(ipcMain, getMainWindow) {
+function registerSetupHandlers(getMainWindow) {
   ipcMain.handle('sidecar:validate-key', async (_event, provider, key) => {
     try {
       const { validateApiKey } = require('../src/utils/api-key-store');
@@ -95,14 +95,35 @@ function registerSetupHandlers(ipcMain, getMainWindow) {
     }
   });
 
-  ipcMain.handle('sidecar:save-config', (_event, defaultModel, aliasOverrides) => {
-    const { saveConfig, getDefaultAliases } = require('../src/utils/config');
-    const aliases = getDefaultAliases();
-    if (aliasOverrides && typeof aliasOverrides === 'object') {
-      Object.assign(aliases, aliasOverrides);
+  // Read-modify-write: never rewrite an alias the renderer didn't send.
+  // aliasWrites values: string = set, null = delete. First run seeds live.
+  ipcMain.handle('sidecar:save-config', async (_event, defaultModel, aliasWrites) => {
+    try {
+      const { loadConfig, saveConfig } = require('../src/utils/config');
+      let cfg = loadConfig();
+      if (!cfg) {
+        const { toLiveSeedAliases } = require('../src/utils/quick-picks');
+        let catalog = [];
+        try {
+          catalog = await require('../src/utils/model-catalog').getCatalog();
+        } catch (_err) { /* offline: pinned seeds */ }
+        cfg = { aliases: toLiveSeedAliases(catalog) };
+      }
+      if (!cfg.aliases) { cfg.aliases = {}; }
+      if (defaultModel) { cfg.default = defaultModel; }
+      if (aliasWrites && typeof aliasWrites === 'object') {
+        for (const [alias, model] of Object.entries(aliasWrites)) {
+          if (model === null) { delete cfg.aliases[alias]; }
+          // empty string: ignore (use null to delete)
+          else if (typeof model === 'string' && model) { cfg.aliases[alias] = model; }
+        }
+      }
+      saveConfig(cfg);
+      return { success: true };
+    } catch (err) {
+      logger.error('save-config handler error', { error: err.message });
+      throw err; // renderer invoke() rejects; its catch re-enables Finish
     }
-    saveConfig({ default: defaultModel, aliases });
-    return { success: true };
   });
 
   ipcMain.handle('sidecar:get-config', () => {

package/electron/main.js

@@ -93,7 +93,7 @@ function createAmicusWindow() {
     x: winX, y: winY,
     show: false,
     frame: true, backgroundColor: '#2D2B2A',
-    title: CLIENT === 'cowork' ? 'Openwork Amicus' : 'Amicus',
+    title: 'Amicus',
     icon: ICON_PATH,
     webPreferences: {
       preload: path.join(__dirname, 'preload.js'),
@@ -270,9 +270,17 @@ function createAmicusWindow() {
 // Setup Window (API Key Form)
 // ============================================================================
 
-function createSetupWindow() {
+async function createSetupWindow() {
   // Lazy-load setup UI to avoid loading it for sidecar mode
   const { buildSetupHTML } = require('./setup-ui');
+  const { resolveQuickPicks } = require('../src/utils/quick-picks');
+  let quickPicks;
+  try {
+    const catalog = await require('../src/utils/model-catalog').getCatalog();
+    quickPicks = resolveQuickPicks(catalog);
+  } catch (_err) {
+    quickPicks = undefined;  // buildSetupHTML falls back to pinned
+  }
 
   mainWindow = new BrowserWindow({
     width: 560, height: 680, minWidth: 480, minHeight: 580,
@@ -286,7 +294,7 @@ function createSetupWindow() {
     }
   });
 
-  const html = buildSetupHTML({ client: CLIENT });
+  const html = buildSetupHTML({ client: CLIENT, quickPicks });
   mainWindow.loadURL(`data:text/html;charset=utf-8,${encodeURIComponent(html)}`);
   mainWindow.webContents.on('page-title-updated', (e) => e.preventDefault());
 
@@ -417,7 +425,7 @@ ipcMain.handle('sidecar:resize-toolbar', (_event, height) => {
 });
 
 // Setup mode: all setup IPC handlers (extracted to ipc-setup.js)
-registerSetupHandlers(ipcMain, () => mainWindow);
+registerSetupHandlers(() => mainWindow);
 
 // ============================================================================
 // Settings Child Window (opened from sidecar toolbar gear button)
@@ -456,7 +464,7 @@ app.whenReady().then(() => {
   }
 
   if (MODE === 'setup') {
-    createSetupWindow();
+    createSetupWindow().catch((err) => { logger.error('createSetupWindow failed', err); });
   } else {
     createAmicusWindow();
   }

package/electron/preload.js

@@ -7,16 +7,9 @@
 
 const { contextBridge, ipcRenderer } = require('electron');
 
-// Inject CSS before page scripts run to hide OpenCode branding
-// and match window background color to prevent white flash on load
-const style = document.createElement('style');
-style.textContent = [
-  'html, body { background-color: #2D2B2A !important; }',
-  '#root > div > header { display: none !important; }',
-  'svg[viewBox="0 0 234 42"] { display: none !important; }',
-].join('\n');
-document.documentElement.appendChild(style);
-
+// Bridge exposure needs no DOM and must run before any cosmetic step:
+// the CSS injection below once threw at preload-evaluation time and killed
+// the script before the bridge was exposed.
 contextBridge.exposeInMainWorld('sidecar', {
   /** Trigger fold: summarize and return to Claude Code */
   fold: () => ipcRenderer.invoke('sidecar:fold'),
@@ -31,3 +24,30 @@ contextBridge.exposeInMainWorld('sidecar', {
   /** Notify main process to resize toolbar area */
   resizeToolbar: (height) => ipcRenderer.invoke('sidecar:resize-toolbar', height),
 });
+
+/**
+ * Inject CSS to hide OpenCode branding and match the window background color
+ * to prevent a white flash on load. Cosmetic only — must never throw, or it
+ * would kill the rest of the preload.
+ */
+function injectBrandingCss() {
+  try {
+    const style = document.createElement('style');
+    style.textContent = [
+      'html, body { background-color: #2D2B2A !important; }',
+      '#root > div > header { display: none !important; }',
+      'svg[viewBox="0 0 234 42"] { display: none !important; }',
+    ].join('\n');
+    document.documentElement.appendChild(style);
+  } catch {
+    // cosmetic — a failed injection must not break the preload
+  }
+}
+
+// documentElement is still null while the preload evaluates; defer until the
+// DOM exists so the injection cannot null-deref.
+if (document.documentElement) {
+  injectBrandingCss();
+} else {
+  document.addEventListener('DOMContentLoaded', injectBrandingCss);
+}

package/electron/setup-ui-keys.js

@@ -43,6 +43,15 @@ const PROVIDERS = [
     helpUrl: 'https://console.anthropic.com/settings/keys',
     helpLabel: 'console.anthropic.com/settings/keys',
     recommended: false
+  },
+  {
+    id: 'deepseek',
+    name: 'DeepSeek',
+    description: 'Direct access to DeepSeek-V3 and DeepSeek-R1 models',
+    placeholder: 'sk-...',
+    helpUrl: 'https://platform.deepseek.com/api_keys',
+    helpLabel: 'platform.deepseek.com/api_keys',
+    recommended: false
   }
 ];