@kamel-ahmed/proxy-claude 1.0.4 → 1.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kamel-ahmed/proxy-claude",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "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/onboard.js

@@ -50,41 +50,36 @@ const ACCOUNTS_FILE = path.join(CONFIG_DIR, 'accounts.json');
 const CLAUDE_CONFIG_DIR = path.join(PLATFORM.homeDir, '.claude');
 const CLAUDE_SETTINGS_FILE = path.join(CLAUDE_CONFIG_DIR, 'settings.json');
 
-// Default model configurations
-const MODEL_PRESETS = {
-    claude: {
-        name: 'Claude Models (Recommended)',
-        description: 'Best for coding tasks with extended thinking',
-        models: {
-            ANTHROPIC_MODEL: 'claude-sonnet-4-5-thinking',
-            ANTHROPIC_DEFAULT_OPUS_MODEL: 'claude-opus-4-5-thinking',
-            ANTHROPIC_DEFAULT_SONNET_MODEL: 'claude-sonnet-4-5-thinking',
-            ANTHROPIC_DEFAULT_HAIKU_MODEL: 'gemini-2.5-flash-lite',
-            CLAUDE_CODE_SUBAGENT_MODEL: 'claude-sonnet-4-5-thinking',
-        }
+// All available models in Antigravity (fetched dynamically, but this is a fallback)
+const ALL_MODELS = [
+    // Claude models
+    { id: 'claude-opus-4-5-thinking', family: 'claude', tier: 'opus', description: 'Claude Opus 4.5 with thinking' },
+    { id: 'claude-sonnet-4-5-thinking', family: 'claude', tier: 'sonnet', description: 'Claude Sonnet 4.5 with thinking' },
+    { id: 'claude-sonnet-4-5', family: 'claude', tier: 'sonnet', description: 'Claude Sonnet 4.5' },
+    // Gemini models  
+    { id: 'gemini-3-pro-high', family: 'gemini', tier: 'opus', description: 'Gemini 3 Pro High (best quality)' },
+    { id: 'gemini-3-pro-low', family: 'gemini', tier: 'sonnet', description: 'Gemini 3 Pro Low' },
+    { id: 'gemini-3-flash', family: 'gemini', tier: 'sonnet', description: 'Gemini 3 Flash (fast)' },
+    { id: 'gemini-2.5-flash-lite', family: 'gemini', tier: 'haiku', description: 'Gemini 2.5 Flash Lite (fastest)' },
+];
+
+// Model tier descriptions
+const TIER_INFO = {
+    opus: {
+        name: 'Opus (Primary)',
+        description: 'Main model for complex tasks',
+        envKey: 'ANTHROPIC_DEFAULT_OPUS_MODEL',
     },
-    gemini: {
-        name: 'Gemini Models',
-        description: 'Google\'s Gemini models with thinking support',
-        models: {
-            ANTHROPIC_MODEL: 'gemini-3-pro-high',
-            ANTHROPIC_DEFAULT_OPUS_MODEL: 'gemini-3-pro-high',
-            ANTHROPIC_DEFAULT_SONNET_MODEL: 'gemini-3-flash',
-            ANTHROPIC_DEFAULT_HAIKU_MODEL: 'gemini-2.5-flash-lite',
-            CLAUDE_CODE_SUBAGENT_MODEL: 'gemini-3-flash',
-        }
+    sonnet: {
+        name: 'Sonnet (Default)',
+        description: 'Balanced model for most tasks',
+        envKey: 'ANTHROPIC_DEFAULT_SONNET_MODEL',
+    },
+    haiku: {
+        name: 'Haiku (Fast)',
+        description: 'Quick model for simple tasks & background',
+        envKey: 'ANTHROPIC_DEFAULT_HAIKU_MODEL',
     },
-    balanced: {
-        name: 'Balanced (Claude + Gemini)',
-        description: 'Claude for main tasks, Gemini for background',
-        models: {
-            ANTHROPIC_MODEL: 'claude-sonnet-4-5-thinking',
-            ANTHROPIC_DEFAULT_OPUS_MODEL: 'claude-opus-4-5-thinking',
-            ANTHROPIC_DEFAULT_SONNET_MODEL: 'claude-sonnet-4-5-thinking',
-            ANTHROPIC_DEFAULT_HAIKU_MODEL: 'gemini-2.5-flash-lite',
-            CLAUDE_CODE_SUBAGENT_MODEL: 'gemini-3-flash',
-        }
-    }
 };
 
 /**
@@ -215,6 +210,65 @@ function getExistingAccounts() {
     return [];
 }
 
+/**
+ * Fetch available models from the API using account token
+ */
+async function fetchAvailableModels(accounts) {
+    if (!accounts || accounts.length === 0) {
+        return ALL_MODELS;
+    }
+    
+    try {
+        // Get token from first account
+        const account = accounts[0];
+        const token = account.accessToken;
+        
+        if (!token) {
+            return ALL_MODELS;
+        }
+        
+        // Import the model API
+        const { fetchAvailableModels: fetchModels } = await import('../cloudcode/model-api.js');
+        const data = await fetchModels(token);
+        
+        if (data && data.models) {
+            const models = [];
+            for (const [modelId, modelData] of Object.entries(data.models)) {
+                // Only include Claude and Gemini models
+                if (!modelId.includes('claude') && !modelId.includes('gemini')) continue;
+                
+                // Determine family
+                const family = modelId.includes('claude') ? 'claude' : 'gemini';
+                
+                // Determine tier based on model name
+                let tier = 'sonnet';
+                if (modelId.includes('opus') || modelId.includes('pro-high')) tier = 'opus';
+                else if (modelId.includes('haiku') || modelId.includes('flash-lite')) tier = 'haiku';
+                
+                // Check if model has quota (remaining > 0)
+                const hasQuota = modelData.remainingFraction === undefined || modelData.remainingFraction > 0;
+                
+                models.push({
+                    id: modelId,
+                    family,
+                    tier,
+                    description: modelData.displayName || modelId,
+                    hasQuota,
+                    remainingFraction: modelData.remainingFraction,
+                });
+            }
+            
+            if (models.length > 0) {
+                return models;
+            }
+        }
+    } catch (error) {
+        print(`Could not fetch models from API: ${error.message}`, 'warn');
+    }
+    
+    return ALL_MODELS;
+}
+
 /**
  * Add Google account via OAuth
  */
@@ -260,9 +314,69 @@ function saveClaudeSettings(settings) {
 }
 
 /**
- * Configure Claude Code settings
+ * Select a model for a specific tier
+ */
+async function selectModelForTier(rl, tier, availableModels) {
+    const tierInfo = TIER_INFO[tier];
+    console.log('');
+    console.log(`${COLORS.bold}${tierInfo.name}${COLORS.reset} - ${COLORS.dim}${tierInfo.description}${COLORS.reset}`);
+    console.log('');
+    
+    // Filter models that are suitable for this tier or higher
+    // opus can use any model, sonnet can use sonnet/haiku, haiku uses haiku
+    const tierPriority = { opus: 3, sonnet: 2, haiku: 1 };
+    const minTier = tierPriority[tier];
+    
+    const suitableModels = availableModels.filter(m => {
+        const modelTier = tierPriority[m.tier] || 2;
+        return modelTier >= minTier - 1; // Allow one tier lower
+    });
+    
+    // Sort: models with quota first, then by family (claude first), then by tier
+    suitableModels.sort((a, b) => {
+        // Quota status
+        if (a.hasQuota !== b.hasQuota) return a.hasQuota ? -1 : 1;
+        // Family (claude first for opus/sonnet, gemini first for haiku)
+        if (tier === 'haiku') {
+            if (a.family !== b.family) return a.family === 'gemini' ? -1 : 1;
+        } else {
+            if (a.family !== b.family) return a.family === 'claude' ? -1 : 1;
+        }
+        // Tier priority
+        return (tierPriority[b.tier] || 0) - (tierPriority[a.tier] || 0);
+    });
+    
+    // Display models
+    console.log(`${COLORS.dim}Available models:${COLORS.reset}`);
+    suitableModels.forEach((model, index) => {
+        const quotaStatus = model.hasQuota === false 
+            ? `${COLORS.red}(no quota)${COLORS.reset}` 
+            : model.remainingFraction !== undefined 
+                ? `${COLORS.green}(${Math.round(model.remainingFraction * 100)}% quota)${COLORS.reset}`
+                : '';
+        const familyBadge = model.family === 'claude' 
+            ? `${COLORS.magenta}[Claude]${COLORS.reset}` 
+            : `${COLORS.blue}[Gemini]${COLORS.reset}`;
+        console.log(`  ${COLORS.cyan}${index + 1}.${COLORS.reset} ${model.id} ${familyBadge} ${quotaStatus}`);
+    });
+    console.log('');
+    
+    // Default to first model with quota
+    const defaultIndex = suitableModels.findIndex(m => m.hasQuota !== false) + 1 || 1;
+    
+    const choice = await prompt(rl, `Select model for ${tier} (1-${suitableModels.length})`, String(defaultIndex));
+    const index = parseInt(choice, 10) - 1;
+    
+    if (index >= 0 && index < suitableModels.length) {
+        return suitableModels[index].id;
+    }
+    return suitableModels[0]?.id || ALL_MODELS.find(m => m.tier === tier)?.id;
+}
+
+/**
+ * Configure Claude Code settings with selected models
  */
-function configureClaudeSettings(modelPreset, port = 8080) {
+function configureClaudeSettingsWithModels(modelConfig, port = 8080) {
     const existing = loadClaudeSettings();
     
     const newSettings = {
@@ -271,7 +385,11 @@ function configureClaudeSettings(modelPreset, port = 8080) {
             ...(existing.env || {}),
             ANTHROPIC_AUTH_TOKEN: 'proxy-claude',
             ANTHROPIC_BASE_URL: `http://localhost:${port}`,
-            ...modelPreset.models,
+            ANTHROPIC_MODEL: modelConfig.sonnet, // Default model is sonnet
+            ANTHROPIC_DEFAULT_OPUS_MODEL: modelConfig.opus,
+            ANTHROPIC_DEFAULT_SONNET_MODEL: modelConfig.sonnet,
+            ANTHROPIC_DEFAULT_HAIKU_MODEL: modelConfig.haiku,
+            CLAUDE_CODE_SUBAGENT_MODEL: modelConfig.haiku, // Subagent uses haiku for efficiency
             ENABLE_EXPERIMENTAL_MCP_CLI: 'true',
         }
     };
@@ -286,33 +404,9 @@ function configureClaudeSettings(modelPreset, port = 8080) {
 }
 
 /**
- * Display model selection menu
+ * Print summary with selected models
  */
-async function selectModelPreset(rl) {
-    console.log('');
-    console.log(`${COLORS.bold}Available model configurations:${COLORS.reset}`);
-    console.log('');
-    
-    const presets = Object.entries(MODEL_PRESETS);
-    presets.forEach(([key, preset], index) => {
-        console.log(`  ${COLORS.cyan}${index + 1}.${COLORS.reset} ${COLORS.bold}${preset.name}${COLORS.reset}`);
-        console.log(`     ${COLORS.dim}${preset.description}${COLORS.reset}`);
-    });
-    console.log('');
-    
-    const choice = await prompt(rl, 'Select configuration (1-3)', '1');
-    const index = parseInt(choice, 10) - 1;
-    
-    if (index >= 0 && index < presets.length) {
-        return presets[index];
-    }
-    return presets[0]; // Default to first option
-}
-
-/**
- * Print summary
- */
-function printSummary(accounts, modelPreset, port) {
+function printSummary(accounts, modelConfig, port) {
     console.log('');
     console.log(`${COLORS.green}╔══════════════════════════════════════════════════════════╗${COLORS.reset}`);
     console.log(`${COLORS.green}║${COLORS.reset}     ${COLORS.bold}${COLORS.green}Setup Complete!${COLORS.reset}                                   ${COLORS.green}║${COLORS.reset}`);
@@ -321,7 +415,9 @@ function printSummary(accounts, modelPreset, port) {
     
     console.log(`${COLORS.bold}Configuration Summary:${COLORS.reset}`);
     console.log(`  ${COLORS.dim}•${COLORS.reset} Accounts: ${accounts.length} configured`);
-    console.log(`  ${COLORS.dim}•${COLORS.reset} Model preset: ${modelPreset[1].name}`);
+    console.log(`  ${COLORS.dim}•${COLORS.reset} Opus model: ${COLORS.cyan}${modelConfig.opus}${COLORS.reset}`);
+    console.log(`  ${COLORS.dim}•${COLORS.reset} Sonnet model: ${COLORS.cyan}${modelConfig.sonnet}${COLORS.reset}`);
+    console.log(`  ${COLORS.dim}•${COLORS.reset} Haiku model: ${COLORS.cyan}${modelConfig.haiku}${COLORS.reset}`);
     console.log(`  ${COLORS.dim}•${COLORS.reset} Proxy port: ${port}`);
     console.log(`  ${COLORS.dim}•${COLORS.reset} Settings saved to: ${CLAUDE_SETTINGS_FILE}`);
     console.log('');
@@ -422,11 +518,26 @@ export async function runOnboarding(options = {}) {
         // Step 3: Model Configuration
         printStep(++currentStep, totalSteps, 'Model Configuration');
         
-        print('Select which AI models to use with Claude Code.', 'info');
-        print(`${COLORS.dim}(Haiku model uses Gemini to preserve Claude quota)${COLORS.reset}`, 'info');
+        print('Fetching available models from your account...', 'step');
+        const availableModels = await fetchAvailableModels(accounts);
+        print(`Found ${availableModels.length} models available`, 'success');
+        
+        console.log('');
+        print('Now select a model for each tier. Models with quota are shown first.', 'info');
+        print(`${COLORS.dim}Tip: Use Gemini for Haiku to save your Claude quota!${COLORS.reset}`, 'info');
+        
+        // Select model for each tier
+        const modelConfig = {
+            opus: await selectModelForTier(rl, 'opus', availableModels),
+            sonnet: await selectModelForTier(rl, 'sonnet', availableModels),
+            haiku: await selectModelForTier(rl, 'haiku', availableModels),
+        };
         
-        const modelPreset = await selectModelPreset(rl);
-        print(`Selected: ${modelPreset[1].name}`, 'success');
+        console.log('');
+        print('Model configuration:', 'success');
+        console.log(`  ${COLORS.dim}Opus:${COLORS.reset}   ${COLORS.cyan}${modelConfig.opus}${COLORS.reset}`);
+        console.log(`  ${COLORS.dim}Sonnet:${COLORS.reset} ${COLORS.cyan}${modelConfig.sonnet}${COLORS.reset}`);
+        console.log(`  ${COLORS.dim}Haiku:${COLORS.reset}  ${COLORS.cyan}${modelConfig.haiku}${COLORS.reset}`);
         
         // Step 4: Apply Configuration
         printStep(++currentStep, totalSteps, 'Applying Configuration');
@@ -435,11 +546,11 @@ export async function runOnboarding(options = {}) {
         
         // Configure Claude Code settings
         print('Configuring Claude Code settings...', 'step');
-        configureClaudeSettings(modelPreset[1], port);
+        configureClaudeSettingsWithModels(modelConfig, port);
         print(`Settings saved to ${CLAUDE_SETTINGS_FILE}`, 'success');
         
         // Print summary
-        printSummary(accounts, modelPreset, port);
+        printSummary(accounts, modelConfig, port);
         
         rl.close();
         return true;