@jonnyhoo/ccs 1.1.1 → 1.1.3

package/dist/config/unified-config-loader.js

@@ -2,8 +2,7 @@
 /**
  * Unified Config Loader
  *
- * Loads and saves the unified YAML configuration.
- * Provides fallback to legacy JSON format for backward compatibility.
+ * 精简版：加载和保存 YAML 配置，只保留核心功能。
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -29,133 +28,95 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getImageAnalysisConfig = exports.getDashboardAuthConfig = exports.getThinkingConfig = exports.getGlobalEnvConfig = exports.getWebSearchConfig = exports.setDefaultProfile = exports.getDefaultProfile = exports.isUnifiedMode = exports.updateUnifiedConfig = exports.saveUnifiedConfig = exports.loadOrCreateUnifiedConfig = exports.loadUnifiedConfig = exports.getConfigFormat = exports.hasLegacyConfig = exports.hasUnifiedConfig = exports.getConfigJsonPath = exports.getConfigYamlPath = void 0;
+exports.getThinkingConfig = exports.getGlobalEnvConfig = exports.setDefaultProfile = exports.getDefaultProfile = exports.isUnifiedMode = exports.updateUnifiedConfig = exports.saveUnifiedConfig = exports.loadOrCreateUnifiedConfig = exports.loadUnifiedConfig = exports.getConfigFormat = exports.hasLegacyConfig = exports.hasUnifiedConfig = exports.getConfigJsonPath = exports.getConfigYamlPath = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const yaml = __importStar(require("js-yaml"));
 const config_manager_1 = require("../utils/config-manager");
 const unified_config_types_1 = require("./unified-config-types");
-const feature_flags_1 = require("./feature-flags");
 const CONFIG_YAML = 'config.yaml';
 const CONFIG_JSON = 'config.json';
 const CONFIG_LOCK = 'config.yaml.lock';
-const LOCK_STALE_MS = 5000; // Lock is stale after 5 seconds
-/**
- * Get path to unified config.yaml
- */
+const LOCK_STALE_MS = 5000;
 function getConfigYamlPath() {
     return path.join((0, config_manager_1.getCcsDir)(), CONFIG_YAML);
 }
 exports.getConfigYamlPath = getConfigYamlPath;
-/**
- * Get path to legacy config.json
- */
 function getConfigJsonPath() {
     return path.join((0, config_manager_1.getCcsDir)(), CONFIG_JSON);
 }
 exports.getConfigJsonPath = getConfigJsonPath;
-/**
- * Get path to config lockfile
- */
 function getLockFilePath() {
     return path.join((0, config_manager_1.getCcsDir)(), CONFIG_LOCK);
 }
-/**
- * Acquire lockfile for config write operations.
- * Returns true if lock acquired, false if already locked by another process.
- * Cleans up stale locks (older than LOCK_STALE_MS).
- */
 function acquireLock() {
     const lockPath = getLockFilePath();
     const lockData = `${process.pid}\n${Date.now()}`;
     try {
-        // Check if lock exists
-        if (fs.existsSync(lockPath)) {
+        // 尝试原子创建锁文件（wx = 排他写入，文件已存在则失败）
+        const fd = fs.openSync(lockPath, 'wx', 0o600);
+        fs.writeSync(fd, lockData);
+        fs.closeSync(fd);
+        return true;
+    }
+    catch (createError) {
+        // 文件已存在，检查是否过期
+        try {
             const content = fs.readFileSync(lockPath, 'utf8');
             const [pidStr, timestampStr] = content.trim().split('\n');
             const timestamp = parseInt(timestampStr, 10);
-            // Check if lock is stale
             if (Date.now() - timestamp > LOCK_STALE_MS) {
-                // Stale lock - remove and acquire
                 fs.unlinkSync(lockPath);
+                return acquireLock();
             }
-            else {
-                // Check if process still exists
-                try {
-                    process.kill(parseInt(pidStr, 10), 0); // Signal 0 checks if process exists
-                    // Process exists - lock is valid
-                    return false;
-                }
-                catch {
-                    // Process doesn't exist - remove stale lock
-                    fs.unlinkSync(lockPath);
-                }
+            // 检查持锁进程是否存活
+            try {
+                process.kill(parseInt(pidStr, 10), 0);
+                return false; // 进程存活，锁有效
+            }
+            catch {
+                fs.unlinkSync(lockPath);
+                return acquireLock();
             }
         }
-        // Acquire lock
-        fs.writeFileSync(lockPath, lockData, { mode: 0o600 });
-        return true;
-    }
-    catch {
-        // Lock acquisition failed
-        return false;
+        catch {
+            return false;
+        }
     }
 }
-/**
- * Release lockfile after config write operation.
- */
 function releaseLock() {
     const lockPath = getLockFilePath();
     try {
-        if (fs.existsSync(lockPath)) {
+        if (fs.existsSync(lockPath))
             fs.unlinkSync(lockPath);
-        }
     }
     catch {
-        // Ignore cleanup errors
+        /* ignore */
     }
 }
-/**
- * Check if unified config.yaml exists
- */
 function hasUnifiedConfig() {
     return fs.existsSync(getConfigYamlPath());
 }
 exports.hasUnifiedConfig = hasUnifiedConfig;
-/**
- * Check if legacy config.json exists
- */
 function hasLegacyConfig() {
     return fs.existsSync(getConfigJsonPath());
 }
 exports.hasLegacyConfig = hasLegacyConfig;
-/**
- * Determine which config format is active.
- * Returns 'yaml' if unified config exists or is enabled,
- * 'json' if only legacy config exists,
- * 'none' if no config exists.
- */
 function getConfigFormat() {
     if (hasUnifiedConfig())
         return 'yaml';
-    if ((0, feature_flags_1.isUnifiedConfigEnabled)())
-        return 'yaml';
     if (hasLegacyConfig())
         return 'json';
     return 'none';
 }
 exports.getConfigFormat = getConfigFormat;
 /**
- * Load unified config from YAML file.
- * Returns null if file doesn't exist or format check fails.
- * Auto-upgrades config if version is outdated (regenerates comments).
+ * 加载 unified config。文件不存在或格式错误返回 null。
  */
 function loadUnifiedConfig() {
     const yamlPath = getConfigYamlPath();
-    // If file doesn't exist, return null
-    if (!fs.existsSync(yamlPath)) {
+    if (!fs.existsSync(yamlPath))
         return null;
-    }
     try {
         const content = fs.readFileSync(yamlPath, 'utf8');
         const parsed = yaml.load(content);
@@ -163,35 +124,25 @@ function loadUnifiedConfig() {
             console.error(`[!] Invalid config format in ${yamlPath}`);
             return null;
         }
-        // Auto-upgrade if version is outdated (regenerates YAML with new comments and fields)
+        // 版本升级
         if ((parsed.version ?? 1) < unified_config_types_1.UNIFIED_CONFIG_VERSION) {
-            // Merge with defaults to add new fields (e.g., model for websearch providers)
             const upgraded = mergeWithDefaults(parsed);
             upgraded.version = unified_config_types_1.UNIFIED_CONFIG_VERSION;
             try {
                 saveUnifiedConfig(upgraded);
-                if (process.env.CCS_DEBUG) {
-                    console.error(`[i] Config upgraded to v${unified_config_types_1.UNIFIED_CONFIG_VERSION}`);
-                }
                 return upgraded;
             }
-            catch (saveError) {
-                console.error('[!] Config upgrade failed to save:', saveError.message);
-                // Continue using the upgraded version in-memory even if save fails
+            catch {
+                // 保存失败也返回内存中的升级版本
             }
         }
         return parsed;
     }
     catch (err) {
-        // U3: Provide better context for YAML syntax errors
         if (err instanceof yaml.YAMLException) {
             const mark = err.mark;
             console.error(`[X] YAML syntax error in ${yamlPath}:`);
             console.error(`    Line ${(mark?.line ?? 0) + 1}, Column ${(mark?.column ?? 0) + 1}: ${err.reason || 'Invalid syntax'}`);
-            if (mark?.snippet) {
-                console.error(`    ${mark.snippet}`);
-            }
-            console.error(`    Tip: Check for missing colons, incorrect indentation, or unquoted special characters.`);
         }
         else {
             const error = err instanceof Error ? err.message : 'Unknown error';
@@ -201,128 +152,21 @@ function loadUnifiedConfig() {
     }
 }
 exports.loadUnifiedConfig = loadUnifiedConfig;
-/**
- * Merge partial config with defaults.
- * Preserves existing data while filling in missing sections.
- */
 function mergeWithDefaults(partial) {
     const defaults = (0, unified_config_types_1.createEmptyUnifiedConfig)();
     return {
         version: partial.version ?? defaults.version,
         setup_completed: partial.setup_completed,
         default: partial.default ?? defaults.default,
-        accounts: partial.accounts ?? defaults.accounts,
         profiles: partial.profiles ?? defaults.profiles,
-        cliproxy: {
-            oauth_accounts: partial.cliproxy?.oauth_accounts ?? defaults.cliproxy.oauth_accounts,
-            providers: defaults.cliproxy.providers, // Always use defaults for providers
-            variants: partial.cliproxy?.variants ?? defaults.cliproxy.variants,
-            logging: {
-                enabled: partial.cliproxy?.logging?.enabled ?? defaults.cliproxy.logging?.enabled ?? false,
-                request_log: partial.cliproxy?.logging?.request_log ?? defaults.cliproxy.logging?.request_log ?? false,
-            },
-            // Auth config - preserve user values, no defaults (uses constants as fallback)
-            auth: partial.cliproxy?.auth,
-            // Backend selection - validate and preserve user choice (original vs plus)
-            backend: partial.cliproxy?.backend === 'original' || partial.cliproxy?.backend === 'plus'
-                ? partial.cliproxy.backend
-                : undefined, // Invalid values become undefined (defaults to 'plus' at runtime)
-            // Auto-sync - default to true
-            auto_sync: partial.cliproxy?.auto_sync ?? defaults.cliproxy.auto_sync ?? true,
-        },
         preferences: {
             ...defaults.preferences,
             ...partial.preferences,
         },
-        websearch: {
-            enabled: partial.websearch?.enabled ?? defaults.websearch?.enabled ?? true,
-            providers: {
-                gemini: {
-                    enabled: partial.websearch?.providers?.gemini?.enabled ??
-                        partial.websearch?.gemini?.enabled ?? // Legacy fallback
-                        true,
-                    model: partial.websearch?.providers?.gemini?.model ?? 'gemini-2.5-flash',
-                    timeout: partial.websearch?.providers?.gemini?.timeout ??
-                        partial.websearch?.gemini?.timeout ?? // Legacy fallback
-                        55,
-                },
-                opencode: {
-                    enabled: partial.websearch?.providers?.opencode?.enabled ?? false,
-                    model: partial.websearch?.providers?.opencode?.model ?? 'opencode/grok-code',
-                    timeout: partial.websearch?.providers?.opencode?.timeout ?? 90,
-                },
-                grok: {
-                    enabled: partial.websearch?.providers?.grok?.enabled ?? false,
-                    timeout: partial.websearch?.providers?.grok?.timeout ?? 55,
-                },
-            },
-            // Legacy fields (keep for backwards compatibility during read)
-            gemini: partial.websearch?.gemini,
-        },
-        // Copilot config - strictly opt-in, merge with defaults
-        copilot: {
-            enabled: partial.copilot?.enabled ?? unified_config_types_1.DEFAULT_COPILOT_CONFIG.enabled,
-            auto_start: partial.copilot?.auto_start ?? unified_config_types_1.DEFAULT_COPILOT_CONFIG.auto_start,
-            port: partial.copilot?.port ?? unified_config_types_1.DEFAULT_COPILOT_CONFIG.port,
-            account_type: partial.copilot?.account_type ?? unified_config_types_1.DEFAULT_COPILOT_CONFIG.account_type,
-            rate_limit: partial.copilot?.rate_limit ?? unified_config_types_1.DEFAULT_COPILOT_CONFIG.rate_limit,
-            wait_on_limit: partial.copilot?.wait_on_limit ?? unified_config_types_1.DEFAULT_COPILOT_CONFIG.wait_on_limit,
-            model: partial.copilot?.model ?? unified_config_types_1.DEFAULT_COPILOT_CONFIG.model,
-        },
-        // Global env - injected into all non-Claude subscription profiles
         global_env: {
             enabled: partial.global_env?.enabled ?? true,
             env: partial.global_env?.env ?? { ...unified_config_types_1.DEFAULT_GLOBAL_ENV },
         },
-        // CLIProxy server config - remote/local CLIProxyAPI settings
-        cliproxy_server: {
-            remote: {
-                enabled: partial.cliproxy_server?.remote?.enabled ?? unified_config_types_1.DEFAULT_CLIPROXY_SERVER_CONFIG.remote.enabled,
-                host: partial.cliproxy_server?.remote?.host ?? unified_config_types_1.DEFAULT_CLIPROXY_SERVER_CONFIG.remote.host,
-                // Port is optional - undefined means use protocol default (443 for HTTPS, 8317 for HTTP)
-                port: partial.cliproxy_server?.remote?.port,
-                protocol: partial.cliproxy_server?.remote?.protocol ??
-                    unified_config_types_1.DEFAULT_CLIPROXY_SERVER_CONFIG.remote.protocol,
-                auth_token: partial.cliproxy_server?.remote?.auth_token ??
-                    unified_config_types_1.DEFAULT_CLIPROXY_SERVER_CONFIG.remote.auth_token,
-                // management_key is optional - falls back to auth_token when not set
-                management_key: partial.cliproxy_server?.remote?.management_key,
-            },
-            fallback: {
-                enabled: partial.cliproxy_server?.fallback?.enabled ??
-                    unified_config_types_1.DEFAULT_CLIPROXY_SERVER_CONFIG.fallback.enabled,
-                auto_start: partial.cliproxy_server?.fallback?.auto_start ??
-                    unified_config_types_1.DEFAULT_CLIPROXY_SERVER_CONFIG.fallback.auto_start,
-            },
-            local: {
-                port: partial.cliproxy_server?.local?.port ?? unified_config_types_1.DEFAULT_CLIPROXY_SERVER_CONFIG.local.port,
-                auto_start: partial.cliproxy_server?.local?.auto_start ??
-                    unified_config_types_1.DEFAULT_CLIPROXY_SERVER_CONFIG.local.auto_start,
-            },
-        },
-        // Quota management config - hybrid auto+manual account selection
-        quota_management: {
-            mode: partial.quota_management?.mode ?? unified_config_types_1.DEFAULT_QUOTA_MANAGEMENT_CONFIG.mode,
-            auto: {
-                preflight_check: partial.quota_management?.auto?.preflight_check ??
-                    unified_config_types_1.DEFAULT_QUOTA_MANAGEMENT_CONFIG.auto.preflight_check,
-                exhaustion_threshold: partial.quota_management?.auto?.exhaustion_threshold ??
-                    unified_config_types_1.DEFAULT_QUOTA_MANAGEMENT_CONFIG.auto.exhaustion_threshold,
-                tier_priority: partial.quota_management?.auto?.tier_priority ??
-                    unified_config_types_1.DEFAULT_QUOTA_MANAGEMENT_CONFIG.auto.tier_priority,
-                cooldown_minutes: partial.quota_management?.auto?.cooldown_minutes ??
-                    unified_config_types_1.DEFAULT_QUOTA_MANAGEMENT_CONFIG.auto.cooldown_minutes,
-            },
-            manual: {
-                paused_accounts: partial.quota_management?.manual?.paused_accounts ??
-                    unified_config_types_1.DEFAULT_QUOTA_MANAGEMENT_CONFIG.manual.paused_accounts,
-                forced_default: partial.quota_management?.manual?.forced_default ??
-                    unified_config_types_1.DEFAULT_QUOTA_MANAGEMENT_CONFIG.manual.forced_default,
-                tier_lock: partial.quota_management?.manual?.tier_lock ??
-                    unified_config_types_1.DEFAULT_QUOTA_MANAGEMENT_CONFIG.manual.tier_lock,
-            },
-        },
-        // Thinking config - auto/manual/off control for reasoning budget
         thinking: {
             mode: partial.thinking?.mode ?? unified_config_types_1.DEFAULT_THINKING_CONFIG.mode,
             override: partial.thinking?.override,
@@ -334,103 +178,40 @@ function mergeWithDefaults(partial) {
             provider_overrides: partial.thinking?.provider_overrides,
             show_warnings: partial.thinking?.show_warnings ?? unified_config_types_1.DEFAULT_THINKING_CONFIG.show_warnings,
         },
-        // Dashboard auth config - disabled by default
-        dashboard_auth: {
-            enabled: partial.dashboard_auth?.enabled ?? unified_config_types_1.DEFAULT_DASHBOARD_AUTH_CONFIG.enabled,
-            username: partial.dashboard_auth?.username ?? unified_config_types_1.DEFAULT_DASHBOARD_AUTH_CONFIG.username,
-            password_hash: partial.dashboard_auth?.password_hash ?? unified_config_types_1.DEFAULT_DASHBOARD_AUTH_CONFIG.password_hash,
-            session_timeout_hours: partial.dashboard_auth?.session_timeout_hours ??
-                unified_config_types_1.DEFAULT_DASHBOARD_AUTH_CONFIG.session_timeout_hours,
-        },
-        // Image analysis config - enabled by default for CLIProxy providers
-        image_analysis: {
-            enabled: partial.image_analysis?.enabled ?? unified_config_types_1.DEFAULT_IMAGE_ANALYSIS_CONFIG.enabled,
-            timeout: partial.image_analysis?.timeout ?? unified_config_types_1.DEFAULT_IMAGE_ANALYSIS_CONFIG.timeout,
-            provider_models: partial.image_analysis?.provider_models ?? unified_config_types_1.DEFAULT_IMAGE_ANALYSIS_CONFIG.provider_models,
-        },
-        // Router config - scenario-based routing for sub-agents
-        router: partial.router,
     };
 }
-/**
- * Load config, preferring YAML if available, falling back to creating empty config.
- * Merges with defaults to ensure all sections exist.
- */
 function loadOrCreateUnifiedConfig() {
     const existing = loadUnifiedConfig();
-    if (existing) {
-        // Merge with defaults to fill any missing sections
+    if (existing)
         return mergeWithDefaults(existing);
-    }
-    // Create empty config
-    const config = (0, unified_config_types_1.createEmptyUnifiedConfig)();
-    return config;
+    return (0, unified_config_types_1.createEmptyUnifiedConfig)();
 }
 exports.loadOrCreateUnifiedConfig = loadOrCreateUnifiedConfig;
-/**
- * Generate YAML header with helpful comments.
- */
 function generateYamlHeader() {
     return `# CCS Unified Configuration
 # Docs: https://github.com/kaitranntt/ccs
 `;
 }
-/**
- * Generate YAML content with section comments for better readability.
- */
 function generateYamlWithComments(config) {
     const lines = [];
-    // Version
     lines.push(`version: ${config.version}`);
     if (config.setup_completed !== undefined) {
         lines.push(`setup_completed: ${config.setup_completed}`);
     }
     lines.push('');
-    // Default
     if (config.default) {
         lines.push(`# Default profile used when running 'ccs' without arguments`);
         lines.push(`default: "${config.default}"`);
         lines.push('');
     }
-    // Accounts section
-    lines.push('# ----------------------------------------------------------------------------');
-    lines.push('# Accounts: Isolated Claude instances (each with separate auth/sessions)');
-    lines.push('# Manage with: ccs auth add <name>, ccs auth list, ccs auth remove <name>');
-    lines.push('# ----------------------------------------------------------------------------');
-    lines.push(yaml.dump({ accounts: config.accounts }, { indent: 2, lineWidth: -1, quotingType: '"' }).trim());
-    lines.push('');
-    // Profiles section
+    // Profiles
     lines.push('# ----------------------------------------------------------------------------');
     lines.push('# Profiles: API-based providers (GLM, GLMT, Kimi, custom endpoints)');
     lines.push('# Each profile points to a *.settings.json file containing env vars.');
-    lines.push('# Edit the settings file directly to customize (ANTHROPIC_MAX_TOKENS, etc.)');
     lines.push('# ----------------------------------------------------------------------------');
     lines.push(yaml.dump({ profiles: config.profiles }, { indent: 2, lineWidth: -1, quotingType: '"' }).trim());
     lines.push('');
-    // CLIProxy section
-    lines.push('# ----------------------------------------------------------------------------');
-    lines.push('# CLIProxy: OAuth-based providers (gemini, codex, agy, qwen, iflow)');
-    lines.push('# Each variant can reference a *.settings.json file for custom env vars.');
-    lines.push('# Edit the settings file directly to customize model or other settings.');
-    lines.push('# ----------------------------------------------------------------------------');
-    lines.push(yaml.dump({ cliproxy: config.cliproxy }, { indent: 2, lineWidth: -1, quotingType: '"' }).trim());
-    lines.push('');
-    // CLIProxy Server section (remote proxy configuration) - placed right after cliproxy
-    if (config.cliproxy_server) {
-        lines.push('# ----------------------------------------------------------------------------');
-        lines.push('# CLIProxy Server: Remote proxy connection settings');
-        lines.push('# Configure via Dashboard (`ccs config`) > Proxy tab.');
-        lines.push('#');
-        lines.push('# remote: Connect to a remote CLIProxyAPI instance');
-        lines.push('# fallback: Use local proxy if remote is unreachable');
-        lines.push('# local: Local proxy settings (port, auto-start)');
-        lines.push('# ----------------------------------------------------------------------------');
-        lines.push(yaml
-            .dump({ cliproxy_server: config.cliproxy_server }, { indent: 2, lineWidth: -1, quotingType: '"' })
-            .trim());
-        lines.push('');
-    }
-    // Preferences section
+    // Preferences
     lines.push('# ----------------------------------------------------------------------------');
     lines.push('# Preferences: User settings');
     lines.push('# ----------------------------------------------------------------------------');
@@ -438,144 +219,32 @@ function generateYamlWithComments(config) {
         .dump({ preferences: config.preferences }, { indent: 2, lineWidth: -1, quotingType: '"' })
         .trim());
     lines.push('');
-    // WebSearch section
-    if (config.websearch) {
-        lines.push('# ----------------------------------------------------------------------------');
-        lines.push('# WebSearch: CLI-based web search for third-party profiles');
-        lines.push('# Dashboard (`ccs config`) is the source of truth for provider selection.');
-        lines.push('#');
-        lines.push('# Third-party providers (gemini, codex, agy, etc.) do not have access to');
-        lines.push("# Anthropic's WebSearch tool. These CLI tools provide fallback web search.");
-        lines.push('#');
-        lines.push('# Fallback chain: Gemini -> OpenCode -> Grok (tries in order until success)');
-        lines.push('#');
-        lines.push('# Gemini models: gemini-2.5-flash (default), gemini-2.5-pro, gemini-2.5-flash-lite');
-        lines.push('# OpenCode models: opencode/grok-code (default), opencode/gpt-4o, opencode/claude-3.5-sonnet');
-        lines.push('#');
-        lines.push('# Install commands:');
-        lines.push('#   gemini: npm i -g @google/gemini-cli (FREE - 1000 req/day)');
-        lines.push('#   opencode: curl -fsSL https://opencode.ai/install | bash (FREE via Zen)');
-        lines.push('#   grok: npm i -g @vibe-kit/grok-cli (requires GROK_API_KEY)');
-        lines.push('# ----------------------------------------------------------------------------');
-        lines.push(yaml
-            .dump({ websearch: config.websearch }, { indent: 2, lineWidth: -1, quotingType: '"' })
-            .trim());
-        lines.push('');
-    }
-    // Copilot section (GitHub Copilot proxy)
-    if (config.copilot) {
-        lines.push('# ----------------------------------------------------------------------------');
-        lines.push('# Copilot: GitHub Copilot API proxy (via copilot-api)');
-        lines.push('# Uses your existing GitHub Copilot subscription with Claude Code.');
-        lines.push('#');
-        lines.push('# !! DISCLAIMER - USE AT YOUR OWN RISK !!');
-        lines.push('# This uses an UNOFFICIAL reverse-engineered API.');
-        lines.push('# Excessive usage may trigger GitHub account restrictions.');
-        lines.push('# CCS provides NO WARRANTY and accepts NO RESPONSIBILITY for consequences.');
-        lines.push('#');
-        lines.push('# Setup: npx copilot-api auth (authenticate with GitHub)');
-        lines.push('# Usage: ccs copilot (switch to copilot profile)');
-        lines.push('#');
-        lines.push('# Models: claude-sonnet-4.5, claude-opus-4.5, gpt-5.1, gemini-2.5-pro');
-        lines.push('# Account types: individual, business, enterprise');
-        lines.push('# ----------------------------------------------------------------------------');
-        lines.push(yaml.dump({ copilot: config.copilot }, { indent: 2, lineWidth: -1, quotingType: '"' }).trim());
-        lines.push('');
-    }
-    // Global env section
+    // Global env
     if (config.global_env) {
         lines.push('# ----------------------------------------------------------------------------');
         lines.push('# Global Environment Variables: Injected into all non-Claude subscription profiles');
-        lines.push('# These env vars disable telemetry/reporting for third-party providers.');
-        lines.push('# Configure via Dashboard (`ccs config`) > Global Env tab.');
-        lines.push('#');
-        lines.push('# Default variables:');
-        lines.push('#   DISABLE_BUG_COMMAND: Disables /bug command (not supported by proxy)');
-        lines.push('#   DISABLE_ERROR_REPORTING: Disables error reporting to Anthropic');
-        lines.push('#   DISABLE_TELEMETRY: Disables usage telemetry');
         lines.push('# ----------------------------------------------------------------------------');
         lines.push(yaml
             .dump({ global_env: config.global_env }, { indent: 2, lineWidth: -1, quotingType: '"' })
             .trim());
         lines.push('');
     }
-    // Thinking section (extended thinking/reasoning configuration)
+    // Thinking
     if (config.thinking) {
         lines.push('# ----------------------------------------------------------------------------');
         lines.push('# Thinking: Extended thinking/reasoning budget configuration');
-        lines.push('# Controls reasoning depth for supported providers (agy, gemini, codex).');
-        lines.push('#');
         lines.push('# Modes: auto (use tier_defaults), off (disable), manual (--thinking flag only)');
-        lines.push('# Levels: minimal (512), low (1K), medium (8K), high (24K), xhigh (32K), auto');
-        lines.push('# Override: Set global override value (number or level name)');
-        lines.push('# Provider overrides: Per-provider tier defaults');
         lines.push('# ----------------------------------------------------------------------------');
         lines.push(yaml
             .dump({ thinking: config.thinking }, { indent: 2, lineWidth: -1, quotingType: '"' })
             .trim());
         lines.push('');
     }
-    // Dashboard auth section (only if configured)
-    if (config.dashboard_auth?.enabled) {
-        lines.push('# ----------------------------------------------------------------------------');
-        lines.push('# Dashboard Auth: Optional login protection for CCS dashboard');
-        lines.push('# Generate password hash: npx bcrypt-cli hash "your-password"');
-        lines.push('# ENV override: CCS_DASHBOARD_AUTH_ENABLED, CCS_DASHBOARD_USERNAME, CCS_DASHBOARD_PASSWORD_HASH');
-        lines.push('# ----------------------------------------------------------------------------');
-        lines.push(yaml
-            .dump({ dashboard_auth: config.dashboard_auth }, { indent: 2, lineWidth: -1, quotingType: '"' })
-            .trim());
-        lines.push('');
-    }
-    // Image analysis section
-    if (config.image_analysis) {
-        lines.push('# ----------------------------------------------------------------------------');
-        lines.push('# Image Analysis: Vision-based analysis for images and PDFs');
-        lines.push('# Routes Read tool requests for images/PDFs through CLIProxy vision API.');
-        lines.push('#');
-        lines.push('# When enabled: Image files trigger vision analysis instead of raw file read');
-        lines.push('# Provider models: Vision model used for each CLIProxy provider');
-        lines.push('# Timeout: Maximum seconds to wait for analysis (10-600)');
-        lines.push('#');
-        lines.push('# Supported formats: .jpg, .jpeg, .png, .gif, .webp, .heic, .bmp, .tiff, .pdf');
-        lines.push('# Configure via: ccs config image-analysis');
-        lines.push('# ----------------------------------------------------------------------------');
-        lines.push(yaml
-            .dump({ image_analysis: config.image_analysis }, { indent: 2, lineWidth: -1, quotingType: '"' })
-            .trim());
-        lines.push('');
-    }
-    // Router section (scenario routing for sub-agents)
-    if (config.router) {
-        lines.push('# ----------------------------------------------------------------------------');
-        lines.push('# Router: Scenario-based routing for Claude sub-agents');
-        lines.push('# Routes different request types (background, think, webSearch) to profiles.');
-        lines.push('#');
-        lines.push('# Scenarios:');
-        lines.push('#   default     - Fallback for unmatched requests');
-        lines.push('#   background  - Claude background/haiku sub-agents');
-        lines.push('#   think       - Extended thinking requests');
-        lines.push('#   longContext - Requests exceeding token threshold');
-        lines.push('#   webSearch   - Web search tool requests');
-        lines.push('#');
-        lines.push('# Configure via: ccs router set <scenario> <profile>');
-        lines.push('# ----------------------------------------------------------------------------');
-        lines.push(yaml
-            .dump({ router: config.router }, { indent: 2, lineWidth: -1, quotingType: '"' })
-            .trim());
-        lines.push('');
-    }
     return lines.join('\n');
 }
-/**
- * Save unified config to YAML file.
- * Uses atomic write (temp file + rename) to prevent corruption.
- * Uses lockfile to prevent concurrent writes.
- */
 function saveUnifiedConfig(config) {
     const yamlPath = getConfigYamlPath();
     const dir = path.dirname(yamlPath);
-    // Acquire lock (retry for up to 1 second)
     const maxRetries = 10;
     const retryDelayMs = 100;
     let lockAcquired = false;
@@ -584,41 +253,34 @@ function saveUnifiedConfig(config) {
             lockAcquired = true;
             break;
         }
-        // Synchronous sleep without CPU-intensive busy-wait
-        // Uses Atomics.wait which properly sleeps the thread
-        // Note: saveUnifiedConfig is sync API with 19+ callers, converting to async not feasible
-        Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, retryDelayMs);
+        // 同步忙等待，避免阻塞事件循环的 Atomics.wait
+        const waitUntil = Date.now() + retryDelayMs;
+        while (Date.now() < waitUntil) { /* spin */ }
     }
     if (!lockAcquired) {
         throw new Error('Config file is locked by another process. Wait a moment and try again.');
     }
     try {
-        // Ensure directory exists
         if (!fs.existsSync(dir)) {
             fs.mkdirSync(dir, { recursive: true, mode: 0o700 });
         }
-        // Ensure version is set
         config.version = unified_config_types_1.UNIFIED_CONFIG_VERSION;
-        // Generate YAML with section comments
         const yamlContent = generateYamlWithComments(config);
         const content = generateYamlHeader() + yamlContent;
-        // Atomic write: write to temp file, then rename
         const tempPath = `${yamlPath}.tmp.${process.pid}`;
         try {
             fs.writeFileSync(tempPath, content, { mode: 0o600 });
             fs.renameSync(tempPath, yamlPath);
         }
         catch (error) {
-            // Clean up temp file on error
             if (fs.existsSync(tempPath)) {
                 try {
                     fs.unlinkSync(tempPath);
                 }
                 catch {
-                    // Ignore cleanup errors
+                    /* ignore */
                 }
             }
-            // Classify filesystem errors
             const err = error;
             if (err.code === 'ENOSPC') {
                 throw new Error('Disk full - cannot save config. Free up space and try again.');
@@ -630,15 +292,10 @@ function saveUnifiedConfig(config) {
         }
     }
     finally {
-        // Always release lock
         releaseLock();
     }
 }
 exports.saveUnifiedConfig = saveUnifiedConfig;
-/**
- * Update unified config with partial data.
- * Loads existing config, merges changes, and saves.
- */
 function updateUnifiedConfig(updates) {
     const config = loadOrCreateUnifiedConfig();
     const updated = { ...config, ...updates };
@@ -646,19 +303,10 @@ function updateUnifiedConfig(updates) {
     return updated;
 }
 exports.updateUnifiedConfig = updateUnifiedConfig;
-/**
- * Check if unified config mode is active.
- * Returns true if config.yaml exists OR CCS_UNIFIED_CONFIG=1.
- *
- * Use this centralized function instead of duplicating the logic.
- */
 function isUnifiedMode() {
-    return hasUnifiedConfig() || (0, feature_flags_1.isUnifiedConfigEnabled)();
+    return hasUnifiedConfig();
 }
 exports.isUnifiedMode = isUnifiedMode;
-/**
- * Get or set default profile name.
- */
 function getDefaultProfile() {
     const config = loadUnifiedConfig();
     return config?.default;
@@ -668,47 +316,6 @@ function setDefaultProfile(name) {
     updateUnifiedConfig({ default: name });
 }
 exports.setDefaultProfile = setDefaultProfile;
-/**
- * Get websearch configuration.
- * Returns defaults if not configured.
- * Supports Gemini CLI, OpenCode, and Grok CLI providers.
- */
-function getWebSearchConfig() {
-    const config = loadOrCreateUnifiedConfig();
-    // Build provider configs
-    const geminiConfig = {
-        enabled: config.websearch?.providers?.gemini?.enabled ?? config.websearch?.gemini?.enabled ?? true,
-        model: config.websearch?.providers?.gemini?.model ?? 'gemini-2.5-flash',
-        timeout: config.websearch?.providers?.gemini?.timeout ?? config.websearch?.gemini?.timeout ?? 55,
-    };
-    const opencodeConfig = {
-        enabled: config.websearch?.providers?.opencode?.enabled ?? false,
-        model: config.websearch?.providers?.opencode?.model ?? 'opencode/grok-code',
-        timeout: config.websearch?.providers?.opencode?.timeout ?? 90,
-    };
-    const grokConfig = {
-        enabled: config.websearch?.providers?.grok?.enabled ?? false,
-        timeout: config.websearch?.providers?.grok?.timeout ?? 55,
-    };
-    // Auto-enable master switch if ANY provider is enabled
-    const anyProviderEnabled = geminiConfig.enabled || opencodeConfig.enabled || grokConfig.enabled;
-    const enabled = anyProviderEnabled && (config.websearch?.enabled ?? true);
-    return {
-        enabled,
-        providers: {
-            gemini: geminiConfig,
-            opencode: opencodeConfig,
-            grok: grokConfig,
-        },
-        // Legacy field for backwards compatibility
-        gemini: config.websearch?.gemini,
-    };
-}
-exports.getWebSearchConfig = getWebSearchConfig;
-/**
- * Get global_env configuration.
- * Returns defaults if not configured.
- */
 function getGlobalEnvConfig() {
     const config = loadOrCreateUnifiedConfig();
     return {
@@ -717,16 +324,10 @@ function getGlobalEnvConfig() {
     };
 }
 exports.getGlobalEnvConfig = getGlobalEnvConfig;
-/**
- * Get thinking configuration.
- * Returns defaults if not configured.
- */
 function getThinkingConfig() {
     const config = loadOrCreateUnifiedConfig();
-    // W2: Check for invalid thinking config (e.g., thinking: true instead of object)
     if (config.thinking !== undefined && typeof config.thinking !== 'object') {
         console.warn(`[!] Invalid thinking config: expected object, got ${typeof config.thinking}. Using defaults.`);
-        console.warn(`    Tip: Use 'thinking: { mode: auto }' instead of 'thinking: true'`);
         return unified_config_types_1.DEFAULT_THINKING_CONFIG;
     }
     return {
@@ -742,37 +343,4 @@ function getThinkingConfig() {
     };
 }
 exports.getThinkingConfig = getThinkingConfig;
-/**
- * Get dashboard_auth configuration with ENV var override.
- * Priority: ENV vars > config.yaml > defaults
- */
-function getDashboardAuthConfig() {
-    const config = loadOrCreateUnifiedConfig();
-    // ENV vars take precedence
-    const envEnabled = process.env.CCS_DASHBOARD_AUTH_ENABLED;
-    const envUsername = process.env.CCS_DASHBOARD_USERNAME;
-    const envPasswordHash = process.env.CCS_DASHBOARD_PASSWORD_HASH;
-    return {
-        enabled: envEnabled !== undefined
-            ? envEnabled === 'true' || envEnabled === '1'
-            : (config.dashboard_auth?.enabled ?? false),
-        username: envUsername ?? config.dashboard_auth?.username ?? '',
-        password_hash: envPasswordHash ?? config.dashboard_auth?.password_hash ?? '',
-        session_timeout_hours: config.dashboard_auth?.session_timeout_hours ?? 24,
-    };
-}
-exports.getDashboardAuthConfig = getDashboardAuthConfig;
-/**
- * Get image_analysis configuration.
- * Returns defaults if not configured.
- */
-function getImageAnalysisConfig() {
-    const config = loadOrCreateUnifiedConfig();
-    return {
-        enabled: config.image_analysis?.enabled ?? unified_config_types_1.DEFAULT_IMAGE_ANALYSIS_CONFIG.enabled,
-        timeout: config.image_analysis?.timeout ?? unified_config_types_1.DEFAULT_IMAGE_ANALYSIS_CONFIG.timeout,
-        provider_models: config.image_analysis?.provider_models ?? unified_config_types_1.DEFAULT_IMAGE_ANALYSIS_CONFIG.provider_models,
-    };
-}
-exports.getImageAnalysisConfig = getImageAnalysisConfig;
 //# sourceMappingURL=unified-config-loader.js.map