aicodeswitch 3.6.3 → 3.9.2

package/dist/server/database.js

@@ -386,7 +386,7 @@ class DatabaseManager {
       CREATE TABLE IF NOT EXISTS rules (
         id TEXT PRIMARY KEY,
         route_id TEXT NOT NULL,
-        content_type TEXT NOT NULL CHECK(content_type IN ('default', 'background', 'thinking', 'long-context', 'image-understanding', 'model-mapping')),
+        content_type TEXT NOT NULL CHECK(content_type IN ('default', 'background', 'thinking', 'long-context', 'image-understanding', 'model-mapping', 'high-iq')),
         target_service_id TEXT NOT NULL,
         target_model TEXT,
         replaced_model TEXT,

package/dist/server/fs-database.js

@@ -1707,7 +1707,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'];
+        const validContentTypes = ['default', 'background', 'thinking', 'long-context', 'image-understanding', 'model-mapping', 'high-iq'];
         if (!rule.contentType || !validContentTypes.includes(rule.contentType)) {
             return { valid: false, error: `规则[${index}](${rule.id}) 的 contentType 无效` };
         }
@@ -2264,11 +2264,22 @@ class FileSystemDatabaseManager {
             existing.lastRequestAt = now;
             existing.requestCount++;
             existing.totalTokens += session.totalTokens || 0;
-            existing.vendorId = session.vendorId;
-            existing.vendorName = session.vendorName;
-            existing.serviceId = session.serviceId;
-            existing.serviceName = session.serviceName;
-            existing.model = session.model;
+            if (session.vendorId !== undefined)
+                existing.vendorId = session.vendorId;
+            if (session.vendorName !== undefined)
+                existing.vendorName = session.vendorName;
+            if (session.serviceId !== undefined)
+                existing.serviceId = session.serviceId;
+            if (session.serviceName !== undefined)
+                existing.serviceName = session.serviceName;
+            if (session.model !== undefined)
+                existing.model = session.model;
+            if (session.highIqMode !== undefined)
+                existing.highIqMode = session.highIqMode;
+            if (Object.prototype.hasOwnProperty.call(session, 'highIqRuleId'))
+                existing.highIqRuleId = session.highIqRuleId;
+            if (Object.prototype.hasOwnProperty.call(session, 'highIqEnabledAt'))
+                existing.highIqEnabledAt = session.highIqEnabledAt;
         }
         else {
             // 创建新 session
@@ -2285,6 +2296,9 @@ class FileSystemDatabaseManager {
                 serviceId: session.serviceId,
                 serviceName: session.serviceName,
                 model: session.model,
+                highIqMode: session.highIqMode,
+                highIqRuleId: session.highIqRuleId,
+                highIqEnabledAt: session.highIqEnabledAt,
             });
         }
         // 异步保存（不阻塞）

package/dist/server/main.js

@@ -104,7 +104,7 @@ const asyncHandler = (handler) => (req, res, next) => {
         next(err);
     });
 };
-const writeClaudeConfig = (dbManager, enableAgentTeams) => __awaiter(void 0, void 0, void 0, function* () {
+const writeClaudeConfig = (dbManager, enableAgentTeams, enableBypassPermissionsSupport) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const homeDir = os_1.default.homedir();
         const port = process.env.PORT ? parseInt(process.env.PORT, 10) : 4567;
@@ -153,6 +153,13 @@ const writeClaudeConfig = (dbManager, enableAgentTeams) => __awaiter(void 0, voi
         const claudeSettings = {
             env: claudeSettingsEnv
         };
+        // 如果开启对bypassPermissions的支持，添加对应的配置项
+        if (enableBypassPermissionsSupport) {
+            claudeSettings.permissions = {
+                defaultMode: "bypassPermissions"
+            };
+            claudeSettings.skipDangerousModePermissionPrompt = true;
+        }
         fs_1.default.writeFileSync(claudeSettingsPath, JSON.stringify(claudeSettings, null, 2));
         // Claude Code .claude.json
         const claudeJsonPath = path_1.default.join(homeDir, '.claude.json');
@@ -243,6 +250,57 @@ const updateClaudeAgentTeamsConfig = (enableAgentTeams) => __awaiter(void 0, voi
         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 DEFAULT_CODEX_REASONING_EFFORT = 'high';
 const isCodexReasoningEffort = (value) => {
@@ -1417,7 +1475,8 @@ ${instruction}
     })));
     app.post('/api/write-config/claude', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () {
         const enableAgentTeams = req.body.enableAgentTeams;
-        const result = yield writeClaudeConfig(dbManager, enableAgentTeams);
+        const enableBypassPermissionsSupport = req.body.enableBypassPermissionsSupport;
+        const result = yield writeClaudeConfig(dbManager, enableAgentTeams, enableBypassPermissionsSupport);
         res.json(result);
     })));
     app.post('/api/write-config/codex', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () {
@@ -1434,6 +1493,12 @@ ${instruction}
         const result = yield updateClaudeAgentTeamsConfig(enableAgentTeams);
         res.json(result);
     })));
+    // 更新Claude Code配置中的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);
+        res.json(result);
+    })));
     app.post('/api/update-codex-reasoning-effort', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () {
         const requestedEffort = req.body.modelReasoningEffort;
         if (!isCodexReasoningEffort(requestedEffort)) {

package/dist/server/original-config-reader.js

@@ -0,0 +1,181 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.readOriginalConfig = exports.readCodexOriginalConfig = exports.readClaudeOriginalConfig = void 0;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const os_1 = __importDefault(require("os"));
+const types_1 = require("../types");
+/**
+ * TOML 解析器（简单实现，仅用于解析 Codex config.toml）
+ */
+const parseToml = (content) => {
+    const result = {};
+    let currentSection = result;
+    const lines = content.split('\n');
+    for (const line of lines) {
+        const trimmed = line.trim();
+        // 跳过空行和注释
+        if (!trimmed || trimmed.startsWith('#')) {
+            continue;
+        }
+        // 检查是否是 section
+        const sectionMatch = trimmed.match(/^\[([^\]]+)\]$/);
+        if (sectionMatch) {
+            const sectionPath = sectionMatch[1].split('.');
+            currentSection = result;
+            for (const key of sectionPath) {
+                if (!currentSection[key]) {
+                    currentSection[key] = {};
+                }
+                currentSection = currentSection[key];
+            }
+            continue;
+        }
+        // 解析键值对
+        const kvMatch = trimmed.match(/^([^=]+)=(.*)$/);
+        if (kvMatch) {
+            const key = kvMatch[1].trim();
+            let value = kvMatch[2].trim();
+            // 移除引号
+            if ((value.startsWith('"') && value.endsWith('"')) ||
+                (value.startsWith("'") && value.endsWith("'"))) {
+                value = value.slice(1, -1);
+            }
+            // 尝试转换为布尔值
+            if (value === 'true') {
+                value = true;
+            }
+            else if (value === 'false') {
+                value = false;
+            }
+            currentSection[key] = value;
+        }
+    }
+    return result;
+};
+/**
+ * 读取 Claude Code 原始配置
+ * 从备份文件或当前配置文件中读取（如果未激活路由）
+ */
+const readClaudeOriginalConfig = () => {
+    var _a, _b, _c;
+    try {
+        const homeDir = os_1.default.homedir();
+        const settingsPath = path_1.default.join(homeDir, '.claude/settings.json');
+        const settingsBakPath = path_1.default.join(homeDir, '.claude/settings.json.aicodeswitch_backup');
+        // 优先读取备份文件（原始配置）
+        let configPath = settingsBakPath;
+        if (!fs_1.default.existsSync(configPath)) {
+            // 如果没有备份，尝试读取当前配置
+            configPath = settingsPath;
+            if (!fs_1.default.existsSync(configPath)) {
+                console.log('No Claude config file found');
+                return null;
+            }
+        }
+        const content = fs_1.default.readFileSync(configPath, 'utf-8');
+        const config = JSON.parse(content);
+        // 提取配置信息
+        const baseUrl = ((_a = config.env) === null || _a === void 0 ? void 0 : _a.ANTHROPIC_BASE_URL) || 'https://api.anthropic.com';
+        const apiKey = ((_b = config.env) === null || _b === void 0 ? void 0 : _b.ANTHROPIC_AUTH_TOKEN) || ((_c = config.env) === null || _c === void 0 ? void 0 : _c.ANTHROPIC_API_KEY) || '';
+        if (!apiKey) {
+            console.log('No API key found in Claude config');
+            return null;
+        }
+        return {
+            apiUrl: baseUrl,
+            apiKey: apiKey,
+            authType: types_1.AuthType.AUTH_TOKEN,
+            sourceType: 'claude',
+        };
+    }
+    catch (error) {
+        console.error('Failed to read Claude original config:', error);
+        return null;
+    }
+};
+exports.readClaudeOriginalConfig = readClaudeOriginalConfig;
+/**
+ * 读取 Codex 原始配置
+ * 从备份文件或当前配置文件中读取（如果未激活路由）
+ */
+const readCodexOriginalConfig = () => {
+    try {
+        const homeDir = os_1.default.homedir();
+        const configPath = path_1.default.join(homeDir, '.codex/config.toml');
+        const configBakPath = path_1.default.join(homeDir, '.codex/config.toml.aicodeswitch_backup');
+        const authPath = path_1.default.join(homeDir, '.codex/auth.json');
+        // 优先读取备份文件（原始配置）
+        let tomlPath = configBakPath;
+        if (!fs_1.default.existsSync(tomlPath)) {
+            // 如果没有备份，尝试读取当前配置
+            tomlPath = configPath;
+            if (!fs_1.default.existsSync(tomlPath)) {
+                console.log('No Codex config file found');
+                return null;
+            }
+        }
+        const tomlContent = fs_1.default.readFileSync(tomlPath, 'utf-8');
+        const config = parseToml(tomlContent);
+        // 提取 base_url
+        let baseUrl = '';
+        let model = config.model;
+        // 从 model_providers 中查找配置
+        if (config.model_providers) {
+            const providerName = config.model_provider;
+            if (providerName && config.model_providers[providerName]) {
+                baseUrl = config.model_providers[providerName].base_url;
+            }
+        }
+        if (!baseUrl) {
+            console.log('No base_url found in Codex config');
+            return null;
+        }
+        // 读取 API key（从 auth.json）
+        let apiKey = '';
+        if (fs_1.default.existsSync(authPath)) {
+            try {
+                const authContent = fs_1.default.readFileSync(authPath, 'utf-8');
+                const authConfig = JSON.parse(authContent);
+                // Codex 的 auth.json 可能包含多个 provider 的 key
+                // 尝试读取常见的字段
+                apiKey = authConfig.api_key || authConfig.openai_api_key || authConfig.key || '';
+            }
+            catch (error) {
+                console.error('Failed to read Codex auth.json:', error);
+            }
+        }
+        if (!apiKey) {
+            console.log('No API key found in Codex auth.json');
+            return null;
+        }
+        return {
+            apiUrl: baseUrl,
+            apiKey: apiKey,
+            authType: types_1.AuthType.API_KEY,
+            sourceType: 'openai',
+            model: model,
+        };
+    }
+    catch (error) {
+        console.error('Failed to read Codex original config:', error);
+        return null;
+    }
+};
+exports.readCodexOriginalConfig = readCodexOriginalConfig;
+/**
+ * 根据目标类型读取原始配置
+ */
+const readOriginalConfig = (targetType) => {
+    if (targetType === 'claude-code') {
+        return (0, exports.readClaudeOriginalConfig)();
+    }
+    else if (targetType === 'codex') {
+        return (0, exports.readCodexOriginalConfig)();
+    }
+    return null;
+};
+exports.readOriginalConfig = readOriginalConfig;