@askalf/dario 3.0.3 → 3.1.0

package/dist/cc-template.d.ts

@@ -1,409 +1,20 @@
 /**
- * Claude Code request template — the exact tool definitions, system structure,
- * and request shape that real Claude Code sends.
+ * Claude Code request template — auto-extracted from CC v2.1.104 MITM capture.
  *
- * Instead of transforming third-party requests signal-by-signal, we replace
- * the entire request with a CC template and inject only the conversation content.
- * The upstream sees a genuine CC request. Anthropic can't detect it without
- * flagging their own binary.
- *
- * Source: MITM capture + binary RE of Claude Code v2.1.100
+ * Tool definitions, system prompt, and request structure are loaded from
+ * cc-template-data.json (extracted via MITM proxy from real CC session).
+ * This ensures byte-level fidelity with real CC requests.
  */
-/** Claude Code's exact tool definitions (from binary RE + MITM capture). */
-export declare const CC_TOOL_DEFINITIONS: ({
-    name: string;
-    description: string;
-    input_schema: {
-        type: "object";
-        properties: {
-            command: {
-                type: "string";
-                description: string;
-            };
-            timeout: {
-                type: "number";
-                description: string;
-            };
-            file_path?: undefined;
-            offset?: undefined;
-            limit?: undefined;
-            content?: undefined;
-            old_string?: undefined;
-            new_string?: undefined;
-            replace_all?: undefined;
-            pattern?: undefined;
-            path?: undefined;
-            output_mode?: undefined;
-            url?: undefined;
-            query?: undefined;
-            notebook_path?: undefined;
-            cell_number?: undefined;
-            new_source?: undefined;
-            prompt?: undefined;
-            description?: undefined;
-            question?: undefined;
-        };
-        required: string[];
-    };
-} | {
-    name: string;
-    description: string;
-    input_schema: {
-        type: "object";
-        properties: {
-            file_path: {
-                type: "string";
-                description: string;
-            };
-            offset: {
-                type: "integer";
-                description: string;
-            };
-            limit: {
-                type: "integer";
-                description: string;
-            };
-            command?: undefined;
-            timeout?: undefined;
-            content?: undefined;
-            old_string?: undefined;
-            new_string?: undefined;
-            replace_all?: undefined;
-            pattern?: undefined;
-            path?: undefined;
-            output_mode?: undefined;
-            url?: undefined;
-            query?: undefined;
-            notebook_path?: undefined;
-            cell_number?: undefined;
-            new_source?: undefined;
-            prompt?: undefined;
-            description?: undefined;
-            question?: undefined;
-        };
-        required: string[];
-    };
-} | {
-    name: string;
-    description: string;
-    input_schema: {
-        type: "object";
-        properties: {
-            file_path: {
-                type: "string";
-                description: string;
-            };
-            content: {
-                type: "string";
-                description: string;
-            };
-            command?: undefined;
-            timeout?: undefined;
-            offset?: undefined;
-            limit?: undefined;
-            old_string?: undefined;
-            new_string?: undefined;
-            replace_all?: undefined;
-            pattern?: undefined;
-            path?: undefined;
-            output_mode?: undefined;
-            url?: undefined;
-            query?: undefined;
-            notebook_path?: undefined;
-            cell_number?: undefined;
-            new_source?: undefined;
-            prompt?: undefined;
-            description?: undefined;
-            question?: undefined;
-        };
-        required: string[];
-    };
-} | {
-    name: string;
-    description: string;
-    input_schema: {
-        type: "object";
-        properties: {
-            file_path: {
-                type: "string";
-                description: string;
-            };
-            old_string: {
-                type: "string";
-                description: string;
-            };
-            new_string: {
-                type: "string";
-                description: string;
-            };
-            replace_all: {
-                type: "boolean";
-                description: string;
-                default: boolean;
-            };
-            command?: undefined;
-            timeout?: undefined;
-            offset?: undefined;
-            limit?: undefined;
-            content?: undefined;
-            pattern?: undefined;
-            path?: undefined;
-            output_mode?: undefined;
-            url?: undefined;
-            query?: undefined;
-            notebook_path?: undefined;
-            cell_number?: undefined;
-            new_source?: undefined;
-            prompt?: undefined;
-            description?: undefined;
-            question?: undefined;
-        };
-        required: string[];
-    };
-} | {
-    name: string;
-    description: string;
-    input_schema: {
-        type: "object";
-        properties: {
-            pattern: {
-                type: "string";
-                description: string;
-            };
-            path: {
-                type: "string";
-                description: string;
-            };
-            command?: undefined;
-            timeout?: undefined;
-            file_path?: undefined;
-            offset?: undefined;
-            limit?: undefined;
-            content?: undefined;
-            old_string?: undefined;
-            new_string?: undefined;
-            replace_all?: undefined;
-            output_mode?: undefined;
-            url?: undefined;
-            query?: undefined;
-            notebook_path?: undefined;
-            cell_number?: undefined;
-            new_source?: undefined;
-            prompt?: undefined;
-            description?: undefined;
-            question?: undefined;
-        };
-        required: string[];
-    };
-} | {
-    name: string;
-    description: string;
-    input_schema: {
-        type: "object";
-        properties: {
-            pattern: {
-                type: "string";
-                description: string;
-            };
-            path: {
-                type: "string";
-                description: string;
-            };
-            output_mode: {
-                type: "string";
-                enum: string[];
-                description: string;
-            };
-            command?: undefined;
-            timeout?: undefined;
-            file_path?: undefined;
-            offset?: undefined;
-            limit?: undefined;
-            content?: undefined;
-            old_string?: undefined;
-            new_string?: undefined;
-            replace_all?: undefined;
-            url?: undefined;
-            query?: undefined;
-            notebook_path?: undefined;
-            cell_number?: undefined;
-            new_source?: undefined;
-            prompt?: undefined;
-            description?: undefined;
-            question?: undefined;
-        };
-        required: string[];
-    };
-} | {
-    name: string;
-    description: string;
-    input_schema: {
-        type: "object";
-        properties: {
-            url: {
-                type: "string";
-                description: string;
-            };
-            command?: undefined;
-            timeout?: undefined;
-            file_path?: undefined;
-            offset?: undefined;
-            limit?: undefined;
-            content?: undefined;
-            old_string?: undefined;
-            new_string?: undefined;
-            replace_all?: undefined;
-            pattern?: undefined;
-            path?: undefined;
-            output_mode?: undefined;
-            query?: undefined;
-            notebook_path?: undefined;
-            cell_number?: undefined;
-            new_source?: undefined;
-            prompt?: undefined;
-            description?: undefined;
-            question?: undefined;
-        };
-        required: string[];
-    };
-} | {
-    name: string;
-    description: string;
-    input_schema: {
-        type: "object";
-        properties: {
-            query: {
-                type: "string";
-                description: string;
-            };
-            command?: undefined;
-            timeout?: undefined;
-            file_path?: undefined;
-            offset?: undefined;
-            limit?: undefined;
-            content?: undefined;
-            old_string?: undefined;
-            new_string?: undefined;
-            replace_all?: undefined;
-            pattern?: undefined;
-            path?: undefined;
-            output_mode?: undefined;
-            url?: undefined;
-            notebook_path?: undefined;
-            cell_number?: undefined;
-            new_source?: undefined;
-            prompt?: undefined;
-            description?: undefined;
-            question?: undefined;
-        };
-        required: string[];
-    };
-} | {
-    name: string;
-    description: string;
-    input_schema: {
-        type: "object";
-        properties: {
-            notebook_path: {
-                type: "string";
-                description: string;
-            };
-            cell_number: {
-                type: "integer";
-                description: string;
-            };
-            new_source: {
-                type: "string";
-                description: string;
-            };
-            command?: undefined;
-            timeout?: undefined;
-            file_path?: undefined;
-            offset?: undefined;
-            limit?: undefined;
-            content?: undefined;
-            old_string?: undefined;
-            new_string?: undefined;
-            replace_all?: undefined;
-            pattern?: undefined;
-            path?: undefined;
-            output_mode?: undefined;
-            url?: undefined;
-            query?: undefined;
-            prompt?: undefined;
-            description?: undefined;
-            question?: undefined;
-        };
-        required: string[];
-    };
-} | {
-    name: string;
-    description: string;
-    input_schema: {
-        type: "object";
-        properties: {
-            prompt: {
-                type: "string";
-                description: string;
-            };
-            description: {
-                type: "string";
-                description: string;
-            };
-            command?: undefined;
-            timeout?: undefined;
-            file_path?: undefined;
-            offset?: undefined;
-            limit?: undefined;
-            content?: undefined;
-            old_string?: undefined;
-            new_string?: undefined;
-            replace_all?: undefined;
-            pattern?: undefined;
-            path?: undefined;
-            output_mode?: undefined;
-            url?: undefined;
-            query?: undefined;
-            notebook_path?: undefined;
-            cell_number?: undefined;
-            new_source?: undefined;
-            question?: undefined;
-        };
-        required: string[];
-    };
-} | {
+/** CC's exact tool definitions — loaded from MITM capture. */
+export declare const CC_TOOL_DEFINITIONS: {
     name: string;
     description: string;
-    input_schema: {
-        type: "object";
-        properties: {
-            question: {
-                type: "string";
-                description: string;
-            };
-            command?: undefined;
-            timeout?: undefined;
-            file_path?: undefined;
-            offset?: undefined;
-            limit?: undefined;
-            content?: undefined;
-            old_string?: undefined;
-            new_string?: undefined;
-            replace_all?: undefined;
-            pattern?: undefined;
-            path?: undefined;
-            output_mode?: undefined;
-            url?: undefined;
-            query?: undefined;
-            notebook_path?: undefined;
-            cell_number?: undefined;
-            new_source?: undefined;
-            prompt?: undefined;
-            description?: undefined;
-        };
-        required: string[];
-    };
-})[];
+    input_schema: Record<string, unknown>;
+}[];
+/** CC's static system prompt (~25KB). */
+export declare const CC_SYSTEM_PROMPT: string;
+/** CC's agent identity string. */
+export declare const CC_AGENT_IDENTITY: string;
 /** Client tool name → CC tool mapping with parameter translation. */
 interface ToolMapping {
     ccTool: string;
@@ -415,7 +26,7 @@ interface ToolMapping {
  * Replaces the entire request structure — tools, fields, ordering — with
  * what real CC sends. Only the conversation content is preserved.
  */
-export declare function buildCCRequest(clientBody: Record<string, unknown>, billingTag: string, agentIdentity: string, cache1h: {
+export declare function buildCCRequest(clientBody: Record<string, unknown>, billingTag: string, cache1h: {
     type: 'ephemeral';
     ttl: '1h';
 }, identity: {

package/dist/cc-template.js

@@ -1,151 +1,22 @@
 /**
- * Claude Code request template — the exact tool definitions, system structure,
- * and request shape that real Claude Code sends.
+ * Claude Code request template — auto-extracted from CC v2.1.104 MITM capture.
  *
- * Instead of transforming third-party requests signal-by-signal, we replace
- * the entire request with a CC template and inject only the conversation content.
- * The upstream sees a genuine CC request. Anthropic can't detect it without
- * flagging their own binary.
- *
- * Source: MITM capture + binary RE of Claude Code v2.1.100
+ * Tool definitions, system prompt, and request structure are loaded from
+ * cc-template-data.json (extracted via MITM proxy from real CC session).
+ * This ensures byte-level fidelity with real CC requests.
  */
-/** Claude Code's exact tool definitions (from binary RE + MITM capture). */
-export const CC_TOOL_DEFINITIONS = [
-    {
-        name: 'Bash',
-        description: 'Execute a bash command and return its output. The working directory persists between commands. Use this for system commands, file operations, git, npm, etc.',
-        input_schema: {
-            type: 'object',
-            properties: {
-                command: { type: 'string', description: 'The command to execute' },
-                timeout: { type: 'number', description: 'Optional timeout in milliseconds (max 600000)' },
-            },
-            required: ['command'],
-        },
-    },
-    {
-        name: 'Read',
-        description: 'Reads a file from the local filesystem. The file_path parameter must be an absolute path.',
-        input_schema: {
-            type: 'object',
-            properties: {
-                file_path: { type: 'string', description: 'The absolute path to the file to read' },
-                offset: { type: 'integer', description: 'The line number to start reading from' },
-                limit: { type: 'integer', description: 'The number of lines to read' },
-            },
-            required: ['file_path'],
-        },
-    },
-    {
-        name: 'Write',
-        description: 'Writes a file to the local filesystem. This tool will overwrite the existing file if there is one.',
-        input_schema: {
-            type: 'object',
-            properties: {
-                file_path: { type: 'string', description: 'The absolute path to the file to write' },
-                content: { type: 'string', description: 'The content to write to the file' },
-            },
-            required: ['file_path', 'content'],
-        },
-    },
-    {
-        name: 'Edit',
-        description: 'Performs exact string replacements in files. The edit will FAIL if old_string is not unique in the file.',
-        input_schema: {
-            type: 'object',
-            properties: {
-                file_path: { type: 'string', description: 'The absolute path to the file to modify' },
-                old_string: { type: 'string', description: 'The text to replace' },
-                new_string: { type: 'string', description: 'The text to replace it with' },
-                replace_all: { type: 'boolean', description: 'Replace all occurrences', default: false },
-            },
-            required: ['file_path', 'old_string', 'new_string'],
-        },
-    },
-    {
-        name: 'Glob',
-        description: 'Fast file pattern matching tool that works with any codebase size. Returns matching file paths.',
-        input_schema: {
-            type: 'object',
-            properties: {
-                pattern: { type: 'string', description: 'The glob pattern to match files against' },
-                path: { type: 'string', description: 'The directory to search in' },
-            },
-            required: ['pattern'],
-        },
-    },
-    {
-        name: 'Grep',
-        description: 'A powerful search tool built on ripgrep. Supports full regex syntax.',
-        input_schema: {
-            type: 'object',
-            properties: {
-                pattern: { type: 'string', description: 'The regular expression pattern to search for' },
-                path: { type: 'string', description: 'File or directory to search in' },
-                output_mode: { type: 'string', enum: ['content', 'files_with_matches', 'count'], description: 'Output mode' },
-            },
-            required: ['pattern'],
-        },
-    },
-    {
-        name: 'WebFetch',
-        description: 'Fetches a URL from the internet and returns the content.',
-        input_schema: {
-            type: 'object',
-            properties: {
-                url: { type: 'string', description: 'The URL to fetch' },
-            },
-            required: ['url'],
-        },
-    },
-    {
-        name: 'WebSearch',
-        description: 'Searches the web using a search engine and returns results.',
-        input_schema: {
-            type: 'object',
-            properties: {
-                query: { type: 'string', description: 'The search query' },
-            },
-            required: ['query'],
-        },
-    },
-    {
-        name: 'NotebookEdit',
-        description: 'Edits a Jupyter notebook cell.',
-        input_schema: {
-            type: 'object',
-            properties: {
-                notebook_path: { type: 'string', description: 'Path to the notebook file' },
-                cell_number: { type: 'integer', description: 'Cell number to edit' },
-                new_source: { type: 'string', description: 'New cell source code' },
-            },
-            required: ['notebook_path', 'cell_number', 'new_source'],
-        },
-    },
-    {
-        name: 'Agent',
-        description: 'Launch a new agent to handle complex tasks. The agent runs in an isolated context.',
-        input_schema: {
-            type: 'object',
-            properties: {
-                prompt: { type: 'string', description: 'The task for the agent to perform' },
-                description: { type: 'string', description: 'A short description of the task' },
-            },
-            required: ['description', 'prompt'],
-        },
-    },
-    {
-        name: 'AskUserQuestion',
-        description: 'Ask the user a question and wait for their response.',
-        input_schema: {
-            type: 'object',
-            properties: {
-                question: { type: 'string', description: 'The question to ask' },
-            },
-            required: ['question'],
-        },
-    },
-];
+import { readFileSync } from 'node:fs';
+import { join, dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+const __dirname = dirname(fileURLToPath(import.meta.url));
+// Load template data at module init — fail fast if missing
+const TEMPLATE = JSON.parse(readFileSync(join(__dirname, 'cc-template-data.json'), 'utf-8'));
+/** CC's exact tool definitions — loaded from MITM capture. */
+export const CC_TOOL_DEFINITIONS = TEMPLATE.tools;
+/** CC's static system prompt (~25KB). */
+export const CC_SYSTEM_PROMPT = TEMPLATE.system_prompt;
+/** CC's agent identity string. */
+export const CC_AGENT_IDENTITY = TEMPLATE.agent_identity;
 const TOOL_MAP = {
     // Direct maps
     bash: { ccTool: 'Bash', translateArgs: (a) => ({ command: a.cmd || a.command || a.c || '' }) },
@@ -181,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, agentIdentity, cache1h, identity) {
+export function buildCCRequest(clientBody, billingTag, cache1h, identity) {
     const model = clientBody.model || 'claude-sonnet-4-6';
     const isHaiku = model.toLowerCase().includes('haiku');
     const messages = clientBody.messages || [];
@@ -311,13 +182,21 @@ export function buildCCRequest(clientBody, billingTag, agentIdentity, cache1h, i
     // ── Build the CC request from template ──
     // Key order matches CC v2.1.104 MITM capture exactly:
     // model, messages, system, tools, metadata, max_tokens, thinking, context_management, output_config, stream
+    //
+    // System prompt structure (3 blocks, matching real CC):
+    //   [0] billing tag (no cache)
+    //   [1] agent identity (1h cache)
+    //   [2] CC's full 25KB system prompt + client's custom prompt appended (1h cache)
+    const fullSystemPrompt = systemText
+        ? `${CC_SYSTEM_PROMPT}\n\n${systemText}`
+        : CC_SYSTEM_PROMPT;
     const ccRequest = {
         model,
         messages,
         system: [
             { type: 'text', text: billingTag },
-            { type: 'text', text: agentIdentity, cache_control: cache1h },
-            { type: 'text', text: systemText || 'You are a helpful assistant.', cache_control: cache1h },
+            { type: 'text', text: CC_AGENT_IDENTITY, cache_control: cache1h },
+            { type: 'text', text: fullSystemPrompt, cache_control: cache1h },
         ],
     };
     // Tools come before metadata in CC's key order

package/dist/oauth.js

@@ -15,6 +15,9 @@ 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';
 // Refresh 30 min before expiry
 const REFRESH_BUFFER_MS = 30 * 60 * 1000;
+// After a failed refresh, don't retry for 60s to avoid spam
+let lastRefreshFailure = 0;
+const REFRESH_COOLDOWN_MS = 60 * 1000;
 // In-memory credential cache — avoids disk reads on every request
 let credentialsCache = null;
 let credentialsCacheTime = 0;
@@ -210,6 +213,8 @@ async function doRefreshTokens() {
             signal: AbortSignal.timeout(15000),
         });
         if (!res.ok) {
+            const errBody = await res.text().catch(() => '');
+            console.error(`[dario] Refresh attempt ${attempt + 1}/3 failed: HTTP ${res.status} — ${errBody.slice(0, 200)}`);
             if (res.status === 401 || res.status === 403) {
                 throw new Error(`Refresh token rejected (${res.status}). Run \`dario login\` to re-authenticate.`);
             }
@@ -240,10 +245,22 @@ export async function getAccessToken() {
     if (oauth.expiresAt > Date.now() + REFRESH_BUFFER_MS) {
         return oauth.accessToken;
     }
-    // Need refresh
+    // Need refresh — but don't spam if we just failed
+    if (Date.now() - lastRefreshFailure < REFRESH_COOLDOWN_MS) {
+        // Still in cooldown from a recent failure, use current token even if expiring
+        return oauth.accessToken;
+    }
     console.log('[dario] Token expiring soon, refreshing...');
-    const refreshed = await refreshTokens();
-    return refreshed.accessToken;
+    try {
+        const refreshed = await refreshTokens();
+        return refreshed.accessToken;
+    }
+    catch (err) {
+        lastRefreshFailure = Date.now();
+        console.error(`[dario] Refresh failed: ${err instanceof Error ? err.message : err}. Will retry in 60s. Run \`dario login\` if this persists.`);
+        // Return current token — it might still work for a few more minutes
+        return oauth.accessToken;
+    }
 }
 /**
  * Get token status info.