aicodeswitch 3.9.2 → 3.9.4

package/dist/server/fs-database.js

@@ -209,6 +209,8 @@ class FileSystemDatabaseManager {
             yield this.loadAllData();
             // 执行数据源类型迁移（在加载数据之后）
             yield this.migrateSourceTypes();
+            // OpenAI base URL 迁移：将末尾 /v1 自动移除
+            yield this.migrateOpenAIBaseUrls();
             // 确保默认配置
             yield this.ensureDefaultConfig();
         });
@@ -357,6 +359,41 @@ class FileSystemDatabaseManager {
             console.log(`[TypeMigration] Migration completed. Migrated ${migratedCount} services.`);
         });
     }
+    /**
+     * 迁移 OpenAI base URL（在初始化时执行）
+     * 仅处理 sourceType=openai 且 apiUrl 末尾为 /v1 的服务
+     */
+    migrateOpenAIBaseUrls() {
+        return __awaiter(this, void 0, void 0, function* () {
+            console.log('[OpenAIBaseUrlMigration] Checking for OpenAI base URL migration...');
+            let migratedCount = 0;
+            for (const vendor of this.vendors) {
+                if (!vendor.services)
+                    continue;
+                for (const service of vendor.services) {
+                    if (service.sourceType !== 'openai' || typeof service.apiUrl !== 'string') {
+                        continue;
+                    }
+                    const trimmedUrl = service.apiUrl.trim();
+                    if (!/\/v1\/?$/i.test(trimmedUrl)) {
+                        continue;
+                    }
+                    const migratedUrl = trimmedUrl.replace(/\/v1\/?$/i, '');
+                    if (migratedUrl && migratedUrl !== service.apiUrl) {
+                        console.log(`[OpenAIBaseUrlMigration] Migrated service "${service.name}": ${service.apiUrl} -> ${migratedUrl}`);
+                        service.apiUrl = migratedUrl;
+                        migratedCount++;
+                    }
+                }
+            }
+            if (migratedCount === 0) {
+                console.log('[OpenAIBaseUrlMigration] No migration needed');
+                return;
+            }
+            yield this.saveVendors();
+            console.log(`[OpenAIBaseUrlMigration] Migration completed. Migrated ${migratedCount} services.`);
+        });
+    }
     /**
      * 迁移导入数据中的类型
      * 用于导入功能，自动将旧类型转换为新类型
@@ -364,7 +401,13 @@ class FileSystemDatabaseManager {
     migrateVendorsOnImport(vendors) {
         return vendors.map(vendor => {
             var _a;
-            return (Object.assign(Object.assign({}, vendor), { services: (_a = vendor.services) === null || _a === void 0 ? void 0 : _a.map(service => (Object.assign(Object.assign({}, service), { sourceType: service.sourceType ? (0, type_migration_1.normalizeSourceType)(service.sourceType) : undefined }))) }));
+            return (Object.assign(Object.assign({}, vendor), { services: (_a = vendor.services) === null || _a === void 0 ? void 0 : _a.map(service => {
+                    const normalizedSourceType = service.sourceType ? (0, type_migration_1.normalizeSourceType)(service.sourceType) : undefined;
+                    const normalizedApiUrl = normalizedSourceType === 'openai' && typeof service.apiUrl === 'string'
+                        ? service.apiUrl.trim().replace(/\/v1\/?$/i, '')
+                        : service.apiUrl;
+                    return Object.assign(Object.assign({}, service), { sourceType: normalizedSourceType, apiUrl: normalizedApiUrl });
+                }) }));
         });
     }
     saveVendors() {

package/dist/server/main.js

@@ -104,6 +104,31 @@ const asyncHandler = (handler) => (req, res, next) => {
         next(err);
     });
 };
+const OPENAI_V1_SUFFIX_RE = /\/v1\/?$/i;
+const validateOpenAIServiceBaseUrl = (service) => {
+    if ((service === null || service === void 0 ? void 0 : service.sourceType) !== 'openai') {
+        return null;
+    }
+    if (typeof service.apiUrl !== 'string') {
+        return null;
+    }
+    if (!OPENAI_V1_SUFFIX_RE.test(service.apiUrl.trim())) {
+        return null;
+    }
+    return 'OpenAI 数据源请填写不包含 /v1 的 base URL，例如：https://api.openai.com';
+};
+const validateOpenAIServiceBaseUrlsInVendorPayload = (vendorBody) => {
+    if (!Array.isArray(vendorBody === null || vendorBody === void 0 ? void 0 : vendorBody.services)) {
+        return null;
+    }
+    for (const service of vendorBody.services) {
+        const error = validateOpenAIServiceBaseUrl(service);
+        if (error) {
+            return error;
+        }
+    }
+    return null;
+};
 const writeClaudeConfig = (dbManager, enableAgentTeams, enableBypassPermissionsSupport) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const homeDir = os_1.default.homedir();
@@ -902,8 +927,22 @@ const registerRoutes = (dbManager, proxyServer) => {
         }
     });
     app.get('/api/vendors', (_req, res) => res.json(dbManager.getVendors()));
-    app.post('/api/vendors', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () { return res.json(yield dbManager.createVendor(req.body)); })));
-    app.put('/api/vendors/:id', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () { return res.json(yield dbManager.updateVendor(req.params.id, req.body)); })));
+    app.post('/api/vendors', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () {
+        const error = validateOpenAIServiceBaseUrlsInVendorPayload(req.body);
+        if (error) {
+            res.status(400).json({ error });
+            return;
+        }
+        res.json(yield dbManager.createVendor(req.body));
+    })));
+    app.put('/api/vendors/:id', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () {
+        const error = validateOpenAIServiceBaseUrlsInVendorPayload(req.body);
+        if (error) {
+            res.status(400).json({ error });
+            return;
+        }
+        res.json(yield dbManager.updateVendor(req.params.id, req.body));
+    })));
     app.delete('/api/vendors/:id', (req, res) => __awaiter(void 0, void 0, void 0, function* () {
         try {
             const result = yield dbManager.deleteVendor(req.params.id);
@@ -921,11 +960,29 @@ const registerRoutes = (dbManager, proxyServer) => {
     });
     app.post('/api/services', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () {
         console.log('[创建服务] 请求数据:', JSON.stringify(req.body, null, 2));
+        const error = validateOpenAIServiceBaseUrl(req.body);
+        if (error) {
+            res.status(400).json({ error });
+            return;
+        }
         const result = yield dbManager.createAPIService(req.body);
         console.log('[创建服务] 创建结果:', JSON.stringify(result, null, 2));
         res.json(result);
     })));
-    app.put('/api/services/:id', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () { return res.json(yield dbManager.updateAPIService(req.params.id, req.body)); })));
+    app.put('/api/services/:id', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () {
+        const existingService = dbManager.getAPIService(req.params.id);
+        if (!existingService) {
+            res.status(404).json({ error: '服务不存在' });
+            return;
+        }
+        const mergedService = Object.assign(Object.assign({}, existingService), req.body);
+        const error = validateOpenAIServiceBaseUrl(mergedService);
+        if (error) {
+            res.status(400).json({ error });
+            return;
+        }
+        res.json(yield dbManager.updateAPIService(req.params.id, req.body));
+    })));
     app.delete('/api/services/:id', (req, res) => __awaiter(void 0, void 0, void 0, function* () {
         console.log('[删除服务] 请求 ID:', req.params.id);
         try {

package/dist/server/proxy-server.js

@@ -887,7 +887,8 @@ class ProxyServer {
                 return undefined;
             const body = req.body;
             const requestModel = body === null || body === void 0 ? void 0 : body.model;
-            const contentType = forcedContentType || this.determineContentType(req);
+            const route = this.dbManager.getRoutes().find(r => r.id === routeId);
+            const contentType = forcedContentType || this.determineContentType(req, (route === null || route === void 0 ? void 0 : route.targetType) || 'claude-code', routeId);
             // 高智商规则优先于 model-mapping，确保 !!/推断命中时不会被模型映射覆盖
             if (contentType === 'high-iq') {
                 const highIqRules = enabledRules.filter(rule => rule.contentType === 'high-iq');
@@ -910,7 +911,32 @@ class ProxyServer {
                     return rule;
                 }
             }
-            // 1. 首先查找 model-mapping 类型的规则，按 sortOrder 降序匹配
+            // 1. 查找其他内容类型的规则
+            const contentTypeRules = enabledRules.filter(rule => rule.contentType === contentType);
+            // 过滤黑名单和token限制
+            for (const rule of contentTypeRules) {
+                const isBlacklisted = yield this.dbManager.isServiceBlacklisted(rule.targetServiceId, routeId, contentType);
+                if (isBlacklisted) {
+                    continue;
+                }
+                // 检查并重置到期的规则
+                this.dbManager.checkAndResetRuleIfNeeded(rule.id);
+                this.dbManager.checkAndResetRequestCountIfNeeded(rule.id);
+                // 检查token限制（tokenLimit单位是k，需要乘以1000转换为实际token数）
+                if (rule.tokenLimit && rule.totalTokensUsed !== undefined && rule.totalTokensUsed >= rule.tokenLimit * 1000) {
+                    continue; // 跳过超限规则
+                }
+                // 检查请求次数限制
+                if (rule.requestCountLimit && rule.totalRequestsUsed !== undefined && rule.totalRequestsUsed >= rule.requestCountLimit) {
+                    continue; // 跳过超限规则
+                }
+                // 检查频率限制
+                if (this.isFrequencyLimitExceeded(rule)) {
+                    continue; // 跳过达到频率限制的规则
+                }
+                return rule;
+            }
+            // 2. 然后查找 model-mapping 类型的规则
             if (requestModel) {
                 const modelMappingRules = enabledRules.filter(rule => rule.contentType === 'model-mapping' &&
                     rule.replacedModel &&
@@ -939,31 +965,6 @@ class ProxyServer {
                     return rule;
                 }
             }
-            // 2. 查找其他内容类型的规则
-            const contentTypeRules = enabledRules.filter(rule => rule.contentType === contentType);
-            // 过滤黑名单和token限制
-            for (const rule of contentTypeRules) {
-                const isBlacklisted = yield this.dbManager.isServiceBlacklisted(rule.targetServiceId, routeId, contentType);
-                if (isBlacklisted) {
-                    continue;
-                }
-                // 检查并重置到期的规则
-                this.dbManager.checkAndResetRuleIfNeeded(rule.id);
-                this.dbManager.checkAndResetRequestCountIfNeeded(rule.id);
-                // 检查token限制（tokenLimit单位是k，需要乘以1000转换为实际token数）
-                if (rule.tokenLimit && rule.totalTokensUsed !== undefined && rule.totalTokensUsed >= rule.tokenLimit * 1000) {
-                    continue; // 跳过超限规则
-                }
-                // 检查请求次数限制
-                if (rule.requestCountLimit && rule.totalRequestsUsed !== undefined && rule.totalRequestsUsed >= rule.requestCountLimit) {
-                    continue; // 跳过超限规则
-                }
-                // 检查频率限制
-                if (this.isFrequencyLimitExceeded(rule)) {
-                    continue; // 跳过达到频率限制的规则
-                }
-                return rule;
-            }
             // 3. 最后返回 default 规则
             const defaultRules = enabledRules.filter(rule => rule.contentType === 'default');
             // 过滤黑名单和token限制
@@ -1003,7 +1004,8 @@ class ProxyServer {
         const body = req.body;
         const requestModel = body === null || body === void 0 ? void 0 : body.model;
         const candidates = [];
-        const contentType = forcedContentType || this.determineContentType(req);
+        const route = this.dbManager.getRoutes().find(r => r.id === routeId);
+        const contentType = forcedContentType || this.determineContentType(req, (route === null || route === void 0 ? void 0 : route.targetType) || 'claude-code', routeId);
         const prioritizeContentType = contentType === 'high-iq';
         const modelMappingRules = requestModel
             ? enabledRules.filter(rule => rule.contentType === 'model-mapping' &&
@@ -1133,7 +1135,7 @@ class ProxyServer {
             }
         }
     }
-    determineContentType(req) {
+    determineContentType(req, targetType, routeId) {
         const body = req.body;
         if (!body)
             return 'default';
@@ -1145,8 +1147,10 @@ class ProxyServer {
         if (explicitType) {
             return explicitType;
         }
+        // 获取sessionId用于session级别的检测（如long-context）
+        const sessionId = this.defaultExtractSessionId(req, targetType);
         for (const detector of this.getContentTypeDetectors()) {
-            if (detector.match(req, body)) {
+            if (detector.match(req, body, sessionId, routeId)) {
                 return detector.type;
             }
         }
@@ -1158,17 +1162,17 @@ class ProxyServer {
                 type: 'image-understanding',
                 match: (_req, body) => this.containsImageContent(body.messages) || this.containsImageContent(body.input),
             },
-            {
-                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),
+                match: (_req, body, sessionId, routeId) => this.hasLongContextSignal(body, sessionId, routeId),
+            },
+            {
+                type: 'thinking',
+                match: (_req, body) => this.hasThinkingSignal(body),
             },
             {
                 type: 'background',
@@ -1574,8 +1578,8 @@ class ProxyServer {
         ];
         return candidates.some((value) => value === true || value === 'background');
     }
-    hasLongContextSignal(body) {
-        var _a, _b;
+    hasLongContextSignal(body, sessionId, routeId) {
+        var _a, _b, _c;
         const explicit = [
             body === null || body === void 0 ? void 0 : body.long_context,
             body === null || body === void 0 ? void 0 : body.longContext,
@@ -1585,6 +1589,22 @@ class ProxyServer {
         if (explicit.some((value) => value === true)) {
             return true;
         }
+        // 检查session累积tokens
+        if (sessionId && routeId) {
+            const session = this.dbManager.getSession(sessionId);
+            if (session && session.totalTokens > 0) {
+                // 查找该route下的long-context规则，获取阈值配置
+                const rules = this.getRulesByRouteId(routeId);
+                const longContextRule = rules === null || rules === void 0 ? void 0 : rules.find(rule => rule.contentType === 'long-context' && !rule.isDisabled);
+                // 默认阈值为1M tokens (1000k)
+                const defaultThreshold = 1000; // 单位：k
+                const threshold = (_c = longContextRule === null || longContextRule === void 0 ? void 0 : longContextRule.sessionTokenThreshold) !== null && _c !== void 0 ? _c : defaultThreshold;
+                // 如果session累积tokens超过阈值，则认为是long-context
+                if (session.totalTokens >= threshold * 1000) {
+                    return true;
+                }
+            }
+        }
         const maxTokens = this.extractNumericField(body, [
             'max_tokens',
             'max_output_tokens',
@@ -1694,19 +1714,15 @@ class ProxyServer {
     }
     /**
      * 构建 OpenAI Responses 类型的完整 URL
-     * - baseUrl 以 /v{number} 结尾时，直接拼接请求路径
-     * - baseUrl 不带版本时，自动补 /v1 再拼接请求路径
-     * - 兼容请求路径本身已携带版本前缀（如 /v1/responses）场景
+     * - 用户填写不含 /v1 的 baseUrl
+     * - 服务端固定拼接 /v1 + 请求路径
      */
     buildOpenAIResponsesUrl(baseUrl, mappedPath) {
         const trimmedBase = baseUrl.trim().replace(/\/+$/, '');
         const normalizedPath = mappedPath.startsWith('/') || mappedPath === '' ? mappedPath : `/${mappedPath}`;
-        const baseHasVersionSuffix = /\/v\d+$/i.test(trimmedBase);
-        const pathHasVersionPrefix = /^\/v\d+(?:\/|$)/i.test(normalizedPath);
-        if (baseHasVersionSuffix || pathHasVersionPrefix) {
-            return `${trimmedBase}${normalizedPath}`;
-        }
-        return `${trimmedBase}/v1${normalizedPath}`;
+        const pathWithoutVersionPrefix = normalizedPath.replace(/^\/v\d+(?=\/|$)/i, '');
+        const normalizedResponsesPath = pathWithoutVersionPrefix || '/responses';
+        return `${trimmedBase}/v1${normalizedResponsesPath}`;
     }
     /**
      * 构建 Gemini API 的完整 URL
@@ -2273,8 +2289,9 @@ class ProxyServer {
                 // Session 索引逻辑
                 const sessionId = this.defaultExtractSessionId(req, targetType);
                 if (sessionId) {
-                    const totalTokens = ((usageForLog === null || usageForLog === void 0 ? void 0 : usageForLog.inputTokens) || 0) + ((usageForLog === null || usageForLog === void 0 ? void 0 : usageForLog.outputTokens) || 0) +
-                        ((usageForLog === null || usageForLog === void 0 ? void 0 : usageForLog.totalTokens) || 0);
+                    // 正确计算当前请求的tokens：优先使用totalTokens，否则使用input+output
+                    const totalTokens = (usageForLog === null || usageForLog === void 0 ? void 0 : usageForLog.totalTokens) ||
+                        (((usageForLog === null || usageForLog === void 0 ? void 0 : usageForLog.inputTokens) || 0) + ((usageForLog === null || usageForLog === void 0 ? void 0 : usageForLog.outputTokens) || 0));
                     const sessionTitle = this.defaultExtractSessionTitle(req, sessionId);
                     const existingSession = this.dbManager.getSession(sessionId);
                     this.dbManager.upsertSession({
@@ -2298,7 +2315,8 @@ class ProxyServer {
                 }
                 // 更新规则的token使用量（只在成功请求时更新）
                 if (usageForLog && statusCode < 400) {
-                    const totalTokens = (usageForLog.inputTokens || 0) + (usageForLog.outputTokens || 0);
+                    const totalTokens = usageForLog.totalTokens ||
+                        ((usageForLog.inputTokens || 0) + (usageForLog.outputTokens || 0));
                     if (totalTokens > 0) {
                         this.dbManager.incrementRuleTokenUsage(rule.id, totalTokens);
                         // 获取更新后的规则数据并广播
@@ -2448,7 +2466,13 @@ class ProxyServer {
                     upstreamUrl = this.buildGeminiUrl(service.apiUrl, model, streamRequested);
                 }
                 else if (sourceType === 'openai') {
-                    // OpenAI Responses 兼容模式：自动处理 baseUrl 是否包含 /v{number}
+                    if (/\/v1\/?$/i.test(service.apiUrl.trim())) {
+                        const error = 'OpenAI 数据源请填写不包含 /v1 的 base URL，例如：https://api.openai.com';
+                        res.status(400).json({ error });
+                        yield finalizeLog(400, error);
+                        return;
+                    }
+                    // OpenAI Responses：固定拼接为 {baseUrl}/v1/*
                     upstreamUrl = this.buildOpenAIResponsesUrl(service.apiUrl, mappedPath);
                 }
                 else if (this.isChatType(sourceType) || this.isGeminiChatSource(sourceType)) {