@kamel-ahmed/proxy-claude 1.0.1 → 1.0.3

package/bin/cli.js

@@ -22,10 +22,13 @@ proxy-claude v${packageJson.version}
 Proxy server for using Antigravity's Claude models with Claude Code CLI.
 
 USAGE:
-  proxy-claude <command> [options]
+  proxy-claude [command] [options]
 
 COMMANDS:
-  start                 Start the proxy server (default port: 8080)
+  (default)             Start proxy + launch Claude Code (interactive)
+  run                   Same as default - start proxy + Claude Code
+  start                 Start the proxy server only (foreground)
+  web                   Same as start - server with web dashboard
   accounts              Manage Google accounts (interactive)
   accounts add          Add a new Google account via OAuth
   accounts list         List all configured accounts
@@ -33,7 +36,7 @@ COMMANDS:
   accounts verify       Verify account tokens are valid
   accounts clear        Remove all accounts
   refresh               Check and refresh account tokens
-  setup                 Install Claude Code CLI and create global 'proxy-claude' command
+  setup                 Install Claude Code CLI (if needed)
 
 OPTIONS:
   --help, -h            Show this help message
@@ -43,10 +46,11 @@ ENVIRONMENT:
   PORT                  Server port (default: 8080)
 
 EXAMPLES:
-  proxy-claude start
-  PORT=3000 proxy-claude start
-  proxy-claude accounts add
-  proxy-claude accounts list
+  proxy-claude                    # Start proxy + Claude Code
+  proxy-claude run                # Same as above
+  proxy-claude start              # Start proxy server only
+  PORT=3000 proxy-claude          # Use custom port
+  proxy-claude accounts add       # Add Google account
 
 CONFIGURATION:
   Claude Code CLI (~/.claude/settings.json):
@@ -81,11 +85,94 @@ async function main() {
       break;
 
     case 'start':
-    case undefined:
-      // Default to starting the server
+      // Start the server only
+      await import('../src/index.js');
+      break;
+
+    case 'web':
+      // Alias for start (server with web dashboard)
       await import('../src/index.js');
       break;
 
+    case undefined:
+    case 'run': {
+      // Default: Start proxy in background + launch Claude Code
+      const { spawn, execSync } = await import('child_process');
+      const port = process.env.PORT || 8080;
+      
+      console.log(`\x1b[34mStarting Antigravity Claude Proxy on port ${port}...\x1b[0m`);
+      
+      // Start proxy in background
+      const proxyProcess = spawn('node', [join(__dirname, '..', 'src', 'index.js')], {
+        detached: true,
+        stdio: 'ignore',
+        env: { ...process.env, PORT: port }
+      });
+      proxyProcess.unref();
+      
+      // Wait for proxy to be ready
+      console.log('Waiting for proxy to be ready...');
+      let ready = false;
+      for (let i = 0; i < 60; i++) {
+        try {
+          execSync(`curl -s http://localhost:${port}/health`, { stdio: 'ignore' });
+          ready = true;
+          break;
+        } catch {
+          await new Promise(r => setTimeout(r, 500));
+        }
+      }
+      
+      if (!ready) {
+        console.error('\x1b[31mError: Proxy failed to start within 30 seconds.\x1b[0m');
+        process.exit(1);
+      }
+      
+      console.log(`\x1b[32m✓ Proxy is ready on port ${port}!\x1b[0m\n`);
+      
+      // Check if claude is installed
+      try {
+        execSync('which claude', { stdio: 'ignore' });
+      } catch {
+        console.error('\x1b[31mError: Claude Code CLI not found.\x1b[0m');
+        console.error('Install it with: npm install -g @anthropic-ai/claude-code');
+        process.exit(1);
+      }
+      
+      // Launch Claude with proxy config
+      const claudeArgs = args.slice(command === 'run' ? 1 : 0);
+      const claudeProcess = spawn('claude', claudeArgs, {
+        stdio: 'inherit',
+        env: {
+          ...process.env,
+          ANTHROPIC_BASE_URL: `http://localhost:${port}`,
+          ANTHROPIC_API_KEY: 'dummy'
+        }
+      });
+      
+      // Cleanup on exit
+      const cleanup = () => {
+        console.log('\n\x1b[33mStopping Antigravity Claude Proxy...\x1b[0m');
+        try {
+          execSync(`lsof -ti tcp:${port} | xargs kill 2>/dev/null`, { stdio: 'ignore' });
+        } catch {}
+        console.log('\x1b[32m✓ Proxy stopped\x1b[0m');
+      };
+      
+      claudeProcess.on('close', (code) => {
+        cleanup();
+        process.exit(code || 0);
+      });
+      
+      process.on('SIGINT', () => {
+        claudeProcess.kill('SIGINT');
+      });
+      process.on('SIGTERM', () => {
+        claudeProcess.kill('SIGTERM');
+      });
+      break;
+    }
+
     case 'accounts': {
       // Pass remaining args to accounts CLI
       const subCommand = args[1] || 'add';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kamel-ahmed/proxy-claude",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "Proxy server to use Antigravity's Claude models with Claude Code CLI - run 'proxy-claude' to start",
   "main": "src/index.js",
   "type": "module",

package/src/cli/setup.js

@@ -65,7 +65,7 @@ async function createProxyLauncher() {
 # proxy-claude - Full CLI for Antigravity Claude Proxy
 # This script provides complete control over the proxy and Claude Code.
 
-VERSION="1.0.1"
+VERSION="1.0.2"
 PORT=\${PORT:-${DEFAULT_PORT || 8080}}
 PROXY_PID=""
 

package/src/server.js

@@ -638,7 +638,7 @@ app.post('/refresh-token', async (req, res) => {
 app.get('/v1/models', async (req, res) => {
     try {
         await ensureInitialized();
-        const account = accountManager.pickNext();
+        const { account } = accountManager.selectAccount();
         if (!account) {
             return res.status(503).json({
                 type: 'error',