aicodeswitch 1.5.0 → 1.6.0

package/dist/server/proxy-server.js

@@ -702,6 +702,7 @@ class ProxyServer {
         return sourceType === 'openai-responses';
     }
     applyModelOverride(body, rule) {
+        // 如果 targetModel 为空或不存在,保留原始 model(透传)
         if (!rule.targetModel)
             return body;
         if (body && typeof body === 'object') {
@@ -813,6 +814,49 @@ class ProxyServer {
         }
         return undefined;
     }
+    /**
+     * 根据源工具类型和目标API类型,映射请求路径
+     * @param sourceTool 源工具类型 (claude-code 或 codex)
+     * @param targetSourceType 目标API的数据格式类型
+     * @param originalPath 原始请求路径(已去除工具前缀)
+     * @returns 映射后的目标路径
+     */
+    mapRequestPath(sourceTool, targetSourceType, originalPath) {
+        // Claude Code 发起的请求
+        if (sourceTool === 'claude-code') {
+            // Claude Code 默认使用 Claude API 格式
+            if (this.isClaudeSource(targetSourceType)) {
+                // Claude → Claude: 直接透传路径
+                return originalPath;
+            }
+            else if (this.isOpenAIChatSource(targetSourceType)) {
+                // Claude → OpenAI Chat: /v1/messages → /v1/chat/completions
+                return originalPath.replace(/\/v1\/messages\b/, '/v1/chat/completions');
+            }
+            else if (this.isOpenAIResponsesSource(targetSourceType)) {
+                // Claude → OpenAI Responses: /v1/messages → /v1/responses/completions
+                return originalPath.replace(/\/v1\/messages\b/, '/v1/responses/completions');
+            }
+        }
+        // Codex 发起的请求
+        if (sourceTool === 'codex') {
+            // Codex 默认使用 OpenAI Responses API 格式
+            if (this.isOpenAIResponsesSource(targetSourceType)) {
+                // OpenAI Responses → OpenAI Responses: 直接透传路径
+                return originalPath;
+            }
+            else if (this.isOpenAIChatSource(targetSourceType)) {
+                // OpenAI Responses → OpenAI Chat: /v1/responses/completions → /v1/chat/completions
+                return originalPath.replace(/\/v1\/responses\/completions\b/, '/v1/chat/completions');
+            }
+            else if (this.isClaudeSource(targetSourceType)) {
+                // OpenAI Responses → Claude: /v1/responses/completions → /v1/messages
+                return originalPath.replace(/\/v1\/responses\/completions\b/, '/v1/messages');
+            }
+        }
+        // 默认:直接返回原始路径
+        return originalPath;
+    }
     proxyRequest(req, res, route, rule, service) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
@@ -827,6 +871,7 @@ class ProxyServer {
             let responseHeadersForLog;
             let responseBodyForLog;
             let streamChunksForLog;
+            let upstreamRequestForLog;
             const finalizeLog = (statusCode, error) => __awaiter(this, void 0, void 0, function* () {
                 var _a, _b;
                 if (logged || !((_a = this.config) === null || _a === void 0 ? void 0 : _a.enableLogging))
@@ -859,6 +904,7 @@ class ProxyServer {
                     responseHeaders: responseHeadersForLog,
                     responseBody: responseBodyForLog,
                     streamChunks: streamChunksForLog,
+                    upstreamRequest: upstreamRequestForLog,
                 });
             });
             try {
@@ -903,9 +949,11 @@ class ProxyServer {
                 else if (route.targetType === 'codex' && req.path.startsWith('/codex')) {
                     pathToAppend = req.path.slice('/codex'.length);
                 }
+                // 根据源工具类型和目标API类型,映射请求路径
+                const mappedPath = this.mapRequestPath(route.targetType, sourceType, pathToAppend);
                 const config = {
                     method: req.method,
-                    url: `${service.apiUrl}${pathToAppend}`,
+                    url: `${service.apiUrl}${mappedPath}`,
                     headers: this.buildUpstreamHeaders(req, service, sourceType, streamRequested),
                     timeout: service.timeout || 30000,
                     validateStatus: () => true,
@@ -917,6 +965,11 @@ class ProxyServer {
                 if (['POST', 'PUT', 'PATCH'].includes(req.method.toUpperCase())) {
                     config.data = requestBody;
                 }
+                // 记录实际发出的请求信息作为日志的一部分
+                upstreamRequestForLog = {
+                    url: `${service.apiUrl}${mappedPath}`,
+                    model: (requestBody === null || requestBody === void 0 ? void 0 : requestBody.model) || '',
+                };
                 const response = yield (0, axios_1.default)(config);
                 const responseHeaders = response.headers || {};
                 const contentType = typeof responseHeaders['content-type'] === 'string' ? responseHeaders['content-type'] : '';