aicodeswitch 4.0.4 → 5.1.0

package/dist/server/fs-database.js

@@ -32,9 +32,17 @@ 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 VALID_CLAUDE_EFFORT_LEVELS = ['low', 'medium', 'high', 'max'];
+const DEFAULT_CLAUDE_EFFORT_LEVEL = 'medium';
 const isCodexReasoningEffort = (value) => {
     return typeof value === 'string' && VALID_CODEX_REASONING_EFFORTS.includes(value);
 };
+const isClaudeEffortLevel = (value) => {
+    return typeof value === 'string' && VALID_CLAUDE_EFFORT_LEVELS.includes(value);
+};
+const isValidAutocompactPct = (v) => {
+    return typeof v === 'number' && Number.isInteger(v) && v >= 1 && v <= 100;
+};
 const normalizeFailoverRecoverySeconds = (value) => {
     const parsed = typeof value === 'number' ? value : Number(value);
     if (!Number.isFinite(parsed) || parsed <= 0) {
@@ -61,6 +69,8 @@ class FileSystemDatabaseManager {
     get blacklistFile() { return path_1.default.join(this.dataPath, 'blacklist.json'); }
     get statisticsFile() { return path_1.default.join(this.dataPath, 'statistics.json'); }
     get mcpFile() { return path_1.default.join(this.dataPath, 'mcps.json'); }
+    get toolBindingsFile() { return path_1.default.join(this.dataPath, 'tool-bindings.json'); }
+    get apiPathBindingsFile() { return path_1.default.join(this.dataPath, 'api-path-bindings.json'); }
     // 创建空的统计数据结构
     createEmptyStatistics() {
         return {
@@ -188,6 +198,27 @@ class FileSystemDatabaseManager {
             writable: true,
             value: []
         });
+        Object.defineProperty(this, "apiPathBindingsData", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: []
+        });
+        Object.defineProperty(this, "apiPathModelsData", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: ''
+        });
+        Object.defineProperty(this, "toolBindings", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: {
+                'claude-code': { tool: 'claude-code', routeId: null },
+                'codex': { tool: 'codex', routeId: null },
+            }
+        });
         // 持久化统计数据
         Object.defineProperty(this, "statistics", {
             enumerable: true,
@@ -207,6 +238,26 @@ class FileSystemDatabaseManager {
             writable: true,
             value: false
         });
+        // 分片写入锁：防止并发读写同一个分片文件导致数据损坏
+        Object.defineProperty(this, "shardWriteLocks", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Map()
+        });
+        // 延迟维护标记：启动时跳过耗时操作，后台异步执行
+        Object.defineProperty(this, "_needsShardVerification", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
+        Object.defineProperty(this, "_needsSessionLogIndexBuild", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
         // 缓存机制
         Object.defineProperty(this, "logsCountCache", {
             enumerable: true,
@@ -271,6 +322,41 @@ class FileSystemDatabaseManager {
             yield this.ensureDefaultConfig();
         });
     }
+    /**
+     * 执行延迟的维护任务（启动后异步执行，不阻塞服务启动）
+     * 包括：分片一致性校验、损坏修复、旧日志清理、会话索引构建
+     */
+    deferredMaintenance() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const tasks = [];
+            if (this._needsShardVerification) {
+                this._needsShardVerification = false;
+                tasks.push((() => __awaiter(this, void 0, void 0, function* () {
+                    try {
+                        yield this.verifyShardIndexConsistency();
+                        yield this.cleanupOldLogShards();
+                        console.log('[Database] Background shard verification completed');
+                    }
+                    catch (err) {
+                        console.error('[Database] Background shard verification failed:', err);
+                    }
+                }))());
+            }
+            if (this._needsSessionLogIndexBuild) {
+                this._needsSessionLogIndexBuild = false;
+                tasks.push((() => __awaiter(this, void 0, void 0, function* () {
+                    try {
+                        yield this.buildSessionLogIndex();
+                        console.log('[Database] Background session log index build completed');
+                    }
+                    catch (err) {
+                        console.error('[Database] Background session log index build failed:', err);
+                    }
+                }))());
+            }
+            yield Promise.all(tasks);
+        });
+    }
     loadAllData() {
         return __awaiter(this, void 0, void 0, function* () {
             yield Promise.all([
@@ -279,14 +365,16 @@ class FileSystemDatabaseManager {
                 this.loadRoutes(),
                 this.loadConfig(),
                 this.loadSessions(),
-                this.loadLogsIndex(),
+                this.loadLogsIndex(true), // 启动时跳过耗时校验
                 this.loadErrorLogs(),
                 this.loadBlacklist(),
                 this.loadStatistics(),
                 this.loadMCPs(),
+                this.loadApiPathBindings(),
+                this.loadToolBindings(),
             ]);
             // 会话日志索引依赖 logShardsIndex，必须在 loadLogsIndex 之后
-            yield this.loadSessionLogIndex();
+            yield this.loadSessionLogIndex(true); // 启动时跳过全量构建
         });
     }
     loadVendors() {
@@ -298,9 +386,10 @@ class FileSystemDatabaseManager {
                 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 });
+                            const normalizedService = Object.assign(Object.assign({}, service), { apiKey: typeof service.apiKey === 'string' ? service.apiKey : '', inheritVendorApiKey: service.inheritVendorApiKey === true, inheritVendorApiBaseUrl: service.inheritVendorApiBaseUrl === true });
                             if (normalizedService.apiKey !== service.apiKey ||
-                                normalizedService.inheritVendorApiKey !== service.inheritVendorApiKey) {
+                                normalizedService.inheritVendorApiKey !== service.inheritVendorApiKey ||
+                                normalizedService.inheritVendorApiBaseUrl !== service.inheritVendorApiBaseUrl) {
                                 needSave = true;
                             }
                             return normalizedService;
@@ -514,6 +603,31 @@ class FileSystemDatabaseManager {
             yield this.saveRoutesData();
         });
     }
+    loadToolBindings() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const data = yield promises_1.default.readFile(this.toolBindingsFile, 'utf-8');
+                const parsed = JSON.parse(data);
+                // Merge with defaults to handle new tools
+                this.toolBindings = {
+                    'claude-code': parsed['claude-code'] || { tool: 'claude-code', routeId: null },
+                    'codex': parsed['codex'] || { tool: 'codex', routeId: null },
+                };
+            }
+            catch (_a) {
+                // File doesn't exist yet, use defaults
+                this.toolBindings = {
+                    'claude-code': { tool: 'claude-code', routeId: null },
+                    'codex': { tool: 'codex', routeId: null },
+                };
+            }
+        });
+    }
+    saveToolBindings() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield promises_1.default.writeFile(this.toolBindingsFile, JSON.stringify(this.toolBindings, null, 2));
+        });
+    }
     /**
      * 检测并迁移旧的 rules.json 到 routes.json 的 rules 属性
      * 旧格式：routes.json + rules.json 分离
@@ -596,7 +710,7 @@ class FileSystemDatabaseManager {
         });
     }
     loadLogsIndex() {
-        return __awaiter(this, void 0, void 0, function* () {
+        return __awaiter(this, arguments, void 0, function* (deferMaintenance = true) {
             try {
                 const data = yield promises_1.default.readFile(this.logsIndexFile, 'utf-8');
                 this.logShardsIndex = JSON.parse(data);
@@ -607,8 +721,47 @@ class FileSystemDatabaseManager {
             }
             // 检查并迁移旧的 logs.json 文件
             yield this.migrateOldLogsIfNeeded();
-            // 清理旧日志分片
-            yield this.cleanupOldLogShards();
+            if (deferMaintenance) {
+                // 启动时跳过耗时操作，由 deferredMaintenance() 异步执行
+                this._needsShardVerification = true;
+            }
+            else {
+                // 校验索引与实际分片数据的一致性
+                yield this.verifyShardIndexConsistency();
+                // 清理旧日志分片
+                yield this.cleanupOldLogShards();
+            }
+        });
+    }
+    /**
+     * 校验索引中的 count 与实际分片文件中的数据是否一致
+     * 修复因并发写入竞争导致的不一致
+     */
+    verifyShardIndexConsistency() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let fixedCount = 0;
+            for (const shard of this.logShardsIndex) {
+                try {
+                    const shardLogs = yield this.loadLogShard(shard.filename);
+                    if (shardLogs.length !== shard.count) {
+                        console.warn(`[Database] Shard count mismatch on startup: ${shard.filename} index=${shard.count} actual=${shardLogs.length}, correcting`);
+                        shard.count = shardLogs.length;
+                        fixedCount++;
+                    }
+                }
+                catch (_a) {
+                    // 分片文件无法读取，将 count 设为 0
+                    if (shard.count > 0) {
+                        console.warn(`[Database] Shard file unreadable on startup: ${shard.filename}, setting count to 0`);
+                        shard.count = 0;
+                        fixedCount++;
+                    }
+                }
+            }
+            if (fixedCount > 0) {
+                console.log(`[Database] Fixed ${fixedCount} shard index count mismatch(es)`);
+                yield this.saveLogsIndex();
+            }
         });
     }
     saveLogsIndex() {
@@ -617,10 +770,10 @@ class FileSystemDatabaseManager {
         });
     }
     /**
-     * 加载会话日志索引，若不存在则从现有日志全量构建
+     * 加载会话日志索引，若不存在则标记为延迟构建
      */
     loadSessionLogIndex() {
-        return __awaiter(this, void 0, void 0, function* () {
+        return __awaiter(this, arguments, void 0, function* (deferBuild = true) {
             try {
                 const data = yield promises_1.default.readFile(this.sessionLogIndexFile, 'utf-8');
                 const parsed = JSON.parse(data);
@@ -628,9 +781,16 @@ class FileSystemDatabaseManager {
                 console.log(`[Database] Session log index loaded: ${this.sessionLogIndex.size} sessions`);
             }
             catch (_a) {
-                // 索引文件不存在，从现有日志全量构建
-                console.log('[Database] Session log index not found, building from existing logs...');
-                yield this.buildSessionLogIndex();
+                if (deferBuild) {
+                    // 启动时跳过全量构建，由 deferredMaintenance() 异步执行
+                    console.log('[Database] Session log index not found, will build in background...');
+                    this._needsSessionLogIndexBuild = true;
+                }
+                else {
+                    // 索引文件不存在，从现有日志全量构建
+                    console.log('[Database] Session log index not found, building from existing logs...');
+                    yield this.buildSessionLogIndex();
+                }
             }
         });
     }
@@ -863,8 +1023,20 @@ class FileSystemDatabaseManager {
         return __awaiter(this, void 0, void 0, function* () {
             const filepath = path_1.default.join(this.logsDir, filename);
             try {
-                const data = yield promises_1.default.readFile(filepath, 'utf-8');
-                return JSON.parse(data);
+                let content = yield promises_1.default.readFile(filepath, 'utf-8');
+                // 检测并修复空字节损坏（并发写入竞争可能导致文件中间出现大量 \x00）
+                const nullIndex = content.indexOf('\x00');
+                if (nullIndex !== -1) {
+                    console.warn(`[Database] Detected corrupted shard file: ${filename}, truncating at null byte (pos ${nullIndex})`);
+                    content = content.substring(0, nullIndex);
+                    // 尝试补全被截断的 JSON 数组
+                    const openBrackets = (content.match(/\[/g) || []).length;
+                    const closeBrackets = (content.match(/\]/g) || []).length;
+                    if (openBrackets > closeBrackets) {
+                        content += ']';
+                    }
+                }
+                return JSON.parse(content);
             }
             catch (_a) {
                 return [];
@@ -874,8 +1046,12 @@ class FileSystemDatabaseManager {
     saveLogShard(filename, logs) {
         return __awaiter(this, void 0, void 0, function* () {
             const filepath = path_1.default.join(this.logsDir, filename);
+            const tempFile = path_1.default.join(this.logsDir, `.tmp_${filename}`);
             yield promises_1.default.mkdir(this.logsDir, { recursive: true });
-            yield promises_1.default.writeFile(filepath, JSON.stringify(logs, null, 2));
+            const content = JSON.stringify(logs, null, 2);
+            // 先写临时文件，再原子重命名，避免写入中途被并发操作导致文件损坏
+            yield promises_1.default.writeFile(tempFile, content, 'utf-8');
+            yield promises_1.default.rename(tempFile, filepath);
         });
     }
     loadErrorLogs() {
@@ -970,6 +1146,51 @@ class FileSystemDatabaseManager {
             }
         });
     }
+    loadApiPathBindings() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const defaults = [
+                { apiPath: '/v1/messages', routeId: null },
+                { apiPath: '/v1/responses', routeId: null },
+                { apiPath: '/v1/chat/completions', routeId: null },
+                { apiPath: '/v1beta/models', routeId: null },
+                { apiPath: '/v1/models', routeId: null },
+            ];
+            try {
+                const data = yield promises_1.default.readFile(this.apiPathBindingsFile, 'utf-8');
+                const parsed = JSON.parse(data);
+                this.apiPathBindingsData = parsed.bindings || defaults;
+                this.apiPathModelsData = parsed.models || '';
+            }
+            catch (_a) {
+                this.apiPathBindingsData = defaults;
+                this.apiPathModelsData = '';
+                yield this.saveApiPathBindings();
+            }
+        });
+    }
+    saveApiPathBindings() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield promises_1.default.writeFile(this.apiPathBindingsFile, JSON.stringify({
+                bindings: this.apiPathBindingsData,
+                models: this.apiPathModelsData,
+            }, null, 2));
+        });
+    }
+    getApiPathBindings() {
+        return this.apiPathBindingsData;
+    }
+    getApiPathModels() {
+        return this.apiPathModelsData;
+    }
+    updateApiPathBindings(bindings, models) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.apiPathBindingsData = bindings;
+            if (models !== undefined) {
+                this.apiPathModelsData = models;
+            }
+            yield this.saveApiPathBindings();
+        });
+    }
     saveMCPs() {
         return __awaiter(this, void 0, void 0, function* () {
             yield promises_1.default.writeFile(this.mcpFile, JSON.stringify(this.mcps, null, 2));
@@ -977,28 +1198,43 @@ class FileSystemDatabaseManager {
     }
     ensureDefaultConfig() {
         return __awaiter(this, void 0, void 0, function* () {
-            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),
-                ruleGlobalTimeout: typeof (current === null || current === void 0 ? void 0 : current.ruleGlobalTimeout) === 'number' && current.ruleGlobalTimeout > 0
-                    ? current.ruleGlobalTimeout
-                    : undefined,
-                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 : '',
+            const defaults = {
+                enableLogging: true,
+                logRetentionDays: 30,
+                maxLogSize: 100000,
+                apiKey: '',
+                enableFailover: true,
+                failoverRecoverySeconds: DEFAULT_FAILOVER_RECOVERY_SECONDS,
+                ruleGlobalTimeout: undefined,
+                enableAgentTeams: false,
+                enableBypassPermissionsSupport: false,
+                claudeEffortLevel: DEFAULT_CLAUDE_EFFORT_LEVEL,
+                autocompactPctOverride: undefined,
+                claudeDefaultModel: undefined,
+                codexModelReasoningEffort: DEFAULT_CODEX_REASONING_EFFORT,
+                codexDefaultModel: undefined,
+                proxyEnabled: false,
+                proxyUrl: '',
+                proxyUsername: '',
+                proxyPassword: '',
             };
+            // spread: current 覆盖 defaults，未来新增字段自动保留
+            this.config = Object.assign(Object.assign({}, defaults), current);
+            // 校验归一化（与 updateConfig 保持一致）
+            if (!isCodexReasoningEffort(this.config.codexModelReasoningEffort)) {
+                this.config.codexModelReasoningEffort = DEFAULT_CODEX_REASONING_EFFORT;
+            }
+            if (!isClaudeEffortLevel(this.config.claudeEffortLevel)) {
+                this.config.claudeEffortLevel = DEFAULT_CLAUDE_EFFORT_LEVEL;
+            }
+            if (typeof this.config.autocompactPctOverride !== 'undefined' && !isValidAutocompactPct(this.config.autocompactPctOverride)) {
+                this.config.autocompactPctOverride = undefined;
+            }
+            this.config.failoverRecoverySeconds = normalizeFailoverRecoverySeconds(this.config.failoverRecoverySeconds);
+            if (typeof this.config.ruleGlobalTimeout !== 'number' || this.config.ruleGlobalTimeout <= 0) {
+                this.config.ruleGlobalTimeout = undefined;
+            }
             // 仅在首次创建或存在字段补齐时落盘
             if (!current || JSON.stringify(current) !== JSON.stringify(this.config)) {
                 yield this.saveConfig();
@@ -1007,22 +1243,28 @@ class FileSystemDatabaseManager {
     }
     migrateRouteToolSettingsToGlobalConfig() {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const rawRoutes = this.routes;
+            // ---------------------------------------------------------------------------
+            // Step 1: Migrate legacy route-level tool settings (enableAgentTeams, etc.)
+            //         to global AppConfig — only if AppConfig doesn't already have them.
+            // ---------------------------------------------------------------------------
             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 getPreferredRoute = (targetType) => {
+                    // Prefer isActive=true route, fall back to first match
+                    const active = rawRoutes.find(r => r.targetType === targetType && r.isActive === true);
+                    if (active)
+                        return active;
+                    return rawRoutes.find(r => r.targetType === targetType);
+                };
                 const preferredClaudeRoute = getPreferredRoute('claude-code');
                 const preferredCodexRoute = getPreferredRoute('codex');
                 const nextConfig = Object.assign({}, (this.config || {}));
+                let configUpdated = false;
                 if (typeof (preferredClaudeRoute === null || preferredClaudeRoute === void 0 ? void 0 : preferredClaudeRoute.enableAgentTeams) === 'boolean') {
                     nextConfig.enableAgentTeams = preferredClaudeRoute.enableAgentTeams;
                     configUpdated = true;
@@ -1038,28 +1280,68 @@ class FileSystemDatabaseManager {
                 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');
+                    console.log('[Migration] Migrated route-level tool settings to global AppConfig');
+                }
+            }
+            // ---------------------------------------------------------------------------
+            // Step 2: Migrate route.targetType + route.isActive → tool-bindings
+            //
+            // This step is the core migration for the Route Activation UX Refactor.
+            // It reads the old Route.isActive and Route.targetType fields from routes.json
+            // and writes equivalent entries into tool-bindings.json.
+            //
+            // Idempotency:
+            //   - If tool-bindings.json already has a non-null routeId for a tool, and
+            //     the routes no longer carry isActive/targetType (already migrated), this
+            //     step is a no-op.
+            //   - If routes still carry the old fields (first run after upgrade), they
+            //     are migrated and then cleaned.
+            // ---------------------------------------------------------------------------
+            const hasLegacyRouteFields = rawRoutes.some(r => Object.prototype.hasOwnProperty.call(r, 'isActive') ||
+                Object.prototype.hasOwnProperty.call(r, 'targetType'));
+            if (hasLegacyRouteFields) {
+                let toolBindingsUpdated = false;
+                for (const route of rawRoutes) {
+                    // Only migrate routes that are explicitly active and have a targetType
+                    if (route.isActive === true && route.targetType) {
+                        const tool = route.targetType;
+                        if (tool === 'claude-code' || tool === 'codex') {
+                            // Only write if tool-bindings doesn't already have a binding
+                            // (avoid overwriting user's newer tool-binding choices)
+                            if (!((_a = this.toolBindings[tool]) === null || _a === void 0 ? void 0 : _a.routeId)) {
+                                this.toolBindings[tool] = { tool, routeId: route.id };
+                                toolBindingsUpdated = true;
+                                console.log(`[Migration] Binding tool '${tool}' → route '${route.id}' (${route.name || 'unnamed'})`);
+                            }
+                        }
+                    }
+                }
+                if (toolBindingsUpdated) {
+                    yield this.saveToolBindings();
+                    console.log('[Migration] Saved migrated tool-bindings to tool-bindings.json');
+                }
+                // Clean legacy fields from all route objects
+                let routesUpdated = false;
+                this.routes = rawRoutes.map((route) => {
+                    const hasLegacy = Object.prototype.hasOwnProperty.call(route, 'targetType') ||
+                        Object.prototype.hasOwnProperty.call(route, 'isActive') ||
+                        Object.prototype.hasOwnProperty.call(route, 'enableAgentTeams') ||
+                        Object.prototype.hasOwnProperty.call(route, 'enableBypassPermissionsSupport') ||
+                        Object.prototype.hasOwnProperty.call(route, 'codexModelReasoningEffort');
+                    if (!hasLegacy)
+                        return route;
+                    routesUpdated = true;
+                    const { targetType, isActive, enableAgentTeams, enableBypassPermissionsSupport, codexModelReasoningEffort } = route, cleanedRoute = __rest(route, ["targetType", "isActive", "enableAgentTeams", "enableBypassPermissionsSupport", "codexModelReasoningEffort"]);
+                    return cleanedRoute;
+                });
+                if (routesUpdated) {
+                    yield this.saveRoutes();
+                    console.log('[Migration] Cleaned legacy fields (targetType, isActive, deprecated tool settings) from routes.json');
+                }
+            }
+            else {
+                // No legacy fields found — either already migrated or fresh install
+                console.log('[Migration] No legacy route fields found, skipping tool-bindings migration');
             }
         });
     }
@@ -1081,7 +1363,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), { apiKey: typeof vendor.apiKey === 'string' ? vendor.apiKey : '', id, services: vendor.services || [], createdAt: now, updatedAt: now });
+            const newVendor = Object.assign(Object.assign({}, vendor), { apiKey: typeof vendor.apiKey === 'string' ? vendor.apiKey : '', apiBaseUrl: typeof vendor.apiBaseUrl === 'string' ? vendor.apiBaseUrl : '', id, services: vendor.services || [], createdAt: now, updatedAt: now });
             console.log('[数据库] 创建供应商，返回数据:', JSON.stringify(newVendor, null, 2));
             this.vendors.push(newVendor);
             yield this.saveVendors();
@@ -1096,7 +1378,9 @@ class FileSystemDatabaseManager {
             const now = Date.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 || ''), 
+                    : (this.vendors[index].apiKey || ''), apiBaseUrl: typeof vendor.apiBaseUrl === 'string'
+                    ? vendor.apiBaseUrl
+                    : (this.vendors[index].apiBaseUrl || ''), 
                 // 供应商服务应通过 create/update/deleteAPIService 单独维护，避免编辑供应商时误覆盖
                 services: this.vendors[index].services, updatedAt: now });
             yield this.saveVendors();
@@ -1181,7 +1465,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), { apiKey: typeof serviceData.apiKey === 'string' ? serviceData.apiKey : '', inheritVendorApiKey: serviceData.inheritVendorApiKey === true, id, createdAt: now, updatedAt: now });
+            const newService = Object.assign(Object.assign({}, serviceData), { apiKey: typeof serviceData.apiKey === 'string' ? serviceData.apiKey : '', inheritVendorApiKey: serviceData.inheritVendorApiKey === true, inheritVendorApiBaseUrl: serviceData.inheritVendorApiBaseUrl === true, id, createdAt: now, updatedAt: now });
             console.log('[数据库] 创建服务，最终数据:', JSON.stringify(newService, null, 2));
             if (!vendor.services) {
                 vendor.services = [];
@@ -1206,7 +1490,9 @@ class FileSystemDatabaseManager {
             const now = Date.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 });
+                    : vendor.services[index].inheritVendorApiKey === true, inheritVendorApiBaseUrl: service.inheritVendorApiBaseUrl !== undefined
+                    ? service.inheritVendorApiBaseUrl === true
+                    : vendor.services[index].inheritVendorApiBaseUrl === true, updatedAt: now });
             // 更新供应商的 updatedAt 时间
             vendor.updatedAt = now;
             yield this.saveVendors();
@@ -1280,7 +1566,7 @@ class FileSystemDatabaseManager {
         return __awaiter(this, void 0, void 0, function* () {
             const id = crypto_1.default.randomUUID();
             const now = Date.now();
-            const newRoute = Object.assign(Object.assign({}, route), { id, createdAt: now, updatedAt: now });
+            const newRoute = { name: route.name, description: route.description, id, createdAt: now, updatedAt: now };
             this.routes.push(newRoute);
             yield this.saveRoutes();
             return newRoute;
@@ -1302,6 +1588,10 @@ class FileSystemDatabaseManager {
             const index = this.routes.findIndex(r => r.id === id);
             if (index === -1)
                 return false;
+            // 检查该路由是否被工具绑定
+            if (this.isRouteBound(id)) {
+                return false;
+            }
             // 删除关联的规则
             this.rules = this.rules.filter(r => r.routeId !== id);
             yield this.saveRules();
@@ -1310,46 +1600,56 @@ class FileSystemDatabaseManager {
             return true;
         });
     }
-    activateRoute(id) {
+    getRoute(id) {
+        return this.routes.find(r => r.id === id);
+    }
+    // ToolBindings operations
+    getToolBindings() {
+        return this.toolBindings;
+    }
+    getActiveRouteIdForTool(tool) {
+        var _a, _b;
+        return (_b = (_a = this.toolBindings[tool]) === null || _a === void 0 ? void 0 : _a.routeId) !== null && _b !== void 0 ? _b : null;
+    }
+    activateToolRoute(tool, routeId) {
         return __awaiter(this, void 0, void 0, function* () {
-            const route = this.routes.find(r => r.id === id);
+            const route = this.routes.find(r => r.id === routeId);
             if (!route)
                 return false;
-            // 停用同类型的其他路由
-            for (const r of this.routes) {
-                if (r.targetType === route.targetType) {
-                    r.isActive = r.id === id;
-                }
-            }
-            yield this.saveRoutes();
+            this.toolBindings[tool] = { tool, routeId };
+            yield this.saveToolBindings();
             return true;
         });
     }
-    deactivateRoute(id) {
+    deactivateToolRoute(tool) {
         return __awaiter(this, void 0, void 0, function* () {
-            const route = this.routes.find(r => r.id === id);
-            if (!route)
-                return false;
-            route.isActive = false;
-            yield this.saveRoutes();
+            this.toolBindings[tool] = { tool, routeId: null };
+            yield this.saveToolBindings();
             return true;
         });
     }
-    deactivateAllRoutes() {
+    deactivateAllToolRoutes() {
         return __awaiter(this, void 0, void 0, function* () {
             let count = 0;
-            for (const route of this.routes) {
-                if (route.isActive) {
-                    route.isActive = false;
+            for (const tool of Object.keys(this.toolBindings)) {
+                if (this.toolBindings[tool].routeId) {
+                    this.toolBindings[tool] = { tool, routeId: null };
                     count++;
                 }
             }
             if (count > 0) {
-                yield this.saveRoutes();
+                yield this.saveToolBindings();
             }
             return count;
         });
     }
+    isRouteBound(routeId) {
+        for (const tool of Object.keys(this.toolBindings)) {
+            if (this.toolBindings[tool].routeId === routeId)
+                return true;
+        }
+        return false;
+    }
     // Rule operations
     getRules(routeId) {
         const rules = routeId
@@ -1543,29 +1843,47 @@ class FileSystemDatabaseManager {
             const logWithId = Object.assign(Object.assign({}, log), { contentType, id });
             // 获取目标分片文件名
             const filename = yield this.getLogShardFilename(logWithId.timestamp);
-            // 加载现有分片数据
-            let shardLogs = yield this.loadLogShard(filename);
-            // 添加新日志
-            shardLogs.push(logWithId);
-            // 保存分片
-            yield this.saveLogShard(filename, shardLogs);
-            // 更新索引
-            const date = new Date(logWithId.timestamp).toISOString().split('T')[0];
-            let shardIndex = this.logShardsIndex.find(s => s.filename === filename);
-            if (shardIndex) {
-                shardIndex.count = shardLogs.length;
-                shardIndex.endTime = Math.max(shardIndex.endTime, logWithId.timestamp);
+            // 使用分片级别的写入锁，防止并发 read-modify-write 竞争条件
+            const previousLock = this.shardWriteLocks.get(filename) || Promise.resolve();
+            let shardLogsLength = 0;
+            const currentWrite = previousLock.then(() => __awaiter(this, void 0, void 0, function* () {
+                const shardLogs = yield this.loadLogShard(filename);
+                shardLogs.push(logWithId);
+                shardLogsLength = shardLogs.length;
+                yield this.saveLogShard(filename, shardLogs);
+                // 更新索引（在锁内完成，保证一致性）
+                const date = new Date(logWithId.timestamp).toISOString().split('T')[0];
+                const shardIndex = this.logShardsIndex.find(s => s.filename === filename);
+                if (shardIndex) {
+                    shardIndex.count = shardLogs.length;
+                    shardIndex.endTime = Math.max(shardIndex.endTime, logWithId.timestamp);
+                }
+                else {
+                    this.logShardsIndex.push({
+                        filename,
+                        date,
+                        startTime: logWithId.timestamp,
+                        endTime: logWithId.timestamp,
+                        count: 1
+                    });
+                }
+                yield this.saveLogsIndex();
+            }));
+            this.shardWriteLocks.set(filename, currentWrite);
+            try {
+                yield currentWrite;
             }
-            else {
-                this.logShardsIndex.push({
-                    filename,
-                    date,
-                    startTime: logWithId.timestamp,
-                    endTime: logWithId.timestamp,
-                    count: 1
-                });
+            catch (error) {
+                // 写入失败时清理锁
+                if (this.shardWriteLocks.get(filename) === currentWrite) {
+                    this.shardWriteLocks.delete(filename);
+                }
+                throw error;
+            }
+            // 如果当前锁已执行完毕且没有被后续锁覆盖，清理它
+            if (this.shardWriteLocks.get(filename) === currentWrite) {
+                this.shardWriteLocks.delete(filename);
             }
-            yield this.saveLogsIndex();
             // 同时更新统计数据
             yield this.updateStatistics(logWithId);
             // 清除计数缓存
@@ -1578,7 +1896,7 @@ class FileSystemDatabaseManager {
                     refs = [];
                     this.sessionLogIndex.set(sessionId, refs);
                 }
-                refs.push({ filename, index: shardLogs.length - 1, timestamp: logWithId.timestamp });
+                refs.push({ filename, index: shardLogsLength - 1, timestamp: logWithId.timestamp });
                 this.scheduleSessionLogIndexFlush();
             }
         });
@@ -1592,11 +1910,16 @@ class FileSystemDatabaseManager {
             // 遍历分片直到收集足够的日志
             for (const shard of sortedShards) {
                 if (currentOffset + shard.count <= offset) {
-                    // 跳过整个分片
+                    // 跳过整个分片（使用索引中的 count 做快速跳过判断，避免不必要的磁盘IO）
                     currentOffset += shard.count;
                     continue;
                 }
                 const shardLogs = yield this.loadLogShard(shard.filename);
+                // 修正索引中的计数（如果发现不一致）
+                if (shardLogs.length !== shard.count) {
+                    console.warn(`[Database] Shard count mismatch: ${shard.filename} index=${shard.count} actual=${shardLogs.length}, correcting`);
+                    shard.count = shardLogs.length;
+                }
                 // 计算需要从该分片取出的日志范围
                 let startIndex = 0;
                 if (currentOffset < offset) {
@@ -1606,7 +1929,7 @@ class FileSystemDatabaseManager {
                 const endIndex = Math.min(startIndex + remainingCount, shardLogs.length);
                 // 添加日志到结果
                 allLogs.push(...shardLogs.slice(startIndex, endIndex));
-                currentOffset += shard.count;
+                currentOffset += shardLogs.length;
                 if (allLogs.length >= limit) {
                     break;
                 }
@@ -1976,9 +2299,16 @@ class FileSystemDatabaseManager {
     updateConfig(config) {
         return __awaiter(this, void 0, void 0, function* () {
             const merged = Object.assign(Object.assign({}, (this.config || {})), config);
+            // 校验归一化（与 ensureDefaultConfig 保持一致）
             if (!isCodexReasoningEffort(merged.codexModelReasoningEffort)) {
                 merged.codexModelReasoningEffort = DEFAULT_CODEX_REASONING_EFFORT;
             }
+            if (!isClaudeEffortLevel(merged.claudeEffortLevel)) {
+                merged.claudeEffortLevel = DEFAULT_CLAUDE_EFFORT_LEVEL;
+            }
+            if (typeof merged.autocompactPctOverride !== 'undefined' && !isValidAutocompactPct(merged.autocompactPctOverride)) {
+                merged.autocompactPctOverride = undefined;
+            }
             merged.failoverRecoverySeconds = normalizeFailoverRecoverySeconds(merged.failoverRecoverySeconds);
             if (typeof merged.ruleGlobalTimeout !== 'number' || merged.ruleGlobalTimeout <= 0) {
                 merged.ruleGlobalTimeout = undefined;
@@ -2019,7 +2349,9 @@ class FileSystemDatabaseManager {
                 return { valid: false, error: `供应商[${index}](${vendor.id}) 的服务[${i}] 缺少有效的 name 字段` };
             }
             if (!service.apiUrl || typeof service.apiUrl !== 'string') {
-                return { valid: false, error: `供应商[${index}](${vendor.id}) 的服务[${i}] 缺少有效的 apiUrl 字段` };
+                if (service.inheritVendorApiBaseUrl !== true) {
+                    return { valid: false, error: `供应商[${index}](${vendor.id}) 的服务[${i}] 缺少有效的 apiUrl 字段` };
+                }
             }
             if (!service.apiKey || typeof service.apiKey !== 'string') {
                 if (service.inheritVendorApiKey !== true) {
@@ -2029,6 +2361,9 @@ class FileSystemDatabaseManager {
             if (service.inheritVendorApiKey !== undefined && typeof service.inheritVendorApiKey !== 'boolean') {
                 return { valid: false, error: `供应商[${index}](${vendor.id}) 的服务[${i}] inheritVendorApiKey 必须是布尔值` };
             }
+            if (service.inheritVendorApiBaseUrl !== undefined && typeof service.inheritVendorApiBaseUrl !== 'boolean') {
+                return { valid: false, error: `供应商[${index}](${vendor.id}) 的服务[${i}] inheritVendorApiBaseUrl 必须是布尔值` };
+            }
         }
         return { valid: true };
     }
@@ -2045,12 +2380,7 @@ class FileSystemDatabaseManager {
         if (!route.name || typeof route.name !== 'string') {
             return { valid: false, error: `路由[${index}](${route.id}) 缺少有效的 name 字段` };
         }
-        if (!route.targetType || !['claude-code', 'codex'].includes(route.targetType)) {
-            return { valid: false, error: `路由[${index}](${route.id}) 的 targetType 必须是 'claude-code' 或 'codex'` };
-        }
-        if (typeof route.isActive !== 'boolean') {
-            return { valid: false, error: `路由[${index}](${route.id}) 的 isActive 必须是布尔值` };
-        }
+        // targetType and isActive are no longer part of Route (migrated to tool-bindings)
         return { valid: true };
     }
     /**
@@ -2066,7 +2396,7 @@ class FileSystemDatabaseManager {
         if (!rule.routeId || typeof rule.routeId !== 'string') {
             return { valid: false, error: `规则[${index}](${rule.id}) 缺少有效的 routeId 字段` };
         }
-        const validContentTypes = ['default', 'background', 'thinking', 'long-context', 'image-understanding', 'model-mapping', 'high-iq'];
+        const validContentTypes = ['default', 'background', 'thinking', 'long-context', 'image-understanding', 'model-mapping', 'high-iq', 'compact'];
         if (!rule.contentType || !validContentTypes.includes(rule.contentType)) {
             return { valid: false, error: `规则[${index}](${rule.id}) 的 contentType 无效` };
         }
@@ -2604,9 +2934,9 @@ class FileSystemDatabaseManager {
      * 检查日志是否属于指定 session
      */
     isLogBelongsToSession(log, sessionId) {
-        var _a, _b;
-        // 检查 headers 中的 session_id（Codex）
-        if (((_a = log.headers) === null || _a === void 0 ? void 0 : _a['session_id']) === sessionId) {
+        var _a, _b, _c;
+        // 检查 headers 中的 session-id 或 session_id（Codex，兼容新旧版本）
+        if (((_a = log.headers) === null || _a === void 0 ? void 0 : _a['session-id']) === sessionId || ((_b = log.headers) === null || _b === void 0 ? void 0 : _b['session_id']) === sessionId) {
             return true;
         }
         // 检查 body 中的 metadata.user_id（Claude Code）
@@ -2614,7 +2944,7 @@ class FileSystemDatabaseManager {
             try {
                 // body 可能是对象（已解析）或字符串（未解析）
                 const body = typeof log.body === 'string' ? JSON.parse(log.body) : log.body;
-                if ((_b = body.metadata) === null || _b === void 0 ? void 0 : _b.user_id) {
+                if ((_c = body.metadata) === null || _c === void 0 ? void 0 : _c.user_id) {
                     const userId = body.metadata.user_id;
                     // 兼容新旧格式：新版本为 JSON 字符串，旧版本为纯字符串
                     let extractedSessionId = null;
@@ -2624,7 +2954,7 @@ class FileSystemDatabaseManager {
                             extractedSessionId = parsed.session_id;
                         }
                     }
-                    catch (_c) {
+                    catch (_d) {
                         // 不是 JSON，按旧版本纯字符串处理
                         extractedSessionId = userId;
                     }
@@ -2633,7 +2963,7 @@ class FileSystemDatabaseManager {
                     }
                 }
             }
-            catch (_d) {
+            catch (_e) {
                 // 忽略解析错误
             }
         }
@@ -2641,20 +2971,20 @@ class FileSystemDatabaseManager {
     }
     /**
      * 从日志条目中提取 sessionId（用于索引）
-     * Codex: headers['session_id']
+     * Codex: headers['session-id']（新版）或 headers['session_id']（旧版）
      * Claude Code: body.metadata.user_id（兼容新旧格式）
      */
     extractSessionIdFromLog(log) {
-        var _a, _b;
-        // Codex: headers 中的 session_id
-        const headerSessionId = (_a = log.headers) === null || _a === void 0 ? void 0 : _a['session_id'];
+        var _a, _b, _c;
+        // Codex: headers 中的 session-id 或 session_id（兼容新旧版本）
+        const headerSessionId = ((_a = log.headers) === null || _a === void 0 ? void 0 : _a['session-id']) || ((_b = log.headers) === null || _b === void 0 ? void 0 : _b['session_id']);
         if (typeof headerSessionId === 'string')
             return headerSessionId;
         // Claude Code: body 中的 metadata.user_id
         if (log.body) {
             try {
                 const body = typeof log.body === 'string' ? JSON.parse(log.body) : log.body;
-                if ((_b = body.metadata) === null || _b === void 0 ? void 0 : _b.user_id) {
+                if ((_c = body.metadata) === null || _c === void 0 ? void 0 : _c.user_id) {
                     const userId = body.metadata.user_id;
                     try {
                         const parsed = JSON.parse(userId);
@@ -2662,12 +2992,12 @@ class FileSystemDatabaseManager {
                             return parsed.session_id;
                         }
                     }
-                    catch (_c) {
+                    catch (_d) {
                         return userId;
                     }
                 }
             }
-            catch (_d) {
+            catch (_e) {
                 // 忽略解析错误
             }
         }