amicus 1.0.0 → 1.1.0

package/CHANGELOG.md

@@ -5,6 +5,39 @@ All notable changes to Amicus are documented here. Format follows
 
 ## [Unreleased]
 
+## [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/README.md

@@ -420,6 +420,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. |
@@ -472,6 +473,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

@@ -14,7 +14,7 @@ loadCredentials();
 const { parseArgs, validateStartArgs, 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 { isOneShotCommand, armExitWatchdog } = require('../src/utils/lifecycle');
 const { logger } = require('../src/utils/logger');
 
@@ -98,6 +98,9 @@ async function main() {
       case 'setup':
         await handleSetup(args);
         break;
+      case 'key':
+        await handleKey(args);
+        break;
       case 'abort':
         await handleAbort(args);
         break;

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
   }
 ];
 

package/electron/setup-ui-model.js

@@ -2,24 +2,22 @@
  * Setup UI - Step 2: Default Model Selection
  *
  * Builds the HTML for the model selection step of the wizard.
- * Renders radio card choices with provider routing and pre-selection support.
- * Models are disabled when no configured API key matches their routes.
+ * Renders radio card choices with provider routing, write-preview,
+ * and offline-badge support.
+ *
+ * Choices are RESOLVED rows passed in at call time (see src/utils/quick-picks.js):
+ *   { alias, label, blurb, source: 'live'|'fallback', routes: Object<string,string> }
+ * No curated-models import — this module is pure builder/renderer.
  */
 
-const { getCuratedModels } = require('../src/utils/curated-models');
-/**
- * Wizard quick-pick cards \u2014 derived from curated-models (F5).
- * @type {Array<{alias: string, label: string, routes: Object<string,string>}>}
- */
-const MODEL_CHOICES = getCuratedModels().map(c => ({
-  alias: c.alias, label: `${c.label} \u2014 ${c.blurb}`, routes: c.routes
-}));
+'use strict';
 
 const PROVIDER_NAMES = {
   openrouter: 'OpenRouter',
   google: 'Google AI',
   openai: 'OpenAI',
-  anthropic: 'Anthropic'
+  anthropic: 'Anthropic',
+  deepseek: 'DeepSeek'
 };
 
 /**
@@ -37,7 +35,7 @@ function isModelAvailable(providers, configuredKeys) {
 }
 
 /**
- * Find the best available provider for a model's static route text.
+ * Find the best available provider for a model's route display.
  * Prefers the first provider with a configured key; falls back to first provider.
  * @param {string[]} providers - Route provider IDs
  * @param {Object<string,boolean>} configuredKeys - Which providers have keys
@@ -49,12 +47,13 @@ function bestAvailableProvider(providers, configuredKeys) {
 }
 
 /**
- * Search-over-catalog section (F5). Hidden until the wizard script confirms
- * a non-empty catalog; rows are rendered client-side from the get-catalog IPC.
+ * Search-over-catalog section. Always visible — no display:none gating.
+ * Rows are rendered client-side from the get-catalog IPC response.
  * @returns {string} HTML fragment
  */
 function buildModelSearchHTML() {
-  return `<div id="model-search-section" style="display:none">
+  return `<div id="model-search-section">
+      <div class="search-label">&hellip;or pick any model from the catalog</div>
       <div class="search-head">
         <input type="text" id="model-search-input" placeholder="Search all models (id or name)..." autocomplete="off">
         <button class="icon-btn" id="model-search-refresh" title="Refresh catalog">&#x21bb;</button>
@@ -65,10 +64,11 @@ function buildModelSearchHTML() {
 }
 
 /**
- * Build the HTML fragment for Step 2 (Model Selection)
- * @param {Array<{alias: string, label: string, routes: Object<string,string>}>} choices
- * @param {string} [selectedAlias] - Pre-selected alias, defaults to first available choice
- * @param {Object<string,boolean>} [configuredKeys] - Provider IDs the user has keys for
+ * Build the HTML fragment for Step 2 (Model Selection).
+ * @param {Array<{alias:string, label:string, blurb:string, source:string, routes:Object<string,string>}>} choices
+ *   Resolved rows from resolveQuickPicks(). Each row has separate label + blurb fields.
+ * @param {string} [selectedAlias] - Pre-selected alias; defaults to first available choice.
+ * @param {Object<string,boolean>} [configuredKeys] - Provider IDs the user has keys for.
  * @returns {string} HTML fragment
  */
 function buildModelStepHTML(choices, selectedAlias, configuredKeys = {}) {
@@ -100,12 +100,19 @@ function buildModelStepHTML(choices, selectedAlias, configuredKeys = {}) {
     const showToggle = available.length >= 2;
     const bestProvider = bestAvailableProvider(providers, configuredKeys);
 
+    // Resolved id for the write-preview (prefer bestProvider route)
+    const previewId = c.routes[bestProvider] || Object.values(c.routes)[0] || '';
+
+    // Offline badge for fallback rows
+    const badge = c.source === 'fallback'
+      ? '<span class="pick-badge">offline list</span>' : '';
+
     let routeHtml = '';
     if (!modelAvailable) {
       routeHtml = '<span class="no-key-hint">No API key configured</span>';
     } else if (hasMultipleRoutes) {
       const pills = providers.map(p => {
-        const isActive = (showToggle && p === bestProvider) || (!showToggle && p === bestProvider);
+        const isActive = p === bestProvider;
         const cls = isActive ? 'route-pill active' : 'route-pill';
         return `<button class="${cls}" data-alias="${c.alias}" data-provider="${p}">${PROVIDER_NAMES[p]}</button>`;
       }).join('');
@@ -116,17 +123,20 @@ function buildModelStepHTML(choices, selectedAlias, configuredKeys = {}) {
     } else {
       routeHtml = `<span class="route-static">via ${PROVIDER_NAMES[bestProvider]}</span>`;
     }
+
     return `<label class="${cardClass}">
         <input type="radio" name="default-model" value="${c.alias}" ${checked}${disabled}>
         <span class="model-alias">${c.alias}</span>
-        <span class="model-label">${c.label}</span>
+        <span class="model-label">${c.label} — ${c.blurb}</span>${badge}
+        <span class="model-resolved">${previewId}</span>
         ${routeHtml}
+        <span class="write-preview" data-alias="${c.alias}">will set <code>${c.alias}</code> → <code class="write-preview-id">${previewId}</code></span>
       </label>`;
   }).join('\n      ');
 
   return `<div class="step-content">
     <h1>Choose Default Model</h1>
-    <p class="subtitle">Pick the model to use when no --model flag is given.</p>
+    <p class="subtitle">Current models resolved from the live catalog. Pick the default used when no --model flag is given.</p>
 
     <div class="model-list" id="model-list">
       ${cards}
@@ -135,4 +145,4 @@ function buildModelStepHTML(choices, selectedAlias, configuredKeys = {}) {
   </div>`;
 }
 
-module.exports = { buildModelSearchHTML, buildModelStepHTML, MODEL_CHOICES, PROVIDER_NAMES };
+module.exports = { buildModelSearchHTML, buildModelStepHTML, PROVIDER_NAMES };

package/electron/setup-ui-styles.js

@@ -321,7 +321,12 @@ function buildWizardCSS() {
   .search-row-sub { color: #A09B96; font-size: 11px; margin-top: 2px; }
   .icon-btn { background: none; border: 1px solid #3D3A38; border-radius: 6px; color: #A09B96; cursor: pointer; font-size: 14px; padding: 6px 10px; }
   .icon-btn:hover { border-color: #D97757; color: #D97757; }
-  .icon-btn:disabled { opacity: 0.5; cursor: default; }`;
+  .icon-btn:disabled { opacity: 0.5; cursor: default; }
+  .search-label { margin: 14px 0 6px; font-size: 12px; opacity: 0.75; }
+  .pick-badge { font-size: 10px; padding: 1px 5px; border-radius: 3px; background: #5a4a35; margin-left: 6px; }
+  .model-resolved { display: block; font-size: 11px; opacity: 0.6; font-family: monospace; }
+  .write-preview { display: none; font-size: 11px; margin-top: 4px; }
+  .write-preview-active { display: block; }`;
 }
 
 module.exports = { buildWizardCSS };

package/electron/setup-ui.js

@@ -1,26 +1,32 @@
 /** Setup UI - Wizard Orchestrator: API Keys → Models → Aliases → Review */
 const { buildKeysStepHTML, PROVIDERS } = require('./setup-ui-keys');
-const { buildModelStepHTML, MODEL_CHOICES, PROVIDER_NAMES } = require('./setup-ui-model');
+const { buildModelStepHTML, PROVIDER_NAMES } = require('./setup-ui-model');
 const { buildAliasEditorHTML } = require('./setup-ui-aliases');
 const { buildWizardCSS } = require('./setup-ui-styles');
 const { buildKeysScript } = require('./setup-ui-keys-script');
 const { buildAliasScript } = require('./setup-ui-alias-script');
 const { getDefaultAliases } = require('../src/utils/config');
 const { getBrandName } = require('./toolbar');
+const { resolveQuickPicks } = require('../src/utils/quick-picks');
 
 /**
  * @param {object} [options={}]
  * @param {string} [options.client='code-local'] - Client type for branding
+ * @param {Array} [options.quickPicks] - Resolved quick-pick rows from resolveQuickPicks(catalog).
+ *   Defaults to pinned fallbacks when not provided.
  */
 function buildSetupHTML(options = {}) {
-  const { client = 'code-local' } = options;
+  const {
+    client = 'code-local',
+    quickPicks = resolveQuickPicks([]),          // pinned fallbacks when not provided
+  } = options;
   const brandName = getBrandName(client);
   const keysHtml = buildKeysStepHTML(PROVIDERS);
-  const modelHtml = buildModelStepHTML(MODEL_CHOICES);
+  const modelHtml = buildModelStepHTML(quickPicks);
   const aliasHtml = buildAliasEditorHTML(getDefaultAliases());
   const css = buildWizardCSS();
   const providersJson = JSON.stringify(PROVIDERS);
-  const modelChoicesJson = JSON.stringify(MODEL_CHOICES);
+  const modelChoicesJson = JSON.stringify(quickPicks);
   const providerNamesJson = JSON.stringify(PROVIDER_NAMES);
   const defaultAliasesJson = JSON.stringify(getDefaultAliases());
   return `<!DOCTYPE html>
@@ -63,6 +69,7 @@ function buildWizardScript(providersJson, modelChoicesJson, providerNamesJson, d
   var defaultAliases = ${defaultAliasesJson};
   var routingChoices = {};
   var aliasEdits = {};
+  var aliasDisplay = {};
   window.availableModels = null;
   var keyValid = false, validatedKey = '';
   var $ = function(id) { return document.getElementById(id); };
@@ -128,7 +135,7 @@ function buildWizardScript(providersJson, modelChoicesJson, providerNamesJson, d
           }
         });
         Object.keys(cfg.aliases).forEach(function(k) {
-          if (cfg.aliases[k] !== defaultAliases[k]) { aliasEdits[k] = cfg.aliases[k]; }
+          if (cfg.aliases[k] !== defaultAliases[k]) { aliasDisplay[k] = cfg.aliases[k]; }
         });
         applyAliasEditsToUI();
       }
@@ -136,6 +143,12 @@ function buildWizardScript(providersJson, modelChoicesJson, providerNamesJson, d
   })();
 
   function applyAliasEditsToUI() {
+    Object.keys(aliasDisplay).forEach(function(k) {
+      var row = document.querySelector('.alias-row[data-alias="' + k + '"]');
+      if (!row) { return; }
+      var modelSpan = row.querySelector('.alias-model');
+      if (modelSpan) { modelSpan.textContent = aliasDisplay[k]; }
+    });
     Object.keys(aliasEdits).forEach(function(k) {
       var row = document.querySelector('.alias-row[data-alias="' + k + '"]');
       if (!row) { return; }
@@ -172,6 +185,23 @@ function buildWizardScript(providersJson, modelChoicesJson, providerNamesJson, d
     } else { nextBtn.disabled = false; }
   }
 
+  // Single source of the route choice for a quick-pick row: explicit pill
+  // choice if its key still exists, else first provider with a key, else
+  // the row's first route. Returns the full model id or null.
+  function pickRouteFor(mc) {
+    if (!mc) { return null; }
+    var provs = Object.keys(mc.routes);
+    var prov = routingChoices[mc.alias];
+    if (!prov || !mc.routes[prov]) {
+      prov = null;
+      for (var i = 0; i < provs.length; i++) {
+        if (configuredKeys[provs[i]]) { prov = provs[i]; break; }
+      }
+      if (!prov) { prov = provs[0]; }
+    }
+    return mc.routes[prov] || null;
+  }
+
   function updateRoutingPills() {
     var hasAnyKey = Object.values(configuredKeys).some(function(v) { return v; });
     var firstAvailableAlias = null;
@@ -240,6 +270,7 @@ function buildWizardScript(providersJson, modelChoicesJson, providerNamesJson, d
       var fallback = document.querySelector('input[name="default-model"][value="' + firstAvailableAlias + '"]');
       if (fallback) { fallback.checked = true; }
     }
+    updateWritePreviews();
   }
 
   function updateAliasRoutes() {
@@ -275,15 +306,8 @@ function buildWizardScript(providersJson, modelChoicesJson, providerNamesJson, d
       if (row.querySelector('.alias-model-select')) { return; }
       var modelSpan = row.querySelector('.alias-model');
       if (!modelSpan) { return; }
-      // For MODEL_CHOICES aliases: update text to match available routing
-      if (routedModels[alias]) {
-        modelSpan.textContent = routedModels[alias];
-        aliasEdits[alias] = routedModels[alias];
-        row.classList.remove('alias-no-key');
-        return;
-      }
       // Check if the model's provider has a configured key
-      var model = aliasEdits[alias] || modelSpan.textContent;
+      var model = aliasEdits[alias] || aliasDisplay[alias] || modelSpan.textContent;
       var prefix = model.split('/')[0];
       var noKey = false;
       if (prefix === 'openrouter') {
@@ -301,17 +325,20 @@ function buildWizardScript(providersJson, modelChoicesJson, providerNamesJson, d
       kn.length > 0 ? kn.map(function(k) { return k + ' \\u2713'; }).join(', ') : 'None';
     var r = document.querySelector('input[name="default-model"]:checked');
     document.getElementById('review-model').textContent = window.customDefaultModel || (r ? r.value : 'Not selected');
-    var routeLines = [];
-    modelChoicesData.forEach(function(mc) {
-      var prov = routingChoices[mc.alias];
-      if (!prov) {
-        var provs = Object.keys(mc.routes);
-        prov = provs.find(function(p) { return configuredKeys[p]; }) || provs[0];
+    var writes = [];
+    var r2 = document.querySelector('input[name="default-model"]:checked');
+    if (!window.customDefaultModel && r2) {
+      var mc2 = null;
+      for (var i2 = 0; i2 < modelChoicesData.length; i2++) {
+        if (modelChoicesData[i2].alias === r2.value) { mc2 = modelChoicesData[i2]; break; }
       }
-      var provName = providerNamesData[prov] || prov;
-      routeLines.push(mc.alias + ' \\u2192 ' + provName);
-    });
-    document.getElementById('review-routing').textContent = routeLines.join(', ');
+      if (mc2) {
+        var routeId2 = pickRouteFor(mc2);
+        if (routeId2) { writes.push(mc2.alias + ' \\u2192 ' + routeId2); }
+      }
+    }
+    document.getElementById('review-routing').textContent =
+      writes.length > 0 ? writes.join(', ') : 'No alias changes';
     var editCount = Object.keys(aliasEdits).length;
     var reviewAliases = document.getElementById('review-aliases');
     if (reviewAliases) {
@@ -332,26 +359,31 @@ function buildWizardScript(providersJson, modelChoicesJson, providerNamesJson, d
     routingChoices[alias] = provider;
     var toggle = pill.parentElement;
     toggle.querySelectorAll('.route-pill').forEach(function(p) { p.classList.toggle('active', p === pill); });
+    updateWritePreviews();
   });
 
   finishBtn.addEventListener('click', async function() {
     finishBtn.disabled = true; finishBtn.textContent = 'Saving...';
     try {
       var r = document.querySelector('input[name="default-model"]:checked');
-      var dm = window.customDefaultModel || (r ? r.value : 'gemini');
-      var routingOverrides = {};
-      modelChoicesData.forEach(function(mc) {
-        var prov = routingChoices[mc.alias];
-        if (!prov) {
-          var provs = Object.keys(mc.routes);
-          prov = provs.find(function(p) { return configuredKeys[p]; }) || provs[0];
-        }
-        routingOverrides[mc.alias] = mc.routes[prov];
-      });
+      var dm = window.customDefaultModel || (r ? r.value : null);
+      var aliasWrites = {};
       Object.keys(aliasEdits).forEach(function(k) {
-        routingOverrides[k] = aliasEdits[k];
+        aliasWrites[k] = aliasEdits[k];
       });
-      await window.sidecarSetup.invoke('sidecar:save-config', dm, routingOverrides);
+      if (!window.customDefaultModel && r) {
+        // Selecting a quick pick = explicit touch: upgrade that ONE alias
+        // to the resolved id via the chosen route (user-locked decision #2).
+        var mc = null;
+        for (var i = 0; i < modelChoicesData.length; i++) {
+          if (modelChoicesData[i].alias === r.value) { mc = modelChoicesData[i]; break; }
+        }
+        if (mc) {
+          var routeId = pickRouteFor(mc);
+          if (routeId) { aliasWrites[mc.alias] = routeId; }
+        }
+      }
+      await window.sidecarSetup.invoke('sidecar:save-config', dm, aliasWrites);
       var kc = Object.values(configuredKeys).filter(function(v) { return v; }).length;
       await window.sidecarSetup.invoke('sidecar:setup-done', dm, kc);
     } catch (_e) { finishBtn.disabled = false; finishBtn.textContent = 'Finish'; }
@@ -379,11 +411,12 @@ function buildWizardScript(providersJson, modelChoicesJson, providerNamesJson, d
   function applyCatalog(info) {
     catalogRows = (info && info.models) || [];
     catalogFetchedAt = info && info.fetchedAt;
-    var section = $('model-search-section');
-    if (!section) { return; }
-    section.style.display = catalogRows.length > 0 ? '' : 'none';
     renderSearchMeta();
     renderSearchResults();
+    if (catalogRows.length === 0) {
+      var meta = $('model-search-meta');
+      if (meta) { meta.textContent = 'Catalog unavailable (offline?) \\u2014 use \\u21bb to retry.'; }
+    }
   }
 
   function renderSearchMeta() {
@@ -434,6 +467,25 @@ function buildWizardScript(providersJson, modelChoicesJson, providerNamesJson, d
     var keep = box ? box.scrollTop : 0;
     renderSearchResults();
     if (box) { box.scrollTop = keep; }
+    updateWritePreviews();
+  }
+
+  function updateWritePreviews() {
+    var r = document.querySelector('input[name="default-model"]:checked');
+    var sel = (!window.customDefaultModel && r) ? r.value : null;
+    document.querySelectorAll('.write-preview').forEach(function(el) {
+      var alias = el.getAttribute('data-alias');
+      el.classList.toggle('write-preview-active', alias === sel);
+      if (alias !== sel) { return; }
+      var mc = null;
+      for (var i = 0; i < modelChoicesData.length; i++) {
+        if (modelChoicesData[i].alias === alias) { mc = modelChoicesData[i]; break; }
+      }
+      if (!mc) { return; }
+      var routeId = pickRouteFor(mc);
+      var idEl = el.querySelector('.write-preview-id');
+      if (idEl && routeId) { idEl.textContent = routeId; }
+    });
   }
 
   document.addEventListener('input', function(e) {
@@ -443,6 +495,7 @@ function buildWizardScript(providersJson, modelChoicesJson, providerNamesJson, d
     if (e.target && e.target.name === 'default-model' && e.target.checked) {
       window.customDefaultModel = null;
       renderSearchResults();
+      updateWritePreviews();
     }
   });
   document.addEventListener('click', async function(e) {

package/electron/toolbar.js

@@ -8,12 +8,11 @@
 const TOOLBAR_H = 40;
 
 /**
- * Get the brand name based on client type
- * @param {string} [client='code-local'] - Client type (code-local, code-web, cowork)
- * @returns {string} Brand name to display
+ * Get the brand name to display
+ * @returns {string} Always 'Amicus' — all clients share one brand
  */
-function getBrandName(client) {
-  return client === 'cowork' ? 'Openwork Amicus' : 'Amicus';
+function getBrandName() {
+  return 'Amicus';
 }
 
 /**