aicodeswitch 3.0.19 → 3.6.1

package/dist/server/proxy-server.js

@@ -158,7 +158,10 @@ class ProxyServer {
                 }
                 // 尝试每个规则,直到成功或全部失败
                 let lastError = null;
-                for (const rule of allRules) {
+                let lastFailedRule = null;
+                let lastFailedService = null;
+                for (let index = 0; index < allRules.length; index++) {
+                    const rule = allRules[index];
                     const service = this.getServiceById(rule.targetServiceId);
                     if (!service)
                         continue;
@@ -169,13 +172,19 @@ class ProxyServer {
                         continue;
                     }
                     try {
+                        const nextServiceName = yield this.findNextAvailableServiceName(allRules, index + 1, route.id);
                         // 尝试代理请求
-                        yield this.proxyRequest(req, res, route, rule, service);
+                        yield this.proxyRequest(req, res, route, rule, service, {
+                            failoverEnabled: true,
+                            forwardedToServiceName: nextServiceName,
+                        });
                         return; // 成功,直接返回
                     }
                     catch (error) {
                         console.error(`Service ${service.name} failed:`, error.message);
                         lastError = error;
+                        lastFailedRule = rule;
+                        lastFailedService = service;
                         // 检测是否是 timeout 错误
                         const isTimeout = error.code === 'ECONNABORTED' ||
                             ((_b = error.message) === null || _b === void 0 ? void 0 : _b.toLowerCase().includes('timeout')) ||
@@ -201,6 +210,21 @@ class ProxyServer {
                 }
                 // 所有服务都失败了
                 console.error('All services failed');
+                // 如果有失败的服务但都在黑名单中，尝试使用最后一个失败的服务（作为 fallback）
+                if (lastFailedRule && lastFailedService) {
+                    console.log(`All services in blacklist, attempting fallback to last failed service: ${lastFailedService.name}`);
+                    try {
+                        yield this.proxyRequest(req, res, route, lastFailedRule, lastFailedService, {
+                            failoverEnabled: false, // Fallback 模式不启用故障切换
+                            forwardedToServiceName: undefined,
+                        });
+                        return;
+                    }
+                    catch (fallbackError) {
+                        console.error(`Fallback to service ${lastFailedService.name} also failed:`, fallbackError.message);
+                        lastError = fallbackError;
+                    }
+                }
                 // 记录日志
                 if (((_d = this.config) === null || _d === void 0 ? void 0 : _d.enableLogging) !== false && SUPPORTED_TARGETS.some(target => req.path.startsWith(`/${target}/`))) {
                     yield this.dbManager.addLog({
@@ -339,7 +363,10 @@ class ProxyServer {
                 }
                 // 尝试每个规则,直到成功或全部失败
                 let lastError = null;
-                for (const rule of allRules) {
+                let lastFailedRule = null;
+                let lastFailedService = null;
+                for (let index = 0; index < allRules.length; index++) {
+                    const rule = allRules[index];
                     const service = this.getServiceById(rule.targetServiceId);
                     if (!service)
                         continue;
@@ -350,13 +377,19 @@ class ProxyServer {
                         continue;
                     }
                     try {
+                        const nextServiceName = yield this.findNextAvailableServiceName(allRules, index + 1, route.id);
                         // 尝试代理请求
-                        yield this.proxyRequest(req, res, route, rule, service);
+                        yield this.proxyRequest(req, res, route, rule, service, {
+                            failoverEnabled: true,
+                            forwardedToServiceName: nextServiceName,
+                        });
                         return; // 成功,直接返回
                     }
                     catch (error) {
                         console.error(`Service ${service.name} failed:`, error.message);
                         lastError = error;
+                        lastFailedRule = rule;
+                        lastFailedService = service;
                         // 检测是否是 timeout 错误
                         const isTimeout = error.code === 'ECONNABORTED' ||
                             ((_b = error.message) === null || _b === void 0 ? void 0 : _b.toLowerCase().includes('timeout')) ||
@@ -382,6 +415,21 @@ class ProxyServer {
                 }
                 // 所有服务都失败了
                 console.error('All services failed');
+                // 如果有失败的服务但都在黑名单中，尝试使用最后一个失败的服务（作为 fallback）
+                if (lastFailedRule && lastFailedService) {
+                    console.log(`All services in blacklist, attempting fallback to last failed service: ${lastFailedService.name}`);
+                    try {
+                        yield this.proxyRequest(req, res, route, lastFailedRule, lastFailedService, {
+                            failoverEnabled: false, // Fallback 模式不启用故障切换
+                            forwardedToServiceName: undefined,
+                        });
+                        return;
+                    }
+                    catch (fallbackError) {
+                        console.error(`Fallback to service ${lastFailedService.name} also failed:`, fallbackError.message);
+                        lastError = fallbackError;
+                    }
+                }
                 // 记录日志
                 if (((_d = this.config) === null || _d === void 0 ? void 0 : _d.enableLogging) !== false && SUPPORTED_TARGETS.some(target => req.path.startsWith(`/${target}/`))) {
                     yield this.dbManager.addLog({
@@ -497,6 +545,36 @@ class ProxyServer {
         const activeRoutes = this.getActiveRoutes();
         return activeRoutes.find(route => route.targetType === targetType && route.isActive);
     }
+    findNextAvailableServiceName(allRules, startIndex, routeId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            for (let index = startIndex; index < allRules.length; index++) {
+                const rule = allRules[index];
+                const service = this.getServiceById(rule.targetServiceId);
+                if (!service)
+                    continue;
+                const isBlacklisted = yield this.dbManager.isServiceBlacklisted(service.id, routeId, rule.contentType);
+                if (isBlacklisted)
+                    continue;
+                return service.name;
+            }
+            return undefined;
+        });
+    }
+    buildFailoverHint(forwardedToServiceName) {
+        if (!forwardedToServiceName) {
+            return '';
+        }
+        return `；已自动转发给 ${forwardedToServiceName} 服务继续处理`;
+    }
+    createFailoverError(message, statusCode, originalError) {
+        const failoverError = new Error(message);
+        failoverError.isFailoverCandidate = true;
+        failoverError.response = { status: statusCode };
+        if (originalError === null || originalError === void 0 ? void 0 : originalError.stack) {
+            failoverError.stack = originalError.stack;
+        }
+        return failoverError;
+    }
     /**
      * 计算请求内容的哈希值，用于去重
      * 基于请求的关键字段生成唯一标识
@@ -945,6 +1023,10 @@ class ProxyServer {
                 type: 'thinking',
                 match: (_req, body) => this.hasThinkingSignal(body),
             },
+            {
+                type: 'high-iq',
+                match: (_req, body) => this.hasHighIqSignal(body),
+            },
             {
                 type: 'long-context',
                 match: (_req, body) => this.hasLongContextSignal(body),
@@ -1009,6 +1091,10 @@ class ProxyServer {
             bg: 'background',
             thinking: 'thinking',
             reasoning: 'thinking',
+            'high-iq': 'high-iq',
+            high_iq: 'high-iq',
+            highiq: 'high-iq',
+            smart: 'high-iq',
             'long-context': 'long-context',
             long_context: 'long-context',
             long: 'long-context',
@@ -1050,6 +1136,65 @@ class ProxyServer {
             ((_a = body === null || body === void 0 ? void 0 : body.reasoning) === null || _a === void 0 ? void 0 : _a.effort) ||
             ((_b = body === null || body === void 0 ? void 0 : body.reasoning) === null || _b === void 0 ? void 0 : _b.enabled));
     }
+    hasHighIqSignal(body) {
+        const messages = body === null || body === void 0 ? void 0 : body.messages;
+        if (!Array.isArray(messages)) {
+            return false;
+        }
+        for (const message of messages) {
+            if ((message === null || message === void 0 ? void 0 : message.role) !== 'user')
+                continue;
+            const content = message === null || message === void 0 ? void 0 : message.content;
+            // 处理字符串类型的 content
+            if (typeof content === 'string') {
+                if (content.trim().startsWith('!!')) {
+                    return true;
+                }
+            }
+            // 处理数组类型的 content
+            else if (Array.isArray(content)) {
+                for (const block of content) {
+                    if ((block === null || block === void 0 ? void 0 : block.type) === 'text' && typeof block.text === 'string') {
+                        if (block.text.trim().startsWith('!!')) {
+                            return true;
+                        }
+                    }
+                }
+            }
+        }
+        return false;
+    }
+    removeHighIqPrefix(body) {
+        if (!(body === null || body === void 0 ? void 0 : body.messages) || !Array.isArray(body.messages)) {
+            return body;
+        }
+        // 深拷贝 body 以避免修改原始对象
+        const processedBody = JSON.parse(JSON.stringify(body));
+        for (const message of processedBody.messages) {
+            if ((message === null || message === void 0 ? void 0 : message.role) !== 'user')
+                continue;
+            const content = message === null || message === void 0 ? void 0 : message.content;
+            // 处理字符串类型的 content
+            if (typeof content === 'string') {
+                if (content.trim().startsWith('!!')) {
+                    // 移除 !! 前缀并执行 trim
+                    message.content = content.replace(/^!!\s*/, '').trim();
+                }
+            }
+            // 处理数组类型的 content
+            else if (Array.isArray(content)) {
+                for (const block of content) {
+                    if ((block === null || block === void 0 ? void 0 : block.type) === 'text' && typeof block.text === 'string') {
+                        if (block.text.trim().startsWith('!!')) {
+                            // 移除 !! 前缀并执行 trim
+                            block.text = block.text.replace(/^!!\s*/, '').trim();
+                        }
+                    }
+                }
+            }
+        }
+        return processedBody;
+    }
     hasBackgroundSignal(body) {
         var _a, _b, _c;
         // 检测 count tokens 请求：messages 只有一条，role 为 "user"，content 为 "count"
@@ -1171,15 +1316,19 @@ class ProxyServer {
     }
     /** 判断是否为 Claude 相关类型（使用 x-api-key 认证） */
     isClaudeSource(sourceType) {
-        return sourceType === 'claude-chat' || sourceType === 'claude-code';
+        return sourceType === 'claude-chat' || sourceType === 'claude';
     }
     isOpenAIChatSource(sourceType) {
-        return sourceType === 'openai-chat' || sourceType === 'openai-responses' || sourceType === 'deepseek-reasoning-chat';
+        return sourceType === 'openai-chat' || sourceType === 'openai' || sourceType === 'deepseek-reasoning-chat';
     }
     /** 判断是否为 Gemini 类型 */
     isGeminiSource(sourceType) {
         return sourceType === 'gemini';
     }
+    /** 判断是否为 Gemini Chat 类型 */
+    isGeminiChatSource(sourceType) {
+        return sourceType === 'gemini-chat';
+    }
     isChatType(sourceType) {
         return sourceType.endsWith('-chat') || sourceType === 'gemini';
     }
@@ -1301,8 +1450,8 @@ class ProxyServer {
         // 向下兼容：检测旧数据的 'auto' 值
         // TODO: 删除
         const isAuto = authType === 'auto';
-        // 使用 x-goog-api-key 认证（适用于 Google Gemini API）
-        if (authType === types_1.AuthType.G_API_KEY || (isAuto && this.isGeminiSource(sourceType))) {
+        // 使用 x-goog-api-key 认证（适用于 Google Gemini API 和 Gemini Chat）
+        if (authType === types_1.AuthType.G_API_KEY || (isAuto && (this.isGeminiSource(sourceType) || this.isGeminiChatSource(sourceType)))) {
             headers['x-goog-api-key'] = service.apiKey;
         }
         // 使用 x-api-key 认证（适用于 claude-chat, claude-code 及某些需要 x-api-key 的 openai-chat 兼容 API）
@@ -1559,13 +1708,15 @@ class ProxyServer {
         // 默认:直接返回原始路径
         return originalPath;
     }
-    proxyRequest(req, res, route, rule, service) {
+    proxyRequest(req, res, route, rule, service, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f;
+            var _a, _b, _c, _d, _e;
             res.locals.skipLog = true;
             const startTime = Date.now();
             const sourceType = (service.sourceType || 'openai-chat');
             const targetType = route.targetType;
+            const failoverEnabled = (options === null || options === void 0 ? void 0 : options.failoverEnabled) === true;
+            const forwardedToServiceName = options === null || options === void 0 ? void 0 : options.forwardedToServiceName;
             let requestBody = req.body || {};
             let usageForLog;
             let logged = false;
@@ -1686,6 +1837,11 @@ class ProxyServer {
                     useMCPProcessing = false;
                 }
             }
+            // 高智商请求处理：移除 !! 前缀
+            if (rule.contentType === 'high-iq' && requestBody.messages) {
+                requestBody = this.removeHighIqPrefix(requestBody);
+                console.log('[HIGH-IQ] Removed !! prefix from user messages');
+            }
             // 用于收集响应数据的变量
             let responseHeadersForLog;
             let responseBodyForLog;
@@ -1801,6 +1957,62 @@ class ProxyServer {
                     console.log(`[MCP] Cleaned up ${tempImageFiles.length} temporary image files`);
                 }
             });
+            const handleUpstreamHttpError = (statusCode, responseData, responseHeaders, contentType) => __awaiter(this, void 0, void 0, function* () {
+                var _a, _b;
+                usageForLog = this.extractTokenUsage(responseData === null || responseData === void 0 ? void 0 : responseData.usage);
+                responseBodyForLog = typeof responseData === 'string' ? responseData : JSON.stringify(responseData);
+                let errorDetail;
+                if (typeof (responseData === null || responseData === void 0 ? void 0 : responseData.error) === 'string') {
+                    errorDetail = responseData.error;
+                }
+                else if (typeof (responseData === null || responseData === void 0 ? void 0 : responseData.message) === 'string') {
+                    errorDetail = responseData.message;
+                }
+                else if (responseData === null || responseData === void 0 ? void 0 : responseData.error) {
+                    errorDetail = JSON.stringify(responseData.error);
+                }
+                else {
+                    errorDetail = JSON.stringify(responseData);
+                }
+                const failoverHint = failoverEnabled ? this.buildFailoverHint(forwardedToServiceName) : '';
+                const upstreamErrorMessage = `Upstream API returned ${statusCode}: ${errorDetail}${failoverHint}`;
+                const vendors = this.dbManager.getVendors();
+                const vendor = vendors.find(v => v.id === service.vendorId);
+                yield this.dbManager.addErrorLog({
+                    timestamp: Date.now(),
+                    method: req.method,
+                    path: req.path,
+                    statusCode,
+                    errorMessage: upstreamErrorMessage,
+                    errorStack: undefined,
+                    requestHeaders: this.normalizeHeaders(req.headers),
+                    requestBody: req.body ? JSON.stringify(req.body) : undefined,
+                    responseHeaders: responseHeadersForLog,
+                    responseBody: responseBodyForLog,
+                    ruleId: rule.id,
+                    targetType,
+                    targetServiceId: service.id,
+                    targetServiceName: service.name,
+                    targetModel: rule.targetModel || ((_a = req.body) === null || _a === void 0 ? void 0 : _a.model),
+                    vendorId: service.vendorId,
+                    vendorName: vendor === null || vendor === void 0 ? void 0 : vendor.name,
+                    requestModel: (_b = req.body) === null || _b === void 0 ? void 0 : _b.model,
+                    upstreamRequest: upstreamRequestForLog,
+                    responseTime: Date.now() - startTime,
+                });
+                if (failoverEnabled) {
+                    yield finalizeLog(statusCode, upstreamErrorMessage);
+                    throw this.createFailoverError(upstreamErrorMessage, statusCode);
+                }
+                this.copyResponseHeaders(responseHeaders, res);
+                if (contentType.includes('application/json')) {
+                    res.status(statusCode).json(responseData);
+                }
+                else {
+                    res.status(statusCode).send(responseData);
+                }
+                yield finalizeLog(res.statusCode);
+            });
             try {
                 if (targetType === 'claude-code') {
                     if (this.isClaudeSource(sourceType)) {
@@ -1809,7 +2021,7 @@ class ProxyServer {
                     else if (this.isOpenAIChatSource(sourceType)) {
                         requestBody = (0, claude_openai_1.transformClaudeRequestToOpenAIChat)(requestBody, rule.targetModel);
                     }
-                    else if (this.isGeminiSource(sourceType)) {
+                    else if (this.isGeminiSource(sourceType) || this.isGeminiChatSource(sourceType)) {
                         requestBody = (0, gemini_1.transformClaudeRequestToGemini)(requestBody);
                     }
                     else {
@@ -1825,7 +2037,7 @@ class ProxyServer {
                     else if (this.isClaudeSource(sourceType)) {
                         requestBody = (0, claude_openai_1.transformClaudeRequestToOpenAIChat)(requestBody, rule.targetModel);
                     }
-                    else if (this.isGeminiSource(sourceType)) {
+                    else if (this.isGeminiSource(sourceType) || this.isGeminiChatSource(sourceType)) {
                         requestBody = (0, gemini_1.transformOpenAIChatRequestToGemini)(requestBody);
                     }
                     else {
@@ -1854,7 +2066,8 @@ class ProxyServer {
                     const model = requestBody.model || rule.targetModel || 'gemini-pro';
                     upstreamUrl = this.buildGeminiUrl(service.apiUrl, model, streamRequested);
                 }
-                else if (this.isChatType(sourceType)) {
+                else if (this.isChatType(sourceType) || this.isGeminiChatSource(sourceType)) {
+                    // Chat 类型（包括 gemini-chat）直接使用用户配置的完整 URL
                     upstreamUrl = service.apiUrl;
                 }
                 else {
@@ -1922,6 +2135,17 @@ class ProxyServer {
                 const responseHeaders = response.headers || {};
                 const contentType = typeof responseHeaders['content-type'] === 'string' ? responseHeaders['content-type'] : '';
                 const isEventStream = streamRequested && contentType.includes('text/event-stream');
+                // 先处理 4xx/5xx：在故障切换模式下抛错，由上层继续切换下一服务
+                if (response.status >= 400) {
+                    let errorResponseData = response.data;
+                    if (streamRequested && response.data && typeof response.data.on === 'function') {
+                        const raw = yield this.readStreamBody(response.data);
+                        errorResponseData = (_a = this.safeJsonParse(raw)) !== null && _a !== void 0 ? _a : raw;
+                    }
+                    responseHeadersForLog = this.normalizeResponseHeaders(responseHeaders);
+                    yield handleUpstreamHttpError(response.status, errorResponseData, responseHeaders, contentType);
+                    return;
+                }
                 if (isEventStream && response.data) {
                     res.status(response.status);
                     if (targetType === 'claude-code' && this.isOpenAIChatSource(sourceType)) {
@@ -2126,8 +2350,8 @@ class ProxyServer {
                         }));
                         return;
                     }
-                    // Gemini -> Claude Code 流式转换
-                    if (targetType === 'claude-code' && this.isGeminiSource(sourceType)) {
+                    // Gemini / Gemini Chat -> Claude Code 流式转换
+                    if (targetType === 'claude-code' && (this.isGeminiSource(sourceType) || this.isGeminiChatSource(sourceType))) {
                         res.setHeader('Content-Type', 'text/event-stream');
                         res.setHeader('Cache-Control', 'no-cache');
                         res.setHeader('Connection', 'keep-alive');
@@ -2222,8 +2446,8 @@ class ProxyServer {
                         }));
                         return;
                     }
-                    // Gemini -> Codex 流式转换
-                    if (targetType === 'codex' && this.isGeminiSource(sourceType)) {
+                    // Gemini / Gemini Chat -> Codex 流式转换
+                    if (targetType === 'codex' && (this.isGeminiSource(sourceType) || this.isGeminiChatSource(sourceType))) {
                         res.setHeader('Content-Type', 'text/event-stream');
                         res.setHeader('Cache-Control', 'no-cache');
                         res.setHeader('Connection', 'keep-alive');
@@ -2379,65 +2603,10 @@ class ProxyServer {
                 let responseData = response.data;
                 if (streamRequested && response.data && typeof response.data.on === 'function' && !isEventStream) {
                     const raw = yield this.readStreamBody(response.data);
-                    responseData = (_a = this.safeJsonParse(raw)) !== null && _a !== void 0 ? _a : raw;
+                    responseData = (_b = this.safeJsonParse(raw)) !== null && _b !== void 0 ? _b : raw;
                 }
                 // 收集响应头
                 responseHeadersForLog = this.normalizeResponseHeaders(responseHeaders);
-                if (response.status >= 400) {
-                    usageForLog = this.extractTokenUsage(responseData === null || responseData === void 0 ? void 0 : responseData.usage);
-                    // 记录错误响应体
-                    responseBodyForLog = typeof responseData === 'string' ? responseData : JSON.stringify(responseData);
-                    // 将 4xx/5xx 错误记录到错误日志
-                    // 确保 errorDetail 总是字符串类型
-                    let errorDetail;
-                    if (typeof (responseData === null || responseData === void 0 ? void 0 : responseData.error) === 'string') {
-                        errorDetail = responseData.error;
-                    }
-                    else if (typeof (responseData === null || responseData === void 0 ? void 0 : responseData.message) === 'string') {
-                        errorDetail = responseData.message;
-                    }
-                    else if (responseData === null || responseData === void 0 ? void 0 : responseData.error) {
-                        errorDetail = JSON.stringify(responseData.error);
-                    }
-                    else {
-                        errorDetail = JSON.stringify(responseData);
-                    }
-                    // 获取供应商信息
-                    const vendors = this.dbManager.getVendors();
-                    const vendor = vendors.find(v => v.id === service.vendorId);
-                    yield this.dbManager.addErrorLog({
-                        timestamp: Date.now(),
-                        method: req.method,
-                        path: req.path,
-                        statusCode: response.status,
-                        errorMessage: `Upstream API returned ${response.status}: ${errorDetail}`,
-                        errorStack: undefined,
-                        requestHeaders: this.normalizeHeaders(req.headers),
-                        requestBody: req.body ? JSON.stringify(req.body) : undefined,
-                        responseHeaders: responseHeadersForLog,
-                        responseBody: responseBodyForLog,
-                        // 添加请求详情和实际转发信息
-                        ruleId: rule.id,
-                        targetType,
-                        targetServiceId: service.id,
-                        targetServiceName: service.name,
-                        targetModel: rule.targetModel || ((_b = req.body) === null || _b === void 0 ? void 0 : _b.model),
-                        vendorId: service.vendorId,
-                        vendorName: vendor === null || vendor === void 0 ? void 0 : vendor.name,
-                        requestModel: (_c = req.body) === null || _c === void 0 ? void 0 : _c.model,
-                        upstreamRequest: upstreamRequestForLog,
-                        responseTime: Date.now() - startTime,
-                    });
-                    this.copyResponseHeaders(responseHeaders, res);
-                    if (contentType.includes('application/json')) {
-                        res.status(response.status).json(responseData);
-                    }
-                    else {
-                        res.status(response.status).send(responseData);
-                    }
-                    yield finalizeLog(res.statusCode);
-                    return;
-                }
                 if (targetType === 'claude-code' && this.isOpenAIChatSource(sourceType)) {
                     const converted = (0, claude_openai_1.transformOpenAIChatResponseToClaude)(responseData);
                     usageForLog = (0, claude_openai_1.extractTokenUsageFromOpenAIUsage)(responseData === null || responseData === void 0 ? void 0 : responseData.usage);
@@ -2445,7 +2614,7 @@ class ProxyServer {
                     responseBodyForLog = JSON.stringify(converted);
                     res.status(response.status).json(converted);
                 }
-                else if (targetType === 'claude-code' && this.isGeminiSource(sourceType)) {
+                else if (targetType === 'claude-code' && (this.isGeminiSource(sourceType) || this.isGeminiChatSource(sourceType))) {
                     const converted = (0, gemini_1.transformGeminiResponseToClaude)(responseData, rule.targetModel);
                     usageForLog = (0, gemini_1.extractTokenUsageFromGeminiUsage)(responseData === null || responseData === void 0 ? void 0 : responseData.usageMetadata);
                     responseBodyForLog = JSON.stringify(converted);
@@ -2457,7 +2626,7 @@ class ProxyServer {
                     responseBodyForLog = JSON.stringify(converted);
                     res.status(response.status).json(converted);
                 }
-                else if (targetType === 'codex' && this.isGeminiSource(sourceType)) {
+                else if (targetType === 'codex' && (this.isGeminiSource(sourceType) || this.isGeminiChatSource(sourceType))) {
                     const converted = (0, gemini_1.transformGeminiResponseToOpenAIChat)(responseData, rule.targetModel);
                     usageForLog = (0, gemini_1.extractTokenUsageFromGeminiUsage)(responseData === null || responseData === void 0 ? void 0 : responseData.usageMetadata);
                     responseBodyForLog = JSON.stringify(converted);
@@ -2479,14 +2648,19 @@ class ProxyServer {
                 yield finalizeLog(res.statusCode);
             }
             catch (error) {
+                if (failoverEnabled && (error === null || error === void 0 ? void 0 : error.isFailoverCandidate)) {
+                    throw error;
+                }
                 console.error('Proxy error:', error);
                 // 检测是否是 timeout 错误
                 const isTimeout = error.code === 'ECONNABORTED' ||
-                    ((_d = error.message) === null || _d === void 0 ? void 0 : _d.toLowerCase().includes('timeout')) ||
+                    ((_c = error.message) === null || _c === void 0 ? void 0 : _c.toLowerCase().includes('timeout')) ||
                     (error.errno && error.errno === 'ETIMEDOUT');
-                const errorMessage = isTimeout
+                const baseErrorMessage = isTimeout
                     ? 'Request timeout - the upstream API took too long to respond'
                     : (error.message || 'Internal server error');
+                const failoverHint = failoverEnabled ? this.buildFailoverHint(forwardedToServiceName) : '';
+                const errorMessage = `${baseErrorMessage}${failoverHint}`;
                 // 将错误记录到错误日志 - 包含请求详情和实际转发信息
                 // 获取供应商信息
                 const vendors = this.dbManager.getVendors();
@@ -2505,14 +2679,17 @@ class ProxyServer {
                     targetType,
                     targetServiceId: service.id,
                     targetServiceName: service.name,
-                    targetModel: rule.targetModel || ((_e = req.body) === null || _e === void 0 ? void 0 : _e.model),
+                    targetModel: rule.targetModel || ((_d = req.body) === null || _d === void 0 ? void 0 : _d.model),
                     vendorId: service.vendorId,
                     vendorName: vendor === null || vendor === void 0 ? void 0 : vendor.name,
-                    requestModel: (_f = req.body) === null || _f === void 0 ? void 0 : _f.model,
+                    requestModel: (_e = req.body) === null || _e === void 0 ? void 0 : _e.model,
                     upstreamRequest: upstreamRequestForLog,
                     responseTime: Date.now() - startTime,
                 });
                 yield finalizeLog(isTimeout ? 504 : 500, errorMessage);
+                if (failoverEnabled) {
+                    throw this.createFailoverError(errorMessage, isTimeout ? 504 : 500, error);
+                }
                 // 根据请求类型返回适当格式的错误响应
                 const streamRequested = this.isStreamRequested(req, req.body || {});
                 if (route.targetType === 'claude-code') {

package/dist/server/type-migration.js

@@ -0,0 +1,68 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.migrateSourceType = migrateSourceType;
+exports.downgradeSourceType = downgradeSourceType;
+exports.isLegacySourceType = isLegacySourceType;
+exports.normalizeSourceType = normalizeSourceType;
+/**
+ * 旧类型 → 新类型映射表
+ */
+const SOURCE_TYPE_MIGRATION_MAP = {
+    'openai-chat': 'openai-chat',
+    'openai-responses': 'openai', // 重命名
+    'claude-chat': 'claude-chat',
+    'claude-code': 'claude', // 重命名
+    'deepseek-reasoning-chat': 'deepseek-reasoning-chat',
+    'gemini': 'gemini',
+    'gemini-chat': 'gemini-chat',
+};
+/**
+ * 新类型 → 旧类型映射表
+ * 用于向下兼容导出
+ */
+const SOURCE_TYPE_REVERSE_MAP = {
+    'openai-chat': 'openai-chat',
+    'openai': 'openai-responses',
+    'claude-chat': 'claude-chat',
+    'claude': 'claude-code',
+    'deepseek-reasoning-chat': 'deepseek-reasoning-chat',
+    'gemini': 'gemini',
+    'gemini-chat': 'gemini-chat',
+};
+/**
+ * 将旧类型转换为新类型
+ * @param legacyType 旧的数据源类型
+ * @returns 新的数据源类型
+ */
+function migrateSourceType(legacyType) {
+    return SOURCE_TYPE_MIGRATION_MAP[legacyType];
+}
+/**
+ * 将新类型转换为旧类型
+ * 用于向下兼容导出
+ * @param newType 新的数据源类型
+ * @returns 旧的数据源类型
+ */
+function downgradeSourceType(newType) {
+    return SOURCE_TYPE_REVERSE_MAP[newType];
+}
+/**
+ * 检查是否为旧类型
+ * @param type 类型字符串
+ * @returns 是否为旧类型
+ */
+function isLegacySourceType(type) {
+    return type === 'openai-responses' || type === 'claude-code';
+}
+/**
+ * 标准化类型
+ * 自动处理新旧类型，将旧类型转换为新类型，新类型保持不变
+ * @param type 类型字符串（可能是旧类型或新类型）
+ * @returns 标准化后的新类型
+ */
+function normalizeSourceType(type) {
+    if (isLegacySourceType(type)) {
+        return migrateSourceType(type);
+    }
+    return type;
+}