@askalf/dario 1.0.7 → 1.0.9

package/dist/cli.js

@@ -16,7 +16,7 @@ import { homedir } from 'node:os';
 import { startOAuthFlow, exchangeCode, getStatus, refreshTokens } from './oauth.js';
 import { startProxy } from './proxy.js';
 const args = process.argv.slice(2);
-const command = args[0] ?? 'proxy';
+const command = args[0] ?? (process.stdin.isTTY ? 'proxy' : 'proxy');
 function ask(question) {
     const rl = createInterface({ input: process.stdin, output: process.stdout });
     return new Promise(resolve => {
@@ -83,10 +83,18 @@ async function status() {
     console.log('  ─────────────');
     console.log('');
     if (!s.authenticated) {
-        console.log(`  Status: ${s.status === 'expired' ? 'Expired (will auto-refresh)' : 'Not authenticated'}`);
-        if (s.status === 'none') {
+        if (s.status === 'expired' && s.canRefresh) {
+            console.log('  Status: Expired (will auto-refresh when proxy starts)');
+            console.log('  Run `dario refresh` to refresh now, or `dario proxy` to start.');
+        }
+        else if (s.status === 'none') {
+            console.log('  Status: Not authenticated');
             console.log('  Run `dario login` to authenticate.');
         }
+        else {
+            console.log(`  Status: ${s.status}`);
+            console.log('  Run `dario login` to re-authenticate.');
+        }
     }
     else {
         console.log(`  Status: ${s.status}`);
@@ -124,7 +132,9 @@ async function proxy() {
         process.exit(1);
     }
     const verbose = args.includes('--verbose') || args.includes('-v');
-    await startProxy({ port, verbose });
+    const modelArg = args.find(a => a.startsWith('--model='));
+    const model = modelArg ? modelArg.split('=')[1] : undefined;
+    await startProxy({ port, verbose, model });
 }
 async function help() {
     console.log(`
@@ -138,6 +148,9 @@ 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)
     --port=PORT              Port to listen on (default: 3456)
     --verbose, -v            Log all requests
 

package/dist/oauth.d.ts

@@ -45,4 +45,5 @@ export declare function getStatus(): Promise<{
     status: 'healthy' | 'expiring' | 'expired' | 'none';
     expiresAt?: number;
     expiresIn?: string;
+    canRefresh?: boolean;
 }>;

package/dist/oauth.js

@@ -5,7 +5,7 @@
  * Handles authorization, token exchange, storage, and auto-refresh.
  */
 import { randomBytes, createHash } from 'node:crypto';
-import { readFile, writeFile, mkdir, chmod } from 'node:fs/promises';
+import { readFile, writeFile, mkdir, chmod, rename } from 'node:fs/promises';
 import { dirname, join } from 'node:path';
 import { homedir } from 'node:os';
 // Claude CLI's public OAuth client (PKCE, no secret needed)
@@ -58,7 +58,6 @@ async function saveCredentials(creds) {
     // Write atomically: write to temp file, then rename
     const tmpPath = `${path}.tmp.${Date.now()}`;
     await writeFile(tmpPath, JSON.stringify(creds, null, 2), { mode: 0o600 });
-    const { rename } = await import('node:fs/promises');
     await rename(tmpPath, path);
     // Set permissions (best-effort — no-op on Windows where mode is ignored)
     try {
@@ -105,10 +104,10 @@ export async function exchangeCode(code, codeVerifier) {
             redirect_uri: OAUTH_REDIRECT_URI,
             code_verifier: codeVerifier,
         }),
+        signal: AbortSignal.timeout(30000),
     });
     if (!res.ok) {
-        const err = await res.text().catch(() => 'Unknown error');
-        throw new Error(`Token exchange failed (${res.status}): ${err}`);
+        throw new Error(`Token exchange failed (${res.status}). Check your authorization code and try again.`);
     }
     const data = await res.json();
     const tokens = {
@@ -203,7 +202,9 @@ export async function getStatus() {
     const { expiresAt } = creds.claudeAiOauth;
     const now = Date.now();
     if (expiresAt < now) {
-        return { authenticated: false, status: 'expired', expiresAt };
+        // Expired but has refresh token — can be refreshed
+        const canRefresh = !!creds.claudeAiOauth.refreshToken;
+        return { authenticated: false, status: 'expired', expiresAt, canRefresh };
     }
     const ms = expiresAt - now;
     const hours = Math.floor(ms / 3600000);

package/dist/proxy.d.ts

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

package/dist/proxy.js

@@ -39,6 +39,22 @@ function getOsName() {
 }
 // Persistent session ID per proxy lifetime (like Claude Code does per session)
 const SESSION_ID = randomUUID();
+// Detect @anthropic-ai/sdk version from installed package
+function detectSdkVersion() {
+    try {
+        const pkg = require('@anthropic-ai/sdk/package.json');
+        return pkg.version ?? '0.81.0';
+    }
+    catch {
+        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
@@ -54,6 +70,8 @@ export async function startProxy(opts = {}) {
         process.exit(1);
     }
     const cliVersion = detectClaudeVersion();
+    const sdkVersion = detectSdkVersion();
+    const modelOverride = opts.model ? (MODEL_ALIASES[opts.model] ?? opts.model) : null;
     let requestCount = 0;
     let tokenCostEstimate = 0;
     const server = createServer(async (req, res) => {
@@ -109,7 +127,6 @@ export async function startProxy(opts = {}) {
         // Proxy to Anthropic
         try {
             const accessToken = await getAccessToken();
-            requestCount++;
             // Read request body with size limit
             const chunks = [];
             let totalBytes = 0;
@@ -124,8 +141,19 @@ export async function startProxy(opts = {}) {
                 chunks.push(buf);
             }
             const body = Buffer.concat(chunks);
+            // 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;
@@ -158,7 +186,7 @@ export async function startProxy(opts = {}) {
                 'x-stainless-arch': arch,
                 'x-stainless-lang': 'js',
                 'x-stainless-os': getOsName(),
-                'x-stainless-package-version': '0.81.0',
+                'x-stainless-package-version': sdkVersion,
                 'x-stainless-retry-count': '0',
                 'x-stainless-runtime': 'node',
                 'x-stainless-runtime-version': nodeVersion,
@@ -167,10 +195,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') ?? '';
@@ -186,6 +212,7 @@ export async function startProxy(opts = {}) {
                 if (v)
                     responseHeaders[h] = v;
             }
+            requestCount++;
             res.writeHead(upstream.status, responseHeaders);
             if (isStream && upstream.body) {
                 // Stream SSE chunks through
@@ -229,8 +256,18 @@ export async function startProxy(opts = {}) {
             res.end(JSON.stringify({ error: 'Proxy error', message: 'Failed to reach upstream API' }));
         }
     });
+    server.on('error', (err) => {
+        if (err.code === 'EADDRINUSE') {
+            console.error(`[dario] Port ${port} is already in use. Is another dario proxy running?`);
+        }
+        else {
+            console.error(`[dario] Server error: ${err.message}`);
+        }
+        process.exit(1);
+    });
     server.listen(port, LOCALHOST, () => {
         const oauthLine = `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('');
@@ -241,6 +278,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.7",
+  "version": "1.0.9",
   "description": "Use your Claude subscription as an API. Two commands, no API key. OAuth bridge for Claude Max/Pro.",
   "type": "module",
   "bin": {