@askalf/dario 3.0.2 → 3.0.4

package/dist/cc-template.js

@@ -309,6 +309,8 @@ export function buildCCRequest(clientBody, billingTag, agentIdentity, cache1h, i
         systemText = systemText.replace(pattern, '');
     }
     // ── 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
     const ccRequest = {
         model,
         messages,
@@ -317,17 +319,12 @@ export function buildCCRequest(clientBody, billingTag, agentIdentity, cache1h, i
             { type: 'text', text: agentIdentity, cache_control: cache1h },
             { type: 'text', text: systemText || 'You are a helpful assistant.', cache_control: cache1h },
         ],
-        max_tokens: 64000,
     };
-    // Model-specific fields (matches CC v2.1.104 exactly)
-    if (!isHaiku) {
-        ccRequest.thinking = { type: 'adaptive' };
-        ccRequest.output_config = { effort: 'medium' };
-        ccRequest.context_management = { edits: [{ type: 'clear_thinking_20251015', keep: 'all' }] };
-        // CC sends temperature:1 explicitly when not in thinking-only mode
-        ccRequest.temperature = 1;
+    // Tools come before metadata in CC's key order
+    if (clientTools && clientTools.length > 0) {
+        ccRequest.tools = CC_TOOL_DEFINITIONS;
     }
-    // Always include metadata
+    // Metadata
     ccRequest.metadata = {
         user_id: JSON.stringify({
             device_id: identity.deviceId,
@@ -335,11 +332,14 @@ export function buildCCRequest(clientBody, billingTag, agentIdentity, cache1h, i
             session_id: identity.sessionId,
         }),
     };
-    ccRequest.stream = stream;
-    // Use CC's exact tool definitions — not the client's
-    if (clientTools && clientTools.length > 0) {
-        ccRequest.tools = CC_TOOL_DEFINITIONS;
+    ccRequest.max_tokens = 64000;
+    // Model-specific fields — order: thinking, context_management, output_config
+    if (!isHaiku) {
+        ccRequest.thinking = { type: 'adaptive' };
+        ccRequest.context_management = { edits: [{ type: 'clear_thinking_20251015', keep: 'all' }] };
+        ccRequest.output_config = { effort: 'medium' };
     }
+    ccRequest.stream = stream;
     return { body: ccRequest, toolMap: activeToolMap, unmappedTools };
 }
 /**

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.

package/dist/proxy.js

@@ -725,8 +725,10 @@ export async function startProxy(opts = {}) {
             }
             else {
                 // Claude-optimized: full beta set matching real Claude Code (exact order from MITM capture)
-                // Beta set from CC v2.1.104 binary RE — some are CC-internal/gated, only include publicly accepted ones
-                beta = 'claude-code-20250219,oauth-2025-04-20,interleaved-thinking-2025-05-14,fine-grained-tool-streaming-2025-05-14,context-management-2025-06-27,prompt-caching-scope-2026-01-05,advisor-tool-2026-03-01,effort-2025-11-24,fast-mode-2026-02-01,redact-thinking-2026-02-12,context-1m-2025-08-07,web-search-2025-03-05,advanced-tool-use-2025-11-20,tool-search-tool-2025-10-19';
+                // Exact beta set from CC v2.1.104 MITM capture (exact order)
+                // Only 8 betas — CC sends more conditionally (fast-mode, web-search, etc.)
+                // but the base set for a standard request is exactly this
+                beta = 'claude-code-20250219,oauth-2025-04-20,context-1m-2025-08-07,interleaved-thinking-2025-05-14,context-management-2025-06-27,prompt-caching-scope-2026-01-05,advisor-tool-2026-03-01,effort-2025-11-24';
                 if (clientBeta) {
                     const baseSet = new Set(beta.split(','));
                     const filtered = filterBillableBetas(clientBeta)

package/package.json

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