@askalf/dario 4.8.144 → 4.8.145

package/dist/cc-template.d.ts

@@ -490,6 +490,17 @@ export declare const CC_CACHE_CONTROL: CacheControl;
  * Exported for unit testing.
  */
 export declare function applyCcPromptCaching(ccRequest: Record<string, unknown>, cacheControl: CacheControl): void;
+/**
+ * Drop later tools whose exact name already appeared. Upstream rejects the
+ * whole request with 400 "tools: Tool names must be unique" on any repeat,
+ * so this is the last-line guard on the assembled advertise array — a
+ * polluted live template (see the mcp__ exclusion at the availableCC build)
+ * or a client double-declare degrades to first-wins instead of a hard
+ * request failure. Exported for tests.
+ */
+export declare function dedupeToolsByName<T extends {
+    name?: unknown;
+}>(tools: T[]): T[];
 export declare function buildCCRequest(clientBody: Record<string, unknown>, billingTag: string, cacheControl: CacheControl, identity: {
     deviceId: string;
     accountUuid: string;

package/dist/cc-template.js

@@ -1308,6 +1308,27 @@ export function applyCcPromptCaching(ccRequest, cacheControl) {
         }
     }
 }
+/**
+ * Drop later tools whose exact name already appeared. Upstream rejects the
+ * whole request with 400 "tools: Tool names must be unique" on any repeat,
+ * so this is the last-line guard on the assembled advertise array — a
+ * polluted live template (see the mcp__ exclusion at the availableCC build)
+ * or a client double-declare degrades to first-wins instead of a hard
+ * request failure. Exported for tests.
+ */
+export function dedupeToolsByName(tools) {
+    const seen = new Set();
+    const out = [];
+    for (const t of tools) {
+        const name = typeof t.name === 'string' ? t.name : '';
+        if (name && seen.has(name))
+            continue;
+        if (name)
+            seen.add(name);
+        out.push(t);
+    }
+    return out;
+}
 export function buildCCRequest(clientBody, billingTag, cacheControl, identity, opts = {}) {
     const model = clientBody.model || 'claude-sonnet-5';
     const isHaiku = model.toLowerCase().includes('haiku');
@@ -1648,10 +1669,20 @@ export function buildCCRequest(clientBody, billingTag, cacheControl, identity, o
             // declaration encodes the client's platform, so a win32 CC declaring
             // PowerShell/Glob/Grep gets their canonical defs even from a Linux-hosted
             // dario. The host filter only governs the no-declaration fallbacks.
-            const availableCC = CC_TOOL_DEFINITIONS_UNION.filter((t) => clientToolNames.has(t.name.toLowerCase()));
+            //
+            // mcp__* entries are EXCLUDED from the template side: a live capture on
+            // a machine with MCP servers configured absorbs the capture session's
+            // mcp__* tools into the template (the dario#678 reporter's doctor showed
+            // 138 tool defs — ~111 of them MCP pollution), and any client-declared
+            // MCP tool whose name also sat in the polluted union then went out
+            // TWICE (template def + verbatim client schema) — upstream rejects the
+            // whole request with 400 "tools: Tool names must be unique". MCP
+            // schemas are operator-supplied; the client's declaration is the only
+            // authoritative source, never the template.
+            const availableCC = CC_TOOL_DEFINITIONS_UNION.filter((t) => !isMcpToolName(t.name) && clientToolNames.has(t.name.toLowerCase()));
             const mcpTools = clientTools.filter((t) => isMcpToolName(t.name));
             ccRequest.tools = availableCC.length > 0 || mcpTools.length > 0
-                ? [...availableCC, ...mcpTools]
+                ? dedupeToolsByName([...availableCC, ...mcpTools])
                 : CC_TOOL_DEFINITIONS;
         }
     }

package/dist/live-fingerprint.js

@@ -550,9 +550,18 @@ export function extractTemplate(captured) {
     const systemPrompt = pickTextBlock(systemBlocks[2]);
     if (!agentIdentity || !systemPrompt)
         return null;
+    // mcp__* tools are EXCLUDED from the template: the capture spawns the
+    // operator's own CC, and on a machine with MCP servers configured the
+    // captured request declares their mcp__<server>__<tool> schemas — session
+    // config, not CC wire shape. Baking them poisoned CC_TOOL_DEFINITIONS_UNION
+    // and duplicated any client-declared MCP tool on the advertise path
+    // (template def + verbatim client schema), which upstream rejects with
+    // 400 "tools: Tool names must be unique" (dario#678 follow-up). Local
+    // startsWith mirror of cc-template's isMcpToolName — importing it here
+    // would cycle (cc-template imports loadTemplate from this module).
     const tools = Array.isArray(body.tools)
         ? body.tools
-            .filter((t) => typeof t.name === 'string')
+            .filter((t) => typeof t.name === 'string' && !t.name.startsWith('mcp__'))
             .map((t) => ({
             name: t.name,
             description: t.description ?? '',

package/dist/proxy.d.ts

@@ -64,8 +64,10 @@ export declare const CLAUDE_CODE_BETA = "claude-code-20250219";
  * it, ORDER included:
  *
  *   opus-4-8    = base                                    (unchanged)
- *   sonnet-5    = base − {mid-conversation-system}        (CC 2.1.201 dropped it
- *                 from sonnet; 2.1.199 sonnet == opus and still kept it — #667)
+ *   sonnet-5    = base                                    (== opus — wire-drift
+ *                 live capture, CC 2.1.204: mid-conversation-system included)
+ *   sonnet-4-x  = base − {mid-conversation-system}        (CC 2.1.201 dropped it
+ *                 from sonnet 4.6; 2.1.199 sonnet == opus and still kept it — #667)
  *   haiku-4-5   = base − {mid-conversation-system, 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

package/dist/proxy.js

@@ -323,8 +323,10 @@ function moveBetaBefore(flags, flag, anchor) {
  * it, ORDER included:
  *
  *   opus-4-8    = base                                    (unchanged)
- *   sonnet-5    = base − {mid-conversation-system}        (CC 2.1.201 dropped it
- *                 from sonnet; 2.1.199 sonnet == opus and still kept it — #667)
+ *   sonnet-5    = base                                    (== opus — wire-drift
+ *                 live capture, CC 2.1.204: mid-conversation-system included)
+ *   sonnet-4-x  = base − {mid-conversation-system}        (CC 2.1.201 dropped it
+ *                 from sonnet 4.6; 2.1.199 sonnet == opus and still kept it — #667)
  *   haiku-4-5   = base − {mid-conversation-system, 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
@@ -353,9 +355,11 @@ export function betaForModel(base, model, skipContext1m = false) {
         flags = flags.filter((f) => !drop.has(f));
         flags = moveBetaBefore(flags, CLAUDE_CODE_BETA, ADVISOR_TOOL_BETA);
     }
-    else if (m.includes('sonnet')) {
-        // CC 2.1.201 dropped mid-conversation-system from sonnet's beta set (2.1.199
-        // sonnet == opus and still carried it — live capture #667). opus + fable keep it.
+    else if (/sonnet-4/.test(m)) {
+        // CC 2.1.201 dropped mid-conversation-system from SONNET 4.6's beta set
+        // (2.1.199 sonnet == opus and still carried it — live capture #667).
+        // Scoped to the sonnet-4 line: Sonnet 5 carries it again — the wire-drift
+        // runner's live capture on CC 2.1.204 shows sonnet-5's set equal to opus's.
         flags = flags.filter((f) => f !== MID_CONVERSATION_SYSTEM_BETA);
     }
     else if (m.includes('fable')) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@askalf/dario",
-  "version": "4.8.144",
+  "version": "4.8.145",
   "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": {