@askalf/dario 3.2.6 → 3.3.0

package/dist/cc-template.d.ts

@@ -33,6 +33,8 @@ export declare function buildCCRequest(clientBody: Record<string, unknown>, bill
     deviceId: string;
     accountUuid: string;
     sessionId: string;
+}, opts?: {
+    preserveTools?: boolean;
 }): {
     body: Record<string, unknown>;
     toolMap: Map<string, ToolMapping>;

package/dist/cc-template.js

@@ -52,7 +52,7 @@ const TOOL_MAP = {
  * Replaces the entire request structure — tools, fields, ordering — with
  * what real CC sends. Only the conversation content is preserved.
  */
-export function buildCCRequest(clientBody, billingTag, cache1h, identity) {
+export function buildCCRequest(clientBody, billingTag, cache1h, identity, opts = {}) {
     const model = clientBody.model || 'claude-sonnet-4-6';
     const isHaiku = model.toLowerCase().includes('haiku');
     const messages = clientBody.messages || [];
@@ -71,9 +71,14 @@ export function buildCCRequest(clientBody, billingTag, cache1h, identity) {
         }
     }
     // ── Build tool mapping ──
+    // In preserveTools mode, skip the tool name/arg rewriting entirely.
+    // Tool routing in real agents requires bidirectional schema fidelity that
+    // lossy forward-only translation can't provide. Users with custom tool
+    // schemas should use preserveTools to keep their tools as-is and accept
+    // the fingerprint risk on their own account.
     const activeToolMap = new Map();
     const unmappedTools = [];
-    if (clientTools) {
+    if (clientTools && !opts.preserveTools) {
         for (const tool of clientTools) {
             const name = (tool.name || '').toLowerCase();
             const mapping = TOOL_MAP[name];
@@ -105,30 +110,27 @@ export function buildCCRequest(clientBody, billingTag, cache1h, identity) {
         }
     }
     // ── Remap tool_use and tool_result references in message history ──
-    // Track tool_use_id → CC tool name for consistent remapping
-    const toolUseIdMap = new Map();
-    for (const msg of messages) {
-        if (Array.isArray(msg.content)) {
-            for (const block of msg.content) {
-                if (block.type === 'tool_use' && typeof block.name === 'string') {
-                    const mapping = activeToolMap.get(block.name);
-                    if (mapping) {
-                        block.name = mapping.ccTool;
-                        if (mapping.translateArgs && block.input) {
-                            block.input = mapping.translateArgs(block.input);
+    // Skip in preserveTools mode — leave conversation history untouched.
+    if (!opts.preserveTools) {
+        for (const msg of messages) {
+            if (Array.isArray(msg.content)) {
+                for (const block of msg.content) {
+                    if (block.type === 'tool_use' && typeof block.name === 'string') {
+                        const mapping = activeToolMap.get(block.name);
+                        if (mapping) {
+                            block.name = mapping.ccTool;
+                            if (mapping.translateArgs && block.input) {
+                                block.input = mapping.translateArgs(block.input);
+                            }
                         }
                     }
-                    // Track the ID so tool_results stay consistent
-                    if (typeof block.id === 'string') {
-                        toolUseIdMap.set(block.id, block.name);
-                    }
-                }
-                // Strip any client-specific fields from tool_result blocks that CC wouldn't send
-                if (block.type === 'tool_result') {
-                    // Remove non-standard fields clients may add
-                    for (const key of Object.keys(block)) {
-                        if (!['type', 'tool_use_id', 'content', 'is_error'].includes(key)) {
-                            delete block[key];
+                    // Strip any client-specific fields from tool_result blocks that CC wouldn't send
+                    if (block.type === 'tool_result') {
+                        // Remove non-standard fields clients may add
+                        for (const key of Object.keys(block)) {
+                            if (!['type', 'tool_use_id', 'content', 'is_error'].includes(key)) {
+                                delete block[key];
+                            }
                         }
                     }
                 }
@@ -199,9 +201,11 @@ export function buildCCRequest(clientBody, billingTag, cache1h, identity) {
             { type: 'text', text: fullSystemPrompt, cache_control: cache1h },
         ],
     };
-    // Tools come before metadata in CC's key order
+    // Tools come before metadata in CC's key order.
+    // preserveTools mode: pass client tools through unchanged (better for real
+    // agents with custom schemas, but loses the CC tool fingerprint).
     if (clientTools && clientTools.length > 0) {
-        ccRequest.tools = CC_TOOL_DEFINITIONS;
+        ccRequest.tools = opts.preserveTools ? clientTools : CC_TOOL_DEFINITIONS;
     }
     // Metadata
     ccRequest.metadata = {

package/dist/cli.js

@@ -128,9 +128,10 @@ async function proxy() {
     const verbose = args.includes('--verbose') || args.includes('-v');
     const cliBackend = args.includes('--cli');
     const passthrough = args.includes('--passthrough') || args.includes('--thin');
+    const preserveTools = args.includes('--preserve-tools') || args.includes('--keep-tools');
     const modelArg = args.find(a => a.startsWith('--model='));
     const model = modelArg ? modelArg.split('=')[1] : undefined;
-    await startProxy({ port, verbose, model, cliBackend, passthrough });
+    await startProxy({ port, verbose, model, cliBackend, passthrough, preserveTools });
 }
 async function help() {
     console.log(`
@@ -150,6 +151,7 @@ async function help() {
                              Default: passthrough (client decides)
     --cli                    Use Claude CLI as backend (bypasses rate limits)
     --passthrough            Thin proxy — OAuth swap only, no injection
+    --preserve-tools         Keep client tool schemas (for agents with custom tools)
     --port=PORT              Port to listen on (default: 3456)
     --verbose, -v            Log all requests
 

package/dist/oauth.js

@@ -8,11 +8,13 @@ import { randomBytes, createHash } from 'node:crypto';
 import { readFile, writeFile, mkdir, rename } from 'node:fs/promises';
 import { dirname, join } from 'node:path';
 import { homedir } from 'node:os';
-// Claude Code's public OAuth client (PKCE, no secret needed)
-const OAUTH_CLIENT_ID = '9d1c250a-e61b-44d9-88ed-5944d1962f5e';
-const OAUTH_AUTHORIZE_URL = 'https://platform.claude.com/oauth/authorize';
+// Claude Code's public OAuth client (PKCE, no secret needed) — extracted from CC v2.1.104 binary
+const OAUTH_CLIENT_ID = '22422756-60c9-4084-8eb7-27705fd5cf9a';
+// Max Plan OAuth (for Claude Pro/Max subscriptions) — claude.com/cai/oauth/authorize
+const OAUTH_AUTHORIZE_URL = 'https://claude.com/cai/oauth/authorize';
 const OAUTH_TOKEN_URL = 'https://platform.claude.com/v1/oauth/token';
-const OAUTH_SCOPES = 'org:create_api_key user:profile user:inference user:sessions:claude_code user:mcp_servers user:file_upload';
+// Max plan scopes (excludes org:create_api_key which requires Console plan)
+const OAUTH_SCOPES = 'user:profile user:inference user:sessions:claude_code user:mcp_servers user:file_upload';
 // Refresh 30 min before expiry
 const REFRESH_BUFFER_MS = 30 * 60 * 1000;
 // After a failed refresh, don't retry for 60s to avoid spam

package/dist/proxy.d.ts

@@ -4,6 +4,7 @@ interface ProxyOptions {
     model?: string;
     cliBackend?: boolean;
     passthrough?: boolean;
+    preserveTools?: boolean;
 }
 export declare function sanitizeError(err: unknown): string;
 export declare function startProxy(opts?: ProxyOptions): Promise<void>;

package/dist/proxy.js

@@ -705,7 +705,7 @@ export async function startProxy(opts = {}) {
                         const fullVersion = `${cliVersion}.${buildTag}`;
                         const billingTag = `x-anthropic-billing-header: cc_version=${fullVersion}; cc_entrypoint=cli; cch=${cch};`;
                         const CACHE_1H = { type: 'ephemeral', ttl: '1h' };
-                        const { body: ccBody, toolMap } = buildCCRequest(r, billingTag, CACHE_1H, { deviceId: identity.deviceId, accountUuid: identity.accountUuid, sessionId: SESSION_ID });
+                        const { body: ccBody, toolMap } = buildCCRequest(r, billingTag, CACHE_1H, { deviceId: identity.deviceId, accountUuid: identity.accountUuid, sessionId: SESSION_ID }, { preserveTools: opts.preserveTools ?? false });
                         // Store tool map for response reverse-mapping
                         ccToolMap = toolMap;
                         // Replace request body entirely with CC template

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@askalf/dario",
-  "version": "3.2.6",
+  "version": "3.3.0",
   "description": "Use your Claude subscription as an API. No API key needed. Local proxy for Claude Max/Pro subscriptions.",
   "type": "module",
   "bin": {