@askalf/dario 6.12.3 → 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/package.json

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