aicodeswitch 3.9.3 → 4.0.0

package/dist/server/main.js

@@ -30,6 +30,8 @@ const websocket_service_1 = require("./websocket-service");
 const rules_status_service_1 = require("./rules-status-service");
 const type_migration_1 = require("./type-migration");
 const config_metadata_1 = require("./config-metadata");
+const config_merge_1 = require("./config-merge");
+const config_managed_fields_1 = require("./config-managed-fields");
 const config_1 = require("./config");
 const appDir = path_1.default.join(os_1.default.homedir(), '.aicodeswitch');
 const legacyDataDir = path_1.default.join(appDir, 'data');
@@ -104,7 +106,13 @@ const asyncHandler = (handler) => (req, res, next) => {
         next(err);
     });
 };
-const writeClaudeConfig = (dbManager, enableAgentTeams, enableBypassPermissionsSupport) => __awaiter(void 0, void 0, void 0, function* () {
+const VALID_CLAUDE_EFFORT_LEVELS = ['low', 'medium', 'high', 'max'];
+const DEFAULT_CLAUDE_EFFORT_LEVEL = 'medium';
+const isClaudeEffortLevel = (value) => {
+    return typeof value === 'string' && VALID_CLAUDE_EFFORT_LEVELS.includes(value);
+};
+const writeClaudeConfig = (dbManager_1, enableAgentTeams_1, enableBypassPermissionsSupport_1, effortLevel_1, defaultModel_1, ...args_1) => __awaiter(void 0, [dbManager_1, enableAgentTeams_1, enableBypassPermissionsSupport_1, effortLevel_1, defaultModel_1, ...args_1], void 0, function* (dbManager, enableAgentTeams, enableBypassPermissionsSupport, effortLevel, defaultModel, options = {}) {
+    var _a;
     try {
         const homeDir = os_1.default.homedir();
         const port = process.env.PORT ? parseInt(process.env.PORT, 10) : 4567;
@@ -116,29 +124,44 @@ const writeClaudeConfig = (dbManager, enableAgentTeams, enableBypassPermissionsS
         const claudeJsonBakPath = path_1.default.join(homeDir, '.claude.json.aicodeswitch_backup');
         // 使用新的配置状态检测来判断是否可以写入
         const configStatus = (0, config_metadata_1.checkClaudeConfigStatus)();
+        const isRuntimeRefresh = options.allowOverwriteRefresh === true && configStatus.isOverwritten;
         // 只有当当前配置已经是代理配置时，才拒绝写入
-        if (configStatus.isOverwritten) {
+        if (configStatus.isOverwritten && !isRuntimeRefresh) {
             console.error('Claude config has already been overwritten. Please restore the original config first.');
             return false;
         }
         // 如果 .aicodeswitch_backup 文件不存在，才进行备份（避免覆盖已有备份）
-        let originalSettingsHash = undefined;
-        if (!fs_1.default.existsSync(claudeSettingsBakPath)) {
-            // 计算原始配置文件的 hash(如果存在)
-            if (fs_1.default.existsSync(claudeSettingsPath)) {
-                originalSettingsHash = (0, crypto_1.createHash)('sha256').update(fs_1.default.readFileSync(claudeSettingsPath, 'utf-8')).digest('hex');
-                // 备份当前配置文件
-                fs_1.default.renameSync(claudeSettingsPath, claudeSettingsBakPath);
+        let originalSettingsHash = isRuntimeRefresh
+            ? (_a = configStatus.metadata) === null || _a === void 0 ? void 0 : _a.originalHash
+            : undefined;
+        if (!isRuntimeRefresh) {
+            if (!fs_1.default.existsSync(claudeSettingsBakPath)) {
+                // 计算原始配置文件的 hash(如果存在)
+                if (fs_1.default.existsSync(claudeSettingsPath)) {
+                    originalSettingsHash = (0, crypto_1.createHash)('sha256').update(fs_1.default.readFileSync(claudeSettingsPath, 'utf-8')).digest('hex');
+                    // 备份当前配置文件
+                    fs_1.default.renameSync(claudeSettingsPath, claudeSettingsBakPath);
+                }
+            }
+            else {
+                // .aicodeswitch_backup 已存在，直接使用现有的备份文件
+                console.log('Backup file already exists, skipping backup step');
             }
-        }
-        else {
-            // .aicodeswitch_backup 已存在，直接使用现有的备份文件
-            console.log('Backup file already exists, skipping backup step');
         }
         if (!fs_1.default.existsSync(claudeDir)) {
             fs_1.default.mkdirSync(claudeDir, { recursive: true });
         }
-        // 构建环境变量配置
+        // 读取当前配置（如果存在），保留工具运行时写入的内容
+        let currentSettings = {};
+        if (fs_1.default.existsSync(claudeSettingsPath)) {
+            try {
+                currentSettings = JSON.parse(fs_1.default.readFileSync(claudeSettingsPath, 'utf-8'));
+            }
+            catch (error) {
+                console.warn('Failed to parse current settings.json, using empty object:', error);
+            }
+        }
+        // 构建代理配置
         const claudeSettingsEnv = {
             ANTHROPIC_AUTH_TOKEN: config.apiKey || "api_key",
             ANTHROPIC_API_KEY: "",
@@ -150,32 +173,56 @@ const writeClaudeConfig = (dbManager, enableAgentTeams, enableBypassPermissionsS
         if (enableAgentTeams) {
             claudeSettingsEnv.CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS = "1";
         }
-        const claudeSettings = {
+        const proxySettings = {
             env: claudeSettingsEnv
         };
         // 如果开启对bypassPermissions的支持，添加对应的配置项
         if (enableBypassPermissionsSupport) {
-            claudeSettings.permissions = {
+            proxySettings.permissions = {
                 defaultMode: "bypassPermissions"
             };
-            claudeSettings.skipDangerousModePermissionPrompt = true;
+            proxySettings.skipDangerousModePermissionPrompt = true;
+        }
+        // 如果设置了 effortLevel，添加对应的配置项
+        if (effortLevel && isClaudeEffortLevel(effortLevel)) {
+            proxySettings.effortLevel = effortLevel;
+        }
+        // 如果设置了默认模型，添加对应的配置项
+        if (defaultModel && typeof defaultModel === 'string' && defaultModel.trim()) {
+            proxySettings.model = defaultModel.trim();
         }
-        fs_1.default.writeFileSync(claudeSettingsPath, JSON.stringify(claudeSettings, null, 2));
+        // 使用智能合并：将代理配置的管理字段写入，保留当前配置的非管理字段
+        const mergedSettings = (0, config_merge_1.mergeJsonConfig)(proxySettings, currentSettings, config_managed_fields_1.CLAUDE_SETTINGS_MANAGED_FIELDS);
+        // 原子性写入合并后的配置
+        (0, config_merge_1.atomicWriteFile)(claudeSettingsPath, JSON.stringify(mergedSettings, null, 2));
         // Claude Code .claude.json
         const claudeJsonPath = path_1.default.join(homeDir, '.claude.json');
-        // 先读取原文件内容（如果存在）
-        let claudeJson = {};
+        // 读取当前配置（如果存在），保留工具运行时写入的内容
+        let currentClaudeJson = {};
         if (fs_1.default.existsSync(claudeJsonPath)) {
-            claudeJson = JSON.parse(fs_1.default.readFileSync(claudeJsonPath, 'utf8'));
+            try {
+                currentClaudeJson = JSON.parse(fs_1.default.readFileSync(claudeJsonPath, 'utf-8'));
+            }
+            catch (error) {
+                console.warn('Failed to parse current .claude.json, using empty object:', error);
+            }
         }
         // 然后处理备份
-        if (!fs_1.default.existsSync(claudeJsonBakPath)) {
-            if (fs_1.default.existsSync(claudeJsonPath)) {
-                fs_1.default.renameSync(claudeJsonPath, claudeJsonBakPath);
+        if (!isRuntimeRefresh) {
+            if (!fs_1.default.existsSync(claudeJsonBakPath)) {
+                if (fs_1.default.existsSync(claudeJsonPath)) {
+                    fs_1.default.renameSync(claudeJsonPath, claudeJsonBakPath);
+                }
             }
         }
-        claudeJson.hasCompletedOnboarding = true;
-        fs_1.default.writeFileSync(claudeJsonPath, JSON.stringify(claudeJson, null, 2));
+        // 构建代理配置
+        const proxyClaudeJson = {
+            hasCompletedOnboarding: true
+        };
+        // 使用智能合并
+        const mergedClaudeJson = (0, config_merge_1.mergeJsonConfig)(proxyClaudeJson, currentClaudeJson, config_managed_fields_1.CLAUDE_JSON_MANAGED_FIELDS);
+        // 原子性写入合并后的配置
+        (0, config_merge_1.atomicWriteFile)(claudeJsonPath, JSON.stringify(mergedClaudeJson, null, 2));
         // 保存元数据
         const currentSettingsHash = (0, crypto_1.createHash)('sha256').update(fs_1.default.readFileSync(claudeSettingsPath, 'utf-8')).digest('hex');
         const metadata = {
@@ -203,125 +250,13 @@ const writeClaudeConfig = (dbManager, enableAgentTeams, enableBypassPermissionsS
         return false;
     }
 });
-/**
- * 更新Claude Code配置中的Agent Teams设置
- * 此函数假设配置文件已经被代理覆盖，直接修改环境变量而不重新备份
- */
-const updateClaudeAgentTeamsConfig = (enableAgentTeams) => __awaiter(void 0, void 0, void 0, function* () {
-    try {
-        const homeDir = os_1.default.homedir();
-        const claudeSettingsPath = path_1.default.join(homeDir, '.claude/settings.json');
-        // 检查配置文件是否存在
-        if (!fs_1.default.existsSync(claudeSettingsPath)) {
-            console.error('Claude settings.json does not exist');
-            return false;
-        }
-        // 读取当前配置
-        const currentContent = fs_1.default.readFileSync(claudeSettingsPath, 'utf-8');
-        const currentConfig = JSON.parse(currentContent);
-        // 检查是否是代理配置
-        const configStatus = (0, config_metadata_1.checkClaudeConfigStatus)();
-        if (!configStatus.isOverwritten) {
-            console.error('Claude config is not overwritten by proxy. Please activate a route first.');
-            return false;
-        }
-        // 更新或删除Agent Teams环境变量
-        if (enableAgentTeams) {
-            currentConfig.env.CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS = "1";
-        }
-        else {
-            delete currentConfig.env.CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS;
-        }
-        // 写入更新后的配置
-        fs_1.default.writeFileSync(claudeSettingsPath, JSON.stringify(currentConfig, null, 2));
-        // 更新元数据中的当前配置hash
-        const metadata = (0, config_metadata_1.loadMetadata)('claude');
-        if (metadata && metadata.files[0]) {
-            metadata.files[0].currentHash = (0, crypto_1.createHash)('sha256')
-                .update(fs_1.default.readFileSync(claudeSettingsPath, 'utf-8'))
-                .digest('hex');
-            metadata.timestamp = Date.now();
-            (0, config_metadata_1.saveMetadata)(metadata);
-        }
-        return true;
-    }
-    catch (error) {
-        console.error('Failed to update Claude Agent Teams config:', error);
-        return false;
-    }
-});
-/**
- * 更新Claude Code配置中的bypassPermissions支持设置
- * 此函数假设配置文件已经被代理覆盖，直接修改配置而不重新备份
- */
-const updateClaudeBypassPermissionsSupportConfig = (enableBypassPermissionsSupport) => __awaiter(void 0, void 0, void 0, function* () {
-    try {
-        const homeDir = os_1.default.homedir();
-        const claudeSettingsPath = path_1.default.join(homeDir, '.claude/settings.json');
-        // 检查配置文件是否存在
-        if (!fs_1.default.existsSync(claudeSettingsPath)) {
-            console.error('Claude settings.json does not exist');
-            return false;
-        }
-        // 读取当前配置
-        const currentContent = fs_1.default.readFileSync(claudeSettingsPath, 'utf-8');
-        const currentConfig = JSON.parse(currentContent);
-        // 检查是否是代理配置
-        const configStatus = (0, config_metadata_1.checkClaudeConfigStatus)();
-        if (!configStatus.isOverwritten) {
-            console.error('Claude config is not overwritten by proxy. Please activate a route first.');
-            return false;
-        }
-        // 更新或删除bypassPermissions支持配置项
-        if (enableBypassPermissionsSupport) {
-            currentConfig.permissions = {
-                defaultMode: "bypassPermissions"
-            };
-            currentConfig.skipDangerousModePermissionPrompt = true;
-        }
-        else {
-            delete currentConfig.permissions;
-            delete currentConfig.skipDangerousModePermissionPrompt;
-        }
-        // 写入更新后的配置
-        fs_1.default.writeFileSync(claudeSettingsPath, JSON.stringify(currentConfig, null, 2));
-        // 更新元数据中的当前配置hash
-        const metadata = (0, config_metadata_1.loadMetadata)('claude');
-        if (metadata && metadata.files[0]) {
-            metadata.files[0].currentHash = (0, crypto_1.createHash)('sha256')
-                .update(fs_1.default.readFileSync(claudeSettingsPath, 'utf-8'))
-                .digest('hex');
-            metadata.timestamp = Date.now();
-            (0, config_metadata_1.saveMetadata)(metadata);
-        }
-        return true;
-    }
-    catch (error) {
-        console.error('Failed to update Claude bypassPermissions support config:', error);
-        return false;
-    }
-});
-const VALID_CODEX_REASONING_EFFORTS = ['low', 'medium', 'high'];
+const VALID_CODEX_REASONING_EFFORTS = ['low', 'medium', 'high', 'xhigh'];
 const DEFAULT_CODEX_REASONING_EFFORT = 'high';
 const isCodexReasoningEffort = (value) => {
     return typeof value === 'string' && VALID_CODEX_REASONING_EFFORTS.includes(value);
 };
-const buildCodexConfigToml = (modelReasoningEffort) => {
-    const localPort = process.env.PORT ? parseInt(process.env.PORT, 10) : 4567;
-    return `model_provider = "aicodeswitch"
-model = "gpt-5.1-codex"
-model_reasoning_effort = "${modelReasoningEffort}"
-disable_response_storage = true
-
-
-[model_providers.aicodeswitch]
-name = "aicodeswitch"
-base_url = "http://${host}:${localPort}/codex"
-wire_api = "responses"
-requires_openai_auth = true
-`;
-};
-const writeCodexConfig = (dbManager_1, ...args_1) => __awaiter(void 0, [dbManager_1, ...args_1], void 0, function* (dbManager, modelReasoningEffort = DEFAULT_CODEX_REASONING_EFFORT) {
+const writeCodexConfig = (dbManager_1, ...args_1) => __awaiter(void 0, [dbManager_1, ...args_1], void 0, function* (dbManager, modelReasoningEffort = DEFAULT_CODEX_REASONING_EFFORT, codexDefaultModel, options = {}) {
+    var _a;
     try {
         const homeDir = os_1.default.homedir();
         const config = dbManager.getConfig();
@@ -332,41 +267,92 @@ const writeCodexConfig = (dbManager_1, ...args_1) => __awaiter(void 0, [dbManage
         const codexAuthBakPath = path_1.default.join(codexDir, 'auth.json.aicodeswitch_backup');
         // 使用新的配置状态检测来判断是否可以写入
         const configStatus = (0, config_metadata_1.checkCodexConfigStatus)();
+        const isRuntimeRefresh = options.allowOverwriteRefresh === true && configStatus.isOverwritten;
         // 只有当当前配置已经是代理配置时，才拒绝写入
-        if (configStatus.isOverwritten) {
+        if (configStatus.isOverwritten && !isRuntimeRefresh) {
             console.error('Codex config has already been overwritten. Please restore the original config first.');
             return false;
         }
         // 如果 .aicodeswitch_backup 文件不存在，才进行备份（避免覆盖已有备份）
-        let originalConfigHash = undefined;
-        if (!fs_1.default.existsSync(codexConfigBakPath)) {
-            // 计算原始配置文件的 hash(如果存在)
-            if (fs_1.default.existsSync(codexConfigPath)) {
-                originalConfigHash = (0, crypto_1.createHash)('sha256').update(fs_1.default.readFileSync(codexConfigPath, 'utf-8')).digest('hex');
-                // 备份当前配置文件
-                fs_1.default.renameSync(codexConfigPath, codexConfigBakPath);
+        let originalConfigHash = isRuntimeRefresh
+            ? (_a = configStatus.metadata) === null || _a === void 0 ? void 0 : _a.originalHash
+            : undefined;
+        if (!isRuntimeRefresh) {
+            if (!fs_1.default.existsSync(codexConfigBakPath)) {
+                // 计算原始配置文件的 hash(如果存在)
+                if (fs_1.default.existsSync(codexConfigPath)) {
+                    originalConfigHash = (0, crypto_1.createHash)('sha256').update(fs_1.default.readFileSync(codexConfigPath, 'utf-8')).digest('hex');
+                    // 备份当前配置文件
+                    fs_1.default.renameSync(codexConfigPath, codexConfigBakPath);
+                }
+            }
+            else {
+                // .aicodeswitch_backup 已存在，直接使用现有的备份文件
+                console.log('Backup file already exists, skipping backup step');
             }
-        }
-        else {
-            // .aicodeswitch_backup 已存在，直接使用现有的备份文件
-            console.log('Backup file already exists, skipping backup step');
         }
         if (!fs_1.default.existsSync(codexDir)) {
             fs_1.default.mkdirSync(codexDir, { recursive: true });
         }
-        fs_1.default.writeFileSync(codexConfigPath, buildCodexConfigToml(modelReasoningEffort));
+        // 读取当前配置（如果存在），保留工具运行时写入的内容
+        let currentConfig = {};
+        if (fs_1.default.existsSync(codexConfigPath)) {
+            try {
+                currentConfig = (0, config_merge_1.parseToml)(fs_1.default.readFileSync(codexConfigPath, 'utf-8'));
+            }
+            catch (error) {
+                console.warn('Failed to parse current config.toml, using empty object:', error);
+            }
+        }
+        // 构建代理配置
+        const proxyConfig = {
+            model_provider: "aicodeswitch",
+            model: codexDefaultModel || "gpt-5.3-codex", // 使用配置的默认模型，否则使用默认值
+            model_reasoning_effort: modelReasoningEffort,
+            disable_response_storage: true,
+            preferred_auth_method: "apikey",
+            requires_openai_auth: true,
+            enableRouteSelection: true,
+            model_providers: {
+                aicodeswitch: {
+                    name: "aicodeswitch",
+                    base_url: `http://${host}:${process.env.PORT ? parseInt(process.env.PORT, 10) : 4567}/codex`,
+                    wire_api: "responses"
+                }
+            }
+        };
+        // 使用智能合并
+        const mergedConfig = (0, config_merge_1.mergeTomlConfig)(proxyConfig, currentConfig, config_managed_fields_1.CODEX_CONFIG_MANAGED_FIELDS);
+        // 原子性写入合并后的配置
+        (0, config_merge_1.atomicWriteFile)(codexConfigPath, (0, config_merge_1.stringifyToml)(mergedConfig));
         // Codex auth.json
         const codexAuthPath = path_1.default.join(codexDir, 'auth.json');
+        // 读取当前配置（如果存在），保留工具运行时写入的内容
+        let currentAuth = {};
+        if (fs_1.default.existsSync(codexAuthPath)) {
+            try {
+                currentAuth = JSON.parse(fs_1.default.readFileSync(codexAuthPath, 'utf-8'));
+            }
+            catch (error) {
+                console.warn('Failed to parse current auth.json, using empty object:', error);
+            }
+        }
         // 同样处理 auth.json 的备份
-        if (!fs_1.default.existsSync(codexAuthBakPath)) {
-            if (fs_1.default.existsSync(codexAuthPath)) {
-                fs_1.default.renameSync(codexAuthPath, codexAuthBakPath);
+        if (!isRuntimeRefresh) {
+            if (!fs_1.default.existsSync(codexAuthBakPath)) {
+                if (fs_1.default.existsSync(codexAuthPath)) {
+                    fs_1.default.renameSync(codexAuthPath, codexAuthBakPath);
+                }
             }
         }
-        const codexAuth = {
+        // 构建代理配置
+        const proxyAuth = {
             OPENAI_API_KEY: config.apiKey || "api_key"
         };
-        fs_1.default.writeFileSync(codexAuthPath, JSON.stringify(codexAuth, null, 2));
+        // 使用智能合并
+        const mergedAuth = (0, config_merge_1.mergeJsonConfig)(proxyAuth, currentAuth, config_managed_fields_1.CODEX_AUTH_MANAGED_FIELDS);
+        // 原子性写入合并后的配置
+        (0, config_merge_1.atomicWriteFile)(codexAuthPath, JSON.stringify(mergedAuth, null, 2));
         // 保存元数据
         const currentConfigHash = (0, crypto_1.createHash)('sha256').update(fs_1.default.readFileSync(codexConfigPath, 'utf-8')).digest('hex');
         const metadata = {
@@ -394,60 +380,62 @@ const writeCodexConfig = (dbManager_1, ...args_1) => __awaiter(void 0, [dbManage
         return false;
     }
 });
-const updateCodexReasoningEffortConfig = (modelReasoningEffort) => __awaiter(void 0, void 0, void 0, function* () {
-    try {
-        const homeDir = os_1.default.homedir();
-        const codexConfigPath = path_1.default.join(homeDir, '.codex/config.toml');
-        if (!fs_1.default.existsSync(codexConfigPath)) {
-            console.error('Codex config.toml does not exist');
-            return false;
-        }
-        const configStatus = (0, config_metadata_1.checkCodexConfigStatus)();
-        if (!configStatus.isOverwritten) {
-            console.error('Codex config is not overwritten by proxy. Please activate a route first.');
-            return false;
-        }
-        fs_1.default.writeFileSync(codexConfigPath, buildCodexConfigToml(modelReasoningEffort));
-        const metadata = (0, config_metadata_1.loadMetadata)('codex');
-        if (metadata && metadata.files[0]) {
-            metadata.files[0].currentHash = (0, crypto_1.createHash)('sha256')
-                .update(fs_1.default.readFileSync(codexConfigPath, 'utf-8'))
-                .digest('hex');
-            metadata.timestamp = Date.now();
-            (0, config_metadata_1.saveMetadata)(metadata);
-        }
-        return true;
-    }
-    catch (error) {
-        console.error('Failed to update Codex reasoning effort config:', error);
-        return false;
-    }
-});
 const restoreClaudeConfig = () => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const homeDir = os_1.default.homedir();
+        let restoredAnyFile = false;
         // Restore Claude Code settings.json
         const claudeDir = path_1.default.join(homeDir, '.claude');
         const claudeSettingsPath = path_1.default.join(claudeDir, 'settings.json');
         const claudeSettingsBakPath = path_1.default.join(claudeDir, 'settings.json.aicodeswitch_backup');
         if (fs_1.default.existsSync(claudeSettingsBakPath)) {
+            // 读取备份配置
+            const backupSettings = JSON.parse(fs_1.default.readFileSync(claudeSettingsBakPath, 'utf-8'));
+            // 读取当前配置（可能包含工具运行时写入的新内容）
+            let currentSettings = {};
             if (fs_1.default.existsSync(claudeSettingsPath)) {
-                fs_1.default.unlinkSync(claudeSettingsPath);
+                try {
+                    currentSettings = JSON.parse(fs_1.default.readFileSync(claudeSettingsPath, 'utf-8'));
+                }
+                catch (error) {
+                    console.warn('Failed to parse current settings.json during restore, using empty object:', error);
+                }
             }
-            fs_1.default.renameSync(claudeSettingsBakPath, claudeSettingsPath);
+            // 生成合并后的配置（备份作为基础，合并当前的非管理字段）
+            const mergedSettings = (0, config_merge_1.mergeJsonConfig)(backupSettings, currentSettings, config_managed_fields_1.CLAUDE_SETTINGS_MANAGED_FIELDS);
+            // 原子性写入合并后的配置
+            (0, config_merge_1.atomicWriteFile)(claudeSettingsPath, JSON.stringify(mergedSettings, null, 2));
+            // 删除备份文件
+            fs_1.default.unlinkSync(claudeSettingsBakPath);
+            restoredAnyFile = true;
         }
         // Restore Claude Code .claude.json
         const claudeJsonPath = path_1.default.join(homeDir, '.claude.json');
         const claudeJsonBakPath = path_1.default.join(homeDir, '.claude.json.aicodeswitch_backup');
         if (fs_1.default.existsSync(claudeJsonBakPath)) {
+            // 读取备份配置
+            const backupClaudeJson = JSON.parse(fs_1.default.readFileSync(claudeJsonBakPath, 'utf-8'));
+            // 读取当前配置（可能包含工具运行时写入的新内容）
+            let currentClaudeJson = {};
             if (fs_1.default.existsSync(claudeJsonPath)) {
-                fs_1.default.unlinkSync(claudeJsonPath);
+                try {
+                    currentClaudeJson = JSON.parse(fs_1.default.readFileSync(claudeJsonPath, 'utf-8'));
+                }
+                catch (error) {
+                    console.warn('Failed to parse current .claude.json during restore, using empty object:', error);
+                }
             }
-            fs_1.default.renameSync(claudeJsonBakPath, claudeJsonPath);
+            // 生成合并后的配置
+            const mergedClaudeJson = (0, config_merge_1.mergeJsonConfig)(backupClaudeJson, currentClaudeJson, config_managed_fields_1.CLAUDE_JSON_MANAGED_FIELDS);
+            // 原子性写入合并后的配置
+            (0, config_merge_1.atomicWriteFile)(claudeJsonPath, JSON.stringify(mergedClaudeJson, null, 2));
+            // 删除备份文件
+            fs_1.default.unlinkSync(claudeJsonBakPath);
+            restoredAnyFile = true;
         }
         // 删除元数据
         (0, config_metadata_1.deleteMetadata)('claude');
-        return true;
+        return restoredAnyFile;
     }
     catch (error) {
         console.error('Failed to restore Claude config files:', error);
@@ -457,28 +445,59 @@ const restoreClaudeConfig = () => __awaiter(void 0, void 0, void 0, function* ()
 const restoreCodexConfig = () => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const homeDir = os_1.default.homedir();
+        let restoredAnyFile = false;
         // Restore Codex config.toml
         const codexDir = path_1.default.join(homeDir, '.codex');
         const codexConfigPath = path_1.default.join(codexDir, 'config.toml');
         const codexConfigBakPath = path_1.default.join(codexDir, 'config.toml.aicodeswitch_backup');
         if (fs_1.default.existsSync(codexConfigBakPath)) {
+            // 读取备份配置
+            const backupConfig = (0, config_merge_1.parseToml)(fs_1.default.readFileSync(codexConfigBakPath, 'utf-8'));
+            // 读取当前配置（可能包含工具运行时写入的新内容）
+            let currentConfig = {};
             if (fs_1.default.existsSync(codexConfigPath)) {
-                fs_1.default.unlinkSync(codexConfigPath);
+                try {
+                    currentConfig = (0, config_merge_1.parseToml)(fs_1.default.readFileSync(codexConfigPath, 'utf-8'));
+                }
+                catch (error) {
+                    console.warn('Failed to parse current config.toml during restore, using empty object:', error);
+                }
             }
-            fs_1.default.renameSync(codexConfigBakPath, codexConfigPath);
+            // 生成合并后的配置（备份作为基础，合并当前的非管理字段）
+            const mergedConfig = (0, config_merge_1.mergeTomlConfig)(backupConfig, currentConfig, config_managed_fields_1.CODEX_CONFIG_MANAGED_FIELDS);
+            // 原子性写入合并后的配置
+            (0, config_merge_1.atomicWriteFile)(codexConfigPath, (0, config_merge_1.stringifyToml)(mergedConfig));
+            // 删除备份文件
+            fs_1.default.unlinkSync(codexConfigBakPath);
+            restoredAnyFile = true;
         }
         // Restore Codex auth.json
         const codexAuthPath = path_1.default.join(codexDir, 'auth.json');
         const codexAuthBakPath = path_1.default.join(codexDir, 'auth.json.aicodeswitch_backup');
         if (fs_1.default.existsSync(codexAuthBakPath)) {
+            // 读取备份配置
+            const backupAuth = JSON.parse(fs_1.default.readFileSync(codexAuthBakPath, 'utf-8'));
+            // 读取当前配置（可能包含工具运行时写入的新内容）
+            let currentAuth = {};
             if (fs_1.default.existsSync(codexAuthPath)) {
-                fs_1.default.unlinkSync(codexAuthPath);
+                try {
+                    currentAuth = JSON.parse(fs_1.default.readFileSync(codexAuthPath, 'utf-8'));
+                }
+                catch (error) {
+                    console.warn('Failed to parse current auth.json during restore, using empty object:', error);
+                }
             }
-            fs_1.default.renameSync(codexAuthBakPath, codexAuthPath);
+            // 生成合并后的配置
+            const mergedAuth = (0, config_merge_1.mergeJsonConfig)(backupAuth, currentAuth, config_managed_fields_1.CODEX_AUTH_MANAGED_FIELDS);
+            // 原子性写入合并后的配置
+            (0, config_merge_1.atomicWriteFile)(codexAuthPath, JSON.stringify(mergedAuth, null, 2));
+            // 删除备份文件
+            fs_1.default.unlinkSync(codexAuthBakPath);
+            restoredAnyFile = true;
         }
         // 删除元数据
         (0, config_metadata_1.deleteMetadata)('codex');
-        return true;
+        return restoredAnyFile;
     }
     catch (error) {
         console.error('Failed to restore Codex config files:', error);
@@ -513,6 +532,33 @@ const checkCodexBackupExists = () => {
         return false;
     }
 };
+const syncConfigsOnServerStartup = (dbManager) => __awaiter(void 0, void 0, void 0, function* () {
+    const config = dbManager.getConfig();
+    // 服务启动即执行写入，参数来源改为全局配置
+    const claudeEffortLevel = isClaudeEffortLevel(config.claudeEffortLevel)
+        ? config.claudeEffortLevel
+        : DEFAULT_CLAUDE_EFFORT_LEVEL;
+    const claudeWritten = yield writeClaudeConfig(dbManager, config.enableAgentTeams, config.enableBypassPermissionsSupport, claudeEffortLevel, config.claudeDefaultModel);
+    console.log(`[Startup Config Sync] Claude Code config ${claudeWritten ? 'written' : 'skipped'}`);
+    const modelReasoningEffort = isCodexReasoningEffort(config.codexModelReasoningEffort)
+        ? config.codexModelReasoningEffort
+        : DEFAULT_CODEX_REASONING_EFFORT;
+    const codexWritten = yield writeCodexConfig(dbManager, modelReasoningEffort, config.codexDefaultModel);
+    console.log(`[Startup Config Sync] Codex config ${codexWritten ? 'written' : 'skipped'}`);
+});
+const syncConfigsOnGlobalConfigUpdate = (dbManager) => __awaiter(void 0, void 0, void 0, function* () {
+    const config = dbManager.getConfig();
+    const claudeEffortLevel = isClaudeEffortLevel(config.claudeEffortLevel)
+        ? config.claudeEffortLevel
+        : DEFAULT_CLAUDE_EFFORT_LEVEL;
+    const claudeUpdated = yield writeClaudeConfig(dbManager, config.enableAgentTeams, config.enableBypassPermissionsSupport, claudeEffortLevel, config.claudeDefaultModel, { allowOverwriteRefresh: true });
+    console.log(`[Config Update Sync] Claude Code config ${claudeUpdated ? 'written' : 'skipped'}`);
+    const modelReasoningEffort = isCodexReasoningEffort(config.codexModelReasoningEffort)
+        ? config.codexModelReasoningEffort
+        : DEFAULT_CODEX_REASONING_EFFORT;
+    const codexUpdated = yield writeCodexConfig(dbManager, modelReasoningEffort, config.codexDefaultModel, { allowOverwriteRefresh: true });
+    console.log(`[Config Update Sync] Codex config ${codexUpdated ? 'written' : 'skipped'}`);
+});
 const getCentralSkillsDir = () => {
     return path_1.default.join(os_1.default.homedir(), '.aicodeswitch', 'skills');
 };
@@ -902,8 +948,12 @@ const registerRoutes = (dbManager, proxyServer) => {
         }
     });
     app.get('/api/vendors', (_req, res) => res.json(dbManager.getVendors()));
-    app.post('/api/vendors', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () { return res.json(yield dbManager.createVendor(req.body)); })));
-    app.put('/api/vendors/:id', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () { return res.json(yield dbManager.updateVendor(req.params.id, req.body)); })));
+    app.post('/api/vendors', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () {
+        res.json(yield dbManager.createVendor(req.body));
+    })));
+    app.put('/api/vendors/:id', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () {
+        res.json(yield dbManager.updateVendor(req.params.id, req.body));
+    })));
     app.delete('/api/vendors/:id', (req, res) => __awaiter(void 0, void 0, void 0, function* () {
         try {
             const result = yield dbManager.deleteVendor(req.params.id);
@@ -925,7 +975,14 @@ const registerRoutes = (dbManager, proxyServer) => {
         console.log('[创建服务] 创建结果:', JSON.stringify(result, null, 2));
         res.json(result);
     })));
-    app.put('/api/services/:id', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () { return res.json(yield dbManager.updateAPIService(req.params.id, req.body)); })));
+    app.put('/api/services/:id', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () {
+        const existingService = dbManager.getAPIService(req.params.id);
+        if (!existingService) {
+            res.status(404).json({ error: '服务不存在' });
+            return;
+        }
+        res.json(yield dbManager.updateAPIService(req.params.id, req.body));
+    })));
     app.delete('/api/services/:id', (req, res) => __awaiter(void 0, void 0, void 0, function* () {
         console.log('[删除服务] 请求 ID:', req.params.id);
         try {
@@ -970,26 +1027,8 @@ const registerRoutes = (dbManager, proxyServer) => {
     })));
     // 批量停用所有激活的路由（用于应用关闭时清理）
     app.post('/api/routes/deactivate-all', asyncHandler((_req, res) => __awaiter(void 0, void 0, void 0, function* () {
-        console.log('[Deactivate All Routes] Starting cleanup process...');
-        // 步骤1：恢复 Claude Code 配置文件
-        try {
-            console.log('[Deactivate All Routes] Restoring Claude Code config...');
-            const claudeRestored = yield restoreClaudeConfig();
-            console.log(`[Deactivate All Routes] Claude Code config ${claudeRestored ? 'restored' : 'was not modified'}`);
-        }
-        catch (error) {
-            console.error('[Deactivate All Routes] Failed to restore Claude config:', error);
-        }
-        // 步骤2：恢复 Codex 配置文件
-        try {
-            console.log('[Deactivate All Routes] Restoring Codex config...');
-            const codexRestored = yield restoreCodexConfig();
-            console.log(`[Deactivate All Routes] Codex config ${codexRestored ? 'restored' : 'was not modified'}`);
-        }
-        catch (error) {
-            console.error('[Deactivate All Routes] Failed to restore Codex config:', error);
-        }
-        // 步骤3：停用所有激活的路由
+        console.log('[Deactivate All Routes] Starting route deactivation...');
+        // 仅停用路由，不再在路由接口内处理配置文件恢复
         console.log('[Deactivate All Routes] Deactivating all active routes...');
         const deactivatedCount = yield dbManager.deactivateAllRoutes();
         if (deactivatedCount > 0) {
@@ -1000,7 +1039,7 @@ const registerRoutes = (dbManager, proxyServer) => {
         else {
             console.log('[Deactivate All Routes] No active routes to deactivate');
         }
-        console.log('[Deactivate All Routes] Cleanup process completed');
+        console.log('[Deactivate All Routes] Route deactivation completed');
         res.json({
             success: true,
             deactivatedCount
@@ -1043,6 +1082,28 @@ const registerRoutes = (dbManager, proxyServer) => {
             res.status(500).json({ error: 'Failed to clear blacklist' });
         }
     })));
+    // 清除规则的错误状态（广播 idle 状态给所有客户端）
+    app.post('/api/rules/:id/clear-status', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () {
+        const { id } = req.params;
+        const rule = dbManager.getRule(id);
+        if (!rule) {
+            res.status(404).json({ error: 'Rule not found' });
+            return;
+        }
+        // 找到该规则所属的路由
+        const routes = dbManager.getRoutes();
+        const route = routes.find(r => {
+            const rules = dbManager.getRules(r.id);
+            return rules.some(r => r.id === id);
+        });
+        if (!route) {
+            res.status(404).json({ error: 'Route not found' });
+            return;
+        }
+        // 广播 idle 状态给所有客户端
+        rules_status_service_1.rulesStatusBroadcaster.markRuleIdle(route.id, id);
+        res.json({ success: true });
+    })));
     // 获取规则的黑名单状态
     app.get('/api/rules/:routeId/blacklist-status', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () {
         const { routeId } = req.params;
@@ -1132,8 +1193,10 @@ const registerRoutes = (dbManager, proxyServer) => {
         const config = req.body;
         const result = yield dbManager.updateConfig(config);
         if (result) {
-            yield proxyServer.updateConfig(config);
-            updateProxyConfig(config);
+            const latestConfig = dbManager.getConfig();
+            yield proxyServer.updateConfig(latestConfig);
+            updateProxyConfig(latestConfig);
+            yield syncConfigsOnGlobalConfigUpdate(dbManager);
         }
         res.json(result);
     })));
@@ -1474,29 +1537,53 @@ ${instruction}
         res.json({ success: true });
     })));
     app.post('/api/write-config/claude', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () {
-        const enableAgentTeams = req.body.enableAgentTeams;
-        const enableBypassPermissionsSupport = req.body.enableBypassPermissionsSupport;
-        const result = yield writeClaudeConfig(dbManager, enableAgentTeams, enableBypassPermissionsSupport);
+        const appConfig = dbManager.getConfig();
+        const requestedEnableAgentTeams = req.body.enableAgentTeams;
+        const requestedBypass = req.body.enableBypassPermissionsSupport;
+        const enableAgentTeams = typeof requestedEnableAgentTeams === 'boolean'
+            ? requestedEnableAgentTeams
+            : appConfig.enableAgentTeams;
+        const enableBypassPermissionsSupport = typeof requestedBypass === 'boolean'
+            ? requestedBypass
+            : appConfig.enableBypassPermissionsSupport;
+        const result = yield writeClaudeConfig(dbManager, enableAgentTeams, enableBypassPermissionsSupport, undefined, appConfig.claudeDefaultModel);
         res.json(result);
     })));
     app.post('/api/write-config/codex', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () {
+        const appConfig = dbManager.getConfig();
         const requestedEffort = req.body.modelReasoningEffort;
         const modelReasoningEffort = isCodexReasoningEffort(requestedEffort)
             ? requestedEffort
-            : DEFAULT_CODEX_REASONING_EFFORT;
-        const result = yield writeCodexConfig(dbManager, modelReasoningEffort);
+            : isCodexReasoningEffort(appConfig.codexModelReasoningEffort)
+                ? appConfig.codexModelReasoningEffort
+                : DEFAULT_CODEX_REASONING_EFFORT;
+        const result = yield writeCodexConfig(dbManager, modelReasoningEffort, appConfig.codexDefaultModel);
         res.json(result);
     })));
-    // 更新Claude Code配置中的Agent Teams设置（当路由已激活时）
+    // 兼容接口：更新全局 Agent Teams 配置
     app.post('/api/update-claude-agent-teams', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () {
         const { enableAgentTeams } = req.body;
-        const result = yield updateClaudeAgentTeamsConfig(enableAgentTeams);
+        const current = dbManager.getConfig();
+        const result = yield dbManager.updateConfig(Object.assign(Object.assign({}, current), { enableAgentTeams: !!enableAgentTeams }));
+        if (result) {
+            const latestConfig = dbManager.getConfig();
+            yield proxyServer.updateConfig(latestConfig);
+            updateProxyConfig(latestConfig);
+            yield syncConfigsOnGlobalConfigUpdate(dbManager);
+        }
         res.json(result);
     })));
-    // 更新Claude Code配置中的bypassPermissions支持设置（当路由已激活时）
+    // 兼容接口：更新全局 bypassPermissions 支持配置
     app.post('/api/update-claude-bypass-permissions-support', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () {
         const { enableBypassPermissionsSupport } = req.body;
-        const result = yield updateClaudeBypassPermissionsSupportConfig(enableBypassPermissionsSupport);
+        const current = dbManager.getConfig();
+        const result = yield dbManager.updateConfig(Object.assign(Object.assign({}, current), { enableBypassPermissionsSupport: !!enableBypassPermissionsSupport }));
+        if (result) {
+            const latestConfig = dbManager.getConfig();
+            yield proxyServer.updateConfig(latestConfig);
+            updateProxyConfig(latestConfig);
+            yield syncConfigsOnGlobalConfigUpdate(dbManager);
+        }
         res.json(result);
     })));
     app.post('/api/update-codex-reasoning-effort', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () {
@@ -1505,7 +1592,14 @@ ${instruction}
             res.status(400).json({ error: 'Invalid modelReasoningEffort' });
             return;
         }
-        const result = yield updateCodexReasoningEffortConfig(requestedEffort);
+        const current = dbManager.getConfig();
+        const result = yield dbManager.updateConfig(Object.assign(Object.assign({}, current), { codexModelReasoningEffort: requestedEffort }));
+        if (result) {
+            const latestConfig = dbManager.getConfig();
+            yield proxyServer.updateConfig(latestConfig);
+            updateProxyConfig(latestConfig);
+            yield syncConfigsOnGlobalConfigUpdate(dbManager);
+        }
         res.json(result);
     })));
     app.post('/api/restore-config/claude', asyncHandler((_req, res) => __awaiter(void 0, void 0, void 0, function* () {
@@ -1815,6 +1909,15 @@ const start = () => __awaiter(void 0, void 0, void 0, function* () {
     console.log('[Server] Initializing database...');
     const dbManager = yield database_factory_1.DatabaseFactory.createAuto(dataDir, legacyDataDir);
     console.log('[Server] Database initialized successfully');
+    // 服务启动时自动同步配置文件（适用于 CLI 和 dev:server）
+    console.log('[Server] Syncing tool configs with global settings...');
+    try {
+        yield syncConfigsOnServerStartup(dbManager);
+        console.log('[Server] Tool config sync completed');
+    }
+    catch (error) {
+        console.error('[Server] Tool config sync failed:', error);
+    }
     const proxyServer = new proxy_server_1.ProxyServer(dbManager, app);
     // Initialize proxy server and register proxy routes last
     proxyServer.initialize();
@@ -1845,6 +1948,12 @@ const start = () => __awaiter(void 0, void 0, void 0, function* () {
     const toolInstallWss = (0, websocket_service_1.createToolInstallationWSServer)();
     // 创建 WebSocket 服务器用于规则状态
     const rulesStatusWss = (0, rules_status_service_1.createRulesStatusWSServer)();
+    // 设置黑名单检查函数，用于在规则状态同步时检查黑名单是否已过期
+    rules_status_service_1.rulesStatusBroadcaster.setBlacklistChecker((serviceId, routeId, contentType) => __awaiter(void 0, void 0, void 0, function* () {
+        // 检查服务��否在黑名单中
+        const isBlacklisted = yield dbManager.isServiceBlacklisted(serviceId, routeId, contentType);
+        return isBlacklisted;
+    }));
     // 将 WebSocket 服务器附加到 HTTP 服务器
     server.on('upgrade', (request, socket, head) => {
         if (request.url === '/api/tools/install') {
@@ -1863,16 +1972,46 @@ const start = () => __awaiter(void 0, void 0, void 0, function* () {
     });
     console.log(`WebSocket server for tool installation attached to ws://${host}:${port}/api/tools/install`);
     console.log(`WebSocket server for rules status attached to ws://${host}:${port}/api/rules/status`);
-    const shutdown = () => __awaiter(void 0, void 0, void 0, function* () {
-        console.log('Shutting down server...');
-        dbManager.close();
-        server.close(() => {
+    let isShuttingDown = false;
+    let shutdownPromise = null;
+    const shutdown = (signal) => __awaiter(void 0, void 0, void 0, function* () {
+        if (isShuttingDown) {
+            return shutdownPromise !== null && shutdownPromise !== void 0 ? shutdownPromise : Promise.resolve();
+        }
+        isShuttingDown = true;
+        shutdownPromise = (() => __awaiter(void 0, void 0, void 0, function* () {
+            console.log(`[Server] Received ${signal}, shutting down...`);
+            // 服务终止前恢复配置文件（适用于 aicos stop 与 Ctrl+C）
+            try {
+                const claudeRestored = yield restoreClaudeConfig();
+                console.log(`[Shutdown ...] Claude Code config ${claudeRestored ? 'restored' : 'was not modified'}`);
+            }
+            catch (error) {
+                console.error('[Shutdown ...] Failed to restore Claude config:', error);
+            }
+            try {
+                const codexRestored = yield restoreCodexConfig();
+                console.log(`[Shutdown ...] Codex config ${codexRestored ? 'restored' : 'was not modified'}`);
+            }
+            catch (error) {
+                console.error('[Shutdown ...] Failed to restore Codex config:', error);
+            }
+            dbManager.close();
+            yield Promise.race([
+                new Promise((resolve) => {
+                    server.close(() => resolve());
+                }),
+                new Promise((resolve) => {
+                    setTimeout(resolve, 5000);
+                })
+            ]);
             console.log('Server stopped.');
             process.exit(0);
-        });
+        }))();
+        return shutdownPromise;
     });
-    process.on('SIGINT', shutdown);
-    process.on('SIGTERM', shutdown);
+    process.on('SIGINT', () => { void shutdown('SIGINT'); });
+    process.on('SIGTERM', () => { void shutdown('SIGTERM'); });
 });
 // 全局未捕获异常处理 - 防止服务崩溃
 process.on('uncaughtException', (error) => {