aicodeswitch 5.2.3 → 5.2.5

package/dist/server/conversions/detector.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.detectRequestFormat = detectRequestFormat;
+exports.isOfficialOpenAiApi = isOfficialOpenAiApi;
 exports.sourceTypeToFormat = sourceTypeToFormat;
 /**
  * Detect the format of the incoming request based on path and body structure.
@@ -48,6 +49,18 @@ function detectRequestFormat(path, body) {
     // Default to completions
     return 'completions';
 }
+/**
+ * 判断上游 URL 是否为 OpenAI 官方（含 Azure OpenAI）端点。
+ *
+ * 官方端点完整支持 Responses API 的私有扩展（custom 自定义工具、
+ * tool_search/web_search 等内置工具、reasoning.effort、text.verbosity 等），
+ * 因此 responses→responses 直连时无需降级兼容。其余第三方 Responses 提供商
+ * （火山方舟/豆包等）不支持这些扩展，需要走 downgradeResponsesRequest。
+ */
+function isOfficialOpenAiApi(apiUrl) {
+    const u = (apiUrl || '').toLowerCase();
+    return u.includes('api.openai.com') || u.includes('.openai.azure.com');
+}
 /**
  * Determine the upstream format from a SourceType string.
  * Maps the legacy SourceType values to the new Format type.

package/dist/server/conversions/index.js

@@ -15,7 +15,7 @@
  * is driven by the ReasoningConfig passed through TransformRequestOptions.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.processCompactResponse = exports.prepareCompactRequest = exports.buildCompactedResponse = exports.extractSummaryFromResponse = exports.buildCompactUpstreamRequest = exports.buildCompactionPrompt = exports.COMPACTION_SYSTEM_PROMPT = exports.isCodexCompactRequest = exports.isLastClaudeMessageCompact = exports.isClaudeCompactRequest = exports.extractMessageContent = exports.extractConversationText = exports.sanitizeRequestBody = exports.getServerToolSupport = exports.getReasoningConfig = exports.sourceTypeToFormat = exports.detectRequestFormat = void 0;
+exports.processCompactResponse = exports.prepareCompactRequest = exports.buildCompactedResponse = exports.extractSummaryFromResponse = exports.buildCompactUpstreamRequest = exports.buildCompactionPrompt = exports.COMPACTION_SYSTEM_PROMPT = exports.isCodexCompactRequest = exports.isLastClaudeMessageCompact = exports.isClaudeCompactRequest = exports.extractMessageContent = exports.extractConversationText = exports.sanitizeRequestBody = exports.getServerToolSupport = exports.getReasoningConfig = exports.isOfficialOpenAiApi = exports.sourceTypeToFormat = exports.detectRequestFormat = void 0;
 exports.transformRequest = transformRequest;
 exports.transformResponse = transformResponse;
 exports.createStreamConverter = createStreamConverter;
@@ -23,6 +23,7 @@ exports.buildTargetBody = buildTargetBody;
 var detector_js_1 = require("./detector.js");
 Object.defineProperty(exports, "detectRequestFormat", { enumerable: true, get: function () { return detector_js_1.detectRequestFormat; } });
 Object.defineProperty(exports, "sourceTypeToFormat", { enumerable: true, get: function () { return detector_js_1.sourceTypeToFormat; } });
+Object.defineProperty(exports, "isOfficialOpenAiApi", { enumerable: true, get: function () { return detector_js_1.isOfficialOpenAiApi; } });
 var providers_js_1 = require("./thinking/providers.js");
 Object.defineProperty(exports, "getReasoningConfig", { enumerable: true, get: function () { return providers_js_1.getReasoningConfig; } });
 const providers_js_2 = require("./thinking/providers.js");

package/dist/server/conversions/pairs/responses-responses/request.js

@@ -8,13 +8,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.downgradeResponsesRequest = downgradeResponsesRequest;
 /**
- * Responses API 非标准 tool 类型集合。
- * OpenAI 私有扩展（custom、tool_search、web_search 等），
- * 其他 Responses API 提供商不支持这些类型，直接转发会导致 400 错误。
+ * 第三方 Responses API 提供商仅支持 function 类型工具。
+ * OpenAI 私有扩展（apply_patch 的 custom、MCP 的 namespace、
+ * tool_search、web_search、file_search、code_interpreter 等）一律剥离，
+ * 直接转发会导致 400 `unknown tool type` 错误。
+ * 采用 function 白名单而非黑名单，避免新增私有类型时遗漏。
  */
-const NON_STANDARD_TOOL_TYPES = new Set([
-    'custom', 'tool_search', 'web_search', 'file_search', 'code_interpreter',
-]);
 /**
  * Responses API 降级兼容时需移除的顶层字段集合。
  * 这些字段非所有 Responses API 提供商都支持，开启降级兼容时会被移除以避免 400 错误。
@@ -67,9 +66,9 @@ function downgradeResponsesRequest(body) {
             sanitized = Object.assign({}, sanitized);
         return sanitized;
     };
-    // 1. 过滤掉非标准 tool 类型，仅保留 function 类型
+    // 1. 仅保留 function 类型工具，剥离 custom/namespace/tool_search/web_search 等私有类型
     if (Array.isArray(body.tools)) {
-        const filteredTools = body.tools.filter((t) => !NON_STANDARD_TOOL_TYPES.has(t.type));
+        const filteredTools = body.tools.filter((t) => t && t.type === 'function');
         if (filteredTools.length !== body.tools.length) {
             sanitized = Object.assign(Object.assign({}, sanitized), { tools: filteredTools });
         }

package/dist/server/fs-database.js

@@ -3048,6 +3048,167 @@ class FileSystemDatabaseManager {
             yield this.saveSessions();
         });
     }
+    /**
+     * 批量清理过期会话
+     * 以最后请求时间为基准，清理 lastRequestAt 早于 beforeTimestamp 的会话。
+     * @param beforeTimestamp 时间阈值（毫秒），最后请求时间严格早于此值的会话将被处理
+     * @param options.onlyLogs 仅清空关联日志，保留会话本身
+     * @returns 受影响会话数 / 删除的日志数
+     */
+    cleanupSessionsByAge(beforeTimestamp_1) {
+        return __awaiter(this, arguments, void 0, function* (beforeTimestamp, options = {}) {
+            const targetSessions = this.sessions.filter(s => s.lastRequestAt < beforeTimestamp);
+            if (targetSessions.length === 0) {
+                return { sessionsAffected: 0, logsDeleted: 0 };
+            }
+            const targetIds = new Set(targetSessions.map(s => s.id));
+            const { logsDeleted } = yield this.deleteLogsBySessionIds(targetIds);
+            if (!options.onlyLogs) {
+                this.sessions = this.sessions.filter(s => !targetIds.has(s.id));
+                yield this.saveSessions();
+            }
+            return { sessionsAffected: targetSessions.length, logsDeleted };
+        });
+    }
+    /**
+     * 删除指定会话集合关联的所有日志条目，并维护分片文件与索引的一致性。
+     * 多个会话可能共享同一分片，按分片重写并修正其余会话的 index 引用。
+     * 与 addLog 共享分片写入锁（shardWriteLocks），避免并发写入竞争。
+     */
+    deleteLogsBySessionIds(sessionIds) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (sessionIds.size === 0)
+                return { logsDeleted: 0 };
+            // 1. 按分片文件收集待删除的 index（基于内存索引快照）
+            const shardDeletes = new Map();
+            for (const sid of sessionIds) {
+                const refs = this.sessionLogIndex.get(sid);
+                if (!refs)
+                    continue;
+                for (const ref of refs) {
+                    let set = shardDeletes.get(ref.filename);
+                    if (!set) {
+                        set = new Set();
+                        shardDeletes.set(ref.filename, set);
+                    }
+                    set.add(ref.index);
+                }
+            }
+            let logsDeleted = 0;
+            // 2. 逐分片重写（在分片锁内执行，与该分片的 addLog 串行）
+            for (const [filename, deleteSet] of shardDeletes) {
+                let shardRemoved = 0;
+                const prevLock = this.shardWriteLocks.get(filename) || Promise.resolve();
+                const task = prevLock.then(() => __awaiter(this, void 0, void 0, function* () {
+                    const shardLogs = yield this.loadLogShard(filename);
+                    if (shardLogs.length === 0)
+                        return;
+                    // 构建 oldIndex -> newIndex 映射（仅保留项）
+                    const newIndexMap = new Map();
+                    const newLogs = [];
+                    let removed = 0;
+                    for (let i = 0; i < shardLogs.length; i++) {
+                        if (deleteSet.has(i)) {
+                            removed++;
+                            continue;
+                        }
+                        newIndexMap.set(i, newLogs.length);
+                        newLogs.push(shardLogs[i]);
+                    }
+                    if (removed === 0)
+                        return;
+                    shardRemoved = removed;
+                    // 重写或删除分片文件
+                    if (newLogs.length === 0) {
+                        try {
+                            yield promises_1.default.unlink(path_1.default.join(this.logsDir, filename));
+                        }
+                        catch (_a) {
+                            // 文件可能已被其它清理流程删除，忽略
+                        }
+                    }
+                    else {
+                        yield this.saveLogShard(filename, newLogs);
+                    }
+                    // 更新分片索引
+                    const shardIndex = this.logShardsIndex.find(s => s.filename === filename);
+                    if (shardIndex) {
+                        if (newLogs.length === 0) {
+                            this.logShardsIndex = this.logShardsIndex.filter(s => s.filename !== filename);
+                        }
+                        else {
+                            shardIndex.count = newLogs.length;
+                            let minTs = Infinity;
+                            let maxTs = -Infinity;
+                            for (const l of newLogs) {
+                                if (l.timestamp < minTs)
+                                    minTs = l.timestamp;
+                                if (l.timestamp > maxTs)
+                                    maxTs = l.timestamp;
+                            }
+                            shardIndex.startTime = minTs;
+                            shardIndex.endTime = maxTs;
+                        }
+                    }
+                    // 修正引用了该分片的非目标会话的 refs（index 偏移）
+                    for (const [sid, refs] of this.sessionLogIndex) {
+                        if (sessionIds.has(sid))
+                            continue;
+                        let touched = false;
+                        const updated = [];
+                        for (const ref of refs) {
+                            if (ref.filename !== filename) {
+                                updated.push(ref);
+                                continue;
+                            }
+                            if (deleteSet.has(ref.index)) {
+                                touched = true;
+                                continue;
+                            }
+                            const ni = newIndexMap.get(ref.index);
+                            if (ni !== undefined) {
+                                if (ni !== ref.index)
+                                    touched = true;
+                                updated.push(Object.assign(Object.assign({}, ref), { index: ni }));
+                            }
+                            else {
+                                touched = true;
+                            }
+                        }
+                        if (touched) {
+                            if (updated.length === 0) {
+                                this.sessionLogIndex.delete(sid);
+                            }
+                            else {
+                                this.sessionLogIndex.set(sid, updated);
+                            }
+                        }
+                    }
+                }));
+                this.shardWriteLocks.set(filename, task);
+                try {
+                    yield task;
+                    logsDeleted += shardRemoved;
+                }
+                catch (err) {
+                    console.error(`[Database] Failed to cleanup shard ${filename}:`, err);
+                }
+                finally {
+                    if (this.shardWriteLocks.get(filename) === task) {
+                        this.shardWriteLocks.delete(filename);
+                    }
+                }
+            }
+            // 3. 清除目标会话的索引条目
+            for (const sid of sessionIds) {
+                this.sessionLogIndex.delete(sid);
+            }
+            yield this.saveLogsIndex();
+            yield this.saveSessionLogIndexNow();
+            this.logsCountCache = null;
+            return { logsDeleted };
+        });
+    }
     // 新增方法：获取单个 session
     getSession(id) {
         return this.sessions.find(s => s.id === id) || null;

package/dist/server/main.js

@@ -2185,6 +2185,19 @@ ${instruction}
         dbManager.clearSessions();
         res.json(true);
     })));
+    // 清理过期会话（基于最后请求时间），可选择仅清空关联日志而保留会话本身
+    app.post('/api/sessions/cleanup', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () {
+        var _a, _b;
+        const beforeDays = Number((_a = req.body) === null || _a === void 0 ? void 0 : _a.beforeDays);
+        const onlyLogs = Boolean((_b = req.body) === null || _b === void 0 ? void 0 : _b.onlyLogs);
+        if (!Number.isFinite(beforeDays) || !Number.isInteger(beforeDays) || beforeDays < 1 || beforeDays > 15) {
+            res.status(400).json({ error: 'beforeDays 必须为 1-15 之间的整数' });
+            return;
+        }
+        const beforeTimestamp = Date.now() - beforeDays * 24 * 60 * 60 * 1000;
+        const result = yield dbManager.cleanupSessionsByAge(beforeTimestamp, { onlyLogs });
+        res.json(result);
+    })));
     // ─── Session Route Binding API ───
     app.put('/api/sessions/:id/bind-route', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () {
         const sessionId = req.params.id;

package/dist/server/proxy-server.js

@@ -373,7 +373,7 @@ class ProxyServer {
             if (apiPath === '/v1/models') {
                 // 鉴权
                 const apiKeyValue = this.extractApiKey(req);
-                if (apiKeyValue === null || apiKeyValue === void 0 ? void 0 : apiKeyValue.startsWith('sk_')) {
+                if ((apiKeyValue === null || apiKeyValue === void 0 ? void 0 : apiKeyValue.startsWith('sk_')) && (0, auth_1.isAuthEnabled)()) {
                     // AccessKey 鉴权
                     if (!this.accessKeyModule) {
                         res.status(401).json({ error: { type: 'authentication_error', code: 'INVALID_API_KEY', message: 'AccessKey 功能未启用' } });
@@ -399,7 +399,7 @@ class ProxyServer {
             // 检查是否为 AccessKey 请求
             const apiKeyValue = this.extractApiKey(req);
             let accessKeyCtx = null;
-            if ((apiKeyValue === null || apiKeyValue === void 0 ? void 0 : apiKeyValue.startsWith('sk_')) && this.accessKeyModule) {
+            if ((apiKeyValue === null || apiKeyValue === void 0 ? void 0 : apiKeyValue.startsWith('sk_')) && this.accessKeyModule && (0, auth_1.isAuthEnabled)()) {
                 const result = this.accessKeyModule.keyResolver.resolve(apiKeyValue);
                 if (!result || 'error' in result) {
                     const err = result ? result.error : { type: 'authentication_error', code: 'INVALID_API_KEY', message: '无效的 API Key', httpStatus: 401 };
@@ -484,7 +484,7 @@ class ProxyServer {
             }
             // AUTH 鉴权检查
             const apiKeyValue = this.extractApiKey(req);
-            if ((apiKeyValue === null || apiKeyValue === void 0 ? void 0 : apiKeyValue.startsWith('sk_')) && this.accessKeyModule) {
+            if ((apiKeyValue === null || apiKeyValue === void 0 ? void 0 : apiKeyValue.startsWith('sk_')) && this.accessKeyModule && (0, auth_1.isAuthEnabled)()) {
                 const result = this.accessKeyModule.keyResolver.resolve(apiKeyValue);
                 if (!result || 'error' in result) {
                     const err = result ? result.error : { type: 'authentication_error', code: 'INVALID_API_KEY', message: '无效的 API Key', httpStatus: 401 };
@@ -803,7 +803,7 @@ class ProxyServer {
             try {
                 // 检查 API Key 验证（支持 AccessKey 和全局 apiKey）
                 const apiKeyValue = this.extractApiKey(req);
-                if ((apiKeyValue === null || apiKeyValue === void 0 ? void 0 : apiKeyValue.startsWith('sk_')) && this.accessKeyModule) {
+                if ((apiKeyValue === null || apiKeyValue === void 0 ? void 0 : apiKeyValue.startsWith('sk_')) && this.accessKeyModule && (0, auth_1.isAuthEnabled)()) {
                     // AccessKey 鉴权
                     const result = this.accessKeyModule.keyResolver.resolve(apiKeyValue);
                     if (!result || 'error' in result) {
@@ -3248,10 +3248,10 @@ class ProxyServer {
      * @param targetModel 目标模型名称（可选）
      * @returns 转换后往服务商API接口的数据
      */
-    transformRequestToUpstream(tool, source, payloadData, targetModel, providerConfig, serverToolConfig) {
+    transformRequestToUpstream(tool, source, payloadData, targetModel, providerConfig, serverToolConfig, sanitizeBody) {
         const clientFormat = tool === 'codex' ? 'responses' : 'claude';
         const upstreamFormat = (0, index_1.sourceTypeToFormat)(source);
-        const result = (0, index_1.transformRequest)({ fromFormat: clientFormat, toFormat: upstreamFormat, body: payloadData, providerConfig, serverToolConfig });
+        const result = (0, index_1.transformRequest)({ fromFormat: clientFormat, toFormat: upstreamFormat, body: payloadData, providerConfig, serverToolConfig, sanitizeBody });
         const body = result.body;
         // 模型覆盖：OpenAI 模型族保持原样，其余覆盖为 targetModel
         if (targetModel) {
@@ -3878,7 +3878,9 @@ class ProxyServer {
                 const effectiveModel = rule.targetModel || (requestBody === null || requestBody === void 0 ? void 0 : requestBody.model);
                 const providerConfig = (0, index_1.getReasoningConfig)(service.name || '', effectiveApiUrl || '', effectiveModel || '');
                 const serverToolConfig = (0, index_1.getServerToolSupport)(service.name || '', effectiveApiUrl || '');
-                const transformedRequestBody = this.transformRequestToUpstream(targetType, sourceType, payloadForTransform, rule.targetModel, providerConfig, serverToolConfig);
+                // responses→responses 直连非 OpenAI 官方端点时，需降级兼容（剥离 custom/namespace 等私有工具与非标准字段）
+                const sanitizeBody = clientFormat === 'responses' && (0, index_1.sourceTypeToFormat)(sourceType) === 'responses' && !(0, index_1.isOfficialOpenAiApi)(effectiveApiUrl || '');
+                const transformedRequestBody = this.transformRequestToUpstream(targetType, sourceType, payloadForTransform, rule.targetModel, providerConfig, serverToolConfig, sanitizeBody);
                 requestBody = (_b = transformedRequestBody !== null && transformedRequestBody !== void 0 ? transformedRequestBody : this.cloneRequestBody(originalToolRequestBody)) !== null && _b !== void 0 ? _b : {};
                 // 对最终即将发送到上游的 Claude compact 请求再做一次兜底清理，
                 // 避免中间转换/覆盖步骤重新引入未配对的 tool_use。
@@ -4737,7 +4739,9 @@ class ProxyServer {
             const effectiveModel = rule.targetModel || (requestBody === null || requestBody === void 0 ? void 0 : requestBody.model);
             const providerConfig = (0, index_1.getReasoningConfig)(service.name || '', effectiveApiUrl || '', effectiveModel || '');
             const serverToolConfig = (0, index_1.getServerToolSupport)(service.name || '', effectiveApiUrl || '');
-            const transformedRequestBody = this.transformRequestByFormat(clientFormat, sourceType, payloadForTransform, rule.targetModel, providerConfig, serverToolConfig);
+            // responses→responses 直连非 OpenAI 官方端点时，需降级兼容（剥离 custom/namespace 等私有工具与非标准字段）
+            const sanitizeBody = clientFormat === 'responses' && (0, index_1.sourceTypeToFormat)(sourceType) === 'responses' && !(0, index_1.isOfficialOpenAiApi)(effectiveApiUrl || '');
+            const transformedRequestBody = this.transformRequestByFormat(clientFormat, sourceType, payloadForTransform, rule.targetModel, providerConfig, serverToolConfig, sanitizeBody);
             requestBody = (_a = transformedRequestBody !== null && transformedRequestBody !== void 0 ? transformedRequestBody : this.cloneRequestBody(requestBody)) !== null && _a !== void 0 ? _a : {};
             // Compact final sanitize
             if (rule.contentType === 'compact' && clientFormat === 'claude' && Array.isArray(requestBody === null || requestBody === void 0 ? void 0 : requestBody.messages)) {
@@ -4992,9 +4996,9 @@ class ProxyServer {
     /**
      * 使用显式 clientFormat 进行请求转换（取代 tool → format 的硬编码映射）
      */
-    transformRequestByFormat(clientFormat, source, payloadData, targetModel, providerConfig, serverToolConfig) {
+    transformRequestByFormat(clientFormat, source, payloadData, targetModel, providerConfig, serverToolConfig, sanitizeBody) {
         const upstreamFormat = (0, index_1.sourceTypeToFormat)(source);
-        const result = (0, index_1.transformRequest)({ fromFormat: clientFormat, toFormat: upstreamFormat, body: payloadData, providerConfig, serverToolConfig });
+        const result = (0, index_1.transformRequest)({ fromFormat: clientFormat, toFormat: upstreamFormat, body: payloadData, providerConfig, serverToolConfig, sanitizeBody });
         const body = result.body;
         if (targetModel) {
             const isOpenAIModel = /^gpt-|o[123]/i.test(targetModel);