amicus 3.1.0 → 3.2.0

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "amicus",
-  "version": "3.1.0",
+  "version": "3.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"

package/CHANGELOG.md

@@ -5,6 +5,50 @@ All notable changes to Amicus are documented here. Format follows
 
 ## [Unreleased]
 
+## [3.2.0] - 2026-07-16
+
+### Added
+
+- **Cost-aware per-provider default model picker at key-add.** Adding a provider API key (`amicus key
+  <provider>`, the setup wizard, or the Electron key step) now offers a picker that pre-selects a
+  **balanced**-tier model instead of the priciest flagship, shows live `$/M` input pricing, and writes
+  your choice as a vendor-named alias (e.g. `--model anthropic`) — seeding your overall default
+  (`config.default`) on your first key. Applies to direct model vendors (OpenAI, Anthropic, Google,
+  DeepSeek).
+- **`routing.tier` preference** (`frontier` | `balanced` | `economy`, default `balanced`) biasing the
+  picker's per-vendor pre-selection.
+- A one-time onboarding tip on `amicus start` pointing existing users to the new picker.
+
+### Changed
+
+- Model aliases now resolve their per-gateway executable ids **by model**, so user-defined and
+  vendor-named aliases route correctly across the direct and OpenRouter gateways (extends the v3.1.1
+  gateway-correct-ids fix beyond the curated defaults). An alias whose value is an explicit
+  `openrouter/…` id still forces OpenRouter.
+
+## [3.1.1] - 2026-07-16
+
+### Fixed
+
+- **Anthropic model aliases now route correctly for direct-Anthropic-key users.** `--model opus` /
+  `haiku` / `claude` / `sonnet` previously resolved to OpenRouter's dot-form id (e.g.
+  `anthropic/claude-opus-4.8`), which the direct Anthropic API rejects with `model_not_found` (it uses
+  dashes/date suffixes: `claude-opus-4-8`, `claude-haiku-4-5-20251001`). Aliases now carry per-gateway
+  executable ids and the router emits the selected gateway's native id. OpenRouter-only users were
+  unaffected.
+
+### Changed
+
+- `--model claude` / `--model sonnet` default target moves from Claude Sonnet 4.6 to **Claude Sonnet
+  5**; the offline model floor was refreshed to the current Anthropic family.
+- Availability-aware routing: a model not served on the selected gateway (e.g. Fable, which is
+  OpenRouter-only) routes to the gateway that has it, or errors clearly under an explicit `--gateway`.
+
+### Added
+
+- `amicus models --check --strict` exits non-zero on curated default-alias drift; a scheduled
+  `model-drift` CI workflow audits the per-gateway ids against the live (keyless) OpenRouter catalog.
+
 ## [3.1.0] - 2026-07-15
 
 ### Added

package/README.md

@@ -4,7 +4,7 @@
 
 **A multi-model LLM Council for Claude — with a parallel AI window underneath.**
 
-![The Amicus council mid-ritual: five models — Gemini 3 Pro, Llama 4, Grok 4, Claude Opus — reading the same material independently, chaired by GPT-5](./docs/council.png)
+![The Amicus council mid-ritual: five models — Gemini, Llama, Grok, Claude Opus — reading the same material independently, chaired by GPT](./docs/council.png)
 
 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.
 
@@ -319,7 +319,7 @@ $ amicus status demo123 --json
   "taskId": "demo123",
   "status": "complete",
   "elapsed": "5m 0s",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "model": "google/gemini-2.5-flash",
   "phase": "terminal"
 }

package/electron/ipc-setup.js

@@ -42,6 +42,26 @@ function registerSetupHandlers(getMainWindow) {
             require('../src/utils/model-catalog').refreshCatalog().catch(() => {});
           } catch { /* best-effort */ }
         });
+        // Task 8: per-provider default picker choices for the key step.
+        // Per-provider defaults only make sense for DIRECT model vendors --
+        // openrouter is the GATEWAY, not a vendor, so it's skipped entirely
+        // (mirrors provider-default-prompt.js's runProviderDefaultFlow gate;
+        // this path calls the picker core directly instead of that
+        // readline-oriented helper, so it re-checks isDirectProvider itself).
+        const { isDirectProvider } = require('../src/utils/provider-registry');
+        if (isDirectProvider(provider)) {
+          try {
+            const { getCatalog } = require('../src/utils/model-catalog');
+            const { buildProviderDefaultChoices } = require('../src/utils/provider-default-picker');
+            const catalog = await getCatalog();
+            result.providerDefault = buildProviderDefaultChoices(provider, { catalog });
+          } catch (err) {
+            logger.error('save-key providerDefault error', { error: err.message });
+            result.providerDefault = null;
+          }
+        } else {
+          result.providerDefault = null;
+        }
       }
       return result;
     } catch (err) {
@@ -50,6 +70,19 @@ function registerSetupHandlers(getMainWindow) {
     }
   });
 
+  // Task 8: apply a per-provider default picker choice. Read-modify-write,
+  // no-clobber -- applyProviderDefault only ever writes aliases[vendor] and
+  // seeds config.default when absent (see provider-default-picker.js).
+  ipcMain.handle('sidecar:set-provider-default', (_event, provider, chosenId) => {
+    try {
+      const { applyProviderDefault } = require('../src/utils/provider-default-picker');
+      return applyProviderDefault(provider, chosenId, { seedDefaultIfAbsent: true });
+    } catch (err) {
+      logger.error('set-provider-default handler error', { error: err.message });
+      return { success: false, error: err.message };
+    }
+  });
+
   ipcMain.handle('sidecar:remove-key', async (_event, provider) => {
     try {
       const { removeApiKey } = require('../src/utils/api-key-store');

package/electron/preload-setup.js

@@ -22,7 +22,8 @@ contextBridge.exposeInMainWorld('sidecarSetup', {
       'sidecar:get-api-keys',
       'sidecar:get-catalog',
       'sidecar:refresh-catalog',
-      'sidecar:fetch-free-models'
+      'sidecar:fetch-free-models',
+      'sidecar:set-provider-default'
     ];
     if (!allowedChannels.includes(channel)) {
       throw new Error(`IPC channel not allowed: ${channel}`);

package/electron/setup-ui-aliases.js

@@ -9,7 +9,7 @@
 const ALIAS_GROUPS = [
   { name: 'Gemini', keys: ['gemini', 'gemini-pro'] },
   { name: 'GPT', keys: ['gpt', 'gpt-pro', 'codex'] },
-  { name: 'Claude', keys: ['claude', 'sonnet', 'opus', 'haiku'] },
+  { name: 'Claude', keys: ['claude', 'sonnet', 'opus', 'haiku', 'fable'] },
   { name: 'DeepSeek', keys: ['deepseek'] },
   { name: 'Qwen', keys: ['qwen', 'qwen-coder', 'qwen-flash'] },
   { name: 'Mistral', keys: ['mistral', 'devstral'] },

package/electron/setup-ui-keys-script.js

@@ -19,6 +19,8 @@ function buildKeysScript() {
       var prov = providers.find(function(p) { return p.id === id; });
       if (!prov) { return; }
       selectedProvider = prov;
+      // Task 8: a picker rendered for the previously-selected provider is stale here.
+      if (window.hideProviderDefaultPicker) { window.hideProviderDefaultPicker(); }
       document.querySelectorAll('.provider-btn').forEach(function(b) { b.classList.remove('selected'); });
       this.classList.add('selected');
       keySection.classList.add('visible');
@@ -64,7 +66,7 @@ function buildKeysScript() {
     try {
       var res = await window.sidecarSetup.invoke('sidecar:validate-key', selectedProvider.id, key);
       if (res.valid) {
-        await window.sidecarSetup.invoke('sidecar:save-key', selectedProvider.id, key);
+        var saveResult = await window.sidecarSetup.invoke('sidecar:save-key', selectedProvider.id, key);
         configuredKeys[selectedProvider.id] = true;
         var c = document.getElementById('check-' + selectedProvider.id);
         if (c) { c.textContent = '\\u2713'; }
@@ -72,6 +74,10 @@ function buildKeysScript() {
         setInputState('valid'); keyValid = true; validatedKey = key;
         keyHints[selectedProvider.id] = key.slice(0, 8) + '\\u2022'.repeat(Math.min(key.length - 8, 12));
         removeBtn.style.display = ''; updateNextState();
+        // Task 8: inline per-provider default picker beneath the just-saved key.
+        if (window.renderProviderDefaultPicker) {
+          window.renderProviderDefaultPicker(selectedProvider.id, selectedProvider.name, saveResult && saveResult.providerDefault);
+        }
       } else {
         statusMsg.textContent = res.error || 'Invalid key'; statusMsg.className = 'status-invalid';
         setInputState('invalid'); keyValid = false;
@@ -107,6 +113,7 @@ function buildKeysScript() {
       keyInput.value = ''; keyInput.type = 'password'; keyValid = false; setInputState(null);
       statusMsg.textContent = 'Key removed'; statusMsg.className = 'status-testing';
       removeBtn.style.display = 'none'; updateNextState();
+      if (window.hideProviderDefaultPicker) { window.hideProviderDefaultPicker(); }
     } catch (_e) { statusMsg.textContent = 'Failed to remove'; statusMsg.className = 'status-invalid'; }
     removeBtn.disabled = false;
   });`;

package/electron/setup-ui-provider-default.js

@@ -0,0 +1,101 @@
+/**
+ * Setup UI — Per-provider default model picker (Part 2, Task 8).
+ *
+ * Rendered inline in the key step (Step 1), beneath the just-saved key, once
+ * `sidecar:save-key` (ipc-setup.js) returns a non-null `providerDefault` for a
+ * DIRECT provider (google/openai/anthropic/deepseek — never the openrouter
+ * gateway; see ipc-setup.js's own isDirectProvider guard, mirroring the skip
+ * rule in provider-default-prompt.js's runProviderDefaultFlow).
+ *
+ * Split into its own file (rather than growing setup-ui-keys.js /
+ * setup-ui-keys-script.js) per the existing setup-ui-* convention (see
+ * setup-ui-council.js, another Step-content add-on with its own HTML +
+ * script pair).
+ *
+ * Row data (from src/utils/provider-default-picker.js's
+ * buildProviderDefaultChoices): { preselectedId, rows: [{id, name,
+ * contextLength, pricePerMInput, isPreselected}] }. Row name/pricing come
+ * straight from the live model catalog, so the runtime script below builds
+ * rows via createElement/textContent (never innerHTML string interpolation)
+ * — the same convention Step 2's renderSearchResults uses for catalog rows.
+ */
+'use strict';
+
+/** Static (initially hidden) container the key step's picker renders into. */
+function buildProviderDefaultSectionHTML() {
+  return `<div class="provider-default-section" id="provider-default-section" style="display:none">
+      <div class="provider-default-label" id="provider-default-label">Default model</div>
+      <div class="provider-default-list" id="provider-default-list"></div>
+    </div>`;
+}
+
+/**
+ * Browser-only JS: exposes window.renderProviderDefaultPicker(provider,
+ * providerName, providerDefault) and window.hideProviderDefaultPicker(),
+ * wired to apply the pick via sidecar:set-provider-default
+ * (src/utils/provider-default-picker.js's applyProviderDefault,
+ * read-modify-write, no-clobber — see ipc-setup.js). Selecting a row (or
+ * leaving the preselection untouched) both apply the same way: the
+ * preselected id is applied immediately on render, and a change event
+ * re-applies whichever row the user picks instead.
+ * @returns {string} JavaScript source (no <script> tags)
+ */
+function buildProviderDefaultScript() {
+  return `
+  // Task 8: per-provider default picker, inline in the key step.
+  (function() {
+    var section = document.getElementById('provider-default-section');
+    var label = document.getElementById('provider-default-label');
+    var list = document.getElementById('provider-default-list');
+
+    function fmtPrice(p) { return (p === null || p === undefined) ? 'n/a' : '$' + Number(p).toFixed(2) + '/M in'; }
+    function fmtCtx(n) { return (n === null || n === undefined) ? '' : ' \\u00b7 ctx ' + n; }
+
+    function applyChoice(provider, chosenId) {
+      if (!provider || !chosenId) { return; }
+      window.sidecarSetup.invoke('sidecar:set-provider-default', provider, chosenId).catch(function() {});
+    }
+
+    function buildRow(provider, row) {
+      var rowEl = document.createElement('label');
+      rowEl.className = 'provider-default-row';
+      var radio = document.createElement('input');
+      radio.type = 'radio'; radio.name = 'provider-default-' + provider;
+      radio.value = row.id; radio.checked = !!row.isPreselected;
+      var text = document.createElement('span');
+      text.className = 'provider-default-text';
+      text.textContent = row.name + fmtCtx(row.contextLength) + ' \\u00b7 ' + fmtPrice(row.pricePerMInput);
+      rowEl.appendChild(radio); rowEl.appendChild(text);
+      if (row.isPreselected) {
+        var badge = document.createElement('span');
+        badge.className = 'pick-badge'; badge.textContent = 'recommended';
+        rowEl.appendChild(badge);
+      }
+      radio.addEventListener('change', function() { if (radio.checked) { applyChoice(provider, row.id); } });
+      return rowEl;
+    }
+
+    window.hideProviderDefaultPicker = function() {
+      if (!section) { return; }
+      section.style.display = 'none';
+      if (list) { list.innerHTML = ''; }
+    };
+
+    window.renderProviderDefaultPicker = function(provider, providerName, providerDefault) {
+      if (!section || !list) { return; }
+      if (!providerDefault || !Array.isArray(providerDefault.rows) || providerDefault.rows.length === 0) {
+        window.hideProviderDefaultPicker(); return;
+      }
+      if (label) { label.textContent = 'Default model for ' + (providerName || provider); }
+      list.innerHTML = '';
+      providerDefault.rows.forEach(function(row) { list.appendChild(buildRow(provider, row)); });
+      section.style.display = '';
+      // No-selection case: the preselected row is already checked above, so
+      // applying it immediately covers "advance without touching the list".
+      applyChoice(provider, providerDefault.preselectedId);
+    };
+  })();
+  `;
+}
+
+module.exports = { buildProviderDefaultSectionHTML, buildProviderDefaultScript };

package/electron/setup-ui-styles.js

@@ -415,7 +415,19 @@ function __rawWizardCSS() {
     content: ''; position: absolute; inset: 0;
     border-radius: 50%; background: var(--ok);
     animation: amicusPulse 1.6s var(--ease-out) infinite;
-  }`;
+  }
+
+  /* Per-provider default picker (Step 1, Task 8) */
+  .provider-default-section { margin-top: 14px; }
+  .provider-default-label { font-size: 12px; color: var(--text-muted); margin-bottom: 6px; }
+  .provider-default-list { display: flex; flex-direction: column; gap: 2px; }
+  .provider-default-row {
+    display: flex; align-items: center; gap: 8px;
+    padding: 6px 10px; font-size: 12px; color: var(--text); cursor: pointer;
+    border-radius: var(--r-6);
+  }
+  .provider-default-row:hover { background: var(--surface-hover); }
+  .provider-default-row input[type="radio"] { accent-color: var(--accent); flex-shrink: 0; }`;
 }
 
 function buildWizardCSS() {

package/electron/setup-ui.js

@@ -6,6 +6,7 @@ const { buildWizardCSS } = require('./setup-ui-styles');
 const { buildKeysScript } = require('./setup-ui-keys-script');
 const { buildAliasScript } = require('./setup-ui-alias-script');
 const { buildCouncilSectionHTML, buildCouncilScript } = require('./setup-ui-council');
+const { buildProviderDefaultSectionHTML, buildProviderDefaultScript } = require('./setup-ui-provider-default');
 const { getDefaultAliases } = require('../src/utils/config');
 const { getBrandName } = require('./toolbar');
 const { resolveQuickPicks } = require('../src/utils/quick-picks');
@@ -40,7 +41,7 @@ function buildSetupHTML(options = {}) {
   <div class="header"><svg width="18" height="18" 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><span class="header-title">${brandName} Setup</span></div>
   <div class="progress-bar"><div class="progress-step active" id="step-1"><span class="progress-dot">1</span><span>API Keys</span></div><div class="progress-connector"></div><div class="progress-step" id="step-2"><span class="progress-dot">2</span><span>Models</span></div><div class="progress-connector"></div><div class="progress-step" id="step-3"><span class="progress-dot">3</span><span>Routing</span></div><div class="progress-connector"></div><div class="progress-step" id="step-4"><span class="progress-dot">4</span><span>Review</span></div></div>
   <div class="content">
-    <div class="wizard-step visible" id="wizard-step-1"><div id="import-notice"></div>${keysHtml}</div>
+    <div class="wizard-step visible" id="wizard-step-1"><div id="import-notice"></div>${keysHtml}${buildProviderDefaultSectionHTML()}</div>
     <div class="wizard-step" id="wizard-step-2">${modelHtml}${buildCouncilSectionHTML()}</div>
     <div class="wizard-step" id="wizard-step-3">${aliasHtml}</div>
     <div class="wizard-step" id="wizard-step-4">
@@ -63,6 +64,7 @@ function buildWizardScript(providersJson, modelChoicesJson, providerNamesJson, d
   const keysJs = buildKeysScript();
   const aliasJs = buildAliasScript();
   const councilJs = buildCouncilScript();
+  const providerDefaultJs = buildProviderDefaultScript();
   return `<script>
   window.onerror = function(msg, src, line, col, err) { console.error('WIZARD ERROR:', msg, 'at', src, line, col, err); };
   window.onunhandledrejection = function(e) { console.error('WIZARD UNHANDLED REJECTION:', e.reason); };
@@ -574,6 +576,8 @@ function buildWizardScript(providersJson, modelChoicesJson, providerNamesJson, d
   ${keysJs}
 
   ${councilJs}
+
+  ${providerDefaultJs}
 </script>`;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amicus",
-  "version": "3.1.0",
+  "version": "3.2.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": [
@@ -59,6 +59,7 @@
     "refresh-models": "node bin/amicus.js models --refresh",
     "models:info": "node bin/amicus.js models",
     "models:check": "node bin/amicus.js models --check",
+    "models:check:strict": "node bin/amicus.js models --check --strict",
     "generate-icon": "node scripts/generate-icon.js",
     "generate-docs": "node scripts/generate-docs.js",
     "generate-docs:check": "node scripts/generate-docs.js --check",

package/src/cli-handlers-run.js

@@ -14,7 +14,7 @@
 
 const { validateStartArgs } = require('./cli');
 const { validateTaskId } = require('./utils/validators');
-const { resolveLaunchModel } = require('./utils/start-helpers');
+const { resolveLaunchModel, maybeOfferProviderDefaults } = require('./utils/start-helpers');
 const { failJson, ERROR_CODES } = require('./utils/error-doc');
 const { requireNoUiForJson } = require('./utils/cli-preflight');
 const { GATEWAY_MODES } = require('./utils/model-descriptor');
@@ -55,6 +55,14 @@ async function handleStart(args) {
     process.exit(failJson(useJson, { code: validation.code || ERROR_CODES.BAD_ARGS, message: validation.error }));
   }
 
+  // Existing-user one-time onboarding offer (Part 2, Task 9): a non-blocking
+  // notice, printed at most once ever, pointing users who already have direct
+  // provider keys at the per-provider cost-aware default picker. No-ops on
+  // any non-interactive/--json run (see maybeOfferProviderDefaults). Fired
+  // only after validateStartArgs succeeds so a failed first `amicus start`
+  // doesn't burn the one-time flag.
+  maybeOfferProviderDefaults(args);
+
   // Budget gate for solo start
   if (!args['no-cost-gate']) {
     const { lookupPricing } = require('./utils/pricing');

package/src/cli-handlers.js

@@ -159,6 +159,46 @@ async function handleKey(args) {
     process.exit(1);
   }
   console.log(`${provider} key validated and saved.`);
+
+  await offerProviderDefault(provider, args);
+}
+
+/**
+ * After a successful key save, run the per-provider cost-aware default
+ * picker (Part 2, Task 6) and print its one-line summary. Wrapped end-to-end
+ * in try/catch: the key is ALREADY saved by the time this runs, so a picker
+ * failure (offline catalog, bad input, etc.) must never abort `amicus key`
+ * -- it just prints a soft notice instead.
+ * @param {string} provider
+ * @param {object} args parsed CLI args (checked for --json/--quiet to gate interactivity)
+ */
+async function offerProviderDefault(provider, args) {
+  let rl = null;
+  try {
+    const { runProviderDefaultFlow } = require('./utils/provider-default-prompt');
+    const { getCatalog } = require('./utils/model-catalog');
+
+    const interactive = !!process.stdin.isTTY && !args.json && !args.quiet;
+
+    let catalog = [];
+    try { catalog = await getCatalog(); } catch { /* offline/empty: handled gracefully by the picker */ }
+
+    let ask;
+    if (interactive) {
+      const readline = require('readline');
+      rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+      ask = (q) => new Promise((resolve) => rl.question(q, (answer) => resolve((answer || '').trim())));
+    }
+
+    const { summaryLine } = await runProviderDefaultFlow(provider, {
+      interactive, ask, catalog, print: console.log,
+    });
+    console.log(summaryLine);
+  } catch (err) {
+    console.log(`Note: couldn't set a per-provider default (${err.message}). Run 'amicus key ${provider}' again later.`);
+  } finally {
+    if (rl) { rl.close(); }
+  }
 }
 
 module.exports = {

package/src/cli.js

@@ -138,6 +138,7 @@ function isBooleanFlag(key) {
      'html',                 // council report: emit a self-contained HTML page
      'md',                   // council report: emit Markdown (default)
      'fix',                  // doctor: self-heal fixable checks in place (#56)
+     'strict',               // models --check: exit non-zero on curated per-gateway drift (#gwid Task 6)
    ];
   return booleanFlags.includes(key);
 }
@@ -436,6 +437,9 @@ Options for 'models':
   --search <q>                 Filter by substring over model id and name
   --refresh                    Force-refresh the catalog from provider APIs
   --check                      Audit aliases against the catalog (exit = stale count)
+  --strict                     With --check: also exit non-zero on curated
+                               per-gateway drift (stale/divergent direct or
+                               openrouter forms). Informational without it.
   --json                       Machine-readable output
 `,
   list: `

package/src/sidecar/models.js

@@ -14,6 +14,7 @@
 
 const { getCatalogInfo, refreshCatalog, catalogPath } = require('../utils/model-catalog');
 const { collectAliasSources, findStaleAliases, suggestReplacements } = require('../utils/alias-audit');
+const { auditGatewayRoutes } = require('../utils/gateway-route-audit');
 const { buildCatalogDoc, buildAuditDoc } = require('../utils/result-schema');
 const { getFamilies } = require('../utils/curated-models');
 const { pickCurrent } = require('../utils/quick-picks');
@@ -116,8 +117,20 @@ async function runRefresh(args) {
   return 0;
 }
 
+/** One readable line per gateway-route finding (Task 6, #gwid). @param {object} f @returns {string} */
+function fmtGatewayFinding(f) {
+  if (f.kind === 'stale') {
+    return `  GATEWAY STALE (${f.gateway}): ${f.alias} -> ${f.model}`;
+  }
+  if (f.kind === 'divergent-missing') {
+    return `  GATEWAY DIVERGENT: ${f.alias} has no direct form; catalog confirms ${f.model}`;
+  }
+  return `  GATEWAY DIVERGENT: ${f.alias} direct form ${f.model} no longer matches catalog (now ${f.expected})`;
+}
+
 async function runCheck(args) {
-  const { models: catalog } = await getCatalogInfo();
+  const catalogInfo = await getCatalogInfo();
+  const catalog = catalogInfo.models;
   if (!catalog || catalog.length === 0) {
     if (args.json) {
       process.stdout.write(JSON.stringify(buildAuditDoc({
@@ -131,35 +144,44 @@ async function runCheck(args) {
   const sources = collectAliasSources();
   const stale = findStaleAliases(sources, catalog)
     .map(s => ({ ...s, suggestions: suggestReplacements(s.model, catalog) }));
+  // Task 6 (#gwid): per-gateway-form audit of the curated DEFAULTS
+  // (toGatewayRoutes()) — additive to the flat audit above. Informational by
+  // default; --strict promotes it to a build-breaking exit code (CI gate).
+  const gatewayFindings = auditGatewayRoutes(catalogInfo);
+  const legacyExitCode = Math.min(stale.length, CHECK_EXIT_CAP);
+  const exitCode = args.strict
+    ? Math.max(legacyExitCode, Math.min(gatewayFindings.length, CHECK_EXIT_CAP))
+    : legacyExitCode;
+
   if (args.json) {
     process.stdout.write(JSON.stringify(buildAuditDoc({
-      stale, catalogAvailable: true
+      stale, catalogAvailable: true, gatewayFindings
     }), null, 2) + '\n');
-    return Math.min(stale.length, CHECK_EXIT_CAP);
+    return exitCode;
   }
   const driftLines = buildFallbackDriftReport(catalog);
   if (stale.length === 0) {
     process.stdout.write(`All aliases resolve to catalog models (${sources.length} checked).\n`);
-    if (driftLines.length > 0) {
-      process.stdout.write('Pinned fallback drift:\n');
-      for (const l of driftLines) { process.stdout.write(l + '\n'); }
-    }
-    return 0;
-  }
-  for (const s of stale) {
-    process.stdout.write(`STALE: ${s.alias} -> ${s.model} (${s.source})\n`);
-    if (s.suggestions.length > 0) {
-      process.stdout.write(`  candidates: ${s.suggestions.join(', ')}\n`);
-      process.stdout.write(`  fix: amicus setup --add-alias ${s.alias}=${s.suggestions[0]}\n`);
-    } else {
-      process.stdout.write('  no same-vendor candidates in catalog\n');
+  } else {
+    for (const s of stale) {
+      process.stdout.write(`STALE: ${s.alias} -> ${s.model} (${s.source})\n`);
+      if (s.suggestions.length > 0) {
+        process.stdout.write(`  candidates: ${s.suggestions.join(', ')}\n`);
+        process.stdout.write(`  fix: amicus setup --add-alias ${s.alias}=${s.suggestions[0]}\n`);
+      } else {
+        process.stdout.write('  no same-vendor candidates in catalog\n');
+      }
     }
   }
   if (driftLines.length > 0) {
     process.stdout.write('Pinned fallback drift:\n');
     for (const l of driftLines) { process.stdout.write(l + '\n'); }
   }
-  return Math.min(stale.length, CHECK_EXIT_CAP);
+  if (gatewayFindings.length > 0) {
+    process.stdout.write('Per-gateway route audit (curated defaults):\n');
+    for (const f of gatewayFindings) { process.stdout.write(fmtGatewayFinding(f) + '\n'); }
+  }
+  return exitCode;
 }
 
 /**