@kaitranntt/ccs 6.7.0 → 6.7.1-dev.1

package/dist/commands/cliproxy-command.js

@@ -43,25 +43,17 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleCliproxyCommand = void 0;
-const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-const cliproxy_1 = require("../cliproxy");
 const auth_handler_1 = require("../cliproxy/auth-handler");
 const account_manager_1 = require("../cliproxy/account-manager");
 const platform_detector_1 = require("../cliproxy/platform-detector");
 const profile_detector_1 = require("../auth/profile-detector");
-const config_manager_1 = require("../utils/config-manager");
-const config_generator_1 = require("../cliproxy/config-generator");
 const model_catalog_1 = require("../cliproxy/model-catalog");
+const unified_config_loader_1 = require("../config/unified-config-loader");
 const ui_1 = require("../utils/ui");
 const prompt_1 = require("../utils/prompt");
-const reserved_names_1 = require("../config/reserved-names");
-const unified_config_loader_1 = require("../config/unified-config-loader");
-const feature_flags_1 = require("../config/feature-flags");
-const session_tracker_1 = require("../cliproxy/session-tracker");
-/**
- * Parse command line arguments for profile commands
- */
+// Import services
+const services_1 = require("../cliproxy/services");
 function parseProfileArgs(args) {
     const result = {};
     for (let i = 0; i < args.length; i++) {
@@ -87,211 +79,13 @@ function parseProfileArgs(args) {
     }
     return result;
 }
-/**
- * Validate CLIProxy profile name
- */
-function validateProfileName(name) {
-    if (!name) {
-        return 'Profile name is required';
-    }
-    if (!/^[a-zA-Z][a-zA-Z0-9._-]*$/.test(name)) {
-        return 'Name must start with letter, contain only letters, numbers, dot, dash, underscore';
-    }
-    if (name.length > 32) {
-        return 'Name must be 32 characters or less';
-    }
-    // Use centralized reserved names list (includes built-in cliproxy profiles)
-    if ((0, reserved_names_1.isReservedName)(name)) {
-        return `'${name}' is a reserved name`;
-    }
-    return null;
-}
-/**
- * Check if unified config mode is active
- */
-function isUnifiedMode() {
-    return (0, unified_config_loader_1.hasUnifiedConfig)() || (0, feature_flags_1.isUnifiedConfigEnabled)();
-}
-/**
- * Check if CLIProxy variant profile exists
- */
-function cliproxyVariantExists(name) {
-    try {
-        if (isUnifiedMode()) {
-            const config = (0, unified_config_loader_1.loadOrCreateUnifiedConfig)();
-            return !!(config.cliproxy?.variants && name in config.cliproxy.variants);
-        }
-        const config = (0, config_manager_1.loadConfig)();
-        return !!(config.cliproxy && name in config.cliproxy);
-    }
-    catch {
-        return false;
-    }
-}
-/**
- * Create settings.json file for CLIProxy variant
- * Includes all 6 fields for proper Claude CLI integration
- */
-function createCliproxySettingsFile(name, provider, model, _account) {
-    const ccsDir = (0, config_manager_1.getCcsDir)();
-    const settingsPath = path.join(ccsDir, `${provider}-${name}.settings.json`);
-    // Get base env vars from provider config
-    const baseEnv = (0, config_generator_1.getClaudeEnvVars)(provider, config_generator_1.CLIPROXY_DEFAULT_PORT);
-    const settings = {
-        env: {
-            ANTHROPIC_BASE_URL: baseEnv.ANTHROPIC_BASE_URL || '',
-            ANTHROPIC_AUTH_TOKEN: baseEnv.ANTHROPIC_AUTH_TOKEN || '',
-            ANTHROPIC_MODEL: model,
-            ANTHROPIC_DEFAULT_OPUS_MODEL: model,
-            ANTHROPIC_DEFAULT_SONNET_MODEL: model,
-            ANTHROPIC_DEFAULT_HAIKU_MODEL: baseEnv.ANTHROPIC_DEFAULT_HAIKU_MODEL || model,
-        },
-    };
-    // Ensure directory exists
-    if (!fs.existsSync(ccsDir)) {
-        fs.mkdirSync(ccsDir, { recursive: true });
-    }
-    fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + '\n', 'utf8');
-    return settingsPath;
-}
-/**
- * Update config.json with new CLIProxy variant
- */
-function addCliproxyVariant(name, provider, settingsPath, account) {
-    const configPath = (0, config_manager_1.getConfigPath)();
-    // Read existing config or create new
-    let config;
-    try {
-        config = JSON.parse(fs.readFileSync(configPath, 'utf8'));
-    }
-    catch {
-        config = { profiles: {} };
-    }
-    // Ensure cliproxy section exists
-    if (!config.cliproxy) {
-        config.cliproxy = {};
-    }
-    // Use relative path with ~ for portability
-    const relativePath = `~/.ccs/${path.basename(settingsPath)}`;
-    // Build variant config with optional account
-    const variantConfig = {
-        provider,
-        settings: relativePath,
-    };
-    if (account) {
-        variantConfig.account = account;
-    }
-    config.cliproxy[name] = variantConfig;
-    // Write config atomically
-    const tempPath = configPath + '.tmp';
-    fs.writeFileSync(tempPath, JSON.stringify(config, null, 2) + '\n', 'utf8');
-    fs.renameSync(tempPath, configPath);
-}
-/**
- * Remove CLIProxy variant from config.json
- */
-function removeCliproxyVariant(name) {
-    const configPath = (0, config_manager_1.getConfigPath)();
-    let config;
-    try {
-        config = JSON.parse(fs.readFileSync(configPath, 'utf8'));
-    }
-    catch {
-        return null;
-    }
-    if (!config.cliproxy || !(name in config.cliproxy)) {
-        return null;
-    }
-    const variant = config.cliproxy[name];
-    delete config.cliproxy[name];
-    // Clean up empty cliproxy section
-    if (Object.keys(config.cliproxy).length === 0) {
-        delete config.cliproxy;
-    }
-    // Write config atomically
-    const tempPath = configPath + '.tmp';
-    fs.writeFileSync(tempPath, JSON.stringify(config, null, 2) + '\n', 'utf8');
-    fs.renameSync(tempPath, configPath);
-    return variant;
-}
-/**
- * Add CLIProxy variant to unified config (config.yaml)
- * Creates *.settings.json file and stores reference in config.yaml
- */
-function addCliproxyVariantUnified(name, provider, model, account) {
-    const ccsDir = path.join(require('os').homedir(), '.ccs');
-    const settingsFile = `${provider}-${name}.settings.json`;
-    const settingsPath = path.join(ccsDir, settingsFile);
-    // Get base env vars from provider config
-    const baseEnv = (0, config_generator_1.getClaudeEnvVars)(provider, config_generator_1.CLIPROXY_DEFAULT_PORT);
-    // Create settings file with model override
-    const settings = {
-        env: {
-            ANTHROPIC_BASE_URL: baseEnv.ANTHROPIC_BASE_URL || '',
-            ANTHROPIC_AUTH_TOKEN: baseEnv.ANTHROPIC_AUTH_TOKEN || '',
-            ANTHROPIC_MODEL: model,
-            ANTHROPIC_DEFAULT_OPUS_MODEL: model,
-            ANTHROPIC_DEFAULT_SONNET_MODEL: model,
-            ANTHROPIC_DEFAULT_HAIKU_MODEL: baseEnv.ANTHROPIC_DEFAULT_HAIKU_MODEL || model,
-        },
-    };
-    // Ensure directory exists
-    if (!fs.existsSync(ccsDir)) {
-        fs.mkdirSync(ccsDir, { recursive: true });
-    }
-    // Write settings file
-    fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + '\n', 'utf8');
-    // Update config.yaml with reference
-    const config = (0, unified_config_loader_1.loadOrCreateUnifiedConfig)();
-    // Ensure cliproxy.variants section exists
-    if (!config.cliproxy) {
-        config.cliproxy = {
-            oauth_accounts: {},
-            providers: ['gemini', 'codex', 'agy', 'qwen', 'iflow'],
-            variants: {},
-        };
-    }
-    if (!config.cliproxy.variants) {
-        config.cliproxy.variants = {};
-    }
-    // Add variant with settings file reference
-    config.cliproxy.variants[name] = {
-        provider: provider,
-        account,
-        settings: `~/.ccs/${settingsFile}`,
-    };
-    (0, unified_config_loader_1.saveUnifiedConfig)(config);
-}
-/**
- * Remove CLIProxy variant from unified config
- */
-function removeCliproxyVariantUnified(name) {
-    const config = (0, unified_config_loader_1.loadOrCreateUnifiedConfig)();
-    if (!config.cliproxy?.variants || !(name in config.cliproxy.variants)) {
-        return null;
-    }
-    const variant = config.cliproxy.variants[name];
-    // Delete the settings file if it exists
-    if (variant.settings) {
-        const settingsPath = variant.settings.replace(/^~/, require('os').homedir());
-        if (fs.existsSync(settingsPath)) {
-            fs.unlinkSync(settingsPath);
-        }
-    }
-    delete config.cliproxy.variants[name];
-    (0, unified_config_loader_1.saveUnifiedConfig)(config);
-    return { provider: variant.provider, settings: variant.settings };
-}
-/**
- * Format model entry for display
- */
 function formatModelOption(model) {
     const tierBadge = model.tier === 'paid' ? (0, ui_1.color)(' [Paid Tier]', 'warning') : '';
     return `${model.name}${tierBadge}`;
 }
-/**
- * Handle 'ccs cliproxy create' command
- */
+// ============================================================================
+// COMMAND HANDLERS
+// ============================================================================
 async function handleCreate(args) {
     await (0, ui_1.initUI)();
     const parsedArgs = parseProfileArgs(args);
@@ -301,18 +95,17 @@ async function handleCreate(args) {
     let name = parsedArgs.name;
     if (!name) {
         name = await prompt_1.InteractivePrompt.input('Variant name (e.g., g3, flash, pro)', {
-            validate: validateProfileName,
+            validate: services_1.validateProfileName,
         });
     }
     else {
-        const error = validateProfileName(name);
+        const error = (0, services_1.validateProfileName)(name);
         if (error) {
             console.log((0, ui_1.fail)(error));
             process.exit(1);
         }
     }
-    // Check if exists
-    if (cliproxyVariantExists(name) && !parsedArgs.force) {
+    if ((0, services_1.variantExists)(name) && !parsedArgs.force) {
         console.log((0, ui_1.fail)(`Variant '${name}' already exists`));
         console.log(`    Use ${(0, ui_1.color)('--force', 'command')} to overwrite`);
         process.exit(1);
@@ -336,7 +129,6 @@ async function handleCreate(args) {
     const providerAccounts = (0, account_manager_1.getProviderAccounts)(provider);
     if (!account) {
         if (providerAccounts.length === 0) {
-            // No accounts - prompt to authenticate first
             console.log('');
             console.log((0, ui_1.warn)(`No accounts authenticated for ${provider}`));
             console.log('');
@@ -349,7 +141,6 @@ async function handleCreate(args) {
                 console.log(`  ${(0, ui_1.color)(`ccs ${provider} --auth`, 'command')}`);
                 process.exit(0);
             }
-            // Trigger OAuth inline
             console.log('');
             const newAccount = await (0, auth_handler_1.triggerOAuth)(provider, {
                 add: true,
@@ -364,26 +155,20 @@ async function handleCreate(args) {
             console.log((0, ui_1.ok)(`Authenticated as ${newAccount.email || newAccount.id}`));
         }
         else if (providerAccounts.length === 1) {
-            // Single account - auto-select
             account = providerAccounts[0].id;
         }
         else {
-            // Multiple accounts - show selector with "Add new" option
             const ADD_NEW_ID = '__add_new__';
             const accountOptions = [
                 ...providerAccounts.map((acc) => ({
                     id: acc.id,
                     label: `${acc.email || acc.id}${acc.isDefault ? ' (default)' : ''}`,
                 })),
-                {
-                    id: ADD_NEW_ID,
-                    label: (0, ui_1.color)('[+ Add new account...]', 'info'),
-                },
+                { id: ADD_NEW_ID, label: (0, ui_1.color)('[+ Add new account...]', 'info') },
             ];
             const defaultIdx = providerAccounts.findIndex((a) => a.isDefault);
             const selectedAccount = await prompt_1.InteractivePrompt.selectFromList('Select account:', accountOptions, { defaultIndex: defaultIdx >= 0 ? defaultIdx : 0 });
             if (selectedAccount === ADD_NEW_ID) {
-                // Add new account inline
                 console.log('');
                 const newAccount = await (0, auth_handler_1.triggerOAuth)(provider, {
                     add: true,
@@ -403,195 +188,111 @@ async function handleCreate(args) {
         }
     }
     else {
-        // Validate provided account exists
         const exists = providerAccounts.find((a) => a.id === account);
         if (!exists) {
             console.log((0, ui_1.fail)(`Account '${account}' not found for ${provider}`));
             console.log('');
             console.log('Available accounts:');
-            providerAccounts.forEach((a) => {
-                console.log(`  - ${a.email || a.id}${a.isDefault ? ' (default)' : ''}`);
-            });
+            providerAccounts.forEach((a) => console.log(`  - ${a.email || a.id}${a.isDefault ? ' (default)' : ''}`));
             process.exit(1);
         }
     }
     // Step 3: Model selection
     let model = parsedArgs.model;
     if (!model) {
-        // Check if provider has model catalog for interactive selection
         if ((0, model_catalog_1.supportsModelConfig)(provider)) {
             const catalog = (0, model_catalog_1.getProviderCatalog)(provider);
             if (catalog) {
-                const modelOptions = catalog.models.map((m) => ({
-                    id: m.id,
-                    label: formatModelOption(m),
-                }));
+                const modelOptions = catalog.models.map((m) => ({ id: m.id, label: formatModelOption(m) }));
                 const defaultIdx = catalog.models.findIndex((m) => m.id === catalog.defaultModel);
                 model = await prompt_1.InteractivePrompt.selectFromList('Select model:', modelOptions, {
                     defaultIndex: defaultIdx >= 0 ? defaultIdx : 0,
                 });
             }
         }
-        // Fallback to manual input if no catalog
         if (!model) {
             model = await prompt_1.InteractivePrompt.input('Model name', {
                 validate: (val) => (val ? null : 'Model is required'),
             });
         }
     }
-    // Create files
+    // Create variant
     console.log('');
     console.log((0, ui_1.info)('Creating CLIProxy variant...'));
-    try {
-        if (isUnifiedMode()) {
-            // Use unified config format (no settings file needed - env vars derived at runtime)
-            addCliproxyVariantUnified(name, provider, model, account);
-            console.log('');
-            console.log((0, ui_1.infoBox)(`Variant:  ${name}\n` +
-                `Provider: ${provider}\n` +
-                `Model:    ${model}\n` +
-                (account ? `Account:  ${account}\n` : '') +
-                `Config:   ~/.ccs/config.yaml`, 'CLIProxy Variant Created (Unified Config)'));
-        }
-        else {
-            // Legacy: create settings.json file
-            const settingsPath = createCliproxySettingsFile(name, provider, model, account);
-            addCliproxyVariant(name, provider, settingsPath, account);
-            console.log('');
-            console.log((0, ui_1.infoBox)(`Variant:  ${name}\n` +
-                `Provider: ${provider}\n` +
-                `Model:    ${model}\n` +
-                (account ? `Account:  ${account}\n` : '') +
-                `Settings: ~/.ccs/${path.basename(settingsPath)}`, 'CLIProxy Variant Created'));
-        }
-        console.log('');
-        console.log((0, ui_1.header)('Usage'));
-        console.log(`  ${(0, ui_1.color)(`ccs ${name} "your prompt"`, 'command')}`);
-        console.log('');
-        console.log((0, ui_1.dim)('To change model later:'));
-        console.log(`  ${(0, ui_1.color)(`ccs ${name} --config`, 'command')}`);
-        console.log('');
-    }
-    catch (error) {
-        console.log((0, ui_1.fail)(`Failed to create variant: ${error.message}`));
+    const result = (0, services_1.createVariant)(name, provider, model, account);
+    if (!result.success) {
+        console.log((0, ui_1.fail)(`Failed to create variant: ${result.error}`));
         process.exit(1);
     }
+    console.log('');
+    const configType = (0, unified_config_loader_1.isUnifiedMode)()
+        ? 'CLIProxy Variant Created (Unified Config)'
+        : 'CLIProxy Variant Created';
+    const settingsDisplay = (0, unified_config_loader_1.isUnifiedMode)()
+        ? '~/.ccs/config.yaml'
+        : `~/.ccs/${path.basename(result.settingsPath || '')}`;
+    console.log((0, ui_1.infoBox)(`Variant:  ${name}\nProvider: ${provider}\nModel:    ${model}\n${account ? `Account:  ${account}\n` : ''}${(0, unified_config_loader_1.isUnifiedMode)() ? 'Config' : 'Settings'}:   ${settingsDisplay}`, configType));
+    console.log('');
+    console.log((0, ui_1.header)('Usage'));
+    console.log(`  ${(0, ui_1.color)(`ccs ${name} "your prompt"`, 'command')}`);
+    console.log('');
+    console.log((0, ui_1.dim)('To change model later:'));
+    console.log(`  ${(0, ui_1.color)(`ccs ${name} --config`, 'command')}`);
+    console.log('');
 }
-/**
- * Handle 'ccs cliproxy list' command
- */
 async function handleList() {
     await (0, ui_1.initUI)();
     console.log((0, ui_1.header)('CLIProxy Profiles'));
     console.log('');
-    try {
-        // Show auth status for built-in profiles
-        console.log((0, ui_1.subheader)('Built-in Profiles'));
-        const authStatuses = (0, auth_handler_1.getAllAuthStatus)();
-        for (const status of authStatuses) {
-            const oauthConfig = (0, auth_handler_1.getOAuthConfig)(status.provider);
-            const icon = status.authenticated ? (0, ui_1.ok)('') : (0, ui_1.warn)('');
-            const authLabel = status.authenticated
-                ? (0, ui_1.color)('authenticated', 'success')
-                : (0, ui_1.dim)('not authenticated');
-            const lastAuthStr = status.lastAuth ? (0, ui_1.dim)(` (${status.lastAuth.toLocaleDateString()})`) : '';
-            console.log(`  ${icon} ${(0, ui_1.color)(status.provider, 'command').padEnd(18)} ${oauthConfig.displayName.padEnd(16)} ${authLabel}${lastAuthStr}`);
-        }
+    // Built-in profiles
+    console.log((0, ui_1.subheader)('Built-in Profiles'));
+    const authStatuses = (0, auth_handler_1.getAllAuthStatus)();
+    for (const status of authStatuses) {
+        const oauthConfig = (0, auth_handler_1.getOAuthConfig)(status.provider);
+        const icon = status.authenticated ? (0, ui_1.ok)('') : (0, ui_1.warn)('');
+        const authLabel = status.authenticated
+            ? (0, ui_1.color)('authenticated', 'success')
+            : (0, ui_1.dim)('not authenticated');
+        const lastAuthStr = status.lastAuth ? (0, ui_1.dim)(` (${status.lastAuth.toLocaleDateString()})`) : '';
+        console.log(`  ${icon} ${(0, ui_1.color)(status.provider, 'command').padEnd(18)} ${oauthConfig.displayName.padEnd(16)} ${authLabel}${lastAuthStr}`);
+    }
+    console.log('');
+    console.log((0, ui_1.dim)('  To authenticate: ccs <provider> --auth'));
+    console.log((0, ui_1.dim)('  To logout:       ccs <provider> --logout'));
+    console.log('');
+    // Custom variants
+    const variants = (0, services_1.listVariants)();
+    const variantNames = Object.keys(variants);
+    if (variantNames.length > 0) {
+        console.log((0, ui_1.subheader)('Custom Variants'));
+        const rows = variantNames.map((name) => {
+            const variant = variants[name];
+            return [name, variant.provider, variant.settings || '-'];
+        });
+        console.log((0, ui_1.table)(rows, { head: ['Variant', 'Provider', 'Settings'], colWidths: [15, 12, 35] }));
         console.log('');
-        console.log((0, ui_1.dim)('  To authenticate: ccs <provider> --auth'));
-        console.log((0, ui_1.dim)('  To logout:       ccs <provider> --logout'));
-        console.log('');
-        // Show custom variants if any (from unified or legacy config)
-        let variantNames;
-        let variantData;
-        if (isUnifiedMode()) {
-            const unifiedConfig = (0, unified_config_loader_1.loadOrCreateUnifiedConfig)();
-            const variants = unifiedConfig.cliproxy?.variants || {};
-            variantNames = Object.keys(variants);
-            variantData = {};
-            for (const name of variantNames) {
-                const v = variants[name];
-                variantData[name] = { provider: v.provider, settings: v.settings };
-            }
-        }
-        else {
-            const config = (0, config_manager_1.loadConfig)();
-            const variants = config.cliproxy || {};
-            variantNames = Object.keys(variants);
-            variantData = {};
-            for (const name of variantNames) {
-                const v = variants[name];
-                variantData[name] = { provider: v.provider, settings: v.settings };
-            }
-        }
-        if (variantNames.length > 0) {
-            console.log((0, ui_1.subheader)('Custom Variants'));
-            // Build table data
-            const rows = variantNames.map((name) => {
-                const variant = variantData[name];
-                return [name, variant.provider, variant.settings || '-'];
-            });
-            // Print table
-            console.log((0, ui_1.table)(rows, {
-                head: ['Variant', 'Provider', 'Settings'],
-                colWidths: [15, 12, 35],
-            }));
-            console.log('');
-            console.log((0, ui_1.dim)(`Total: ${variantNames.length} custom variant(s)`));
-            console.log('');
-        }
-        console.log((0, ui_1.dim)('To create a custom variant:'));
-        console.log(`  ${(0, ui_1.color)('ccs cliproxy create', 'command')}`);
+        console.log((0, ui_1.dim)(`Total: ${variantNames.length} custom variant(s)`));
         console.log('');
     }
-    catch (error) {
-        console.log((0, ui_1.fail)(`Failed to list profiles: ${error.message}`));
-        process.exit(1);
-    }
+    console.log((0, ui_1.dim)('To create a custom variant:'));
+    console.log(`  ${(0, ui_1.color)('ccs cliproxy create', 'command')}`);
+    console.log('');
 }
-/**
- * Handle 'ccs cliproxy remove' command
- */
 async function handleRemove(args) {
     await (0, ui_1.initUI)();
     const parsedArgs = parseProfileArgs(args);
-    // Get available variants based on config mode
-    let variantNames;
-    let variantData;
-    if (isUnifiedMode()) {
-        const unifiedConfig = (0, unified_config_loader_1.loadOrCreateUnifiedConfig)();
-        const variants = unifiedConfig.cliproxy?.variants || {};
-        variantNames = Object.keys(variants);
-        variantData = {};
-        for (const name of variantNames) {
-            const v = variants[name];
-            variantData[name] = { provider: v.provider, settings: v.settings };
-        }
-    }
-    else {
-        const config = (0, config_manager_1.loadConfig)();
-        const variants = config.cliproxy || {};
-        variantNames = Object.keys(variants);
-        variantData = {};
-        for (const name of variantNames) {
-            const v = variants[name];
-            variantData[name] = { provider: v.provider, settings: v.settings };
-        }
-    }
+    const variants = (0, services_1.listVariants)();
+    const variantNames = Object.keys(variants);
     if (variantNames.length === 0) {
         console.log((0, ui_1.warn)('No CLIProxy variants to remove'));
         process.exit(0);
     }
-    // Interactive selection if not provided
     let name = parsedArgs.name;
     if (!name) {
         console.log((0, ui_1.header)('Remove CLIProxy Variant'));
         console.log('');
         console.log('Available variants:');
-        variantNames.forEach((n, i) => {
-            const v = variantData[n];
-            console.log(`  ${i + 1}. ${n} (${v.provider})`);
-        });
+        variantNames.forEach((n, i) => console.log(`  ${i + 1}. ${n} (${variants[n].provider})`));
         console.log('');
         name = await prompt_1.InteractivePrompt.input('Variant name to remove', {
             validate: (val) => {
@@ -610,8 +311,7 @@ async function handleRemove(args) {
         variantNames.forEach((n) => console.log(`  - ${n}`));
         process.exit(1);
     }
-    const variant = variantData[name];
-    // Confirm deletion
+    const variant = variants[name];
     console.log('');
     console.log(`Variant '${(0, ui_1.color)(name, 'command')}' will be removed.`);
     console.log(`  Provider: ${variant.provider}`);
@@ -622,217 +322,106 @@ async function handleRemove(args) {
         console.log((0, ui_1.info)('Cancelled'));
         process.exit(0);
     }
-    try {
-        if (isUnifiedMode()) {
-            // Remove from unified config
-            removeCliproxyVariantUnified(name);
-        }
-        else {
-            // Remove from legacy config
-            const removed = removeCliproxyVariant(name);
-            if (!removed) {
-                console.log((0, ui_1.fail)('Failed to remove variant from config'));
-                process.exit(1);
-            }
-            // Remove settings file if it exists
-            const settingsFile = removed.settings.replace(/^~/, process.env.HOME || '');
-            if (fs.existsSync(settingsFile)) {
-                fs.unlinkSync(settingsFile);
-            }
-        }
-        console.log((0, ui_1.ok)(`Variant removed: ${name}`));
-        console.log('');
-    }
-    catch (error) {
-        console.log((0, ui_1.fail)(`Failed to remove variant: ${error.message}`));
+    const result = (0, services_1.removeVariant)(name);
+    if (!result.success) {
+        console.log((0, ui_1.fail)(`Failed to remove variant: ${result.error}`));
         process.exit(1);
     }
+    console.log((0, ui_1.ok)(`Variant removed: ${name}`));
+    console.log('');
 }
-// ============================================================================
-// BINARY MANAGEMENT
-// ============================================================================
-/**
- * Show cliproxy command help with styled UI
- */
-async function showHelp() {
+async function handleStop() {
     await (0, ui_1.initUI)();
+    console.log((0, ui_1.header)('Stop CLIProxy'));
     console.log('');
-    console.log((0, ui_1.header)('CLIProxy Management'));
-    console.log('');
-    // Usage
-    console.log((0, ui_1.subheader)('Usage:'));
-    console.log(`  ${(0, ui_1.color)('ccs cliproxy', 'command')} <command> [options]`);
-    console.log('');
-    // Profile Commands
-    console.log((0, ui_1.subheader)('Profile Commands:'));
-    const profileCmds = [
-        ['create [name]', 'Create new CLIProxy variant profile'],
-        ['list', 'List all CLIProxy variant profiles'],
-        ['remove <name>', 'Remove a CLIProxy variant profile'],
-    ];
-    const maxProfileLen = Math.max(...profileCmds.map(([cmd]) => cmd.length));
-    for (const [cmd, desc] of profileCmds) {
-        console.log(`  ${(0, ui_1.color)(cmd.padEnd(maxProfileLen + 2), 'command')} ${desc}`);
+    const result = await (0, services_1.stopProxy)();
+    if (result.stopped) {
+        console.log((0, ui_1.ok)(`CLIProxy stopped (PID ${result.pid})`));
+        if (result.sessionCount && result.sessionCount > 0) {
+            console.log((0, ui_1.info)(`${result.sessionCount} active session(s) were disconnected`));
+        }
     }
-    console.log('');
-    // Proxy Lifecycle Commands
-    console.log((0, ui_1.subheader)('Proxy Lifecycle:'));
-    const lifecycleCmds = [
-        ['status', 'Show running CLIProxy status'],
-        ['stop', 'Stop running CLIProxy instance'],
-    ];
-    const maxLifecycleLen = Math.max(...lifecycleCmds.map(([cmd]) => cmd.length));
-    for (const [cmd, desc] of lifecycleCmds) {
-        console.log(`  ${(0, ui_1.color)(cmd.padEnd(maxLifecycleLen + 2), 'command')} ${desc}`);
+    else {
+        console.log((0, ui_1.warn)(result.error || 'Failed to stop CLIProxy'));
     }
     console.log('');
-    console.log((0, ui_1.dim)('  Note: CLIProxy now persists by default. Use "stop" to terminate.'));
+}
+async function handleProxyStatus() {
+    await (0, ui_1.initUI)();
+    console.log((0, ui_1.header)('CLIProxy Status'));
     console.log('');
-    // Binary Commands
-    console.log((0, ui_1.subheader)('Binary Commands:'));
-    const binaryCmds = [
-        ['--install <version>', 'Install and pin a specific version'],
-        ['--latest', 'Install the latest version (no pin)'],
-        ['--update', 'Unpin and update to latest version'],
-    ];
-    const maxBinaryLen = Math.max(...binaryCmds.map(([cmd]) => cmd.length));
-    for (const [cmd, desc] of binaryCmds) {
-        console.log(`  ${(0, ui_1.color)(cmd.padEnd(maxBinaryLen + 2), 'command')} ${desc}`);
-    }
-    console.log('');
-    // Multi-Account Commands
-    console.log((0, ui_1.subheader)('Multi-Account Commands:'));
-    const multiAcctCmds = [
-        ['--auth', 'Authenticate with a provider (first account)'],
-        ['--auth --add', 'Add another account to a provider'],
-        ['--nickname <name>', 'Set friendly name for account'],
-        ['--accounts', 'List all accounts for a provider'],
-        ['--use <name>', 'Switch to account by nickname/email'],
-    ];
-    const maxMultiLen = Math.max(...multiAcctCmds.map(([cmd]) => cmd.length));
-    for (const [cmd, desc] of multiAcctCmds) {
-        console.log(`  ${(0, ui_1.color)(cmd.padEnd(maxMultiLen + 2), 'command')} ${desc}`);
-    }
-    console.log('');
-    // Create Options
-    console.log((0, ui_1.subheader)('Create Options:'));
-    const createOpts = [
-        ['--provider <name>', 'Provider (gemini, codex, agy, qwen)'],
-        ['--model <model>', 'Model name'],
-        ['--account <id>', 'Account ID (email or default)'],
-        ['--force', 'Overwrite existing variant'],
-        ['--yes, -y', 'Skip confirmation prompts'],
-    ];
-    const maxOptLen = Math.max(...createOpts.map(([opt]) => opt.length));
-    for (const [opt, desc] of createOpts) {
-        console.log(`  ${(0, ui_1.color)(opt.padEnd(maxOptLen + 2), 'command')} ${desc}`);
-    }
-    console.log('');
-    // Examples
-    console.log((0, ui_1.subheader)('Examples:'));
-    console.log(`  $ ${(0, ui_1.color)('ccs cliproxy create', 'command')}                    ${(0, ui_1.dim)('# Interactive wizard')}`);
-    console.log(`  $ ${(0, ui_1.color)('ccs cliproxy create g3 --provider gemini', 'command')}`);
-    console.log(`    ${(0, ui_1.color)('--model gemini-3-pro-preview', 'command')}            ${(0, ui_1.dim)('# Non-interactive')}`);
-    console.log(`  $ ${(0, ui_1.color)('ccs cliproxy list', 'command')}                       ${(0, ui_1.dim)('# Show all variants')}`);
-    console.log(`  $ ${(0, ui_1.color)('ccs cliproxy remove g3', 'command')}                  ${(0, ui_1.dim)('# Remove variant')}`);
-    console.log(`  $ ${(0, ui_1.color)('ccs cliproxy --latest', 'command')}                   ${(0, ui_1.dim)('# Update binary')}`);
-    console.log('');
-    console.log((0, ui_1.subheader)('Multi-Account Examples:'));
-    console.log(`  $ ${(0, ui_1.color)('ccs gemini --auth', 'command')}                       ${(0, ui_1.dim)('# First account')}`);
-    console.log(`  $ ${(0, ui_1.color)('ccs gemini --auth --add', 'command')}                 ${(0, ui_1.dim)('# Add second account')}`);
-    console.log(`  $ ${(0, ui_1.color)('ccs gemini --auth --add --nickname work', 'command')} ${(0, ui_1.dim)('# With nickname')}`);
-    console.log(`  $ ${(0, ui_1.color)('ccs agy --accounts', 'command')}                      ${(0, ui_1.dim)('# List accounts')}`);
-    console.log(`  $ ${(0, ui_1.color)('ccs agy --use work', 'command')}                      ${(0, ui_1.dim)('# Switch account')}`);
-    console.log('');
-    // Notes
-    console.log((0, ui_1.subheader)('Notes:'));
-    console.log(`  Default fallback version: ${(0, ui_1.color)(platform_detector_1.CLIPROXY_FALLBACK_VERSION, 'info')}`);
-    console.log(`  Releases: ${(0, ui_1.color)('https://github.com/router-for-me/CLIProxyAPI/releases', 'path')}`);
+    const status = (0, services_1.getProxyStatus)();
+    if (status.running) {
+        console.log(`  Status:     ${(0, ui_1.color)('Running', 'success')}`);
+        console.log(`  PID:        ${status.pid}`);
+        console.log(`  Port:       ${status.port}`);
+        console.log(`  Sessions:   ${status.sessionCount || 0} active`);
+        if (status.startedAt) {
+            console.log(`  Started:    ${new Date(status.startedAt).toLocaleString()}`);
+        }
+        console.log('');
+        console.log((0, ui_1.dim)('To stop: ccs cliproxy stop'));
+    }
+    else {
+        console.log(`  Status:     ${(0, ui_1.color)('Not running', 'warning')}`);
+        console.log('');
+        console.log((0, ui_1.dim)('CLIProxy starts automatically when you run ccs gemini, codex, etc.'));
+    }
     console.log('');
 }
-/**
- * Show current cliproxy status
- */
 async function showStatus(verbose) {
     await (0, ui_1.initUI)();
-    const installed = (0, cliproxy_1.isCLIProxyInstalled)();
-    const currentVersion = (0, cliproxy_1.getInstalledCliproxyVersion)();
-    const binaryPath = (0, cliproxy_1.getCLIProxyPath)();
-    const pinnedVersion = (0, cliproxy_1.getPinnedVersion)();
+    const status = (0, services_1.getBinaryStatus)();
     console.log('');
     console.log((0, ui_1.color)('CLIProxyAPI Status', 'primary'));
     console.log('');
-    if (installed) {
+    if (status.installed) {
         console.log(`  Installed:  ${(0, ui_1.color)('Yes', 'success')}`);
-        const versionLabel = pinnedVersion
-            ? `${(0, ui_1.color)(`v${currentVersion}`, 'info')} ${(0, ui_1.color)('(pinned)', 'warning')}`
-            : (0, ui_1.color)(`v${currentVersion}`, 'info');
+        const versionLabel = status.pinnedVersion
+            ? `${(0, ui_1.color)(`v${status.currentVersion}`, 'info')} ${(0, ui_1.color)('(pinned)', 'warning')}`
+            : (0, ui_1.color)(`v${status.currentVersion}`, 'info');
         console.log(`  Version:    ${versionLabel}`);
-        console.log(`  Binary:     ${(0, ui_1.dim)(binaryPath)}`);
+        console.log(`  Binary:     ${(0, ui_1.dim)(status.binaryPath)}`);
     }
     else {
         console.log(`  Installed:  ${(0, ui_1.color)('No', 'error')}`);
-        console.log(`  Fallback:   ${(0, ui_1.color)(`v${platform_detector_1.CLIPROXY_FALLBACK_VERSION}`, 'info')}`);
+        console.log(`  Fallback:   ${(0, ui_1.color)(`v${status.fallbackVersion}`, 'info')}`);
         console.log(`  ${(0, ui_1.dim)('Run "ccs gemini" or any provider to auto-install')}`);
     }
-    // Try to fetch latest version
-    try {
+    const latestCheck = await (0, services_1.checkLatestVersion)();
+    if (latestCheck.success && latestCheck.latestVersion) {
         console.log('');
-        console.log(`  ${(0, ui_1.dim)('Checking for updates...')}`);
-        const latestVersion = await (0, cliproxy_1.fetchLatestCliproxyVersion)();
-        if (latestVersion !== currentVersion) {
-            if (pinnedVersion) {
-                console.log(`  Latest:     ${(0, ui_1.color)(`v${latestVersion}`, 'success')} ${(0, ui_1.dim)('(pinned to v' + pinnedVersion + ')')}`);
+        if (latestCheck.updateAvailable) {
+            if (status.pinnedVersion) {
+                console.log(`  Latest:     ${(0, ui_1.color)(`v${latestCheck.latestVersion}`, 'success')} ${(0, ui_1.dim)('(pinned to v' + status.pinnedVersion + ')')}`);
                 console.log('');
                 console.log(`  ${(0, ui_1.dim)('Run "ccs cliproxy --update" to unpin and update')}`);
             }
             else {
-                console.log(`  Latest:     ${(0, ui_1.color)(`v${latestVersion}`, 'success')} ${(0, ui_1.dim)('(update available)')}`);
+                console.log(`  Latest:     ${(0, ui_1.color)(`v${latestCheck.latestVersion}`, 'success')} ${(0, ui_1.dim)('(update available)')}`);
                 console.log('');
                 console.log(`  ${(0, ui_1.dim)('Run "ccs cliproxy --latest" to update')}`);
             }
         }
         else {
-            console.log(`  Latest:     ${(0, ui_1.color)(`v${latestVersion}`, 'success')} ${(0, ui_1.dim)('(up to date)')}`);
+            console.log(`  Latest:     ${(0, ui_1.color)(`v${latestCheck.latestVersion}`, 'success')} ${(0, ui_1.dim)('(up to date)')}`);
         }
     }
-    catch (error) {
-        if (verbose) {
-            const err = error;
-            console.log(`  Latest:     ${(0, ui_1.dim)(`Could not fetch (${err.message})`)}`);
-        }
+    else if (verbose && latestCheck.error) {
+        console.log(`  Latest:     ${(0, ui_1.dim)(`Could not fetch (${latestCheck.error})`)}`);
     }
     console.log('');
-    console.log((0, ui_1.dim)(`Run "ccs cliproxy --help" for all available commands`));
+    console.log((0, ui_1.dim)('Run "ccs cliproxy --help" for all available commands'));
     console.log('');
 }
-/**
- * Install a specific version (pins the version to prevent auto-update)
- */
-async function installVersion(version, verbose) {
-    // Validate version format (basic semver check)
-    if (!/^\d+\.\d+\.\d+$/.test(version)) {
-        console.error((0, ui_1.fail)('Invalid version format. Expected format: X.Y.Z (e.g., 6.5.53)'));
-        process.exit(1);
-    }
+async function handleInstallVersion(version, verbose) {
     console.log((0, ui_1.info)(`Installing CLIProxyAPI v${version}...`));
     console.log('');
-    try {
-        await (0, cliproxy_1.installCliproxyVersion)(version, verbose);
-        // Pin the version to prevent auto-update
-        (0, cliproxy_1.savePinnedVersion)(version);
-        console.log('');
-        console.log((0, ui_1.ok)(`CLIProxyAPI v${version} installed (pinned)`));
-        console.log('');
-        console.log((0, ui_1.dim)('This version will be used until you run:'));
-        console.log(`  ${(0, ui_1.color)('ccs cliproxy --update', 'command')}  ${(0, ui_1.dim)('# Update to latest and unpin')}`);
-        console.log('');
-    }
-    catch (error) {
-        const err = error;
+    const result = await (0, services_1.installVersion)(version, verbose);
+    if (!result.success) {
         console.error('');
         console.error((0, ui_1.fail)(`Failed to install CLIProxyAPI v${version}`));
-        console.error(`    ${err.message}`);
+        console.error(`    ${result.error}`);
         console.error('');
         console.error('Possible causes:');
         console.error('  1. Version does not exist on GitHub');
@@ -843,106 +432,87 @@ async function installVersion(version, verbose) {
         console.error('  https://github.com/router-for-me/CLIProxyAPI/releases');
         process.exit(1);
     }
+    console.log('');
+    console.log((0, ui_1.ok)(`CLIProxyAPI v${version} installed (pinned)`));
+    console.log('');
+    console.log((0, ui_1.dim)('This version will be used until you run:'));
+    console.log(`  ${(0, ui_1.color)('ccs cliproxy --update', 'command')}  ${(0, ui_1.dim)('# Update to latest and unpin')}`);
+    console.log('');
 }
-/**
- * Install latest version (clears any version pin)
- */
-async function installLatest(verbose) {
+async function handleInstallLatest(verbose) {
     console.log((0, ui_1.info)('Fetching latest CLIProxyAPI version...'));
-    try {
-        const latestVersion = await (0, cliproxy_1.fetchLatestCliproxyVersion)();
-        const currentVersion = (0, cliproxy_1.getInstalledCliproxyVersion)();
-        const wasPinned = (0, cliproxy_1.isVersionPinned)();
-        if ((0, cliproxy_1.isCLIProxyInstalled)() && latestVersion === currentVersion && !wasPinned) {
-            console.log((0, ui_1.ok)(`Already running latest version: v${latestVersion}`));
-            return;
-        }
-        console.log((0, ui_1.info)(`Latest version: v${latestVersion}`));
-        if ((0, cliproxy_1.isCLIProxyInstalled)()) {
-            console.log((0, ui_1.info)(`Current version: v${currentVersion}`));
-        }
-        if (wasPinned) {
-            console.log((0, ui_1.info)(`Removing version pin (was v${(0, cliproxy_1.getPinnedVersion)()})`));
-        }
-        console.log('');
-        await (0, cliproxy_1.installCliproxyVersion)(latestVersion, verbose);
-        // Clear any version pin so auto-update works again
-        (0, cliproxy_1.clearPinnedVersion)();
-        console.log('');
-        console.log((0, ui_1.ok)(`CLIProxyAPI updated to v${latestVersion}`));
-        console.log((0, ui_1.dim)('Auto-update is now enabled.'));
-        console.log('');
-    }
-    catch (error) {
-        const err = error;
-        console.error((0, ui_1.fail)(`Failed to install latest version: ${err.message}`));
+    const result = await (0, services_1.installLatest)(verbose);
+    if (!result.success) {
+        console.error((0, ui_1.fail)(`Failed to install latest version: ${result.error}`));
         process.exit(1);
     }
-}
-// ============================================================================
-// PROXY LIFECYCLE COMMANDS
-// ============================================================================
-/**
- * Handle 'ccs cliproxy stop' - Stop running CLIProxy instance
- */
-async function handleStop() {
-    await (0, ui_1.initUI)();
-    console.log((0, ui_1.header)('Stop CLIProxy'));
-    console.log('');
-    const result = await (0, session_tracker_1.stopProxy)();
-    if (result.stopped) {
-        console.log((0, ui_1.ok)(`CLIProxy stopped (PID ${result.pid})`));
-        if (result.sessionCount && result.sessionCount > 0) {
-            console.log((0, ui_1.info)(`${result.sessionCount} active session(s) were disconnected`));
-        }
-    }
-    else {
-        console.log((0, ui_1.warn)(result.error || 'Failed to stop CLIProxy'));
+    if (result.error?.startsWith('Already')) {
+        console.log((0, ui_1.ok)(result.error));
+        return;
     }
     console.log('');
+    console.log((0, ui_1.ok)(`CLIProxyAPI updated to v${result.version}`));
+    console.log((0, ui_1.dim)('Auto-update is now enabled.'));
+    console.log('');
 }
-/**
- * Handle 'ccs cliproxy status' - Show running proxy status
- */
-async function handleProxyStatus() {
+async function showHelp() {
     await (0, ui_1.initUI)();
-    console.log((0, ui_1.header)('CLIProxy Status'));
     console.log('');
-    const status = (0, session_tracker_1.getProxyStatus)();
-    if (status.running) {
-        console.log(`  Status:     ${(0, ui_1.color)('Running', 'success')}`);
-        console.log(`  PID:        ${status.pid}`);
-        console.log(`  Port:       ${status.port}`);
-        console.log(`  Sessions:   ${status.sessionCount || 0} active`);
-        if (status.startedAt) {
-            const started = new Date(status.startedAt);
-            console.log(`  Started:    ${started.toLocaleString()}`);
+    console.log((0, ui_1.header)('CLIProxy Management'));
+    console.log('');
+    console.log((0, ui_1.subheader)('Usage:'));
+    console.log(`  ${(0, ui_1.color)('ccs cliproxy', 'command')} <command> [options]`);
+    console.log('');
+    const sections = [
+        [
+            'Profile Commands:',
+            [
+                ['create [name]', 'Create new CLIProxy variant profile'],
+                ['list', 'List all CLIProxy variant profiles'],
+                ['remove <name>', 'Remove a CLIProxy variant profile'],
+            ],
+        ],
+        [
+            'Proxy Lifecycle:',
+            [
+                ['status', 'Show running CLIProxy status'],
+                ['stop', 'Stop running CLIProxy instance'],
+            ],
+        ],
+        [
+            'Binary Commands:',
+            [
+                ['--install <version>', 'Install and pin a specific version'],
+                ['--latest', 'Install the latest version (no pin)'],
+                ['--update', 'Unpin and update to latest version'],
+            ],
+        ],
+    ];
+    for (const [title, cmds] of sections) {
+        console.log((0, ui_1.subheader)(title));
+        const maxLen = Math.max(...cmds.map(([cmd]) => cmd.length));
+        for (const [cmd, desc] of cmds) {
+            console.log(`  ${(0, ui_1.color)(cmd.padEnd(maxLen + 2), 'command')} ${desc}`);
         }
         console.log('');
-        console.log((0, ui_1.dim)('To stop: ccs cliproxy stop'));
-    }
-    else {
-        console.log(`  Status:     ${(0, ui_1.color)('Not running', 'warning')}`);
-        console.log('');
-        console.log((0, ui_1.dim)('CLIProxy starts automatically when you run ccs gemini, codex, etc.'));
     }
+    console.log((0, ui_1.dim)('  Note: CLIProxy now persists by default. Use "stop" to terminate.'));
+    console.log('');
+    console.log((0, ui_1.subheader)('Notes:'));
+    console.log(`  Default fallback version: ${(0, ui_1.color)(platform_detector_1.CLIPROXY_FALLBACK_VERSION, 'info')}`);
+    console.log(`  Releases: ${(0, ui_1.color)('https://github.com/router-for-me/CLIProxyAPI/releases', 'path')}`);
     console.log('');
 }
 // ============================================================================
 // MAIN ROUTER
 // ============================================================================
-/**
- * Main cliproxy command handler
- */
 async function handleCliproxyCommand(args) {
     const verbose = args.includes('--verbose') || args.includes('-v');
     const command = args[0];
-    // Handle --help
     if (args.includes('--help') || args.includes('-h')) {
         await showHelp();
         return;
     }
-    // Handle profile commands
     if (command === 'create') {
         await handleCreate(args.slice(1));
         return;
@@ -955,7 +525,6 @@ async function handleCliproxyCommand(args) {
         await handleRemove(args.slice(1));
         return;
     }
-    // Handle proxy lifecycle commands
     if (command === 'stop') {
         await handleStop();
         return;
@@ -964,7 +533,6 @@ async function handleCliproxyCommand(args) {
         await handleProxyStatus();
         return;
     }
-    // Handle --install <version>
     const installIdx = args.indexOf('--install');
     if (installIdx !== -1) {
         const version = args[installIdx + 1];
@@ -974,20 +542,13 @@ async function handleCliproxyCommand(args) {
             console.error('    Example: ccs cliproxy --install 6.5.53');
             process.exit(1);
         }
-        await installVersion(version, verbose);
-        return;
-    }
-    // Handle --latest
-    if (args.includes('--latest')) {
-        await installLatest(verbose);
+        await handleInstallVersion(version, verbose);
         return;
     }
-    // Handle --update (unpin and update to latest)
-    if (args.includes('--update')) {
-        await installLatest(verbose);
+    if (args.includes('--latest') || args.includes('--update')) {
+        await handleInstallLatest(verbose);
         return;
     }
-    // Default: show status
     await showStatus(verbose);
 }
 exports.handleCliproxyCommand = handleCliproxyCommand;