amicus 1.9.1 → 2.1.0

package/bin/amicus.js

@@ -7,27 +7,16 @@
  * Routes commands to appropriate handlers.
  */
 
-// One-time, non-destructive migration of the legacy ~/.config/sidecar dir onto
-// the canonical ~/.config/amicus (copy; legacy kept as a backup). Runs before
-// any config/credential read so both resolve to the unified dir. Best-effort.
-try {
-  const { migrateLegacyConfigDir } = require('../src/utils/config');
-  const _m = migrateLegacyConfigDir();
-  if (_m && _m.migrated) {
-    process.stderr.write(`[amicus] Migrated config ${_m.from} → ${_m.to} (legacy kept as a backup).\n`);
-  }
-} catch { /* best-effort: never block startup on migration */ }
-
-// Load API keys from all sources: process.env > sidecar .env > auth.json
+// Load API keys from all sources: process.env > amicus .env > auth.json
 const { loadCredentials } = require('../src/utils/env-loader');
 loadCredentials();
 
-const { parseArgs, getUsage } = require('../src/cli');
-const { validateTaskId } = require('../src/utils/validators');
-const { resolveModelFromArgs, validateFallbackModel } = require('../src/utils/start-helpers');
+const { parseArgs, getUsage, getCommandNames } = require('../src/cli');
 const { handleSetup, handleAbort, handleUpdate, handleMcp, handleKey } = require('../src/cli-handlers');
 const { handleStart, handleFanout, handleRead } = require('../src/cli-handlers-run');
+const { handleResume, handleContinue } = require('../src/cli-handlers-resume-continue');
 const { isOneShotCommand, armExitWatchdog } = require('../src/utils/lifecycle');
+const { suggestCommand } = require('../src/utils/input-validators');
 const { logger } = require('../src/utils/logger');
 
 const VERSION = require('../package.json').version;
@@ -123,6 +112,11 @@ async function main() {
         exitCode = await handleDoctor(args);
         break;
       }
+      case 'spend': {
+        const { handleSpend } = require('../src/cli-handlers-spend');
+        exitCode = await handleSpend(args);
+        break;
+      }
       case 'setup':
         await handleSetup(args);
         break;
@@ -130,7 +124,7 @@ async function main() {
         await handleKey(args);
         break;
       case 'abort':
-        await handleAbort(args);
+        exitCode = await handleAbort(args);
         break;
       case 'mcp':
         await handleMcp();
@@ -138,10 +132,16 @@ async function main() {
       case 'update':
         await handleUpdate();
         break;
-      default:
+      default: {
         console.error(`Unknown command: ${command}`);
+        // suggestCommand honors a cap-3 contract (up to 3 candidates, closest
+        // first) — print all of them, not just the closest, matching the
+        // join precedent in src/cli-handlers.js.
+        const candidates = suggestCommand(command, getCommandNames());
+        if (candidates.length > 0) { console.error(`Did you mean: ${candidates.join(', ')}`); }
         console.log(getUsage());
         process.exit(1);
+      }
     }
   } catch (err) {
     console.error(`Error: ${err.message}`);
@@ -162,9 +162,9 @@ async function main() {
  * Spec Reference: §4.2
  */
 async function handleList(args) {
-  const { listSidecars } = require('../src/index');
+  const { listAmicus } = require('../src/index');
 
-  await listSidecars({
+  await listAmicus({
     status: args.status,
     all: args.all,
     json: args.json,
@@ -172,94 +172,6 @@ async function handleList(args) {
   });
 }
 
-/**
- * Handle 'sidecar resume' command
- * Spec Reference: §4.3
- */
-async function handleResume(args) {
-  const taskId = args._[1];
-
-  if (!taskId) {
-    console.error('Error: task_id is required for resume');
-    console.error('Usage: sidecar resume <task_id>');
-    process.exit(1);
-  }
-
-  const taskIdCheck = validateTaskId(taskId);
-  if (!taskIdCheck.valid) {
-    console.error(taskIdCheck.error);
-    process.exit(1);
-  }
-
-  const { resumeSidecar } = require('../src/index');
-
-  return await resumeSidecar({
-    taskId,
-    project: args.cwd,
-    headless: args['no-ui'],
-    timeout: args.timeout
-  });
-}
-
-/**
- * Handle 'sidecar continue' command
- * Spec Reference: §4.4
- */
-async function handleContinue(args) {
-  const taskId = args._[1];
-
-  if (!taskId) {
-    console.error('Error: task_id is required for continue');
-    console.error('Usage: sidecar continue <task_id> --prompt "..."');
-    process.exit(1);
-  }
-
-  const taskIdCheck = validateTaskId(taskId);
-  if (!taskIdCheck.valid) {
-    console.error(taskIdCheck.error);
-    process.exit(1);
-  }
-
-  // BL-1: accept --prompt-file (XOR --prompt) so the MCP handler can pass a long
-  // follow-up prompt via file, dodging the ~32KB Windows command-line cap.
-  if (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;
-    delete args['prompt-file'];
-  }
-
-  if (!args.prompt && !args.briefing) {
-    console.error('Error: --prompt is required for continue');
-    process.exit(1);
-  }
-
-  // F5: an explicitly passed --model gets the same resolution+validation as start.
-  if (args.model !== undefined) {
-    const { model, alias } = resolveModelFromArgs(args);
-    args.model = model;
-    args.model = await validateFallbackModel(args, alias);
-  }
-
-  const { continueSidecar } = require('../src/index');
-
-  return await continueSidecar({
-    taskId,
-    newTaskId: args['task-id'],
-    briefing: args.prompt || args.briefing,
-    model: args.model,
-    project: args.cwd,
-    contextTurns: args['context-turns'],
-    contextMaxTokens: args['context-max-tokens'],
-    headless: args['no-ui'],
-    timeout: args.timeout
-  });
-}
-
 // Run main
 main().catch(err => {
   console.error(`Fatal error: ${err.message}`);

package/commands/council.md

@@ -17,6 +17,10 @@ the **analysis request**, and the **criteria**. If any of the three is missing o
 ambiguous, ask for it before launching any model (the skill's Stage 0 covers this —
 don't re-ask for what is already present).
 
-Then follow the second-opinion skill end to end: Stage 0 intake/prep and run-folder
-setup, council selection with a cost estimate and explicit user confirmation, the
-three review waves, `amicus council tally`, and the accept/deny decision pass.
+Then follow the second-opinion skill end to end, in pipeline order: Stage 0
+intake/prep and run-folder setup, then council selection with a cost estimate
+and explicit user confirmation; Stage 1 independent reviews, running
+`amicus council validate` on each leg's findings block as it lands; Stage 2
+cross-review, followed by `amicus council tally` once cross-review settles;
+Stage 3 council-chair synthesis; Stage 4 the accept/deny decision pass; and
+Stage 5, which runs `amicus council verdict` to write the final `verdict.json`.

package/electron/fold.js

@@ -9,6 +9,7 @@ const { logger } = require('../src/utils/logger');
 const { requestSummaryFromModel } = require('./summary');
 const { getSummaryTemplate } = require('../src/prompt-builder');
 const { tokenCss } = require('../src/design/tokens');
+const { buildFoldMarker, generateFoldNonce } = require('../src/utils/fold-marker');
 
 /**
  * Create a fold handler bound to the window state
@@ -19,9 +20,17 @@ const { tokenCss } = require('../src/design/tokens');
  * @param {string} state.sessionId - OpenCode session ID
  * @param {string} state.taskId - Sidecar task ID
  * @param {number} state.port - OpenCode server port
+ * @param {string} [state.nonce] - Per-run fold nonce (15b.3, #BL-7 residual). Set by
+ *   main.js from AMICUS_FOLD_NONCE — the SAME value baked into the system prompt's
+ *   fold instruction, so a completion this handler writes matches what the model was
+ *   actually asked to emit. Falls back to a freshly generated nonce when absent (e.g.
+ *   a caller/test that doesn't thread one through) — this is purely defensive: the
+ *   GUI fold path is exit-code driven, not marker-detected, so an un-advertised
+ *   fallback nonce here cannot be exploited the way headless.js's detector could.
  * @returns {{ triggerFold: Function, hasFolded: Function, isFolding: Function, hasCompleted: Function }}
  */
 function createFoldHandler(state) {
+  const nonce = state.nonce || generateFoldNonce();
   // `folded` is set synchronously at triggerFold ENTRY and covers both
   // "in flight" and "done" — this is `hasFolded()`'s existing external
   // contract (main.js wires it straight into createCloseGuard's `hasFolded`
@@ -52,7 +61,7 @@ function createFoldHandler(state) {
       }
 
       const output = [
-        '[SIDECAR_FOLD]',
+        buildFoldMarker(nonce),
         `Model: ${state.model}`,
         `Session: ${state.sessionId || state.taskId}`,
         `Client: ${state.client}`,

package/electron/ipc-setup.js

@@ -4,7 +4,10 @@
  * Extracted from main.js to keep file sizes under 300 lines.
  * Registers all setup-mode IPC handlers: validate-key, save-key,
  * remove-key, setup-done, save-config, get-config, get-api-keys,
- * fetch-models, get-catalog, and refresh-catalog.
+ * get-catalog, and refresh-catalog.
+ * (sidecar:fetch-models was retired in B33/#12 — Step 3's alias editor now
+ * shares the TTL-cached get-catalog data Step 2 loads instead of a second,
+ * uncached live fetch.)
  */
 
 const { ipcMain } = require('electron');
@@ -160,19 +163,6 @@ function registerSetupHandlers(getMainWindow) {
     }
   });
 
-  ipcMain.handle('sidecar:fetch-models', async () => {
-    try {
-      const { readApiKeyValues } = require('../src/utils/api-key-store');
-      const { fetchAllModels, groupModelsByFamily } = require('../src/utils/model-fetcher');
-      const keys = readApiKeyValues();
-      const models = await fetchAllModels(keys);
-      return groupModelsByFamily(models);
-    } catch (err) {
-      logger.error('fetch-models handler error', { error: err.message });
-      return [];
-    }
-  });
-
   // F5: wizard Step 2 reads the catalog CACHE (self-refreshing when stale).
   ipcMain.handle('sidecar:get-catalog', async () => {
     try {
@@ -206,7 +196,12 @@ function registerSetupHandlers(getMainWindow) {
       const catalog = await getCatalog();
       const free = listFreeModels(catalog);
       const suggested = new Set(suggestFreeCouncil(free, 3).map(r => r.id));
-      return free.map(r => ({ id: r.id, suggested: suggested.has(r.id) }));
+      return free.map(r => ({
+        id: r.id,
+        suggested: suggested.has(r.id),
+        name: r.name,
+        vendor: r.id.split('/')[1] || '',
+      }));
     } catch (_err) { return []; }
   });
 }

package/electron/main.js

@@ -15,7 +15,6 @@
 const { app, BrowserWindow, BrowserView, globalShortcut, ipcMain, screen } = require('electron');
 const path = require('path');
 const { logger } = require('../src/utils/logger');
-const { getCompatEnv } = require('../src/utils/env-compat');
 const { buildToolbarHTML, TOOLBAR_H, getBrandName } = require('./toolbar');
 const { createFoldHandler } = require('./fold');
 const { createCloseGuard } = require('./close-guard');
@@ -58,20 +57,25 @@ process.on('unhandledRejection', (reason) => {
 // Configuration from Environment (set by src/sidecar/start.js)
 // ============================================================================
 
-const MODE = getCompatEnv('MODE') || 'sidecar';
-const TASK_ID = getCompatEnv('TASK_ID') || 'unknown';
-const MODEL = getCompatEnv('MODEL') || 'unknown';
-const CWD = getCompatEnv('CWD') || process.cwd();
+const MODE = process.env.AMICUS_MODE || 'sidecar';
+const TASK_ID = process.env.AMICUS_TASK_ID || 'unknown';
+const MODEL = process.env.AMICUS_MODEL || 'unknown';
+const CWD = process.env.AMICUS_CWD || process.cwd();
 // The directory the OpenCode session was actually scoped to (#45). Set by the
 // interactive launcher as canonicalProjectPath(--cwd) so the Web-UI route is
 // built from the SAME directory createSession used. Falls back to CWD for
 // back-compat with launchers that predate this env var.
-const SESSION_DIRECTORY = getCompatEnv('SESSION_DIRECTORY') || CWD;
-const CLIENT = getCompatEnv('CLIENT') || 'code-local';
-const OPENCODE_PORT = parseInt(getCompatEnv('OPENCODE_PORT') || '4096', 10);
-const OPENCODE_SESSION_ID = getCompatEnv('SESSION_ID');
-const FOLD_SHORTCUT = getCompatEnv('FOLD_SHORTCUT') || 'CommandOrControl+Shift+F';
-const WINDOW_POSITION = getCompatEnv('WINDOW_POSITION') || 'right';
+const SESSION_DIRECTORY = process.env.AMICUS_SESSION_DIRECTORY || CWD;
+const CLIENT = process.env.AMICUS_CLIENT || 'code-local';
+const OPENCODE_PORT = parseInt(process.env.AMICUS_OPENCODE_PORT || '4096', 10);
+const OPENCODE_SESSION_ID = process.env.AMICUS_SESSION_ID;
+const FOLD_SHORTCUT = process.env.AMICUS_FOLD_SHORTCUT || 'CommandOrControl+Shift+F';
+const WINDOW_POSITION = process.env.AMICUS_WINDOW_POSITION || 'right';
+// 15b.3: per-run fold nonce (#BL-7 residual). Set by the interactive launcher
+// (src/sidecar/interactive-process.js buildElectronEnv) from the SAME value
+// baked into the system prompt's fold instruction. undefined when a launcher
+// predates this env var — fold.js falls back to the legacy bare marker.
+const FOLD_NONCE = process.env.AMICUS_FOLD_NONCE;
 
 const OPENCODE_URL = `http://localhost:${OPENCODE_PORT}`;
 
@@ -89,7 +93,8 @@ const foldHandler = createFoldHandler({
   cwd: CWD,
   sessionId: OPENCODE_SESSION_ID,
   taskId: TASK_ID,
-  port: OPENCODE_PORT
+  port: OPENCODE_PORT,
+  nonce: FOLD_NONCE
 });
 // Auto-fold on close (backlog B01): a user-initiated window close with no
 // fold yet run must not silently discard the session summary. See
@@ -128,7 +133,7 @@ function createAmicusWindow() {
 
   // Check for updates: prefer env var from CLI (cache is one-shot), fallback to direct check
   let updateInfo = null;
-  const updateInfoRaw = getCompatEnv('UPDATE_INFO');
+  const updateInfoRaw = process.env.AMICUS_UPDATE_INFO;
   if (updateInfoRaw) {
     try { updateInfo = JSON.parse(updateInfoRaw); } catch (_) {}
   }
@@ -201,7 +206,7 @@ function createAmicusWindow() {
   // silently hung process (the historical "Starting up... | 0 messages" bug).
   const failsafe = attachLoadFailsafe({
     webContents: contentView.webContents,
-    timeoutMs: parseInt(getCompatEnv('GUI_LOAD_TIMEOUT_MS') || '', 10) || undefined,
+    timeoutMs: parseInt(process.env.AMICUS_GUI_LOAD_TIMEOUT_MS || '', 10) || undefined,
     onFail: ({ reason, errorCode, errorDescription, validatedURL }) => {
       logger.error('OpenCode UI failed to load', {
         reason, errorCode, errorDescription, validatedURL, url: contentUrl
@@ -217,7 +222,7 @@ function createAmicusWindow() {
       // On timeout, show whatever is in flight rather than aborting the load.
       mainWindow.addBrowserView(contentView);
       updateContentBounds();
-      if (!process.env.SIDECAR_HEADLESS_TEST) {
+      if (!process.env.AMICUS_HEADLESS_TEST) {
         mainWindow.show();
       }
     }
@@ -234,7 +239,7 @@ function createAmicusWindow() {
         failsafe.cancel();
         mainWindow.addBrowserView(contentView);
         updateContentBounds();
-        if (!process.env.SIDECAR_HEADLESS_TEST) {
+        if (!process.env.AMICUS_HEADLESS_TEST) {
           mainWindow.show();
         }
       });

package/electron/preload-setup.js

@@ -20,7 +20,6 @@ contextBridge.exposeInMainWorld('sidecarSetup', {
       'sidecar:save-config',
       'sidecar:get-config',
       'sidecar:get-api-keys',
-      'sidecar:fetch-models',
       'sidecar:get-catalog',
       'sidecar:refresh-catalog',
       'sidecar:fetch-free-models'

package/electron/setup-ui-council.js

@@ -38,23 +38,77 @@ function buildCouncilScript() {
       else if (meta && !loaded) { meta.textContent = ''; }
     };
 
+    // Rows arrive pre-sorted by vendor (listFreeModels); group consecutive
+    // same-vendor runs into collapsible sections, mirroring the Step-3
+    // alias editor's .alias-group <details>/<summary> precedent.
+    function groupByVendor(rows) {
+      var groups = [];
+      var byVendor = {};
+      (rows || []).forEach(function(r) {
+        var v = r.vendor || (r.id.split('/')[1] || '');
+        if (!byVendor[v]) {
+          byVendor[v] = { vendor: v, rows: [] };
+          groups.push(byVendor[v]);
+        }
+        byVendor[v].rows.push(r);
+      });
+      return groups;
+    }
+
+    function vendorLabel(vendor) {
+      if (!vendor) { return 'Other'; }
+      return vendor.charAt(0).toUpperCase() + vendor.slice(1);
+    }
+
+    function buildRow(r, idx) {
+      var id = 'fc-' + idx;
+      var row = document.createElement('label');
+      row.className = 'council-row';
+      var cb = document.createElement('input');
+      cb.type = 'checkbox'; cb.value = r.id; cb.id = id; cb.checked = !!r.suggested;
+      var text = document.createElement('span');
+      text.className = 'council-row-text';
+      var nameEl = document.createElement('span');
+      nameEl.className = 'council-row-name'; nameEl.textContent = r.name || r.id;
+      var idEl = document.createElement('span');
+      idEl.className = 'council-row-id'; idEl.textContent = r.id;
+      text.appendChild(nameEl); text.appendChild(idEl);
+      row.appendChild(cb); row.appendChild(text);
+      return row;
+    }
+
+    function buildGroup(group, startIdx) {
+      var details = document.createElement('details');
+      details.className = 'council-group';
+      details.open = true;
+      var summary = document.createElement('summary');
+      var summaryLabel = document.createElement('span');
+      summaryLabel.textContent = vendorLabel(group.vendor);
+      var count = document.createElement('span');
+      count.className = 'council-group-count';
+      count.textContent = '(' + group.rows.length + ')';
+      summary.appendChild(summaryLabel); summary.appendChild(count);
+      details.appendChild(summary);
+      group.rows.forEach(function(r, i) { details.appendChild(buildRow(r, startIdx + i)); });
+      return details;
+    }
+
     async function loadFree() {
       if (loaded) { return; }
       try {
         var rows = await window.sidecarSetup.invoke('sidecar:fetch-free-models');
         loaded = true;
         results.innerHTML = '';
-        (rows || []).forEach(function(r, i) {
-          var id = 'fc-' + i;
-          var row = document.createElement('label');
-          row.className = 'council-row';
-          var cb = document.createElement('input');
-          cb.type = 'checkbox'; cb.value = r.id; cb.id = id; cb.checked = !!r.suggested;
-          var span = document.createElement('span'); span.textContent = r.id;
-          row.appendChild(cb); row.appendChild(span);
-          results.appendChild(row);
+        var groups = groupByVendor(rows);
+        var idx = 0;
+        groups.forEach(function(group) {
+          results.appendChild(buildGroup(group, idx));
+          idx += group.rows.length;
         });
-        if (meta) { meta.textContent = (rows || []).length + ' free models'; }
+        if (meta) {
+          meta.textContent = (rows || []).length + ' free models across ' + groups.length +
+            ' provider' + (groups.length === 1 ? '' : 's');
+        }
       } catch (_e) { if (meta) { meta.textContent = 'Could not load free models.'; } }
     }
 

package/electron/setup-ui-styles.js

@@ -357,9 +357,40 @@ function __rawWizardCSS() {
   /* Free council picker (Step 2) */
   .council-section { margin-top: 14px; }
   .council-toggle { display: flex; align-items: center; gap: 8px; font-size: 12px; color: var(--text-muted); cursor: pointer; }
-  .council-results { max-height: 160px; overflow-y: auto; margin-top: 6px; }
-  .council-row { display: flex; align-items: center; gap: 8px; padding: 3px 0; font-size: 12px; color: var(--text); font-family: var(--font-mono); }
-  .council-row input[type="checkbox"] { accent-color: var(--accent); }
+  .council-results {
+    max-height: 220px; overflow-y: auto; margin-top: 6px;
+    border: 1px solid var(--border); border-radius: var(--r-6);
+  }
+  .council-results:empty { border: none; }
+  .council-group { margin: 0; border-bottom: 1px solid var(--border); }
+  .council-group:last-child { border-bottom: none; }
+  .council-group summary {
+    display: flex; align-items: center; gap: 6px; padding: 6px 10px;
+    cursor: pointer; font-size: 12px; font-weight: 500; color: var(--text-muted);
+    list-style: none; transition: color var(--dur-fast);
+  }
+  .council-group summary::-webkit-details-marker { display: none; }
+  .council-group summary::before {
+    content: '\\25B6'; font-size: 8px; color: var(--text-faint); transition: transform var(--dur-fast);
+  }
+  .council-group[open] summary::before { transform: rotate(90deg); }
+  .council-group summary:hover { color: var(--accent); }
+  .council-group-count { color: var(--text-faint); font-weight: 400; }
+  .council-row {
+    display: flex; align-items: center; gap: 8px;
+    padding: 5px 10px 5px 24px; font-size: 12px; color: var(--text); cursor: pointer;
+  }
+  .council-row:hover { background: var(--surface-hover); }
+  .council-row input[type="checkbox"] { accent-color: var(--accent); flex-shrink: 0; }
+  .council-row-text { display: flex; flex-direction: column; min-width: 0; }
+  .council-row-name {
+    color: var(--text); font-size: 12px; overflow: hidden;
+    text-overflow: ellipsis; white-space: nowrap;
+  }
+  .council-row-id {
+    color: var(--text-muted); font-size: 11px; font-family: var(--font-mono);
+    margin-top: 1px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;
+  }
   .council-note { font-size: 10px; color: var(--text-faint); margin-top: 6px; line-height: 1.4; }
 
   /* Alias example-icon strokes — driven by class rules (var() is invalid as an SVG attribute) */

package/electron/setup-ui.js

@@ -9,6 +9,7 @@ const { buildCouncilSectionHTML, buildCouncilScript } = require('./setup-ui-coun
 const { getDefaultAliases } = require('../src/utils/config');
 const { getBrandName } = require('./toolbar');
 const { resolveQuickPicks } = require('../src/utils/quick-picks');
+const { PROVIDER_FAMILY_NAMES } = require('../src/utils/model-fetcher');
 
 /**
  * @param {object} [options={}]
@@ -30,6 +31,7 @@ function buildSetupHTML(options = {}) {
   const modelChoicesJson = JSON.stringify(quickPicks);
   const providerNamesJson = JSON.stringify(PROVIDER_NAMES);
   const defaultAliasesJson = JSON.stringify(getDefaultAliases());
+  const familyNamesJson = JSON.stringify(PROVIDER_FAMILY_NAMES);
   return `<!DOCTYPE html>
 <html><head><meta charset="utf-8"><title>Amicus Setup</title>
 <style>${css}</style></head><body>
@@ -51,11 +53,11 @@ function buildSetupHTML(options = {}) {
     </div>
   </div>
   <div class="footer"><div class="footer-brand"><svg width="15" height="15" viewBox="0 0 32 32" fill="none"><path d="M4 8H19"/><path d="M4 11H14L19 8"/><path d="M4 14H13L19 8"/><path d="M4 17H12L19 8"/><path d="M4 20H11L19 8"/><path d="M4 23H10L19 8"/><path class="brand-main" d="M19 8H28"/></svg> ${brandName}</div><div class="footer-nav"><button class="nav-btn" id="back-btn" style="display:none">Back</button><button class="nav-btn primary" id="next-btn" disabled>Next</button><button class="nav-btn primary" id="finish-btn" style="display:none">Finish</button></div></div>
-${buildWizardScript(providersJson, modelChoicesJson, providerNamesJson, defaultAliasesJson)}
+${buildWizardScript(providersJson, modelChoicesJson, providerNamesJson, defaultAliasesJson, familyNamesJson)}
 </body></html>`;
 }
 
-function buildWizardScript(providersJson, modelChoicesJson, providerNamesJson, defaultAliasesJson) {
+function buildWizardScript(providersJson, modelChoicesJson, providerNamesJson, defaultAliasesJson, familyNamesJson) {
   const keysJs = buildKeysScript();
   const aliasJs = buildAliasScript();
   const councilJs = buildCouncilScript();
@@ -69,6 +71,7 @@ function buildWizardScript(providersJson, modelChoicesJson, providerNamesJson, d
   var modelChoicesData = ${modelChoicesJson};
   var providerNamesData = ${providerNamesJson};
   var defaultAliases = ${defaultAliasesJson};
+  var PROVIDER_FAMILY_NAMES = ${familyNamesJson};
   var routingChoices = {};
   var aliasEdits = {};
   var aliasDisplay = {};
@@ -178,7 +181,10 @@ function buildWizardScript(providersJson, modelChoicesJson, providerNamesJson, d
     if (step === 2) { updateRoutingPills(); ensureCatalogLoaded(); window.refreshCouncilGating && window.refreshCouncilGating(); }
     if (step === 3) {
       updateAliasRoutes();
-      if (!window.availableModels) { fetchAvailableModels(); }
+      // B33 / #12: Step 3 shares Step 2's TTL-cached catalog load (single
+      // in-page cache: ensureCatalogLoaded no-ops if Step 2 already loaded
+      // it) instead of a separate live sidecar:fetch-models round-trip.
+      ensureCatalogLoaded();
     }
     updateNextState();
   }
@@ -393,15 +399,11 @@ function buildWizardScript(providersJson, modelChoicesJson, providerNamesJson, d
     } catch (_e) { finishBtn.disabled = false; finishBtn.textContent = 'Finish'; }
   });
 
-  async function fetchAvailableModels() {
-    try {
-      var groups = await window.sidecarSetup.invoke('sidecar:fetch-models');
-      if (groups && groups.length > 0) { window.availableModels = groups; }
-    } catch (_e) {}
-  }
-
-  // ===== F5: searchable catalog picker (Step 2) =====
+  // ===== F5: searchable catalog picker (Step 2) + B33/#12: shared with Step 3 =====
   var catalogRows = null, catalogFetchedAt = null;
+  // #13: last-refresh outcome, so a stale cache (refresh keeps failing) is
+  // shown honestly instead of looking current.
+  var catalogLastRefreshAttempt = null, catalogLastRefreshError = null;
   window.customDefaultModel = null;
 
   async function ensureCatalogLoaded() {
@@ -412,9 +414,32 @@ function buildWizardScript(providersJson, modelChoicesJson, providerNamesJson, d
     } catch (_e) {}
   }
 
+  // Re-derive Step 3's grouped {family, models} shape from the flat catalog
+  // rows client-side (mirrors src/utils/model-fetcher.js groupModelsByFamily
+  // keying: family name from the id prefix, falling back to the prefix
+  // itself for any provider not in PROVIDER_FAMILY_NAMES).
+  function groupCatalogByFamily(rows) {
+    if (!rows || rows.length === 0) { return []; }
+    var order = [], byFamily = {};
+    rows.forEach(function(m) {
+      var prefix = m.id.split('/')[0];
+      var family = PROVIDER_FAMILY_NAMES[prefix] || prefix;
+      if (!byFamily[family]) { byFamily[family] = []; order.push(family); }
+      byFamily[family].push(m);
+    });
+    return order.map(function(family) { return { family: family, models: byFamily[family] }; });
+  }
+
   function applyCatalog(info) {
     catalogRows = (info && info.models) || [];
     catalogFetchedAt = info && info.fetchedAt;
+    catalogLastRefreshAttempt = info && info.lastRefreshAttempt;
+    catalogLastRefreshError = info && info.lastRefreshError;
+    // Single shared in-page cache: Step 3's alias dropdown (buildModelSelect)
+    // reads window.availableModels, re-derived from the same catalog load
+    // Step 2 uses — no second get-catalog round-trip, and the refresh
+    // button (Step 2) re-applying here keeps Step 3's dropdown data current.
+    window.availableModels = groupCatalogByFamily(catalogRows);
     renderSearchMeta();
     renderSearchResults();
     if (catalogRows.length === 0) {
@@ -427,7 +452,14 @@ function buildWizardScript(providersJson, modelChoicesJson, providerNamesJson, d
     var meta = $('model-search-meta');
     if (!meta) { return; }
     var when = catalogFetchedAt ? new Date(catalogFetchedAt).toLocaleString() : 'never';
-    meta.textContent = catalogRows.length + ' models \\u00b7 catalog fetched ' + when;
+    var text = catalogRows.length + ' models \\u00b7 catalog fetched ' + when;
+    // #13: one-line stale hint when the last refresh attempt failed AFTER
+    // the data currently shown was fetched (don't redesign Step 2 for this).
+    if (catalogLastRefreshError && catalogLastRefreshAttempt &&
+        (!catalogFetchedAt || catalogLastRefreshAttempt > catalogFetchedAt)) {
+      text += ' \\u2014 \\u26a0 refresh failed, showing last-known data';
+    }
+    meta.textContent = text;
   }
 
   function fmtCtx(n) { return n == null ? '' : ' \\u00b7 ctx ' + n; }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amicus",
-  "version": "1.9.1",
+  "version": "2.1.0",
   "mcpName": "io.github.BourbonDog/amicus",
   "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.",
   "keywords": [
@@ -28,9 +28,7 @@
   "homepage": "https://bourbondog.github.io/amicus/",
   "bin": {
     "amicus": "./bin/amicus.js",
-    "am": "./bin/amicus.js",
-    "sidecar": "./bin/amicus.js",
-    "claude-sidecar": "./bin/amicus.js"
+    "am": "./bin/amicus.js"
   },
   "main": "src/index.js",
   "exports": {
@@ -85,7 +83,6 @@
   "devDependencies": {
     "chrome-remote-interface": "^0.33.3",
     "eslint": "^8.0.0",
-    "husky": "^9.1.7",
     "jest": "^29.0.0",
     "lint-staged": "^16.3.2",
     "puppeteer": "^24.36.0",

package/skills/second-opinion/MODEL-NOTES.md

@@ -25,8 +25,8 @@ injection, long-read failures, judge tool-wander; see changelog)._
 - **Transient provider errors** (502s, connection drops): re-run the affected leg (solo
   `amicus start --json`, same briefing file) or the wave — see per-model notes for
   model-specific signals. Never present a half-finished run as an answer.
-- **Credentials:** keys live in `~/.config/amicus/.env` (legacy `~/.config/sidecar/.env` still
-  read). Configure with `amicus setup`.
+- **Credentials:** keys live in `~/.config/amicus/.env`. The legacy `~/.config/sidecar/.env`
+  fallback was removed in v2.0.0 (see `docs/SHIMS.md`). Configure with `amicus setup`.
 - **PowerShell `--models` quoting (Windows):** always quote comma-separated model lists —
   `--models "gemini,gpt,deepseek"`. Unquoted, PowerShell splits on commas and amicus receives one
   mangled alias → instant arg-parse failure. (Now baked into every SKILL.md example.)