aicodeswitch 4.0.2 → 4.0.4

package/dist/server/proxy-server.js

@@ -195,9 +195,8 @@ class ProxyServer {
                     // 如果原始配置也不可用，返回错误
                     return res.status(404).json({ error: 'No matching route found and no original config available' });
                 }
-                // 高智商请求判定：从消息结构推断是否启用，不再使用 !x 显式关闭语法
+                // 高智商请求判定：存在规则时从消息末尾往前搜索 [!]/[x] 标记
                 const forcedContentType = yield this.prepareHighIqRouting(req, route, route.targetType);
-                // 检查是否启用故障切换
                 const enableFailover = ((_a = this.config) === null || _a === void 0 ? void 0 : _a.enableFailover) !== false; // 默认为 true
                 if (!enableFailover) {
                     // 故障切换已禁用,使用传统的单一规则匹配
@@ -294,7 +293,7 @@ class ProxyServer {
                         }
                         else {
                             // HTTP错误，检查状态码
-                            const statusCode = ((_c = error.response) === null || _c === void 0 ? void 0 : _c.status) || 500;
+                            const statusCode = this.getErrorStatusCode(error, 500);
                             if (statusCode >= 400) {
                                 yield this.dbManager.addToBlacklist(service.id, route.id, rule.contentType, error.message, statusCode, 'http');
                                 console.log(`Service ${service.name} added to blacklist due to HTTP error ${statusCode} (${route.id}:${rule.contentType}:${service.id})`);
@@ -340,20 +339,28 @@ class ProxyServer {
                 });
                 // 确定目标类型
                 const targetType = req.path.startsWith('/claude-code/') ? 'claude-code' : 'codex';
-                // 记录错误日志 - 包含请求详情
+                // 记录错误日志 - 包含请求详情和最后失败的服务信息
+                const _lastFailedVendor = lastFailedService ? this.dbManager.getVendorByServiceId(lastFailedService.id) : undefined;
                 yield this.dbManager.addErrorLog({
                     timestamp: Date.now(),
                     method: req.method,
                     path: req.path,
                     statusCode: 503,
-                    errorMessage: 'All services failed',
+                    errorMessage: (lastError === null || lastError === void 0 ? void 0 : lastError.message) || 'All services failed',
                     errorStack: lastError === null || lastError === void 0 ? void 0 : lastError.stack,
                     requestHeaders: this.normalizeHeaders(req.headers),
                     requestBody: req.body ? JSON.stringify(req.body) : undefined,
                     // 添加请求详情
                     targetType,
-                    requestModel: (_d = req.body) === null || _d === void 0 ? void 0 : _d.model,
-                    responseTime: 0,
+                    requestModel: (_c = req.body) === null || _c === void 0 ? void 0 : _c.model,
+                    responseTime: Date.now() - requestStartAt,
+                    // 添加最后失败的服务信息
+                    ruleId: lastFailedRule === null || lastFailedRule === void 0 ? void 0 : lastFailedRule.id,
+                    targetServiceId: lastFailedService === null || lastFailedService === void 0 ? void 0 : lastFailedService.id,
+                    targetServiceName: lastFailedService === null || lastFailedService === void 0 ? void 0 : lastFailedService.name,
+                    targetModel: (lastFailedRule === null || lastFailedRule === void 0 ? void 0 : lastFailedRule.targetModel) || ((_d = req.body) === null || _d === void 0 ? void 0 : _d.model),
+                    vendorId: lastFailedService === null || lastFailedService === void 0 ? void 0 : lastFailedService.vendorId,
+                    vendorName: _lastFailedVendor === null || _lastFailedVendor === void 0 ? void 0 : _lastFailedVendor.name,
                 });
                 // 根据路径判断目标类型并返回适当的错误格式
                 const isClaudeCode = req.path.startsWith('/claude-code/');
@@ -400,7 +407,7 @@ class ProxyServer {
                     // 添加请求详情
                     targetType,
                     requestModel: (_e = req.body) === null || _e === void 0 ? void 0 : _e.model,
-                    responseTime: 0,
+                    responseTime: Date.now() - requestStartAt,
                 });
                 // 根据路径判断目标类型并返回适当的错误格式
                 const isClaudeCode = req.path.startsWith('/claude-code/');
@@ -462,7 +469,7 @@ class ProxyServer {
                     });
                     return res.status(404).json({ error: `No active route found for target type: ${targetType}` });
                 }
-                // 高智商请求判定：从消息结构推断是否启用，不再使用 !x 显式关闭语法
+                // 高智商请求判定：存在规则时从消息末尾往前搜索 [!]/[x] 标记
                 const forcedContentType = yield this.prepareHighIqRouting(req, route, targetType);
                 // 检查是否启用故障切换
                 const enableFailover = ((_a = this.config) === null || _a === void 0 ? void 0 : _a.enableFailover) !== false; // 默认为 true
@@ -561,7 +568,7 @@ class ProxyServer {
                         }
                         else {
                             // HTTP错误，检查状态码
-                            const statusCode = ((_c = error.response) === null || _c === void 0 ? void 0 : _c.status) || 500;
+                            const statusCode = this.getErrorStatusCode(error, 500);
                             if (statusCode >= 400) {
                                 yield this.dbManager.addToBlacklist(service.id, route.id, rule.contentType, error.message, statusCode, 'http');
                                 console.log(`Service ${service.name} added to blacklist due to HTTP error ${statusCode} (${route.id}:${rule.contentType}:${service.id})`);
@@ -605,20 +612,28 @@ class ProxyServer {
                     error: (lastError === null || lastError === void 0 ? void 0 : lastError.message) || 'All services failed',
                     tags: this.buildRelayTags(hasRelayAttempt),
                 });
-                // 记录错误日志 - 包含请求详情（使用函数参数 targetType）
+                // 记录错误日志 - 包含请求详情和最后失败的服务信息（使用函数参数 targetType）
+                const _lastFailedVendor2 = lastFailedService ? this.dbManager.getVendorByServiceId(lastFailedService.id) : undefined;
                 yield this.dbManager.addErrorLog({
                     timestamp: Date.now(),
                     method: req.method,
                     path: req.path,
                     statusCode: 503,
-                    errorMessage: 'All services failed',
+                    errorMessage: (lastError === null || lastError === void 0 ? void 0 : lastError.message) || 'All services failed',
                     errorStack: lastError === null || lastError === void 0 ? void 0 : lastError.stack,
                     requestHeaders: this.normalizeHeaders(req.headers),
                     requestBody: req.body ? JSON.stringify(req.body) : undefined,
                     // 添加请求详情
                     targetType,
-                    requestModel: (_d = req.body) === null || _d === void 0 ? void 0 : _d.model,
-                    responseTime: 0,
+                    requestModel: (_c = req.body) === null || _c === void 0 ? void 0 : _c.model,
+                    responseTime: Date.now() - requestStartAt,
+                    // 添加最后失败的服务信息
+                    ruleId: lastFailedRule === null || lastFailedRule === void 0 ? void 0 : lastFailedRule.id,
+                    targetServiceId: lastFailedService === null || lastFailedService === void 0 ? void 0 : lastFailedService.id,
+                    targetServiceName: lastFailedService === null || lastFailedService === void 0 ? void 0 : lastFailedService.name,
+                    targetModel: (lastFailedRule === null || lastFailedRule === void 0 ? void 0 : lastFailedRule.targetModel) || ((_d = req.body) === null || _d === void 0 ? void 0 : _d.model),
+                    vendorId: lastFailedService === null || lastFailedService === void 0 ? void 0 : lastFailedService.vendorId,
+                    vendorName: _lastFailedVendor2 === null || _lastFailedVendor2 === void 0 ? void 0 : _lastFailedVendor2.name,
                 });
                 // 根据路径判断目标类型并返回适当的错误格式
                 const isClaudeCode = req.path.startsWith('/claude-code/');
@@ -664,7 +679,7 @@ class ProxyServer {
                     // 添加请求详情
                     targetType,
                     requestModel: (_e = req.body) === null || _e === void 0 ? void 0 : _e.model,
-                    responseTime: 0,
+                    responseTime: Date.now() - requestStartAt,
                 });
                 if (this.isResponseCommitted(res)) {
                     return;
@@ -882,15 +897,62 @@ class ProxyServer {
         }
         return `；已自动转发给 ${forwardedToServiceName} 服务继续处理`;
     }
+    /**
+     * 解析规则的有效超时时间（毫秒）。
+     * 优先级：rule.timeout > config.ruleGlobalTimeout * 1000 > 300000（5分钟）
+     */
+    resolveEffectiveTimeout(rule) {
+        if (rule.timeout && rule.timeout > 0) {
+            return rule.timeout;
+        }
+        const config = this.dbManager.getConfig();
+        if (config.ruleGlobalTimeout && config.ruleGlobalTimeout > 0) {
+            return config.ruleGlobalTimeout * 1000;
+        }
+        return 300000;
+    }
     createFailoverError(message, statusCode, originalError) {
         const failoverError = new Error(message);
         failoverError.isFailoverCandidate = true;
+        failoverError.statusCode = statusCode;
         failoverError.response = { status: statusCode };
         if (originalError === null || originalError === void 0 ? void 0 : originalError.stack) {
             failoverError.stack = originalError.stack;
         }
         return failoverError;
     }
+    getErrorStatusCode(error, fallbackStatusCode = 500) {
+        var _a, _b, _c;
+        const statusCode = (_c = (_b = (_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.status) !== null && _b !== void 0 ? _b : error === null || error === void 0 ? void 0 : error.statusCode) !== null && _c !== void 0 ? _c : error === null || error === void 0 ? void 0 : error.status;
+        if (typeof statusCode === 'number' && Number.isFinite(statusCode)) {
+            return statusCode;
+        }
+        return fallbackStatusCode;
+    }
+    detectStreamFailure(events) {
+        var _a, _b;
+        for (const event of events) {
+            const eventType = (_a = event.event) === null || _a === void 0 ? void 0 : _a.trim();
+            if (!eventType)
+                continue;
+            if (eventType !== 'response.failed' && eventType !== 'error') {
+                continue;
+            }
+            const parsed = event.data ? this.safeJsonParse(event.data) : null;
+            const errorObj = ((_b = parsed === null || parsed === void 0 ? void 0 : parsed.response) === null || _b === void 0 ? void 0 : _b.error) || (parsed === null || parsed === void 0 ? void 0 : parsed.error) || parsed;
+            const errorCode = errorObj === null || errorObj === void 0 ? void 0 : errorObj.code;
+            const errorMessage = (errorObj === null || errorObj === void 0 ? void 0 : errorObj.message)
+                || (parsed === null || parsed === void 0 ? void 0 : parsed.message)
+                || `Upstream stream returned ${eventType}`;
+            const normalizedMessage = `Upstream stream returned ${eventType}: ${errorMessage}`;
+            const statusCode = errorCode === 'server_is_overloaded' ? 503 : 502;
+            return {
+                statusCode,
+                errorMessage: normalizedMessage,
+            };
+        }
+        return null;
+    }
     isDownstreamClosed(res) {
         return res.destroyed || res.writableEnded || !res.writable;
     }
@@ -1390,7 +1452,7 @@ class ProxyServer {
             },
             {
                 type: 'high-iq',
-                match: (_req, body) => this.hasHighIqSignal(body),
+                match: (_req, body, _sessionId, routeId) => this.hasHighIqSignal(body, routeId),
             },
             {
                 type: 'long-context',
@@ -1534,11 +1596,19 @@ 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) {
+    hasHighIqRuleForRoute(routeId) {
+        var _a;
+        const rules = this.getRulesByRouteId(routeId);
+        return (_a = rules === null || rules === void 0 ? void 0 : rules.some(rule => rule.contentType === 'high-iq' && !rule.isDisabled)) !== null && _a !== void 0 ? _a : false;
+    }
+    hasHighIqSignal(body, routeId) {
+        if (routeId && !this.hasHighIqRuleForRoute(routeId))
+            return false;
         return this.inferHighIqRouting(body, false).shouldUseHighIq;
     }
     inferHighIqRouting(body, previousMode) {
         const messages = this.extractConversationMessages(body);
+        // 从消息列表末尾往前查找 [!] 或 [x] 标记，普通消息跳过继续搜索
         for (let i = messages.length - 1; i >= 0; i--) {
             const message = messages[i];
             if ((message === null || message === void 0 ? void 0 : message.role) !== 'user') {
@@ -1548,17 +1618,22 @@ class ProxyServer {
             if (!signal.hasHumanText) {
                 continue;
             }
+            // [x] 优先：同一消息中 [x] 覆盖 [!]
+            if (signal.hasCancelPrefix) {
+                return {
+                    shouldUseHighIq: false,
+                    decisionSource: 'human',
+                };
+            }
             if (signal.hasHighIqPrefix) {
                 return {
                     shouldUseHighIq: true,
                     decisionSource: 'human',
                 };
             }
-            return {
-                shouldUseHighIq: false,
-                decisionSource: 'human',
-            };
+            // 普通消息（无 [!] 或 [x] 前缀），继续向前搜索
         }
+        // 未找到 [!] 或 [x] 标记，回退到 session 持久化状态
         if (previousMode) {
             return {
                 shouldUseHighIq: true,
@@ -1572,6 +1647,10 @@ class ProxyServer {
     }
     prepareHighIqRouting(req, route, targetType) {
         return __awaiter(this, void 0, void 0, function* () {
+            // 无高智商规则时直接跳过，避免每次都检查消息前缀
+            if (!this.hasHighIqRuleForRoute(route.id)) {
+                return undefined;
+            }
             const sessionId = this.defaultExtractSessionId(req, targetType);
             const session = sessionId ? this.dbManager.getSession(sessionId) : null;
             const previousMode = (session === null || session === void 0 ? void 0 : session.highIqMode) === true;
@@ -1583,7 +1662,7 @@ class ProxyServer {
                         highIqRuleId: undefined,
                         lastRequestAt: Date.now(),
                     });
-                    console.log(`[HIGH-IQ] Session ${sessionId} auto-disabled by latest human message`);
+                    console.log(`[HIGH-IQ] Session ${sessionId} cancelled by [x] prefix`);
                 }
                 return undefined;
             }
@@ -1641,6 +1720,7 @@ class ProxyServer {
     analyzeUserMessageForHighIq(message) {
         let hasHumanText = false;
         let hasHighIqPrefix = false;
+        let hasCancelPrefix = false;
         const scanText = (text, treatAsHuman) => {
             const trimmed = text.trim();
             if (!trimmed) {
@@ -1652,11 +1732,14 @@ class ProxyServer {
             if (treatAsHuman && trimmed.startsWith('[!]')) {
                 hasHighIqPrefix = true;
             }
+            if (treatAsHuman && /^\[x]/i.test(trimmed)) {
+                hasCancelPrefix = true;
+            }
         };
         const content = message === null || message === void 0 ? void 0 : message.content;
         if (typeof content === 'string') {
             scanText(content, true);
-            return { hasHumanText, hasHighIqPrefix };
+            return { hasHumanText, hasHighIqPrefix, hasCancelPrefix };
         }
         const blocks = Array.isArray(content) ? content : [content];
         for (const block of blocks) {
@@ -1692,7 +1775,7 @@ class ProxyServer {
                 }
             }
         }
-        return { hasHumanText, hasHighIqPrefix };
+        return { hasHumanText, hasHighIqPrefix, hasCancelPrefix };
     }
     /**
      * 查找可用的高智商规则
@@ -2134,7 +2217,7 @@ class ProxyServer {
         const headers = {};
         for (const [key, value] of Object.entries(req.headers)) {
             // 排除原始认证头，防止与代理设置的认证头冲突
-            if (['host', 'content-length', 'authorization', 'x-api-key', 'x-anthropic-api-key', 'anthropic-api-key', 'x-goog-api-key'].includes(key.toLowerCase())) {
+            if (['host', 'content-length', 'authorization', 'x-api-key', 'x-anthropic-api-key', 'anthropic-api-key', 'x-goog-api-key', 'accept-encoding'].includes(key.toLowerCase())) {
                 continue;
             }
             if (typeof value === 'string') {
@@ -2169,6 +2252,10 @@ class ProxyServer {
         if (streamRequested && !headers.accept) {
             headers.accept = 'text/event-stream';
         }
+        // 流式场景显式禁用压缩，避免上游返回压缩字节流导致下游出现乱码
+        if (streamRequested) {
+            headers['accept-encoding'] = 'identity';
+        }
         if (!headers.connection) {
             if (streamRequested) {
                 headers.connection = 'keep-alive';
@@ -2280,6 +2367,26 @@ class ProxyServer {
             return null;
         }
     }
+    cloneRequestBody(data) {
+        if (data === null || data === undefined) {
+            return data;
+        }
+        try {
+            return JSON.parse(JSON.stringify(data));
+        }
+        catch (_a) {
+            return data;
+        }
+    }
+    isEmptyResponse(data) {
+        if (data === null || data === undefined)
+            return true;
+        if (typeof data === 'string' && data.trim() === '')
+            return true;
+        if (typeof data === 'object' && !Array.isArray(data) && Object.keys(data).length === 0)
+            return true;
+        return false;
+    }
     /**
      * 从请求中提取 session ID（默认方法）
      * Claude Code: metadata.user_id
@@ -2692,7 +2799,7 @@ class ProxyServer {
     }
     proxyRequest(req, res, route, rule, service, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f, _g;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
             res.locals.skipLog = true;
             const startTime = Date.now();
             const rawSourceType = service.sourceType || 'openai-chat';
@@ -2706,7 +2813,8 @@ class ProxyServer {
             const forwardedToServiceName = options === null || options === void 0 ? void 0 : options.forwardedToServiceName;
             const useOriginalConfig = (options === null || options === void 0 ? void 0 : options.useOriginalConfig) === true;
             let relayedForLog = !useOriginalConfig;
-            let requestBody = req.body || {};
+            const originalToolRequestBody = this.cloneRequestBody(req.body || {});
+            let requestBody = this.cloneRequestBody(originalToolRequestBody) || {};
             let usageForLog;
             let logged = false;
             const extraTagsForLog = [];
@@ -3065,8 +3173,9 @@ class ProxyServer {
             res.once('close', onResponseClosed);
             try {
                 // 使用统一的请求转换方法
-                const transformedRequestBody = this.transformRequestToUpstream(targetType, sourceType, requestBody, rule.targetModel);
-                requestBody = (_b = transformedRequestBody !== null && transformedRequestBody !== void 0 ? transformedRequestBody : requestBody) !== null && _b !== void 0 ? _b : {};
+                const payloadForTransform = this.cloneRequestBody(originalToolRequestBody);
+                const transformedRequestBody = this.transformRequestToUpstream(targetType, sourceType, payloadForTransform, rule.targetModel);
+                requestBody = (_b = transformedRequestBody !== null && transformedRequestBody !== void 0 ? transformedRequestBody : this.cloneRequestBody(originalToolRequestBody)) !== null && _b !== void 0 ? _b : {};
                 // 应用 max_output_tokens 限制
                 requestBody = this.applyMaxOutputTokensLimit(requestBody, service);
                 if (this.shouldDefaultStreamingForClaudeBridge(req, targetType, sourceType, requestBody)
@@ -3091,7 +3200,7 @@ class ProxyServer {
                     method: req.method,
                     url: upstreamUrl,
                     headers: this.buildUpstreamHeaders(req, service, sourceType, streamRequested, requestBody),
-                    timeout: rule.timeout || 3000000, // 默认300秒
+                    timeout: this.resolveEffectiveTimeout(rule),
                     validateStatus: () => true,
                     responseType: streamRequested ? 'stream' : 'json',
                     signal: upstreamAbortController.signal,
@@ -3242,6 +3351,7 @@ class ProxyServer {
                                         requestHeaders: this.normalizeHeaders(req.headers),
                                         requestBody: req.body ? JSON.stringify(req.body) : undefined,
                                         upstreamRequest: upstreamRequestForLog,
+                                        responseHeaders: responseHeadersForLog,
                                         // 添加请求详情
                                         ruleId: rule.id,
                                         targetType,
@@ -3347,6 +3457,7 @@ class ProxyServer {
                                         requestHeaders: this.normalizeHeaders(req.headers),
                                         requestBody: req.body ? JSON.stringify(req.body) : undefined,
                                         upstreamRequest: upstreamRequestForLog,
+                                        responseHeaders: responseHeadersForLog,
                                         // 添加请求详情
                                         ruleId: rule.id,
                                         targetType,
@@ -3441,6 +3552,7 @@ class ProxyServer {
                                         requestHeaders: this.normalizeHeaders(req.headers),
                                         requestBody: req.body ? JSON.stringify(req.body) : undefined,
                                         upstreamRequest: upstreamRequestForLog,
+                                        responseHeaders: responseHeadersForLog,
                                         ruleId: rule.id,
                                         targetType,
                                         targetServiceId: service.id,
@@ -3537,6 +3649,7 @@ class ProxyServer {
                                         requestHeaders: this.normalizeHeaders(req.headers),
                                         requestBody: req.body ? JSON.stringify(req.body) : undefined,
                                         upstreamRequest: upstreamRequestForLog,
+                                        responseHeaders: responseHeadersForLog,
                                         ruleId: rule.id,
                                         targetType,
                                         targetServiceId: service.id,
@@ -3599,94 +3712,142 @@ class ProxyServer {
                         else if (extractedUsage) {
                             usageForLog = this.extractTokenUsageFromResponse(extractedUsage, sourceType);
                         }
-                        void finalizeLog(res.statusCode);
                     };
-                    // 在下游 chunk 收集器完成后执行，确保拿到真正下发给客户端的完整文本
-                    downstreamChunkCollector.on('finish', () => {
-                        finalizeChunks();
-                    });
-                    // 备用：如果eventCollector的finish没有触发，监听res的finish
-                    res.on('finish', () => {
-                        if (!streamChunksForLog) {
-                            finalizeChunks();
-                        }
-                    });
                     // 监听 res 的错误事件
                     res.on('error', (err) => {
                         console.error('[Proxy] Response stream error:', err);
                     });
-                    // 构建 pipeline，根据是否需要转换选择不同的处理链
-                    if (converter) {
+                    const runStreamPipeline = () => __awaiter(this, void 0, void 0, function* () {
                         ensureResponseWritable();
-                        (0, stream_1.pipeline)(response.data, parser, eventCollector, converter, serializer, downstreamChunkCollector, res, (error) => __awaiter(this, void 0, void 0, function* () {
-                            if (error) {
-                                if (this.isClientDisconnectError(error, res)) {
-                                    console.warn('[Proxy] Default stream pipeline closed because client disconnected');
-                                    yield finalizeLog(499, 'Client disconnected');
-                                    return;
-                                }
-                                console.error('[Proxy] Pipeline error (default stream with converter):', error);
-                                // 记录到错误日志
-                                try {
-                                    yield this.dbManager.addErrorLog({
-                                        timestamp: Date.now(),
-                                        method: req.method,
-                                        path: req.path,
-                                        statusCode: 500,
-                                        errorMessage: error.message || 'Stream processing error',
-                                        errorStack: error.stack,
-                                        requestHeaders: this.normalizeHeaders(req.headers),
-                                        requestBody: req.body ? JSON.stringify(req.body) : undefined,
-                                        upstreamRequest: upstreamRequestForLog,
-                                    });
-                                }
-                                catch (logError) {
-                                    console.error('[Proxy] Failed to log error:', logError);
-                                }
-                                yield finalizeLog(500, error.message);
+                        return yield new Promise((resolve, reject) => {
+                            if (converter) {
+                                (0, stream_1.pipeline)(response.data, parser, eventCollector, converter, serializer, downstreamChunkCollector, res, (error) => {
+                                    if (error) {
+                                        reject(error);
+                                        return;
+                                    }
+                                    resolve();
+                                });
+                                return;
                             }
-                        }));
-                    }
-                    else {
-                        ensureResponseWritable();
-                        (0, stream_1.pipeline)(response.data, parser, eventCollector, serializer, downstreamChunkCollector, res, (error) => __awaiter(this, void 0, void 0, function* () {
-                            if (error) {
-                                if (this.isClientDisconnectError(error, res)) {
-                                    console.warn('[Proxy] Default stream pipeline closed because client disconnected');
-                                    yield finalizeLog(499, 'Client disconnected');
+                            (0, stream_1.pipeline)(response.data, parser, eventCollector, serializer, downstreamChunkCollector, res, (error) => {
+                                if (error) {
+                                    reject(error);
                                     return;
                                 }
-                                console.error('[Proxy] Pipeline error (default stream):', error);
-                                // 记录到错误日志
-                                try {
-                                    yield this.dbManager.addErrorLog({
-                                        timestamp: Date.now(),
-                                        method: req.method,
-                                        path: req.path,
-                                        statusCode: 500,
-                                        errorMessage: error.message || 'Stream processing error',
-                                        errorStack: error.stack,
-                                        requestHeaders: this.normalizeHeaders(req.headers),
-                                        requestBody: req.body ? JSON.stringify(req.body) : undefined,
-                                        upstreamRequest: upstreamRequestForLog,
-                                    });
-                                }
-                                catch (logError) {
-                                    console.error('[Proxy] Failed to log error:', logError);
-                                }
-                                yield finalizeLog(500, error.message);
-                            }
-                        }));
+                                resolve();
+                            });
+                        });
+                    });
+                    try {
+                        yield runStreamPipeline();
                     }
+                    catch (error) {
+                        if (this.isClientDisconnectError(error, res)) {
+                            console.warn('[Proxy] Default stream pipeline closed because client disconnected');
+                            yield finalizeLog(499, 'Client disconnected');
+                            return;
+                        }
+                        console.error('[Proxy] Pipeline error (default stream):', error);
+                        // 记录到错误日志
+                        try {
+                            yield this.dbManager.addErrorLog({
+                                timestamp: Date.now(),
+                                method: req.method,
+                                path: req.path,
+                                statusCode: 500,
+                                errorMessage: error.message || 'Stream processing error',
+                                errorStack: error.stack,
+                                requestHeaders: this.normalizeHeaders(req.headers),
+                                requestBody: req.body ? JSON.stringify(req.body) : undefined,
+                                upstreamRequest: upstreamRequestForLog,
+                                responseHeaders: responseHeadersForLog,
+                                ruleId: rule.id,
+                                targetType,
+                                targetServiceId: service.id,
+                                targetServiceName: service.name,
+                                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: (_e = req.body) === null || _e === void 0 ? void 0 : _e.model,
+                                responseTime: Date.now() - startTime,
+                            });
+                        }
+                        catch (logError) {
+                            console.error('[Proxy] Failed to log error:', logError);
+                        }
+                        yield finalizeLog(500, error.message);
+                        if (failoverEnabled && !this.isResponseCommitted(res)) {
+                            throw this.createFailoverError(error.message || 'Stream processing error', 500, error);
+                        }
+                        return;
+                    }
+                    finalizeChunks();
+                    // 检测空流：上游返回 SSE Content-Type 但没有发送任何事件数据
+                    const collectedEvents = eventCollector.getEvents();
+                    if (collectedEvents.length === 0) {
+                        const emptyStreamMsg = 'Upstream API returned an empty stream (HTTP 200, no SSE events)';
+                        console.warn(`[Proxy] ${emptyStreamMsg}`);
+                        yield finalizeLog(200, emptyStreamMsg);
+                        if (!res.writableEnded) {
+                            res.end();
+                        }
+                        return;
+                    }
+                    // 关键修复：识别 stream 内部的 response.failed / error 事件，归类为错误并触发 failover 交接
+                    const streamFailure = this.detectStreamFailure(collectedEvents);
+                    if (streamFailure) {
+                        try {
+                            yield this.dbManager.addErrorLog({
+                                timestamp: Date.now(),
+                                method: req.method,
+                                path: req.path,
+                                statusCode: streamFailure.statusCode,
+                                errorMessage: streamFailure.errorMessage,
+                                requestHeaders: this.normalizeHeaders(req.headers),
+                                requestBody: req.body ? JSON.stringify(req.body) : undefined,
+                                upstreamRequest: upstreamRequestForLog,
+                                responseHeaders: responseHeadersForLog,
+                                responseBody: responseBodyForLog,
+                                ruleId: rule.id,
+                                targetType,
+                                targetServiceId: service.id,
+                                targetServiceName: service.name,
+                                targetModel: rule.targetModel || ((_f = req.body) === null || _f === void 0 ? void 0 : _f.model),
+                                vendorId: service.vendorId,
+                                vendorName: vendor === null || vendor === void 0 ? void 0 : vendor.name,
+                                requestModel: (_g = req.body) === null || _g === void 0 ? void 0 : _g.model,
+                                responseTime: Date.now() - startTime,
+                            });
+                        }
+                        catch (logError) {
+                            console.error('[Proxy] Failed to log stream failure:', logError);
+                        }
+                        yield finalizeLog(streamFailure.statusCode, streamFailure.errorMessage);
+                        if (failoverEnabled && !this.isResponseCommitted(res)) {
+                            throw this.createFailoverError(streamFailure.errorMessage, streamFailure.statusCode);
+                        }
+                        return;
+                    }
+                    yield finalizeLog(res.statusCode);
                     return;
                 }
                 let responseData = response.data;
                 if (streamRequested && response.data && typeof response.data.on === 'function' && !isEventStream) {
                     const raw = yield this.readStreamBody(response.data);
-                    responseData = (_d = this.safeJsonParse(raw)) !== null && _d !== void 0 ? _d : raw;
+                    responseData = (_h = this.safeJsonParse(raw)) !== null && _h !== void 0 ? _h : raw;
                 }
                 // 收集响应头
                 responseHeadersForLog = this.normalizeResponseHeaders(responseHeaders);
+                // 检测上游空响应（HTTP 200 但 body 为空）— 透传 200
+                if (this.isEmptyResponse(responseData)) {
+                    const emptyInfoMsg = 'Upstream API returned an empty response (HTTP 200), passing through';
+                    console.warn(`[Proxy] ${emptyInfoMsg}`);
+                    responseBodyForLog = typeof responseData === 'string' ? responseData : JSON.stringify(responseData);
+                    yield finalizeLog(200, emptyInfoMsg);
+                    res.status(200).end();
+                    return;
+                }
                 // 使用统一的响应转换方法
                 const converted = this.transformResponseToTool(targetType, sourceType, responseData);
                 // 提取 token usage（从原始响应数据中提取）
@@ -3719,14 +3880,62 @@ class ProxyServer {
                     yield finalizeLog(499, 'Client disconnected');
                     return;
                 }
+                // 特殊处理：count_tokens 请求无论如何都返回 200
+                const isCountTokensRequest = this.isCountTokensPath(req.path) || this.isCountTokensPath(req.originalUrl);
+                if (isCountTokensRequest) {
+                    console.warn('[Proxy] count_tokens request failed, falling back to local estimation:', error.message);
+                    // 使用本地估算返回结果
+                    const inputTokens = this.estimateClaudeCountTokens(requestBody);
+                    const localTokenResponse = { input_tokens: inputTokens };
+                    usageForLog = {
+                        inputTokens,
+                        outputTokens: 0,
+                        totalTokens: inputTokens,
+                    };
+                    responseHeadersForLog = {
+                        'content-type': 'application/json; charset=utf-8',
+                    };
+                    responseBodyForLog = JSON.stringify(localTokenResponse);
+                    streamChunksForLog = undefined;
+                    relayedForLog = false;
+                    extraTagsForLog.push('上游失败-本地计算Token');
+                    // 记录错误日志（但不影响响应）
+                    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: 200, // 实际返回 200
+                        errorMessage: `count_tokens upstream failed, used local estimation: ${error.message}`,
+                        errorStack: error.stack,
+                        requestHeaders: this.normalizeHeaders(req.headers),
+                        requestBody: req.body ? JSON.stringify(req.body) : undefined,
+                        ruleId: rule.id,
+                        targetType,
+                        targetServiceId: service.id,
+                        targetServiceName: service.name,
+                        targetModel: rule.targetModel || ((_j = req.body) === null || _j === void 0 ? void 0 : _j.model),
+                        vendorId: service.vendorId,
+                        vendorName: vendor === null || vendor === void 0 ? void 0 : vendor.name,
+                        requestModel: (_k = req.body) === null || _k === void 0 ? void 0 : _k.model,
+                        upstreamRequest: upstreamRequestForLog,
+                        responseTime: Date.now() - startTime,
+                    });
+                    // 返回 200 状态码和本地估算结果
+                    res.status(200).json(localTokenResponse);
+                    yield finalizeLog(200);
+                    return;
+                }
                 if (failoverEnabled && (error === null || error === void 0 ? void 0 : error.isFailoverCandidate)) {
                     throw error;
                 }
                 console.error('Proxy error:', error);
                 // 检测是否是 timeout 错误
                 const isTimeout = error.code === 'ECONNABORTED' ||
-                    ((_e = error.message) === null || _e === void 0 ? void 0 : _e.toLowerCase().includes('timeout')) ||
+                    ((_l = error.message) === null || _l === void 0 ? void 0 : _l.toLowerCase().includes('timeout')) ||
                     (error.errno && error.errno === 'ETIMEDOUT');
+                const statusCode = isTimeout ? 504 : this.getErrorStatusCode(error, 500);
                 const baseErrorMessage = isTimeout
                     ? 'Request timeout - the upstream API took too long to respond'
                     : (error.message || 'Internal server error');
@@ -3740,7 +3949,7 @@ class ProxyServer {
                     timestamp: Date.now(),
                     method: req.method,
                     path: req.path,
-                    statusCode: isTimeout ? 504 : 500,
+                    statusCode,
                     errorMessage: errorMessage,
                     errorStack: error.stack,
                     requestHeaders: this.normalizeHeaders(req.headers),
@@ -3750,16 +3959,17 @@ class ProxyServer {
                     targetType,
                     targetServiceId: service.id,
                     targetServiceName: service.name,
-                    targetModel: rule.targetModel || ((_f = req.body) === null || _f === void 0 ? void 0 : _f.model),
+                    targetModel: rule.targetModel || ((_m = req.body) === null || _m === void 0 ? void 0 : _m.model),
                     vendorId: service.vendorId,
                     vendorName: vendor === null || vendor === void 0 ? void 0 : vendor.name,
-                    requestModel: (_g = req.body) === null || _g === void 0 ? void 0 : _g.model,
+                    requestModel: (_o = req.body) === null || _o === void 0 ? void 0 : _o.model,
                     upstreamRequest: upstreamRequestForLog,
+                    responseHeaders: responseHeadersForLog,
                     responseTime: Date.now() - startTime,
                 });
-                yield finalizeLog(isTimeout ? 504 : 500, errorMessage);
+                yield finalizeLog(statusCode, errorMessage);
                 if (failoverEnabled) {
-                    throw this.createFailoverError(errorMessage, isTimeout ? 504 : 500, error);
+                    throw this.createFailoverError(errorMessage, statusCode, error);
                 }
                 if (this.isResponseCommitted(res)) {
                     return;
@@ -3788,12 +3998,12 @@ class ProxyServer {
                     }
                     else {
                         // 非流式请求：返回 JSON 格式
-                        res.status(500).json(claudeError);
+                        res.status(statusCode).json(claudeError);
                     }
                 }
                 else {
                     // 对于 Codex，返回 JSON 格式的错误响应
-                    res.status(500).json({ error: errorMessage });
+                    res.status(statusCode).json({ error: errorMessage });
                 }
             }
             finally {