amicus 4.1.1 → 4.1.2

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "amicus",
-  "version": "4.1.1",
+  "version": "4.1.2",
   "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,25 @@ All notable changes to Amicus are documented here. Format follows
 
 ## [Unreleased]
 
+## [4.1.2] - 2026-07-22
+
+### Fixed
+
+- **Claude model aliases no longer drift between the direct API and OpenRouter.** The two
+  gateways spell the same model differently — OpenRouter serves `anthropic/claude-opus-4.8`,
+  the direct Anthropic API serves `anthropic/claude-opus-4-8` — and three places converted
+  between the two by adding or removing the `openrouter/` prefix. That is only sound when the
+  rest of the id is identical, which for Claude it is not. Two user-visible consequences: a fresh
+  `amicus setup` wrote an `opus` alias that `amicus doctor` then reported as stale (the exact
+  warning 4.1.1 shipped to remove — and it fired even with an Anthropic-only catalog, not just
+  for OpenRouter users), and the pre-registered fallback catalog handed to a long-lived shared
+  server carried two ids OpenRouter does not serve while omitting the two it does. All three
+  sites now read each gateway's authored route instead of deriving one from the other, and an
+  alias you have overridden yourself is left alone rather than inheriting a curated route.
+  Affects `opus` and `haiku`; every other alias is spelled identically on both gateways or is
+  OpenRouter-only. Default routing is direct-first and was never affected — no run selected a
+  wrong model.
+
 ## [4.1.1] - 2026-07-21
 
 ### Fixed

package/README.md

@@ -329,7 +329,7 @@ $ amicus status demo123 --json
   "taskId": "demo123",
   "status": "complete",
   "elapsed": "5m 0s",
-  "version": "4.1.1",
+  "version": "4.1.2",
   "model": "google/gemini-2.5-flash",
   "phase": "terminal"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amicus",
-  "version": "4.1.1",
+  "version": "4.1.2",
   "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": [

package/src/sidecar/setup.js

@@ -353,8 +353,7 @@ async function runReadlineSetup() {
       return;
     }
 
-    const { resolveQuickPicks, toLiveSeedAliases } = require('../utils/quick-picks');
-    const { toCanonicalDefault } = require('../utils/curated-models');
+    const { resolveQuickPicks, toLiveSeedAliases, toStorableRoute } = require('../utils/quick-picks');
     const picks = resolveQuickPicks(catalog);
 
     console.log('Choose your default model:');
@@ -386,7 +385,7 @@ async function runReadlineSetup() {
       // choice), but the alias's VALUE must stay the vendor phase's tier choice --
       // skip the curated-flagship upgrade so it isn't discarded.
       if (pick && !chosen.noUpgrade && !vendorAliasesWritten.has(chosen.alias)) {
-        cfg.aliases[chosen.alias] = toCanonicalDefault(pick.routes.openrouter || Object.values(pick.routes)[0]);
+        cfg.aliases[chosen.alias] = toStorableRoute(pick);
       } else if (cfg.aliases[chosen.alias] === undefined) {
         const fallback = getDefaultAliases()[chosen.alias];
         if (fallback !== undefined) { cfg.aliases[chosen.alias] = fallback; }

package/src/utils/config.js

@@ -12,8 +12,9 @@ const { autoRepairAlias } = require('./alias-resolver');
 const { isDirectProvider } = require('./provider-registry');
 
 /** Default model alias map — derived from the curated-models single source (F5) */
-const { toDefaultAliases } = require('./curated-models');
+const { toDefaultAliases, toGatewayRoutes } = require('./curated-models');
 const DEFAULT_ALIASES = toDefaultAliases();
+const CURATED_ROUTES = toGatewayRoutes();
 
 /** Built-in council benches (B23) — consulted only when a name is absent from user config. */
 const { resolveBuiltinCouncil } = require('./council-presets');
@@ -261,10 +262,19 @@ function tryResolveModel(modelArg) {
  * threading only that first session's resolved id is insufficient. So for
  * every alias that resolves to a BARE direct-capable-vendor id (post-#61
  * default aliases are bare, e.g. `openai/gpt-5.5`), this ALSO registers the
- * `openrouter/<vendor>/<model>` form — broadening the catalog to cover BOTH
- * routes the router might pick, regardless of which session created the
- * server. This does NOT change what the alias itself resolves to (still
- * bare, still direct-first) — it only widens what's pre-registered.
+ * alias's OpenRouter form — broadening the catalog to cover BOTH routes the
+ * router might pick, regardless of which session created the server. This
+ * does NOT change what the alias itself resolves to (still bare, still
+ * direct-first) — it only widens what's pre-registered.
+ *
+ * The mirror is read from the alias's authored gateway route, NOT built by
+ * prepending `openrouter/`. For DIVERGENT_VENDORS the two ids are different
+ * strings, not merely differently prefixed — OpenRouter serves
+ * `anthropic/claude-opus-4.8` while the direct API serves
+ * `anthropic/claude-opus-4-8`. v4.1.1 made `toDefaultAliases()` emit the
+ * direct form, at which point prepending produced an id OpenRouter does not
+ * serve (fixed in v4.1.2). Aliases the user has overridden fall back to the
+ * prefix form, since no authored gateway route describes them.
  * @param {string[]} [resolvedRoutes] executable model id(s) actually launched
  * @returns {object} e.g. { openrouter: { models: { "x-ai/grok-4.3": {}, ... } } } */
 function buildProviderModels(resolvedRoutes = []) {
@@ -285,13 +295,23 @@ function buildProviderModels(resolvedRoutes = []) {
     providers[providerID].models[modelID] = {};
   };
 
-  for (const fullModel of Object.values(aliases)) {
+  for (const [alias, fullModel] of Object.entries(aliases)) {
     addRoute(fullModel);
 
     // Broaden: a bare direct-capable-vendor route also gets an OpenRouter
-    // mirror registered (see catalog-broadening note above). Gateway-only
-    // aliases (already `openrouter/...`, e.g. grok/qwen/x-ai) are untouched —
-    // OpenRouter is their only possible route anyway, already covered above.
+    // mirror registered (see catalog-broadening note above). Prefer the
+    // alias's AUTHORED OpenRouter route — for divergent vendors it is a
+    // different id, not a prefixed one. Guarded on the alias still holding its
+    // shipped direct value so a user override never inherits a curated route.
+    const curated = CURATED_ROUTES[alias];
+    if (curated && curated.openrouter && curated.direct === fullModel) {
+      addRoute(curated.openrouter);
+      continue;
+    }
+
+    // Fallback for user-defined aliases. Gateway-only aliases (already
+    // `openrouter/...`, e.g. grok/qwen/x-ai) are untouched — OpenRouter is
+    // their only possible route anyway, already covered above.
     if (typeof fullModel === 'string' && !fullModel.startsWith('openrouter/')) {
       const vendor = fullModel.split('/')[0];
       if (isDirectProvider(vendor)) {

package/src/utils/quick-picks.js

@@ -10,7 +10,7 @@
 
 'use strict';
 
-const { getFamilies, toDefaultAliases, toCanonicalDefault } = require('./curated-models');
+const { getFamilies, toDefaultAliases, toCanonicalDefault, DIVERGENT_VENDORS } = require('./curated-models');
 
 const MARKER_RE = /(-preview|-exp|-beta|-latest|:free)+$/;
 
@@ -45,7 +45,7 @@ function pickCurrent(catalog, nsPrefix, vendorPath, idPattern) {
 
 /**
  * @param {Array<{id:string}>} catalog
- * @returns {Array<{alias,label,blurb,source:'live'|'fallback',routes:Object<string,string>}>}
+ * @returns {Array<{alias,label,blurb,vendorPath,source:'live'|'fallback',routes:Object<string,string>}>}
  * `routes` may be empty if a family defines no fallback and the catalog has no match.
  */
 function resolveQuickPicks(catalog) {
@@ -60,30 +60,53 @@ function resolveQuickPicks(catalog) {
       if (direct) { routes[p] = direct; live = true; }
       else if (f.fallback[p]) { routes[p] = f.fallback[p]; }
     }
-    return { alias: f.alias, label: f.label, blurb: f.blurb, routes,
+    return { alias: f.alias, label: f.label, blurb: f.blurb, vendorPath: f.vendorPath, routes,
              source: live ? 'live' : 'fallback' };
   });
 }
 
+/**
+ * The single route value a wizard may STORE for a resolved quick pick.
+ *
+ * For a direct-capable vendor the OpenRouter pick is canonicalised to bare
+ * `vendor/model` so it stays direct-first via the gateway router — otherwise a
+ * fresh `amicus setup` with a live catalog would silently defeat the
+ * direct-first default `toDefaultAliases()` establishes.
+ *
+ * For a DIVERGENT vendor the direct id is never DERIVED from the OpenRouter
+ * one: they are different strings, not differently prefixed (OpenRouter serves
+ * `anthropic/claude-opus-4.8`, the direct API `anthropic/claude-opus-4-8`).
+ * Stripping the prefix there fabricates an id the direct API rejects, which
+ * `amicus doctor` then reports as a stale alias. The row's own direct route is
+ * used verbatim, falling back to the intact `openrouter/` form when the
+ * catalog offered no direct pick. Mirrors the guard already used at
+ * `provider-default-picker.js:82,143,220`.
+ * @param {{vendorPath?:string, routes?:Object<string,string>}} pick
+ * @returns {string|undefined}
+ */
+function toStorableRoute(pick) {
+  const routes = (pick && pick.routes) || {};
+  if (pick && DIVERGENT_VENDORS.has(pick.vendorPath)) {
+    return routes[pick.vendorPath] || routes.openrouter;
+  }
+  return toCanonicalDefault(routes.openrouter || Object.values(routes)[0]);
+}
+
 /**
  * Seed map for fresh configs: static defaults overlaid with live family
- * routes (cardless aliases stay pinned). The overlaid route is run through
- * `toCanonicalDefault` so a direct-capable vendor (e.g. google, openai)
- * lands as bare `vendor/model` (direct-first via the gateway router)
- * instead of the raw `openrouter/<vendor>/<rest>` pick — otherwise a fresh
- * `amicus setup` with a live catalog would silently defeat the direct-first
- * default `toDefaultAliases()` establishes. Gateway-only vendors are
- * returned unchanged by `toCanonicalDefault`.
+ * routes (cardless aliases stay pinned). See `toStorableRoute` for why the
+ * overlaid value is not a raw prefix strip.
  * @returns {Object<string,string>}
  */
 function toLiveSeedAliases(catalog) {
   const seeds = toDefaultAliases();
   for (const r of resolveQuickPicks(catalog || [])) {
     if (r.source === 'live' && r.routes.openrouter) {
-      seeds[r.alias] = toCanonicalDefault(r.routes.openrouter);
+      const stored = toStorableRoute(r);
+      if (stored) { seeds[r.alias] = stored; }
     }
   }
   return seeds;
 }
 
-module.exports = { compareIdsDesc, pickCurrent, resolveQuickPicks, toLiveSeedAliases };
+module.exports = { compareIdsDesc, pickCurrent, resolveQuickPicks, toLiveSeedAliases, toStorableRoute };