@askalf/dario 6.0.3 → 6.0.4

package/dist/claude-model.js

@@ -19,7 +19,9 @@
  *      `--model-alias` values, pinned aliases (`opus48`) and catalog family
  *      shorthands (`opus`, `sonnet1m`) map to a canonical id. The caller
  *      supplies that resolver so classification and forwarding cannot
- *      disagree.
+ *      disagree. The prefix rule applies to the alias TARGET too, since an
+ *      operator alias is written the way a request model is written — see
+ *      stripClaudePrefix.
  *   2. VALIDATE the resolved id against the catalog base set. A `claude-`
  *      prefix on its own proves nothing — `claude-sonnet-6` has the prefix and
  *      does not exist — so the id (sans `[1m]`) must be a base the pool can
@@ -37,6 +39,23 @@
 import { BAKED_BASE_MODELS, resolveAliasAgainst } from './model-catalog.js';
 /** Provider prefixes that force the Claude path (mirrors proxy.ts's PROVIDER_PREFIXES). */
 const CLAUDE_PREFIXES = new Set(['claude', 'anthropic']);
+/**
+ * Strip a Claude-side provider prefix, or refuse the name outright.
+ *
+ * Null on any prefix that isn't `claude:`/`anthropic:` — a recognized
+ * non-Claude prefix is a definite NO, not a fall-through to the name test
+ * (`openai:claude-sonnet-5` is the operator pointing somewhere else on
+ * purpose), and an unrecognized one names a model this pool has no claim on.
+ * `model` is expected already trimmed + lowercased.
+ */
+function stripClaudePrefix(model) {
+    const idx = model.indexOf(':');
+    if (idx <= 0)
+        return model || null;
+    if (!CLAUDE_PREFIXES.has(model.slice(0, idx)))
+        return null;
+    return model.slice(idx + 1) || null;
+}
 /**
  * The canonical id the Claude pool would serve `model` as, or null when it
  * cannot serve it. `bases` is the catalog base set — `getCachedBases()` at a
@@ -45,22 +64,22 @@ const CLAUDE_PREFIXES = new Set(['claude', 'anthropic']);
  * (operator aliases + pinned aliases) where one exists.
  */
 export function resolveClaudeServable(model, bases = BAKED_BASE_MODELS, resolve) {
-    let m = model.trim().toLowerCase();
-    if (!m)
+    const entry = stripClaudePrefix(model.trim().toLowerCase());
+    if (entry === null)
+        return null;
+    // The alias TARGET may carry a prefix of its own — operator aliases are
+    // declared the way a request model is written, and `--model-alias=backup=
+    // claude:opus` is the natural way to say it (dario#1151). The request path
+    // parses that prefix AFTER alias resolution; without the same pass here the
+    // target reached the base check as the literal `claude:opus`, matched
+    // nothing, and a perfectly valid fallback was skipped.
+    const target = stripClaudePrefix((resolve ? resolve(entry) : (resolveAliasAgainst(entry, bases) ?? entry)).trim().toLowerCase());
+    if (target === null)
         return null;
-    const idx = m.indexOf(':');
-    if (idx > 0) {
-        const prefix = m.slice(0, idx);
-        // A recognized non-Claude prefix is a definite NO, not a fall-through to
-        // the name test below — `openai:claude-sonnet-5` is the operator pointing
-        // somewhere else on purpose.
-        if (!CLAUDE_PREFIXES.has(prefix))
-            return null;
-        m = m.slice(idx + 1);
-        if (!m)
-            return null;
-    }
-    const resolved = (resolve ? resolve(m) : (resolveAliasAgainst(m, bases) ?? m)).trim().toLowerCase();
+    // A target that arrived prefixed still holds a shorthand (`claude:opus` →
+    // `opus`), so the catalog pass runs on it. Idempotent for a target already
+    // canonical: resolveAliasAgainst only answers for family shorthands.
+    const resolved = resolveAliasAgainst(target, bases) ?? target;
     const base = resolved.endsWith('[1m]') ? resolved.slice(0, -4) : resolved;
     return bases.some((b) => b.toLowerCase() === base) ? resolved : null;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@askalf/dario",
-  "version": "6.0.3",
+  "version": "6.0.4",
   "description": "Use your Claude Pro/Max subscription in any tool — Cursor, Cline, Aider, the Agent SDK, your scripts — at subscription pricing, not per-token API bills. One local Anthropic + OpenAI-compatible endpoint.",
   "type": "module",
   "bin": {