@askalf/dario 1.0.8 → 1.1.0

package/dist/cli.js

@@ -132,7 +132,10 @@ async function proxy() {
         process.exit(1);
     }
     const verbose = args.includes('--verbose') || args.includes('-v');
-    await startProxy({ port, verbose });
+    const cliBackend = args.includes('--cli');
+    const modelArg = args.find(a => a.startsWith('--model='));
+    const model = modelArg ? modelArg.split('=')[1] : undefined;
+    await startProxy({ port, verbose, model, cliBackend });
 }
 async function help() {
     console.log(`
@@ -146,6 +149,10 @@ async function help() {
     dario logout             Remove saved credentials
 
   Proxy options:
+    --model=MODEL            Force a model for all requests
+                             Shortcuts: opus, sonnet, haiku
+                             Default: passthrough (client decides)
+    --cli                    Use Claude CLI as backend (bypasses rate limits)
     --port=PORT              Port to listen on (default: 3456)
     --verbose, -v            Log all requests
 

package/dist/proxy.d.ts

@@ -10,6 +10,8 @@
 interface ProxyOptions {
     port?: number;
     verbose?: boolean;
+    model?: string;
+    cliBackend?: boolean;
 }
 export declare function startProxy(opts?: ProxyOptions): Promise<void>;
 export {};

package/dist/proxy.js

@@ -9,7 +9,7 @@
  */
 import { createServer } from 'node:http';
 import { randomUUID } from 'node:crypto';
-import { execSync } from 'node:child_process';
+import { execSync, spawn } from 'node:child_process';
 import { arch, platform, version as nodeVersion } from 'node:process';
 import { getAccessToken, getStatus } from './oauth.js';
 const ANTHROPIC_API = 'https://api.anthropic.com';
@@ -49,11 +49,106 @@ function detectSdkVersion() {
         return '0.81.0';
     }
 }
+// Model shortcuts — users can pass short names
+const MODEL_ALIASES = {
+    'opus': 'claude-opus-4-6',
+    'sonnet': 'claude-sonnet-4-6',
+    'haiku': 'claude-haiku-4-5',
+};
 function sanitizeError(err) {
     const msg = err instanceof Error ? err.message : String(err);
     // Never leak tokens in error messages
     return msg.replace(/sk-ant-[a-zA-Z0-9_-]+/g, '[REDACTED]');
 }
+/**
+ * CLI Backend: route requests through `claude --print` instead of direct API.
+ * This bypasses rate limiting because Claude Code's binary has priority routing.
+ */
+async function handleViaCli(body, model, verbose) {
+    try {
+        const parsed = JSON.parse(body.toString());
+        // Extract the last user message as the prompt
+        const messages = parsed.messages ?? [];
+        const lastUser = [...messages].reverse().find(m => m.role === 'user');
+        if (!lastUser) {
+            return { status: 400, body: JSON.stringify({ error: 'No user message' }), contentType: 'application/json' };
+        }
+        const effectiveModel = model ?? parsed.model ?? 'claude-opus-4-6';
+        const prompt = typeof lastUser.content === 'string'
+            ? lastUser.content
+            : JSON.stringify(lastUser.content);
+        // Build claude --print command
+        const args = ['--print', '--model', effectiveModel];
+        // Build system prompt from messages context
+        let systemPrompt = parsed.system ?? '';
+        // Include conversation history as context
+        const history = messages.slice(0, -1);
+        if (history.length > 0) {
+            const historyText = history.map(m => `${m.role}: ${typeof m.content === 'string' ? m.content : JSON.stringify(m.content)}`).join('\n');
+            systemPrompt = systemPrompt ? `${systemPrompt}\n\nConversation history:\n${historyText}` : `Conversation history:\n${historyText}`;
+        }
+        if (systemPrompt) {
+            args.push('--append-system-prompt', systemPrompt);
+        }
+        if (verbose) {
+            console.log(`[dario:cli] model=${effectiveModel} prompt=${prompt.substring(0, 60)}...`);
+        }
+        // Spawn claude --print
+        return new Promise((resolve) => {
+            const child = spawn('claude', args, {
+                stdio: ['pipe', 'pipe', 'pipe'],
+                timeout: 300_000,
+            });
+            let stdout = '';
+            let stderr = '';
+            child.stdout.on('data', (d) => { stdout += d.toString(); });
+            child.stderr.on('data', (d) => { stderr += d.toString(); });
+            child.stdin.write(prompt);
+            child.stdin.end();
+            child.on('close', (code) => {
+                if (code !== 0 || !stdout.trim()) {
+                    resolve({
+                        status: 502,
+                        body: JSON.stringify({ type: 'error', error: { type: 'api_error', message: stderr.substring(0, 200) || 'CLI backend failed' } }),
+                        contentType: 'application/json',
+                    });
+                    return;
+                }
+                // Build a proper Messages API response
+                const text = stdout.trim();
+                const estimatedTokens = Math.ceil(text.length / 4);
+                const response = {
+                    id: `msg_${randomUUID().replace(/-/g, '').substring(0, 24)}`,
+                    type: 'message',
+                    role: 'assistant',
+                    model: effectiveModel,
+                    content: [{ type: 'text', text }],
+                    stop_reason: 'end_turn',
+                    stop_sequence: null,
+                    usage: {
+                        input_tokens: Math.ceil(prompt.length / 4),
+                        output_tokens: estimatedTokens,
+                    },
+                };
+                resolve({ status: 200, body: JSON.stringify(response), contentType: 'application/json' });
+            });
+            child.on('error', (err) => {
+                resolve({
+                    status: 502,
+                    body: JSON.stringify({ type: 'error', error: { type: 'api_error', message: 'Claude CLI not found. Install Claude Code first.' } }),
+                    contentType: 'application/json',
+                });
+            });
+        });
+    }
+    catch (err) {
+        return {
+            status: 400,
+            body: JSON.stringify({ type: 'error', error: { type: 'invalid_request_error', message: 'Invalid request body' } }),
+            contentType: 'application/json',
+        };
+    }
+}
 export async function startProxy(opts = {}) {
     const port = opts.port ?? DEFAULT_PORT;
     const verbose = opts.verbose ?? false;
@@ -65,6 +160,8 @@ export async function startProxy(opts = {}) {
     }
     const cliVersion = detectClaudeVersion();
     const sdkVersion = detectSdkVersion();
+    const modelOverride = opts.model ? (MODEL_ALIASES[opts.model] ?? opts.model) : null;
+    const useCli = opts.cliBackend ?? false;
     let requestCount = 0;
     let tokenCostEstimate = 0;
     const server = createServer(async (req, res) => {
@@ -134,8 +231,30 @@ export async function startProxy(opts = {}) {
                 chunks.push(buf);
             }
             const body = Buffer.concat(chunks);
+            // CLI backend mode: route through claude --print
+            if (useCli && rawPath === '/v1/messages' && req.method === 'POST' && body.length > 0) {
+                const cliResult = await handleViaCli(body, modelOverride, verbose);
+                requestCount++;
+                res.writeHead(cliResult.status, {
+                    'Content-Type': cliResult.contentType,
+                    'Access-Control-Allow-Origin': CORS_ORIGIN,
+                });
+                res.end(cliResult.body);
+                return;
+            }
+            // Override model in request body if --model flag was set
+            let finalBody = body.length > 0 ? body : undefined;
+            if (modelOverride && body.length > 0) {
+                try {
+                    const parsed = JSON.parse(body.toString());
+                    parsed.model = modelOverride;
+                    finalBody = Buffer.from(JSON.stringify(parsed));
+                }
+                catch { /* not JSON, send as-is */ }
+            }
             if (verbose) {
-                console.log(`[dario] #${requestCount} ${req.method} ${req.url}`);
+                const modelInfo = modelOverride ? ` (model: ${modelOverride})` : '';
+                console.log(`[dario] #${requestCount} ${req.method} ${req.url}${modelInfo}`);
             }
             // Build target URL from allowlist (no user input in URL construction)
             const targetUrl = targetBase;
@@ -177,10 +296,8 @@ export async function startProxy(opts = {}) {
             const upstream = await fetch(targetUrl, {
                 method: req.method ?? 'POST',
                 headers,
-                body: body.length > 0 ? body : undefined,
+                body: finalBody ? new Uint8Array(finalBody) : undefined,
                 signal: AbortSignal.timeout(UPSTREAM_TIMEOUT_MS),
-                // @ts-expect-error — duplex needed for streaming
-                duplex: 'half',
             });
             // Detect streaming from content-type (reliable) or body (fallback)
             const contentType = upstream.headers.get('content-type') ?? '';
@@ -250,7 +367,8 @@ export async function startProxy(opts = {}) {
         process.exit(1);
     });
     server.listen(port, LOCALHOST, () => {
-        const oauthLine = `OAuth: ${status.status} (expires in ${status.expiresIn})`;
+        const oauthLine = useCli ? 'Backend: Claude CLI (bypasses rate limits)' : `OAuth: ${status.status} (expires in ${status.expiresIn})`;
+        const modelLine = modelOverride ? `Model: ${modelOverride} (all requests)` : 'Model: passthrough (client decides)';
         console.log('');
         console.log(`  dario — http://localhost:${port}`);
         console.log('');
@@ -261,6 +379,7 @@ export async function startProxy(opts = {}) {
         console.log('    ANTHROPIC_API_KEY=dario');
         console.log('');
         console.log(`  ${oauthLine}`);
+        console.log(`  ${modelLine}`);
         console.log('');
     });
     // Periodic token refresh (every 15 minutes)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@askalf/dario",
-  "version": "1.0.8",
+  "version": "1.1.0",
   "description": "Use your Claude subscription as an API. Two commands, no API key. OAuth bridge for Claude Max/Pro.",
   "type": "module",
   "bin": {