aicodeswitch 3.9.3 → 4.0.0

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

@@ -8,79 +8,103 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const os_1 = __importDefault(require("os"));
 const types_1 = require("../types");
+const toml_1 = __importDefault(require("@iarna/toml"));
 /**
- * TOML 解析器（简单实现，仅用于解析 Codex config.toml）
+ * TOML 解析器（使用 @iarna/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;
+    try {
+        return toml_1.default.parse(content);
+    }
+    catch (error) {
+        console.warn('Failed to parse TOML file:', error);
+        return {}; // 返回空对象以保持兼容性
+    }
+};
+const normalizeApiUrl = (value) => {
+    return value.replace(/\/+$/, '');
+};
+const inferSourceTypeFromBaseUrlAndWireApi = (baseUrl, wireApi) => {
+    const lowerBaseUrl = baseUrl.toLowerCase();
+    const normalizedWireApi = (wireApi || '').toLowerCase();
+    if (lowerBaseUrl.includes('anthropic')) {
+        return normalizedWireApi === 'chat' ? 'claude-chat' : 'claude';
+    }
+    if (lowerBaseUrl.includes('generativelanguage.googleapis.com') ||
+        lowerBaseUrl.includes('aiplatform.googleapis.com') ||
+        lowerBaseUrl.includes('vertexai')) {
+        return normalizedWireApi === 'chat' ? 'gemini-chat' : 'gemini';
+    }
+    if (lowerBaseUrl.includes('deepseek')) {
+        return 'deepseek-reasoning-chat';
+    }
+    if (normalizedWireApi === 'chat') {
+        return 'openai-chat';
+    }
+    return 'openai';
+};
+const inferAuthTypeFromSource = (sourceType) => {
+    if (sourceType === 'gemini' || sourceType === 'gemini-chat') {
+        return types_1.AuthType.G_API_KEY;
+    }
+    if (sourceType === 'claude' || sourceType === 'claude-chat') {
+        return types_1.AuthType.API_KEY;
+    }
+    return types_1.AuthType.AUTH_TOKEN;
+};
+const getProviderCandidateKeys = (providerName) => {
+    if (!providerName) {
+        return [];
+    }
+    const upper = providerName.toUpperCase().replace(/[^A-Z0-9]+/g, '_');
+    const lower = providerName.toLowerCase().replace(/[^a-z0-9]+/g, '_');
+    return [
+        `${upper}_API_KEY`,
+        `${upper}_AUTH_TOKEN`,
+        `${lower}_api_key`,
+        `${lower}_auth_token`,
+    ];
+};
+const pickApiKey = (authConfig, candidates) => {
+    for (const key of candidates) {
+        const value = authConfig[key];
+        if (typeof value === 'string' && value.trim()) {
+            return value.trim();
         }
     }
-    return result;
+    return '';
 };
 /**
  * 读取 Claude Code 原始配置
- * 从备份文件或当前配置文件中读取（如果未激活路由）
+ * fallback 场景下仅从备份文件读取
  */
 const readClaudeOriginalConfig = () => {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e, _f;
     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;
-            }
+        // fallback 只读取备份文件，确保使用真实上游配置
+        if (!fs_1.default.existsSync(settingsBakPath)) {
+            console.log('No Claude backup config file found');
+            return null;
         }
-        const content = fs_1.default.readFileSync(configPath, 'utf-8');
+        const content = fs_1.default.readFileSync(settingsBakPath, '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) || '';
+        const baseUrlRaw = ((_a = config.env) === null || _a === void 0 ? void 0 : _a.ANTHROPIC_BASE_URL) || 'https://api.anthropic.com';
+        const baseUrl = normalizeApiUrl(baseUrlRaw);
+        const authToken = typeof ((_b = config.env) === null || _b === void 0 ? void 0 : _b.ANTHROPIC_AUTH_TOKEN) === 'string' ? config.env.ANTHROPIC_AUTH_TOKEN : '';
+        const apiKeyValue = typeof ((_c = config.env) === null || _c === void 0 ? void 0 : _c.ANTHROPIC_API_KEY) === 'string' ? config.env.ANTHROPIC_API_KEY : '';
+        const apiKey = (authToken || apiKeyValue).trim();
+        const defaultHaikuModel = typeof ((_d = config.env) === null || _d === void 0 ? void 0 : _d.ANTHROPIC_DEFAULT_HAIKU_MODEL) === 'string'
+            ? config.env.ANTHROPIC_DEFAULT_HAIKU_MODEL.trim()
+            : '';
+        const defaultSonnetModel = typeof ((_e = config.env) === null || _e === void 0 ? void 0 : _e.ANTHROPIC_DEFAULT_SONNET_MODEL) === 'string'
+            ? config.env.ANTHROPIC_DEFAULT_SONNET_MODEL.trim()
+            : '';
+        const defaultOpusModel = typeof ((_f = config.env) === null || _f === void 0 ? void 0 : _f.ANTHROPIC_DEFAULT_OPUS_MODEL) === 'string'
+            ? config.env.ANTHROPIC_DEFAULT_OPUS_MODEL.trim()
+            : '';
         if (!apiKey) {
             console.log('No API key found in Claude config');
             return null;
@@ -88,8 +112,13 @@ const readClaudeOriginalConfig = () => {
         return {
             apiUrl: baseUrl,
             apiKey: apiKey,
-            authType: types_1.AuthType.AUTH_TOKEN,
+            authType: authToken ? types_1.AuthType.AUTH_TOKEN : types_1.AuthType.API_KEY,
             sourceType: 'claude',
+            claudeDefaultModels: {
+                haiku: defaultHaikuModel || undefined,
+                sonnet: defaultSonnetModel || undefined,
+                opus: defaultOpusModel || undefined,
+            },
         };
     }
     catch (error) {
@@ -100,63 +129,100 @@ const readClaudeOriginalConfig = () => {
 exports.readClaudeOriginalConfig = readClaudeOriginalConfig;
 /**
  * 读取 Codex 原始配置
- * 从备份文件或当前配置文件中读取（如果未激活路由）
+ * fallback 场景下仅从备份文件读取
  */
 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 authBakPath = path_1.default.join(homeDir, '.codex/auth.json.aicodeswitch_backup');
+        // fallback 只读取备份文件，确保使用真实上游配置
+        if (!fs_1.default.existsSync(configBakPath)) {
+            console.log('No Codex backup config file found');
+            return null;
         }
-        const tomlContent = fs_1.default.readFileSync(tomlPath, 'utf-8');
+        const tomlContent = fs_1.default.readFileSync(configBakPath, 'utf-8');
         const config = parseToml(tomlContent);
-        // 提取 base_url
+        // 提取 provider 配置
         let baseUrl = '';
-        let model = config.model;
+        let wireApi = '';
+        const model = typeof config.model === 'string' ? config.model : undefined;
+        const providerName = typeof config.model_provider === 'string' ? config.model_provider : undefined;
         // 从 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 (config.model_providers && typeof config.model_providers === 'object') {
+            const providers = config.model_providers;
+            if (providerName && providers[providerName]) {
+                const providerConfig = providers[providerName];
+                if (typeof (providerConfig === null || providerConfig === void 0 ? void 0 : providerConfig.base_url) === 'string') {
+                    baseUrl = providerConfig.base_url;
+                }
+                if (typeof (providerConfig === null || providerConfig === void 0 ? void 0 : providerConfig.wire_api) === 'string') {
+                    wireApi = providerConfig.wire_api;
+                }
+            }
+            else {
+                const firstProvider = Object.values(providers).find(provider => typeof (provider === null || provider === void 0 ? void 0 : provider.base_url) === 'string');
+                if (firstProvider) {
+                    baseUrl = firstProvider.base_url;
+                    if (typeof firstProvider.wire_api === 'string') {
+                        wireApi = firstProvider.wire_api;
+                    }
+                }
+            }
+        }
+        if (!baseUrl) {
+            if (typeof config.base_url === 'string' && config.base_url.trim()) {
+                baseUrl = config.base_url;
             }
         }
         if (!baseUrl) {
             console.log('No base_url found in Codex config');
             return null;
         }
-        // 读取 API key（从 auth.json）
+        const normalizedBaseUrl = normalizeApiUrl(baseUrl);
+        const sourceType = inferSourceTypeFromBaseUrlAndWireApi(normalizedBaseUrl, wireApi);
+        // 读取 API key（从 auth.json.aicodeswitch_backup）
         let apiKey = '';
-        if (fs_1.default.existsSync(authPath)) {
+        if (fs_1.default.existsSync(authBakPath)) {
             try {
-                const authContent = fs_1.default.readFileSync(authPath, 'utf-8');
+                const authContent = fs_1.default.readFileSync(authBakPath, 'utf-8');
                 const authConfig = JSON.parse(authContent);
-                // Codex 的 auth.json 可能包含多个 provider 的 key
-                // 尝试读取常见的字段
-                apiKey = authConfig.api_key || authConfig.openai_api_key || authConfig.key || '';
+                const providerCandidateKeys = getProviderCandidateKeys(providerName);
+                const sourceTypeKeys = sourceType === 'claude' || sourceType === 'claude-chat'
+                    ? ['ANTHROPIC_AUTH_TOKEN', 'ANTHROPIC_API_KEY']
+                    : sourceType === 'gemini' || sourceType === 'gemini-chat'
+                        ? ['GEMINI_API_KEY', 'GOOGLE_API_KEY']
+                        : ['OPENAI_API_KEY', 'DEEPSEEK_API_KEY'];
+                const commonKeys = ['api_key', 'openai_api_key', 'key'];
+                apiKey = pickApiKey(authConfig, [
+                    ...providerCandidateKeys,
+                    ...sourceTypeKeys,
+                    ...commonKeys,
+                ]);
             }
             catch (error) {
-                console.error('Failed to read Codex auth.json:', error);
+                console.error('Failed to read Codex auth backup:', error);
+            }
+        }
+        else {
+            console.log('No Codex backup auth file found');
+        }
+        // 某些配置会把 key 内联在 provider 中
+        if (!apiKey && config.model_providers && providerName) {
+            const providerConfig = config.model_providers[providerName];
+            if (providerConfig && typeof providerConfig.api_key === 'string' && providerConfig.api_key.trim()) {
+                apiKey = providerConfig.api_key.trim();
             }
         }
         if (!apiKey) {
-            console.log('No API key found in Codex auth.json');
+            console.log('No API key found in Codex backup config/auth');
             return null;
         }
         return {
-            apiUrl: baseUrl,
+            apiUrl: normalizedBaseUrl,
             apiKey: apiKey,
-            authType: types_1.AuthType.API_KEY,
-            sourceType: 'openai',
+            authType: inferAuthTypeFromSource(sourceType),
+            sourceType,
             model: model,
         };
     }