@askalf/dario 6.12.2 → 6.12.4

package/dist/cc-template.d.ts

@@ -532,6 +532,19 @@ export declare function dedupeToolsByName<T extends {
     name?: unknown;
 }>(tools: T[]): T[];
 export declare function isGenuineCCClient(clientBody: Record<string, unknown>): boolean;
+/**
+ * The client's tool_choice, when it can be honoured against the tools going out: `auto`, `any`
+ * and `none` always; a forced `{type:'tool', name}` with the name translated the way the tool
+ * itself was (remap mode: the client name -> its CC tool or fallback slot; preserve mode: the
+ * map is empty and the name is the client's), and only when that name is in `outgoingTools`.
+ * Anything else, including a malformed value, yields null and the request goes out without one.
+ * Exported for unit testing.
+ */
+export declare function passthroughToolChoice(choice: unknown, outgoingTools: Array<{
+    name?: unknown;
+}> | undefined, toolMap?: ReadonlyMap<string, {
+    ccTool: string;
+}>): Record<string, unknown> | null;
 export declare function buildCCRequest(clientBody: Record<string, unknown>, billingTag: string, cacheControl: CacheControl, identity: {
     deviceId: string;
     accountUuid: string;

package/dist/cc-template.js

@@ -1596,6 +1596,26 @@ export function isGenuineCCClient(clientBody) {
     const text = second.text;
     return CC_ORIGIN_SYSTEM_OPENERS.some((opener) => text.startsWith(opener)) || text.includes('Claude Agent SDK');
 }
+/**
+ * The client's tool_choice, when it can be honoured against the tools going out: `auto`, `any`
+ * and `none` always; a forced `{type:'tool', name}` with the name translated the way the tool
+ * itself was (remap mode: the client name -> its CC tool or fallback slot; preserve mode: the
+ * map is empty and the name is the client's), and only when that name is in `outgoingTools`.
+ * Anything else, including a malformed value, yields null and the request goes out without one.
+ * Exported for unit testing.
+ */
+export function passthroughToolChoice(choice, outgoingTools, toolMap = new Map()) {
+    if (!choice || typeof choice !== 'object' || Array.isArray(choice))
+        return null;
+    const c = choice;
+    if (c.type === 'auto' || c.type === 'any' || c.type === 'none')
+        return c;
+    if (c.type === 'tool' && typeof c.name === 'string') {
+        const name = toolMap.get(c.name)?.ccTool ?? c.name;
+        return (outgoingTools ?? []).some((t) => t.name === name) ? { ...c, name } : null;
+    }
+    return null;
+}
 export function buildCCRequest(clientBody, billingTag, cacheControl, identity, opts = {}) {
     const model = clientBody.model || 'claude-sonnet-5';
     const isHaiku = model.toLowerCase().includes('haiku');
@@ -2132,6 +2152,12 @@ export function buildCCRequest(clientBody, billingTag, cacheControl, identity, o
         ccRequest.tools = CC_TOOL_DEFINITIONS;
         ccRequest.tool_choice = { type: 'none' };
     }
+    // Preserve a valid client tool_choice after tool-name translation.
+    if (clientTools && clientTools.length > 0) {
+        const passed = passthroughToolChoice(clientBody.tool_choice, ccRequest.tools, activeToolMap);
+        if (passed)
+            ccRequest.tool_choice = passed;
+    }
     // Metadata
     ccRequest.metadata = {
         user_id: JSON.stringify({

package/dist/proxy.d.ts

@@ -87,8 +87,12 @@ export declare function parseProviderPrefix(model: string): {
  * the fable request carries it, the opus request does not). Subscription
  * traffic on fable WITHOUT it is soft-refused upstream — every request
  * returns 200 with `stop_reason: "refusal"` and empty content, while the
- * same request on opus/sonnet answers normally. Mirror CC exactly: append
- * for the fable family, leave every other family's set untouched.
+ * same request on opus/sonnet answers normally. CC 2.1.220 extended it to
+ * opus-5; CC 2.1.282 stopped sending it on EVERY family (wire-drift live
+ * capture 2026-09-25: opus-5 and fable-5 now equal the opus-4-8 base), so
+ * betaForModel adds it for no family. Kept exported: drift-report.mjs still
+ * treats it as model-conditional, so a capture that carries it again reads
+ * as a transform change, not base drift.
  * Exported for tests.
  */
 export declare const FABLE_FALLBACK_CREDIT_BETA = "fallback-credit-2026-06-01";
@@ -105,9 +109,10 @@ export declare const MID_CONVERSATION_TOOL_CHANGES_BETA = "mid-conversation-tool
  * it, ORDER included:
  *
  *   opus-4-8    = base                                    (unchanged)
- *   opus-5      = base + fallback-credit-2026-06-01 inserted BEFORE afk-mode
- *                 (live capture CC 2.1.220, 2026-07-25 — identical transform to
- *                 fable's; both are the models whose classifiers can refuse)
+ *   opus-5      = base                                    (CC 2.1.282 dropped
+ *                 fallback-credit-2026-06-01, which 2.1.220 to 2.1.281 inserted
+ *                 before afk-mode; wire-drift live capture 2026-09-25)
+ *   fable-5     = base                                    (same drop as opus-5)
  *   sonnet-5    = base                                    (== opus — wire-drift
  *                 live capture, CC 2.1.204: mid-conversation-system included)
  *                 CC 2.1.265 does NOT send mid-conversation-tool-changes here.
@@ -116,7 +121,6 @@ export declare const MID_CONVERSATION_TOOL_CHANGES_BETA = "mid-conversation-tool
  *   haiku-4-5   = base − {mid-conversation-system, mid-conversation-tool-changes,
  *                 effort, afk-mode}, and claude-code-20250219 MOVED to
  *                 position 5 (before advisor-tool)
- *   fable-5     = base + fallback-credit-2026-06-01 inserted BEFORE afk-mode
  *
  * mid-conversation-tool-changes-2026-07-01 entered `base` with the 2026-09-08
  * rebake (CC 2.1.265). The live wire-drift capture on that rebake shows it on

package/dist/proxy.js

@@ -428,8 +428,12 @@ function filterBillableBetas(betas) {
  * the fable request carries it, the opus request does not). Subscription
  * traffic on fable WITHOUT it is soft-refused upstream — every request
  * returns 200 with `stop_reason: "refusal"` and empty content, while the
- * same request on opus/sonnet answers normally. Mirror CC exactly: append
- * for the fable family, leave every other family's set untouched.
+ * same request on opus/sonnet answers normally. CC 2.1.220 extended it to
+ * opus-5; CC 2.1.282 stopped sending it on EVERY family (wire-drift live
+ * capture 2026-09-25: opus-5 and fable-5 now equal the opus-4-8 base), so
+ * betaForModel adds it for no family. Kept exported: drift-report.mjs still
+ * treats it as model-conditional, so a capture that carries it again reads
+ * as a transform change, not base drift.
  * Exported for tests.
  */
 export const FABLE_FALLBACK_CREDIT_BETA = 'fallback-credit-2026-06-01';
@@ -441,18 +445,11 @@ export const ADVISOR_TOOL_BETA = 'advisor-tool-2026-03-01';
 export const CLAUDE_CODE_BETA = 'claude-code-20250219';
 export const MID_CONVERSATION_TOOL_CHANGES_BETA = 'mid-conversation-tool-changes-2026-07-01';
 /**
- * Insert `flag` immediately before the first `anchor`, deduped. If `flag` is
+ * Insert `flag` immediately AFTER the first `anchor`, deduped. If `flag` is
  * already present the list is returned unchanged; if `anchor` is absent `flag`
  * is appended at the tail. Used to place model-conditional betas at the exact
  * position real CC emits them, rather than always appending.
  */
-function insertBetaBefore(flags, flag, anchor) {
-    if (flags.includes(flag))
-        return flags;
-    const i = flags.indexOf(anchor);
-    return i < 0 ? [...flags, flag] : [...flags.slice(0, i), flag, ...flags.slice(i)];
-}
-/** As insertBetaBefore, but places `flag` immediately AFTER the first `anchor`. */
 function insertBetaAfter(flags, flag, anchor) {
     if (flags.includes(flag))
         return flags;
@@ -477,9 +474,10 @@ function moveBetaBefore(flags, flag, anchor) {
  * it, ORDER included:
  *
  *   opus-4-8    = base                                    (unchanged)
- *   opus-5      = base + fallback-credit-2026-06-01 inserted BEFORE afk-mode
- *                 (live capture CC 2.1.220, 2026-07-25 — identical transform to
- *                 fable's; both are the models whose classifiers can refuse)
+ *   opus-5      = base                                    (CC 2.1.282 dropped
+ *                 fallback-credit-2026-06-01, which 2.1.220 to 2.1.281 inserted
+ *                 before afk-mode; wire-drift live capture 2026-09-25)
+ *   fable-5     = base                                    (same drop as opus-5)
  *   sonnet-5    = base                                    (== opus — wire-drift
  *                 live capture, CC 2.1.204: mid-conversation-system included)
  *                 CC 2.1.265 does NOT send mid-conversation-tool-changes here.
@@ -488,7 +486,6 @@ function moveBetaBefore(flags, flag, anchor) {
  *   haiku-4-5   = base − {mid-conversation-system, mid-conversation-tool-changes,
  *                 effort, afk-mode}, and claude-code-20250219 MOVED to
  *                 position 5 (before advisor-tool)
- *   fable-5     = base + fallback-credit-2026-06-01 inserted BEFORE afk-mode
  *
  * mid-conversation-tool-changes-2026-07-01 entered `base` with the 2026-09-08
  * rebake (CC 2.1.265). The live wire-drift capture on that rebake shows it on
@@ -538,17 +535,9 @@ export function betaForModel(base, model, skipContext1m = false) {
             flags = flags.filter((f) => f !== MID_CONVERSATION_SYSTEM_BETA);
         }
     }
-    else if (m.includes('fable') || /opus-5(?!\d)/.test(m)) {
-        // fallback-credit is NOT fable-only any more. Live capture on CC 2.1.220
-        // (2026-07-25) shows claude-opus-5 carrying it in the same slot — before
-        // afk-mode — while opus-4-8 and sonnet-5 do not. That tracks the models
-        // with refusal classifiers: Opus 5 and Fable 5 can decline a request and
-        // route to a fallback, so CC opts both into the credit beta. Matched on
-        // `opus-5` specifically rather than `opus-5+`: a future opus-6 probably
-        // inherits this, but that's a guess and the wire-drift runner will say so.
-        flags = insertBetaBefore(flags, FABLE_FALLBACK_CREDIT_BETA, AFK_MODE_BETA);
-    }
-    // opus-4-x + unknown families keep the base set unchanged.
+    // opus, fable + unknown families keep the base set unchanged. fable-5 and
+    // opus-5 carried fallback-credit-2026-06-01 from CC 2.1.220 to 2.1.281; CC
+    // 2.1.282 sends neither with it (wire-drift capture 2026-09-25).
     if (/\[1m\]$/.test(m) && !skipContext1m) {
         flags = insertBetaAfter(flags, CONTEXT_1M_BETA, CLAUDE_CODE_BETA);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@askalf/dario",
-  "version": "6.12.2",
+  "version": "6.12.4",
   "description": "Use your Claude and ChatGPT subscriptions in Cursor, Cline, Aider, Claude Code and the Agent SDK — at subscription pricing, not per-token API bills. One local Anthropic + OpenAI-compatible endpoint: either plan answers either wire shape, with automatic failover when one hits its limit.",
   "type": "module",
   "bin": {