aicodeswitch 3.9.4 → 4.0.0

package/dist/server/database-factory.js

@@ -1,37 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -41,170 +8,33 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DatabaseFactory = void 0;
-const path_1 = __importDefault(require("path"));
 const fs_database_1 = require("./fs-database");
-const migrateToFs = __importStar(require("./migrate-to-fs"));
 /**
  * 数据库工厂
- * 根据配置创建相应的数据库实例
+ * 创建文件系统数据库实例
  */
 class DatabaseFactory {
     /**
      * 创建数据库实例
      * @param dataPath 数据存储路径
-     * @param type 数据库类型，默认使用文件系统
      */
-    static create(dataPath_1) {
-        return __awaiter(this, arguments, void 0, function* (dataPath, type = 'filesystem') {
-            if (type === 'filesystem') {
-                const db = new fs_database_1.FileSystemDatabaseManager(dataPath);
-                yield db.initialize();
-                return db;
-            }
-            // 如果用户明确要求使用 SQLite，尝试加载
-            if (type === 'sqlite') {
-                try {
-                    const { DatabaseManager } = yield Promise.resolve().then(() => __importStar(require('./database.js')));
-                    const db = new DatabaseManager(dataPath);
-                    yield db.initialize();
-                    return db;
-                }
-                catch (error) {
-                    console.error('[Database] Failed to load SQLite database, falling back to filesystem:', error);
-                    console.log('[Database] Using filesystem database instead');
-                    const db = new fs_database_1.FileSystemDatabaseManager(dataPath);
-                    yield db.initialize();
-                    return db;
-                }
-            }
-            throw new Error(`Unknown database type: ${type}`);
+    static create(dataPath) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const db = new fs_database_1.FileSystemDatabaseManager(dataPath);
+            yield db.initialize();
+            return db;
         });
     }
     /**
-     * 自动检测并创建数据库实例
-     * 优先使用文件系统数据库，如果存在旧的 SQLite 数据库则自动迁移
+     * 自动创建数据库实例（兼容旧 API）
+     * @param dataPath 数据存储路径
+     * @param _legacyDataPath 已弃用，不再使用
      */
-    static createAuto(dataPath, legacyDataPath) {
+    static createAuto(dataPath, _legacyDataPath) {
         return __awaiter(this, void 0, void 0, function* () {
-            const fs = yield Promise.resolve().then(() => __importStar(require('fs/promises')));
-            const legacyPath = legacyDataPath && legacyDataPath !== dataPath ? legacyDataPath : null;
-            // 检查迁移完成标记文件
-            const migrationMarkerPath = path_1.default.join(dataPath, '.migration-completed');
-            const hasMigrationMarker = yield fs.access(migrationMarkerPath)
-                .then(() => true)
-                .catch(() => false);
-            // 检查是否存在文件系统数据库
-            const fsDbExists = yield fs.access(path_1.default.join(dataPath, 'config.json'))
-                .then(() => true)
-                .catch(() => false);
-            // 如果存在迁移标记且文件系统数据库存在，使用文件系统数据库
-            if (hasMigrationMarker && fsDbExists) {
-                console.log('[Database] Migration marker found, using filesystem database');
-                return this.create(dataPath, 'filesystem');
-            }
-            // 如果不存在迁移标记但存在文件系统数据库，可能是用户手动删除了标记
-            // 这种情况下仍然使用文件系统数据库（避免数据丢失）
-            if (fsDbExists) {
-                console.log('[Database] Using existing filesystem database (no migration marker)');
-                return this.create(dataPath, 'filesystem');
-            }
-            // 如果新目录为空，尝试从旧 data 目录迁移文件系统数据库
-            if (legacyPath) {
-                const legacyFsDbExists = yield fs.access(path_1.default.join(legacyPath, 'config.json'))
-                    .then(() => true)
-                    .catch(() => false);
-                if (legacyFsDbExists) {
-                    console.log('[Database] Found legacy filesystem database, migrating to new directory...');
-                    try {
-                        yield migrateToFs.migrateLegacyFsData(legacyPath, dataPath);
-                        yield fs.writeFile(migrationMarkerPath, new Date().toISOString(), 'utf-8');
-                        console.log('[Database] Legacy filesystem database migration completed');
-                        return this.create(dataPath, 'filesystem');
-                    }
-                    catch (error) {
-                        console.error('[Database] Legacy filesystem migration failed:', error);
-                        console.log('[Database] Falling back to create new filesystem database');
-                    }
-                }
-            }
-            // 如果新目录为空，检查旧 data 目录是否存在 SQLite 数据库
-            if (legacyPath) {
-                const legacySqliteExists = yield fs.access(path_1.default.join(legacyPath, 'app.db'))
-                    .then(() => true)
-                    .catch(() => false);
-                if (legacySqliteExists) {
-                    console.log('[Database] Found legacy SQLite database, migrating to new filesystem directory...');
-                    try {
-                        yield migrateToFs.migrateToFileSystem(legacyPath, dataPath);
-                        console.log('[Database] Verifying migration...');
-                        const verification = yield migrateToFs.verifyMigration(dataPath);
-                        if (verification.success) {
-                            console.log('[Database] ✅ Migration verified successfully');
-                            if (verification.warnings.length > 0) {
-                                console.log('[Database] Warnings:', verification.warnings);
-                            }
-                            yield fs.writeFile(migrationMarkerPath, new Date().toISOString(), 'utf-8');
-                            console.log('[Database] Migration marker file created:', migrationMarkerPath);
-                        }
-                        else {
-                            console.error('[Database] ❌ Migration verification failed');
-                            console.error('[Database] Errors:', verification.errors);
-                            throw new Error('Migration verification failed');
-                        }
-                        console.log('[Database] Migration completed, using filesystem database');
-                        return this.create(dataPath, 'filesystem');
-                    }
-                    catch (error) {
-                        console.error('[Database] Migration failed:', error);
-                        console.log('[Database] Creating new filesystem database');
-                    }
-                }
-            }
-            // 检查是否存在旧的 SQLite 数据库
-            const sqliteDbExists = yield fs.access(path_1.default.join(dataPath, 'app.db'))
-                .then(() => true)
-                .catch(() => false);
-            if (sqliteDbExists) {
-                console.log('[Database] Found old SQLite database, migrating to filesystem...');
-                try {
-                    // 执行迁移
-                    yield migrateToFs.migrateToFileSystem(dataPath);
-                    // 验证迁移结果
-                    console.log('[Database] Verifying migration...');
-                    const verification = yield migrateToFs.verifyMigration(dataPath);
-                    if (verification.success) {
-                        console.log('[Database] ✅ Migration verified successfully');
-                        if (verification.warnings.length > 0) {
-                            console.log('[Database] Warnings:', verification.warnings);
-                        }
-                        // 只有在验证成功后才创建标记文件
-                        const migrationMarkerPath = path_1.default.join(dataPath, '.migration-completed');
-                        yield fs.writeFile(migrationMarkerPath, new Date().toISOString(), 'utf-8');
-                        console.log('[Database] Migration marker file created:', migrationMarkerPath);
-                    }
-                    else {
-                        console.error('[Database] ❌ Migration verification failed');
-                        console.error('[Database] Errors:', verification.errors);
-                        throw new Error('Migration verification failed');
-                    }
-                    console.log('[Database] Migration completed, using filesystem database');
-                }
-                catch (error) {
-                    console.error('[Database] Migration failed:', error);
-                    console.log('[Database] Creating new filesystem database');
-                    // 迁移失败时，原始数据库文件保持不变
-                    // 用户可以使用老版本继续运行，或手动重新配置
-                }
-            }
-            else {
-                console.log('[Database] No existing database found, creating new filesystem database');
-            }
-            return this.create(dataPath, 'filesystem');
+            return this.create(dataPath);
         });
     }
 }

package/dist/server/fs-database.js

@@ -29,6 +29,19 @@ const promises_1 = __importDefault(require("fs/promises"));
 const crypto_1 = __importDefault(require("crypto"));
 const crypto_js_1 = __importDefault(require("crypto-js"));
 const type_migration_1 = require("./type-migration");
+const VALID_CODEX_REASONING_EFFORTS = ['low', 'medium', 'high', 'xhigh'];
+const DEFAULT_CODEX_REASONING_EFFORT = 'high';
+const DEFAULT_FAILOVER_RECOVERY_SECONDS = 30;
+const isCodexReasoningEffort = (value) => {
+    return typeof value === 'string' && VALID_CODEX_REASONING_EFFORTS.includes(value);
+};
+const normalizeFailoverRecoverySeconds = (value) => {
+    const parsed = typeof value === 'number' ? value : Number(value);
+    if (!Number.isFinite(parsed) || parsed <= 0) {
+        return DEFAULT_FAILOVER_RECOVERY_SECONDS;
+    }
+    return Math.floor(parsed);
+};
 /**
  * 基于文件系统的数据库管理器
  * 使用 JSON 文件存储数据，无需编译依赖
@@ -209,8 +222,8 @@ class FileSystemDatabaseManager {
             yield this.loadAllData();
             // 执行数据源类型迁移（在加载数据之后）
             yield this.migrateSourceTypes();
-            // OpenAI base URL 迁移：将末尾 /v1 自动移除
-            yield this.migrateOpenAIBaseUrls();
+            // 路由级工具配置迁移到全局配置（兼容旧版本）
+            yield this.migrateRouteToolSettingsToGlobalConfig();
             // 确保默认配置
             yield this.ensureDefaultConfig();
         });
@@ -233,15 +246,37 @@ class FileSystemDatabaseManager {
     }
     loadVendors() {
         return __awaiter(this, void 0, void 0, function* () {
+            let needSave = false;
             try {
                 const data = yield promises_1.default.readFile(this.vendorsFile, 'utf-8');
-                this.vendors = JSON.parse(data);
+                const parsed = JSON.parse(data);
+                this.vendors = Array.isArray(parsed) ? parsed.map((vendor) => {
+                    const normalizedServices = Array.isArray(vendor.services)
+                        ? vendor.services.map((service) => {
+                            const normalizedService = Object.assign(Object.assign({}, service), { apiKey: typeof service.apiKey === 'string' ? service.apiKey : '', inheritVendorApiKey: service.inheritVendorApiKey === true });
+                            if (normalizedService.apiKey !== service.apiKey ||
+                                normalizedService.inheritVendorApiKey !== service.inheritVendorApiKey) {
+                                needSave = true;
+                            }
+                            return normalizedService;
+                        })
+                        : [];
+                    const normalizedVendor = Object.assign(Object.assign({}, vendor), { apiKey: typeof vendor.apiKey === 'string' ? vendor.apiKey : '', services: normalizedServices });
+                    if (normalizedVendor.apiKey !== vendor.apiKey ||
+                        !Array.isArray(vendor.services)) {
+                        needSave = true;
+                    }
+                    return normalizedVendor;
+                }) : [];
             }
             catch (_a) {
                 this.vendors = [];
             }
             // 兼容性检查：如果存在旧的 services.json，自动迁移
             yield this.migrateServicesIfNeeded();
+            if (needSave) {
+                yield this.saveVendors();
+            }
         });
     }
     /**
@@ -359,41 +394,6 @@ class FileSystemDatabaseManager {
             console.log(`[TypeMigration] Migration completed. Migrated ${migratedCount} services.`);
         });
     }
-    /**
-     * 迁移 OpenAI base URL（在初始化时执行）
-     * 仅处理 sourceType=openai 且 apiUrl 末尾为 /v1 的服务
-     */
-    migrateOpenAIBaseUrls() {
-        return __awaiter(this, void 0, void 0, function* () {
-            console.log('[OpenAIBaseUrlMigration] Checking for OpenAI base URL migration...');
-            let migratedCount = 0;
-            for (const vendor of this.vendors) {
-                if (!vendor.services)
-                    continue;
-                for (const service of vendor.services) {
-                    if (service.sourceType !== 'openai' || typeof service.apiUrl !== 'string') {
-                        continue;
-                    }
-                    const trimmedUrl = service.apiUrl.trim();
-                    if (!/\/v1\/?$/i.test(trimmedUrl)) {
-                        continue;
-                    }
-                    const migratedUrl = trimmedUrl.replace(/\/v1\/?$/i, '');
-                    if (migratedUrl && migratedUrl !== service.apiUrl) {
-                        console.log(`[OpenAIBaseUrlMigration] Migrated service "${service.name}": ${service.apiUrl} -> ${migratedUrl}`);
-                        service.apiUrl = migratedUrl;
-                        migratedCount++;
-                    }
-                }
-            }
-            if (migratedCount === 0) {
-                console.log('[OpenAIBaseUrlMigration] No migration needed');
-                return;
-            }
-            yield this.saveVendors();
-            console.log(`[OpenAIBaseUrlMigration] Migration completed. Migrated ${migratedCount} services.`);
-        });
-    }
     /**
      * 迁移导入数据中的类型
      * 用于导入功能，自动将旧类型转换为新类型
@@ -402,11 +402,7 @@ class FileSystemDatabaseManager {
         return vendors.map(vendor => {
             var _a;
             return (Object.assign(Object.assign({}, vendor), { services: (_a = vendor.services) === null || _a === void 0 ? void 0 : _a.map(service => {
-                    const normalizedSourceType = service.sourceType ? (0, type_migration_1.normalizeSourceType)(service.sourceType) : undefined;
-                    const normalizedApiUrl = normalizedSourceType === 'openai' && typeof service.apiUrl === 'string'
-                        ? service.apiUrl.trim().replace(/\/v1\/?$/i, '')
-                        : service.apiUrl;
-                    return Object.assign(Object.assign({}, service), { sourceType: normalizedSourceType, apiUrl: normalizedApiUrl });
+                    return Object.assign(Object.assign({}, service), { sourceType: service.sourceType ? (0, type_migration_1.normalizeSourceType)(service.sourceType) : undefined });
                 }) }));
         });
     }
@@ -827,22 +823,89 @@ class FileSystemDatabaseManager {
     }
     ensureDefaultConfig() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!this.config) {
-                this.config = {
-                    enableLogging: true,
-                    logRetentionDays: 30,
-                    maxLogSize: 100000,
-                    apiKey: '',
-                    enableFailover: true,
-                    proxyEnabled: false,
-                    proxyUrl: '',
-                    proxyUsername: '',
-                    proxyPassword: '',
-                };
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+            const current = this.config;
+            this.config = {
+                enableLogging: (_a = current === null || current === void 0 ? void 0 : current.enableLogging) !== null && _a !== void 0 ? _a : true,
+                logRetentionDays: (_b = current === null || current === void 0 ? void 0 : current.logRetentionDays) !== null && _b !== void 0 ? _b : 30,
+                maxLogSize: (_c = current === null || current === void 0 ? void 0 : current.maxLogSize) !== null && _c !== void 0 ? _c : 100000,
+                apiKey: (_d = current === null || current === void 0 ? void 0 : current.apiKey) !== null && _d !== void 0 ? _d : '',
+                enableFailover: (_e = current === null || current === void 0 ? void 0 : current.enableFailover) !== null && _e !== void 0 ? _e : true,
+                failoverRecoverySeconds: normalizeFailoverRecoverySeconds(current === null || current === void 0 ? void 0 : current.failoverRecoverySeconds),
+                enableAgentTeams: (_f = current === null || current === void 0 ? void 0 : current.enableAgentTeams) !== null && _f !== void 0 ? _f : false,
+                enableBypassPermissionsSupport: (_g = current === null || current === void 0 ? void 0 : current.enableBypassPermissionsSupport) !== null && _g !== void 0 ? _g : false,
+                codexModelReasoningEffort: isCodexReasoningEffort(current === null || current === void 0 ? void 0 : current.codexModelReasoningEffort)
+                    ? current.codexModelReasoningEffort
+                    : DEFAULT_CODEX_REASONING_EFFORT,
+                proxyEnabled: (_h = current === null || current === void 0 ? void 0 : current.proxyEnabled) !== null && _h !== void 0 ? _h : false,
+                proxyUrl: (_j = current === null || current === void 0 ? void 0 : current.proxyUrl) !== null && _j !== void 0 ? _j : '',
+                proxyUsername: (_k = current === null || current === void 0 ? void 0 : current.proxyUsername) !== null && _k !== void 0 ? _k : '',
+                proxyPassword: (_l = current === null || current === void 0 ? void 0 : current.proxyPassword) !== null && _l !== void 0 ? _l : '',
+            };
+            // 仅在首次创建或存在字段补齐时落盘
+            if (!current || JSON.stringify(current) !== JSON.stringify(this.config)) {
                 yield this.saveConfig();
             }
         });
     }
+    migrateRouteToolSettingsToGlobalConfig() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const hasGlobalToolConfig = !!this.config &&
+                (Object.prototype.hasOwnProperty.call(this.config, 'enableAgentTeams') ||
+                    Object.prototype.hasOwnProperty.call(this.config, 'enableBypassPermissionsSupport') ||
+                    Object.prototype.hasOwnProperty.call(this.config, 'codexModelReasoningEffort'));
+            const getPreferredRoute = (targetType) => {
+                const activeRoute = this.routes.find(route => route.targetType === targetType && route.isActive);
+                if (activeRoute) {
+                    return activeRoute;
+                }
+                return this.routes.find(route => route.targetType === targetType);
+            };
+            let configUpdated = false;
+            if (!hasGlobalToolConfig) {
+                const preferredClaudeRoute = getPreferredRoute('claude-code');
+                const preferredCodexRoute = getPreferredRoute('codex');
+                const nextConfig = Object.assign({}, (this.config || {}));
+                if (typeof (preferredClaudeRoute === null || preferredClaudeRoute === void 0 ? void 0 : preferredClaudeRoute.enableAgentTeams) === 'boolean') {
+                    nextConfig.enableAgentTeams = preferredClaudeRoute.enableAgentTeams;
+                    configUpdated = true;
+                }
+                if (typeof (preferredClaudeRoute === null || preferredClaudeRoute === void 0 ? void 0 : preferredClaudeRoute.enableBypassPermissionsSupport) === 'boolean') {
+                    nextConfig.enableBypassPermissionsSupport = preferredClaudeRoute.enableBypassPermissionsSupport;
+                    configUpdated = true;
+                }
+                if (isCodexReasoningEffort(preferredCodexRoute === null || preferredCodexRoute === void 0 ? void 0 : preferredCodexRoute.codexModelReasoningEffort)) {
+                    nextConfig.codexModelReasoningEffort = preferredCodexRoute.codexModelReasoningEffort;
+                    configUpdated = true;
+                }
+                if (configUpdated) {
+                    this.config = nextConfig;
+                    yield this.saveConfig();
+                    console.log('[ConfigMigration] Migrated route-level tool settings to global app config');
+                }
+            }
+            // 清理路由中的旧字段，避免后续重复歧义
+            let routesUpdated = false;
+            this.routes = this.routes.map((route) => {
+                const hasLegacyFields = Object.prototype.hasOwnProperty.call(route, 'enableAgentTeams') ||
+                    Object.prototype.hasOwnProperty.call(route, 'enableBypassPermissionsSupport') ||
+                    Object.prototype.hasOwnProperty.call(route, 'codexModelReasoningEffort');
+                if (!hasLegacyFields) {
+                    return route;
+                }
+                routesUpdated = true;
+                const cleanedRoute = Object.assign({}, route);
+                delete cleanedRoute.enableAgentTeams;
+                delete cleanedRoute.enableBypassPermissionsSupport;
+                delete cleanedRoute.codexModelReasoningEffort;
+                return cleanedRoute;
+            });
+            if (routesUpdated) {
+                yield this.saveRoutes();
+                console.log('[ConfigMigration] Removed deprecated route-level tool settings');
+            }
+        });
+    }
     // Vendor operations
     getVendors() {
         return [...this.vendors].sort((a, b) => {
@@ -861,7 +924,7 @@ class FileSystemDatabaseManager {
             console.log('[数据库] 创建供应商，输入数据:', JSON.stringify(vendor, null, 2));
             const id = crypto_1.default.randomUUID();
             const now = Date.now();
-            const newVendor = Object.assign(Object.assign({}, vendor), { id, services: vendor.services || [], createdAt: now, updatedAt: now });
+            const newVendor = Object.assign(Object.assign({}, vendor), { apiKey: typeof vendor.apiKey === 'string' ? vendor.apiKey : '', id, services: vendor.services || [], createdAt: now, updatedAt: now });
             console.log('[数据库] 创建供应商，返回数据:', JSON.stringify(newVendor, null, 2));
             this.vendors.push(newVendor);
             yield this.saveVendors();
@@ -874,7 +937,11 @@ class FileSystemDatabaseManager {
             if (index === -1)
                 return false;
             const now = Date.now();
-            this.vendors[index] = Object.assign(Object.assign(Object.assign({}, this.vendors[index]), vendor), { id, services: vendor.services !== undefined ? vendor.services : this.vendors[index].services, updatedAt: now });
+            this.vendors[index] = Object.assign(Object.assign(Object.assign({}, this.vendors[index]), vendor), { id, apiKey: typeof vendor.apiKey === 'string'
+                    ? vendor.apiKey
+                    : (this.vendors[index].apiKey || ''), 
+                // 供应商服务应通过 create/update/deleteAPIService 单独维护，避免编辑供应商时误覆盖
+                services: this.vendors[index].services, updatedAt: now });
             yield this.saveVendors();
             return true;
         });
@@ -884,12 +951,15 @@ class FileSystemDatabaseManager {
             const index = this.vendors.findIndex(v => v.id === id);
             if (index === -1)
                 return false;
-            // 检查是否有服务被规则使用
+            // 级联删除：删除该供应商下服务关联的所有规则
             const vendor = this.vendors[index];
             const serviceIds = (vendor.services || []).map(s => s.id);
-            const rulesUsingServices = this.rules.filter(r => serviceIds.includes(r.targetServiceId));
-            if (rulesUsingServices.length > 0) {
-                throw new Error(`无法删除供应商：有 ${rulesUsingServices.length} 个路由规则正在使用该供应商的服务`);
+            if (serviceIds.length > 0) {
+                const beforeCount = this.rules.length;
+                this.rules = this.rules.filter(r => !serviceIds.includes(r.targetServiceId));
+                if (this.rules.length !== beforeCount) {
+                    yield this.saveRules();
+                }
             }
             this.vendors.splice(index, 1);
             yield this.saveVendors();
@@ -954,7 +1024,7 @@ class FileSystemDatabaseManager {
             const _a = service, { vendorId: _ } = _a, serviceData = __rest(_a, ["vendorId"]);
             const id = crypto_1.default.randomUUID();
             const now = Date.now();
-            const newService = Object.assign(Object.assign({}, serviceData), { id, createdAt: now, updatedAt: now });
+            const newService = Object.assign(Object.assign({}, serviceData), { apiKey: typeof serviceData.apiKey === 'string' ? serviceData.apiKey : '', inheritVendorApiKey: serviceData.inheritVendorApiKey === true, id, createdAt: now, updatedAt: now });
             console.log('[数据库] 创建服务，最终数据:', JSON.stringify(newService, null, 2));
             if (!vendor.services) {
                 vendor.services = [];
@@ -977,7 +1047,9 @@ class FileSystemDatabaseManager {
             if (index === -1)
                 return false;
             const now = Date.now();
-            vendor.services[index] = Object.assign(Object.assign(Object.assign({}, vendor.services[index]), service), { id, updatedAt: now });
+            vendor.services[index] = Object.assign(Object.assign(Object.assign({}, vendor.services[index]), service), { id, apiKey: typeof service.apiKey === 'string' ? service.apiKey : (vendor.services[index].apiKey || ''), inheritVendorApiKey: service.inheritVendorApiKey !== undefined
+                    ? service.inheritVendorApiKey === true
+                    : vendor.services[index].inheritVendorApiKey === true, updatedAt: now });
             // 更新供应商的 updatedAt 时间
             vendor.updatedAt = now;
             yield this.saveVendors();
@@ -995,10 +1067,11 @@ class FileSystemDatabaseManager {
             const index = vendor.services.findIndex(s => s.id === id);
             if (index === -1)
                 return false;
-            // 检查是否有规则正在使用此服务
-            const rulesUsingService = this.rules.filter(r => r.targetServiceId === id);
-            if (rulesUsingService.length > 0) {
-                throw new Error(`无法删除服务：有 ${rulesUsingService.length} 个路由规则正在使用此服务`);
+            // 级联删除：删除使用该服务的所有规则
+            const beforeCount = this.rules.length;
+            this.rules = this.rules.filter(r => r.targetServiceId !== id);
+            if (this.rules.length !== beforeCount) {
+                yield this.saveRules();
             }
             vendor.services.splice(index, 1);
             // 更新供应商的 updatedAt 时间
@@ -1602,7 +1675,56 @@ class FileSystemDatabaseManager {
         }
         return false;
     }
+    /**
+     * 获取状态码为 499 的请求日志
+     * @param limit 返回数量限制
+     * @param offset 偏移量
+     * @returns 匹配的请求日志列表
+     */
+    getClientClosedLogs() {
+        return __awaiter(this, arguments, void 0, function* (limit = 100, offset = 0) {
+            const allMatches = [];
+            const sortedShards = [...this.logShardsIndex].sort((a, b) => b.endTime - a.endTime);
+            // 递序遍历所有分片， collect 499 logs
+            for (const shard of sortedShards) {
+                const shardLogs = yield this.loadLogShard(shard.filename);
+                for (const log of shardLogs) {
+                    if (log.statusCode === 499) {
+                        allMatches.push(log);
+                    }
+                }
+            }
+            // 按时间倒序排列并分页
+            return allMatches
+                .sort((a, b) => b.timestamp - a.timestamp)
+                .slice(offset, offset + limit);
+        });
+    }
+    /**
+     * 获取状态码为 499 的请求日志数量
+     * @returns 匹配的请求数量
+     */
+    getClientClosedLogsCount() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let count = 0;
+            for (const shard of this.logShardsIndex) {
+                const shardLogs = yield this.loadLogShard(shard.filename);
+                for (const log of shardLogs) {
+                    if (log.statusCode === 499) {
+                        count++;
+                    }
+                }
+            }
+            return count;
+        });
+    }
+    // Service blacklist operations
     // Service blacklist operations
+    getFailoverRecoveryMs() {
+        var _a;
+        const seconds = normalizeFailoverRecoverySeconds((_a = this.config) === null || _a === void 0 ? void 0 : _a.failoverRecoverySeconds);
+        return seconds * 1000;
+    }
     isServiceBlacklisted(serviceId, routeId, contentType) {
         return __awaiter(this, void 0, void 0, function* () {
             const key = `${routeId}:${contentType}:${serviceId}`;
@@ -1621,10 +1743,11 @@ class FileSystemDatabaseManager {
         return __awaiter(this, void 0, void 0, function* () {
             const key = `${routeId}:${contentType}:${serviceId}`;
             const now = Date.now();
+            const recoveryMs = this.getFailoverRecoveryMs();
             const existing = this.blacklist.get(key);
             if (existing) {
                 existing.blacklistedAt = now;
-                existing.expiresAt = now + 2 * 60 * 1000; // 2分钟黑名单（从10分钟缩短）
+                existing.expiresAt = now + recoveryMs;
                 existing.errorCount++;
                 existing.lastError = errorMessage;
                 existing.lastStatusCode = statusCode;
@@ -1636,7 +1759,7 @@ class FileSystemDatabaseManager {
                     routeId,
                     contentType,
                     blacklistedAt: now,
-                    expiresAt: now + 2 * 60 * 1000, // 2分钟黑名单（从10分钟缩短）
+                    expiresAt: now + recoveryMs,
                     errorCount: 1,
                     lastError: errorMessage,
                     lastStatusCode: statusCode,
@@ -1675,7 +1798,12 @@ class FileSystemDatabaseManager {
     }
     updateConfig(config) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.config = config;
+            const merged = Object.assign(Object.assign({}, (this.config || {})), config);
+            if (!isCodexReasoningEffort(merged.codexModelReasoningEffort)) {
+                merged.codexModelReasoningEffort = DEFAULT_CODEX_REASONING_EFFORT;
+            }
+            merged.failoverRecoverySeconds = normalizeFailoverRecoverySeconds(merged.failoverRecoverySeconds);
+            this.config = merged;
             yield this.saveConfig();
             return true;
         });
@@ -1693,6 +1821,9 @@ class FileSystemDatabaseManager {
         if (!vendor.name || typeof vendor.name !== 'string') {
             return { valid: false, error: `供应商[${index}](${vendor.id}) 缺少有效的 name 字段` };
         }
+        if (vendor.apiKey !== undefined && typeof vendor.apiKey !== 'string') {
+            return { valid: false, error: `供应商[${index}](${vendor.id}) 的 apiKey 必须是字符串` };
+        }
         if (!Array.isArray(vendor.services)) {
             return { valid: false, error: `供应商[${index}](${vendor.id}) 的 services 不是数组` };
         }
@@ -1711,7 +1842,12 @@ class FileSystemDatabaseManager {
                 return { valid: false, error: `供应商[${index}](${vendor.id}) 的服务[${i}] 缺少有效的 apiUrl 字段` };
             }
             if (!service.apiKey || typeof service.apiKey !== 'string') {
-                return { valid: false, error: `供应商[${index}](${vendor.id}) 的服务[${i}] 缺少有效的 apiKey 字段` };
+                if (service.inheritVendorApiKey !== true) {
+                    return { valid: false, error: `供应商[${index}](${vendor.id}) 的服务[${i}] 缺少有效的 apiKey 字段` };
+                }
+            }
+            if (service.inheritVendorApiKey !== undefined && typeof service.inheritVendorApiKey !== 'boolean') {
+                return { valid: false, error: `供应商[${index}](${vendor.id}) 的服务[${i}] inheritVendorApiKey 必须是布尔值` };
             }
         }
         return { valid: true };
@@ -1898,6 +2034,7 @@ class FileSystemDatabaseManager {
     }
     importData(encryptedData, password) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             try {
                 // 解密
                 let jsonData;
@@ -1933,7 +2070,7 @@ class FileSystemDatabaseManager {
                 this.vendors = importData.vendors.map((v) => (Object.assign(Object.assign({}, v), { updatedAt: now })));
                 this.routes = importData.routes.map((r) => (Object.assign(Object.assign({}, r), { updatedAt: now })));
                 this.rules = importData.rules.map((r) => (Object.assign(Object.assign({}, r), { updatedAt: now })));
-                this.config = Object.assign(Object.assign({}, importData.config), { updatedAt: now });
+                this.config = Object.assign(Object.assign({}, importData.config), { failoverRecoverySeconds: normalizeFailoverRecoverySeconds((_a = importData.config) === null || _a === void 0 ? void 0 : _a.failoverRecoverySeconds), updatedAt: now });
                 // 保存数据
                 yield Promise.all([
                     this.saveVendors(),