@kaitranntt/ccs 7.54.0 → 7.55.0-dev.2

package/dist/ccs.js

@@ -25,8 +25,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 require("./utils/fetch-proxy-setup");
-const child_process_1 = require("child_process");
-const path = __importStar(require("path"));
 const fs = __importStar(require("fs"));
 const claude_detector_1 = require("./utils/claude-detector");
 const config_manager_1 = require("./utils/config-manager");
@@ -44,17 +42,10 @@ const ui_1 = require("./utils/ui");
 const constants_1 = require("./copilot/constants");
 // Import centralized error handling
 const errors_1 = require("./errors");
-// Import extracted command handlers
-const version_command_1 = require("./commands/version-command");
-const help_command_1 = require("./commands/help-command");
-const install_command_1 = require("./commands/install-command");
-const doctor_command_1 = require("./commands/doctor-command");
-const sync_command_1 = require("./commands/sync-command");
-const shell_completion_command_1 = require("./commands/shell-completion-command");
-const update_command_1 = require("./commands/update-command");
+const root_command_router_1 = require("./commands/root-command-router");
 // Import extracted utility functions
 const shell_executor_1 = require("./utils/shell-executor");
-const signal_forwarder_1 = require("./utils/signal-forwarder");
+const glmt_deprecation_1 = require("./utils/glmt-deprecation");
 // Import target adapter system
 const targets_1 = require("./targets");
 const target_resolver_1 = require("./targets/target-resolver");
@@ -76,177 +67,6 @@ function detectProfile(args) {
         return { profile: args[0], remainingArgs: args.slice(1) };
     }
 }
-// ========== GLMT Proxy Execution ==========
-/**
- * Execute Claude CLI with embedded proxy (for GLMT profile)
- */
-async function execClaudeWithProxy(claudeCli, profileName, args, claudeConfigDir) {
-    // 1. Read settings to get API key
-    const settingsPath = (0, config_manager_1.getSettingsPath)(profileName);
-    const settings = JSON.parse(fs.readFileSync(settingsPath, 'utf8'));
-    const envData = settings.env;
-    const apiKey = envData['ANTHROPIC_AUTH_TOKEN'];
-    if (!apiKey || apiKey === 'YOUR_GLM_API_KEY_HERE') {
-        console.error((0, ui_1.fail)('GLMT profile requires Z.AI API key'));
-        console.error(`    Edit ${(0, config_manager_1.getCcsDir)()}/glmt.settings.json and set ANTHROPIC_AUTH_TOKEN`);
-        process.exit(1);
-    }
-    // Detect verbose flag
-    const verbose = args.includes('--verbose') || args.includes('-v');
-    // 2. Spawn embedded proxy with verbose flag
-    const proxyPath = path.join(__dirname, 'glmt', 'glmt-proxy.js');
-    const proxyArgs = verbose ? ['--verbose'] : [];
-    // Use process.execPath for Windows compatibility (CVE-2024-27980)
-    // Pass environment variables to proxy subprocess (required for auth)
-    const proxy = (0, child_process_1.spawn)(process.execPath, [proxyPath, ...proxyArgs], {
-        stdio: ['ignore', 'pipe', verbose ? 'pipe' : 'inherit'],
-        env: {
-            ...process.env,
-            ANTHROPIC_AUTH_TOKEN: apiKey,
-            ANTHROPIC_BASE_URL: envData['ANTHROPIC_BASE_URL'],
-        },
-    });
-    const stopProxy = () => {
-        try {
-            if (!proxy.killed) {
-                proxy.kill('SIGTERM');
-            }
-        }
-        catch {
-            // Best-effort cleanup on process teardown.
-        }
-    };
-    // 3. Wait for proxy ready signal (with timeout)
-    const { ProgressIndicator } = await Promise.resolve().then(() => __importStar(require('./utils/progress-indicator')));
-    const spinner = new ProgressIndicator('Starting GLMT proxy');
-    spinner.start();
-    let port;
-    try {
-        port = await new Promise((resolve, reject) => {
-            const timeout = setTimeout(() => {
-                reject(new Error('Proxy startup timeout (5s)'));
-            }, 5000);
-            proxy.stdout?.on('data', (data) => {
-                const match = data.toString().match(/PROXY_READY:(\d+)/);
-                if (match) {
-                    clearTimeout(timeout);
-                    resolve(parseInt(match[1]));
-                }
-            });
-            proxy.on('error', (error) => {
-                clearTimeout(timeout);
-                reject(error);
-            });
-            proxy.on('exit', (code) => {
-                if (code !== 0 && code !== null) {
-                    clearTimeout(timeout);
-                    reject(new Error(`Proxy exited with code ${code}`));
-                }
-            });
-        });
-        spinner.succeed(`GLMT proxy ready on port ${port}`);
-    }
-    catch (error) {
-        const err = error;
-        spinner.fail('Failed to start GLMT proxy');
-        console.error((0, ui_1.fail)(`Error: ${err.message}`));
-        console.error('');
-        console.error('Possible causes:');
-        console.error('  1. Port conflict (unlikely with random port)');
-        console.error('  2. Node.js permission issue');
-        console.error('  3. Firewall blocking localhost');
-        console.error('');
-        console.error('Workarounds:');
-        console.error('  - Use non-thinking mode: ccs glm "prompt"');
-        console.error('  - Enable verbose logging: ccs glmt --verbose "prompt"');
-        console.error(`  - Check proxy logs in ${(0, config_manager_1.getCcsDir)()}/logs/ (if debug enabled)`);
-        console.error('');
-        stopProxy();
-        (0, errors_1.runCleanup)();
-        process.exit(1);
-    }
-    // 4. Spawn Claude CLI with proxy URL
-    // Use model from user's settings (not hardcoded) - fixes issue #358
-    const configuredModel = envData['ANTHROPIC_MODEL'] || 'glm-5';
-    const envVars = {
-        ANTHROPIC_BASE_URL: `http://127.0.0.1:${port}`,
-        ANTHROPIC_AUTH_TOKEN: apiKey,
-        ANTHROPIC_MODEL: configuredModel,
-        ...(claudeConfigDir ? { CLAUDE_CONFIG_DIR: claudeConfigDir } : {}),
-    };
-    const isWindows = process.platform === 'win32';
-    const isPowerShellScript = isWindows && /\.ps1$/i.test(claudeCli);
-    const needsShell = isWindows && /\.(cmd|bat)$/i.test(claudeCli);
-    const webSearchEnv = (0, websearch_manager_1.getWebSearchHookEnv)();
-    const imageAnalysisEnv = (0, hooks_1.getImageAnalysisHookEnv)(profileName);
-    const claudeLaunchEnv = (0, shell_executor_1.getClaudeLaunchEnvOverrides)();
-    const env = (0, shell_executor_1.stripClaudeCodeEnv)({
-        ...process.env,
-        ...claudeLaunchEnv,
-        ...envVars,
-        ...webSearchEnv,
-        ...imageAnalysisEnv,
-        CCS_PROFILE_TYPE: 'settings', // Signal to WebSearch hook this is a third-party provider
-    });
-    let claude;
-    if (isPowerShellScript) {
-        claude = (0, child_process_1.spawn)('powershell.exe', ['-NoProfile', '-ExecutionPolicy', 'Bypass', '-File', claudeCli, ...args], {
-            stdio: 'inherit',
-            windowsHide: true,
-            env,
-        });
-    }
-    else if (needsShell) {
-        const cmdString = [claudeCli, ...args].map(shell_executor_1.escapeShellArg).join(' ');
-        claude = (0, child_process_1.spawn)(cmdString, {
-            stdio: 'inherit',
-            windowsHide: true,
-            shell: true,
-            env,
-        });
-    }
-    else {
-        claude = (0, child_process_1.spawn)(claudeCli, args, {
-            stdio: 'inherit',
-            windowsHide: true,
-            env,
-        });
-    }
-    // 5. Shared signal forwarding + proxy cleanup lifecycle
-    (0, signal_forwarder_1.wireChildProcessSignals)(claude, (err) => {
-        if (err.code === 'EACCES') {
-            console.error((0, ui_1.fail)(`Claude CLI is not executable: ${claudeCli}`));
-            console.error('    Check file permissions and executable bit.');
-        }
-        else if (err.code === 'ENOENT') {
-            if (isPowerShellScript) {
-                console.error((0, ui_1.fail)('PowerShell executable not found (required for .ps1 wrapper launch).'));
-                console.error('    Ensure powershell.exe is available in PATH.');
-            }
-            else if (needsShell) {
-                console.error((0, ui_1.fail)('Windows command shell not found for Claude wrapper launch.'));
-                console.error('    Ensure cmd.exe is available and accessible.');
-            }
-            else {
-                console.error((0, ui_1.fail)(`Claude CLI not found: ${claudeCli}`));
-            }
-        }
-        else {
-            console.error((0, ui_1.fail)(`Claude CLI error: ${err.message}`));
-        }
-        stopProxy();
-        (0, errors_1.runCleanup)();
-        process.exit(1);
-    }, (code, signal) => {
-        stopProxy();
-        if (signal) {
-            process.kill(process.pid, signal);
-        }
-        else {
-            process.exit(code || 0);
-        }
-    });
-}
 /**
  * Perform background update check (refreshes cache, no notification)
  */
@@ -391,110 +211,7 @@ async function main() {
         // Recovery is best-effort - don't block basic CLI functionality
         console.warn('[!] Recovery failed:', err.message);
     }
-    // Special case: migrate command
-    if (firstArg === 'migrate' || firstArg === '--migrate') {
-        const { handleMigrateCommand, printMigrateHelp } = await Promise.resolve().then(() => __importStar(require('./commands/migrate-command')));
-        const migrateArgs = args.slice(1);
-        if (migrateArgs.includes('--help') || migrateArgs.includes('-h')) {
-            printMigrateHelp();
-            return;
-        }
-        await handleMigrateCommand(migrateArgs);
-        return;
-    }
-    // Special case: update command
-    if (firstArg === 'update' || firstArg === '--update') {
-        const updateArgs = args.slice(1);
-        // Handle --help for update command
-        if (updateArgs.includes('--help') || updateArgs.includes('-h')) {
-            console.log('');
-            console.log('Usage: ccs update [options]');
-            console.log('');
-            console.log('Options:');
-            console.log('  --force       Force reinstall current version');
-            console.log('  --beta, --dev Install from dev channel (unstable)');
-            console.log('  --help, -h    Show this help message');
-            console.log('');
-            console.log('Examples:');
-            console.log('  ccs update           Update to latest stable');
-            console.log('  ccs update --force   Force reinstall');
-            console.log('  ccs update --beta    Install dev channel');
-            console.log('');
-            return;
-        }
-        const forceFlag = updateArgs.includes('--force');
-        const betaFlag = updateArgs.includes('--beta') || updateArgs.includes('--dev');
-        await (0, update_command_1.handleUpdateCommand)({ force: forceFlag, beta: betaFlag });
-        return;
-    }
-    const commandAliases = {
-        '--version': 'version',
-        '-v': 'version',
-        '--help': 'help',
-        '-h': 'help',
-        '--doctor': 'doctor',
-        '--sync': 'sync',
-        '--cleanup': 'cleanup',
-        '--setup': 'setup',
-    };
-    const normalizedFirstArg = commandAliases[firstArg] || firstArg;
-    const earlyCommandHandlers = {
-        version: async () => (0, version_command_1.handleVersionCommand)(),
-        help: async () => (0, help_command_1.handleHelpCommand)(),
-        '--install': async () => (0, install_command_1.handleInstallCommand)(),
-        '--uninstall': async () => (0, install_command_1.handleUninstallCommand)(),
-        '--shell-completion': async () => (0, shell_completion_command_1.handleShellCompletionCommand)(args.slice(1)),
-        '-sc': async () => (0, shell_completion_command_1.handleShellCompletionCommand)(args.slice(1)),
-        doctor: async () => (0, doctor_command_1.handleDoctorCommand)(args.slice(1)),
-        sync: async () => (0, sync_command_1.handleSyncCommand)(),
-        cleanup: async () => {
-            const { handleCleanupCommand } = await Promise.resolve().then(() => __importStar(require('./commands/cleanup-command')));
-            await handleCleanupCommand(args.slice(1));
-        },
-        auth: async () => {
-            const AuthCommandsModule = await Promise.resolve().then(() => __importStar(require('./auth/auth-commands')));
-            const AuthCommands = AuthCommandsModule.default;
-            const authCommands = new AuthCommands();
-            await authCommands.route(args.slice(1));
-        },
-        api: async () => {
-            const { handleApiCommand } = await Promise.resolve().then(() => __importStar(require('./commands/api-command')));
-            await handleApiCommand(args.slice(1));
-        },
-        cliproxy: async () => {
-            const { handleCliproxyCommand } = await Promise.resolve().then(() => __importStar(require('./commands/cliproxy-command')));
-            await handleCliproxyCommand(args.slice(1));
-        },
-        config: async () => {
-            const { handleConfigCommand } = await Promise.resolve().then(() => __importStar(require('./commands/config-command')));
-            await handleConfigCommand(args.slice(1));
-        },
-        tokens: async () => {
-            const { handleTokensCommand } = await Promise.resolve().then(() => __importStar(require('./commands/tokens-command')));
-            const exitCode = await handleTokensCommand(args.slice(1));
-            process.exit(exitCode);
-        },
-        persist: async () => {
-            const { handlePersistCommand } = await Promise.resolve().then(() => __importStar(require('./commands/persist-command')));
-            await handlePersistCommand(args.slice(1));
-        },
-        env: async () => {
-            const { handleEnvCommand } = await Promise.resolve().then(() => __importStar(require('./commands/env-command')));
-            await handleEnvCommand(args.slice(1));
-        },
-        setup: async () => {
-            const { handleSetupCommand } = await Promise.resolve().then(() => __importStar(require('./commands/setup-command')));
-            await handleSetupCommand(args.slice(1));
-        },
-        cursor: async () => {
-            const { handleCursorCommand } = await Promise.resolve().then(() => __importStar(require('./commands/cursor-command')));
-            const exitCode = await handleCursorCommand(args.slice(1));
-            process.exit(exitCode);
-        },
-    };
-    const earlyCommandHandler = earlyCommandHandlers[normalizedFirstArg];
-    if (earlyCommandHandler) {
-        await earlyCommandHandler();
+    if (await (0, root_command_router_1.tryHandleRootCommand)(args)) {
         return;
     }
     // Special case: copilot command (GitHub Copilot integration)
@@ -574,12 +291,6 @@ async function main() {
                 console.error((0, ui_1.info)('Use a settings-based profile with --target instead'));
                 process.exit(1);
             }
-            // GLMT always requires Claude target because it depends on embedded proxy flow.
-            if (profileInfo.type === 'settings' && profileInfo.name === 'glmt') {
-                console.error((0, ui_1.fail)(`${targetAdapter.displayName} does not support GLMT proxy profiles`));
-                console.error((0, ui_1.info)('Use --target claude for glmt, or switch to a direct API profile (glm/km)'));
-                process.exit(1);
-            }
             if (profileInfo.type === 'default') {
                 if (!targetAdapter.supportsProfileType('default')) {
                     console.error((0, ui_1.fail)(`${targetAdapter.displayName} does not support default profile mode`));
@@ -826,13 +537,26 @@ async function main() {
                 console.error((0, ui_1.info)(`Continuity inheritance active: profile "${profileInfo.name}" -> account "${continuityInheritance.sourceAccount}"`));
             }
             const inheritedClaudeConfigDir = continuityInheritance.claudeConfigDir;
-            // Pre-flight validation for GLM/GLMT/MiniMax profiles
-            if (profileInfo.name === 'glm' || profileInfo.name === 'glmt') {
-                const preflightSettingsPath = (0, config_manager_1.getSettingsPath)(profileInfo.name);
-                const preflightSettings = (0, config_manager_1.loadSettings)(preflightSettingsPath);
-                const apiKey = preflightSettings.env?.['ANTHROPIC_AUTH_TOKEN'];
+            const expandedSettingsPath = profileInfo.settingsPath
+                ? (0, helpers_1.expandPath)(profileInfo.settingsPath)
+                : (0, config_manager_1.getSettingsPath)(profileInfo.name);
+            const settings = (0, config_manager_1.loadSettings)(expandedSettingsPath);
+            const rawSettingsEnv = profileInfo.env ?? settings.env ?? {};
+            const isDeprecatedGlmtProfile = (0, glmt_deprecation_1.isDeprecatedGlmtProfileName)(profileInfo.name);
+            const glmtNormalization = isDeprecatedGlmtProfile
+                ? (0, glmt_deprecation_1.normalizeDeprecatedGlmtEnv)(rawSettingsEnv)
+                : null;
+            const settingsEnv = glmtNormalization?.env ?? rawSettingsEnv;
+            if (glmtNormalization) {
+                for (const message of glmtNormalization.warnings) {
+                    console.error((0, ui_1.warn)(message));
+                }
+            }
+            // Pre-flight validation for Z.AI-compatible profiles.
+            if (profileInfo.name === 'glm' || isDeprecatedGlmtProfile) {
+                const apiKey = settingsEnv['ANTHROPIC_AUTH_TOKEN'];
                 if (apiKey) {
-                    const validation = await (0, api_key_validator_1.validateGlmKey)(apiKey, preflightSettings.env?.['ANTHROPIC_BASE_URL']);
+                    const validation = await (0, api_key_validator_1.validateGlmKey)(apiKey, settingsEnv['ANTHROPIC_BASE_URL']);
                     if (!validation.valid) {
                         console.error('');
                         console.error((0, ui_1.fail)(validation.error || 'API key validation failed'));
@@ -847,11 +571,9 @@ async function main() {
                 }
             }
             if (profileInfo.name === 'mm') {
-                const preflightSettingsPath = (0, config_manager_1.getSettingsPath)(profileInfo.name);
-                const preflightSettings = (0, config_manager_1.loadSettings)(preflightSettingsPath);
-                const apiKey = preflightSettings.env?.['ANTHROPIC_AUTH_TOKEN'];
+                const apiKey = settingsEnv['ANTHROPIC_AUTH_TOKEN'];
                 if (apiKey) {
-                    const validation = await (0, api_key_validator_1.validateMiniMaxKey)(apiKey, preflightSettings.env?.['ANTHROPIC_BASE_URL']);
+                    const validation = await (0, api_key_validator_1.validateMiniMaxKey)(apiKey, settingsEnv['ANTHROPIC_BASE_URL']);
                     if (!validation.valid) {
                         console.error('');
                         console.error((0, ui_1.fail)(validation.error || 'API key validation failed'));
@@ -867,10 +589,8 @@ async function main() {
             }
             // Pre-flight validation for Anthropic direct profiles (ANTHROPIC_API_KEY + no BASE_URL)
             {
-                const preflightSettingsPath = (0, config_manager_1.getSettingsPath)(profileInfo.name);
-                const preflightSettings = (0, config_manager_1.loadSettings)(preflightSettingsPath);
-                const anthropicApiKey = preflightSettings.env?.['ANTHROPIC_API_KEY'];
-                const hasBaseUrl = !!preflightSettings.env?.['ANTHROPIC_BASE_URL'];
+                const anthropicApiKey = settingsEnv['ANTHROPIC_API_KEY'];
+                const hasBaseUrl = !!settingsEnv['ANTHROPIC_BASE_URL'];
                 if (anthropicApiKey && !hasBaseUrl) {
                     const validation = await (0, api_key_validator_1.validateAnthropicKey)(anthropicApiKey);
                     if (!validation.valid) {
@@ -886,75 +606,55 @@ async function main() {
                     }
                 }
             }
-            // Check if this is GLMT profile (requires proxy)
-            if (profileInfo.name === 'glmt') {
-                if (resolvedTarget !== 'claude') {
-                    console.error((0, ui_1.fail)(`${targetAdapter?.displayName || 'Target'} does not support GLMT proxy profiles`));
-                    console.error((0, ui_1.info)('Use --target claude for glmt, or switch to a direct API profile (glm/km)'));
-                    process.exit(1);
-                }
-                // GLMT FLOW: Settings-based with embedded proxy for thinking support
-                await execClaudeWithProxy(claudeCli, profileInfo.name, remainingArgs, inheritedClaudeConfigDir);
+            const webSearchEnv = (0, websearch_manager_1.getWebSearchHookEnv)();
+            const imageAnalysisEnv = (0, hooks_1.getImageAnalysisHookEnv)(profileInfo.name);
+            // Get global env vars (DISABLE_TELEMETRY, etc.) for third-party profiles
+            const globalEnvConfig = (0, unified_config_loader_1.getGlobalEnvConfig)();
+            const globalEnv = globalEnvConfig.enabled ? globalEnvConfig.env : {};
+            // Log global env injection for visibility (debug mode only)
+            if (globalEnvConfig.enabled && Object.keys(globalEnv).length > 0 && process.env.CCS_DEBUG) {
+                const envNames = Object.keys(globalEnv).join(', ');
+                console.error((0, ui_1.info)(`Global env: ${envNames}`));
             }
-            else {
-                // EXISTING FLOW: Settings-based profile (glm)
-                // Use --settings flag (backward compatible)
-                const expandedSettingsPath = profileInfo.settingsPath
-                    ? (0, helpers_1.expandPath)(profileInfo.settingsPath)
-                    : (0, config_manager_1.getSettingsPath)(profileInfo.name);
-                const webSearchEnv = (0, websearch_manager_1.getWebSearchHookEnv)();
-                const imageAnalysisEnv = (0, hooks_1.getImageAnalysisHookEnv)(profileInfo.name);
-                // Get global env vars (DISABLE_TELEMETRY, etc.) for third-party profiles
-                const globalEnvConfig = (0, unified_config_loader_1.getGlobalEnvConfig)();
-                const globalEnv = globalEnvConfig.enabled ? globalEnvConfig.env : {};
-                // Log global env injection for visibility (debug mode only)
-                if (globalEnvConfig.enabled && Object.keys(globalEnv).length > 0 && process.env.CCS_DEBUG) {
-                    const envNames = Object.keys(globalEnv).join(', ');
-                    console.error((0, ui_1.info)(`Global env: ${envNames}`));
+            // Explicitly inject effective settings env vars so stale ANTHROPIC_*
+            // values from prior sessions cannot leak into the active profile.
+            const envVars = {
+                ...globalEnv,
+                ...settingsEnv,
+                ...(inheritedClaudeConfigDir ? { CLAUDE_CONFIG_DIR: inheritedClaudeConfigDir } : {}),
+                ...webSearchEnv,
+                ...imageAnalysisEnv,
+                CCS_PROFILE_TYPE: 'settings',
+            };
+            // Dispatch through target adapter for non-claude targets
+            if (resolvedTarget !== 'claude') {
+                const adapter = targetAdapter;
+                if (!adapter) {
+                    console.error((0, ui_1.fail)(`Target adapter not found for "${resolvedTarget}"`));
+                    process.exit(1);
                 }
-                // CRITICAL: Load settings and explicitly set ANTHROPIC_* env vars
-                // to prevent inheriting stale values from previous CLIProxy sessions.
-                // Environment variables take precedence over --settings file values,
-                // so we must explicitly set them here to ensure correct routing.
-                const settings = (0, config_manager_1.loadSettings)(expandedSettingsPath);
-                const settingsEnv = settings.env || {};
-                const envVars = {
-                    ...globalEnv,
-                    ...settingsEnv, // Explicitly inject all settings env vars
-                    ...(inheritedClaudeConfigDir ? { CLAUDE_CONFIG_DIR: inheritedClaudeConfigDir } : {}),
-                    ...webSearchEnv,
-                    ...imageAnalysisEnv,
-                    CCS_PROFILE_TYPE: 'settings', // Signal to WebSearch hook this is a third-party provider
-                };
-                // Dispatch through target adapter for non-claude targets
-                if (resolvedTarget !== 'claude') {
-                    const adapter = targetAdapter;
-                    if (!adapter) {
-                        console.error((0, ui_1.fail)(`Target adapter not found for "${resolvedTarget}"`));
-                        process.exit(1);
-                    }
-                    const directAnthropicBaseUrl = settingsEnv['ANTHROPIC_BASE_URL'] ||
-                        (settingsEnv['ANTHROPIC_API_KEY'] ? 'https://api.anthropic.com' : '');
-                    const creds = {
-                        profile: profileInfo.name,
+                const directAnthropicBaseUrl = settingsEnv['ANTHROPIC_BASE_URL'] ||
+                    (settingsEnv['ANTHROPIC_API_KEY'] ? 'https://api.anthropic.com' : '');
+                const creds = {
+                    profile: profileInfo.name,
+                    baseUrl: directAnthropicBaseUrl,
+                    apiKey: settingsEnv['ANTHROPIC_AUTH_TOKEN'] || settingsEnv['ANTHROPIC_API_KEY'] || '',
+                    model: settingsEnv['ANTHROPIC_MODEL'],
+                    provider: (0, targets_1.resolveDroidProvider)({
+                        provider: settingsEnv['CCS_DROID_PROVIDER'] || settingsEnv['DROID_PROVIDER'],
                         baseUrl: directAnthropicBaseUrl,
-                        apiKey: settingsEnv['ANTHROPIC_AUTH_TOKEN'] || settingsEnv['ANTHROPIC_API_KEY'] || '',
                         model: settingsEnv['ANTHROPIC_MODEL'],
-                        provider: (0, targets_1.resolveDroidProvider)({
-                            provider: settingsEnv['CCS_DROID_PROVIDER'] || settingsEnv['DROID_PROVIDER'],
-                            baseUrl: directAnthropicBaseUrl,
-                            model: settingsEnv['ANTHROPIC_MODEL'],
-                        }),
-                        reasoningOverride: droidReasoningOverride,
-                    };
-                    await adapter.prepareCredentials(creds);
-                    const targetArgs = adapter.buildArgs(profileInfo.name, targetRemainingArgs);
-                    const targetEnv = adapter.buildEnv(creds, profileInfo.type);
-                    adapter.exec(targetArgs, targetEnv, { binaryInfo: targetBinaryInfo || undefined });
-                    return;
-                }
-                (0, shell_executor_1.execClaude)(claudeCli, ['--settings', expandedSettingsPath, ...remainingArgs], envVars);
+                    }),
+                    reasoningOverride: droidReasoningOverride,
+                    envVars,
+                };
+                await adapter.prepareCredentials(creds);
+                const targetArgs = adapter.buildArgs(profileInfo.name, targetRemainingArgs);
+                const targetEnv = adapter.buildEnv(creds, profileInfo.type);
+                adapter.exec(targetArgs, targetEnv, { binaryInfo: targetBinaryInfo || undefined });
+                return;
             }
+            (0, shell_executor_1.execClaude)(claudeCli, ['--settings', expandedSettingsPath, ...remainingArgs], envVars);
         }
         else if (profileInfo.type === 'account') {
             // NEW FLOW: Account-based profile (work, personal)