aicodeswitch 5.1.1 → 5.1.3

package/dist/server/main.js

@@ -33,6 +33,8 @@ const config_metadata_1 = require("./config-metadata");
 const config_merge_1 = require("./config-merge");
 const config_managed_fields_1 = require("./config-managed-fields");
 const config_1 = require("./config");
+const session_migration_1 = require("./session-migration");
+const session_launcher_1 = require("./session-launcher");
 const appDir = path_1.default.join(os_1.default.homedir(), '.aicodeswitch');
 const legacyDataDir = path_1.default.join(appDir, 'data');
 const dataDir = path_1.default.join(appDir, 'fs-db');
@@ -922,7 +924,7 @@ const listInstalledSkills = () => {
     });
     return Array.from(result.values()).sort((a, b) => a.name.localeCompare(b.name, 'zh-CN'));
 };
-const registerRoutes = (dbManager, proxyServer) => {
+const registerRoutes = (dbManager, proxyServer) => __awaiter(void 0, void 0, void 0, function* () {
     updateProxyConfig(dbManager.getConfig());
     app.get('/health', (_req, res) => res.json({ status: 'ok' }));
     // 鉴权相关路由 - 公开访问
@@ -1770,6 +1772,150 @@ ${instruction}
         dbManager.clearSessions();
         res.json(true);
     })));
+    // ─── 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;
+        const { routeId } = req.body || {};
+        if (!routeId) {
+            res.status(400).json({ success: false, error: 'routeId is required' });
+            return;
+        }
+        const session = dbManager.getSession(sessionId);
+        if (!session) {
+            res.status(404).json({ success: false, error: 'Session not found' });
+            return;
+        }
+        const updatedSession = yield dbManager.bindSessionRoute(sessionId, routeId);
+        if (!updatedSession) {
+            res.status(400).json({ success: false, error: 'Route not found' });
+            return;
+        }
+        res.json({ success: true, session: updatedSession });
+    })));
+    app.delete('/api/sessions/:id/bind-route', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () {
+        const sessionId = req.params.id;
+        const session = dbManager.getSession(sessionId);
+        if (!session) {
+            res.status(404).json({ success: false, error: 'Session not found' });
+            return;
+        }
+        const result = yield dbManager.unbindSessionRoute(sessionId);
+        res.json({ success: result });
+    })));
+    app.get('/api/routes/:id/bound-sessions', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () {
+        const routeId = req.params.id;
+        const route = dbManager.getRoute(routeId);
+        if (!route) {
+            res.status(404).json({ error: 'Route not found' });
+            return;
+        }
+        const sessions = dbManager.getBoundSessions(routeId);
+        res.json({
+            routeId,
+            sessions: sessions.map(s => ({
+                id: s.id,
+                title: s.title,
+                targetType: s.targetType,
+                requestCount: s.requestCount,
+                totalTokens: s.totalTokens,
+                lastRequestAt: s.lastRequestAt,
+            })),
+        });
+    })));
+    // ─── Session Migration API ───
+    app.post('/api/sessions/:id/migration-preview', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () {
+        var _a;
+        const sessionId = req.params.id;
+        const { targetTool, includeThinking, includeToolCalls, maxRounds } = req.body || {};
+        if (!targetTool || !['claude-code', 'codex'].includes(targetTool)) {
+            res.status(400).json({ error: 'Invalid targetTool. Must be "claude-code" or "codex".' });
+            return;
+        }
+        try {
+            const content = yield (0, session_migration_1.extractSessionContent)(dbManager, sessionId, {
+                sourceSessionId: sessionId,
+                targetTool,
+                includeThinking: includeThinking === true,
+                includeToolCalls: includeToolCalls !== false,
+                maxRounds: typeof maxRounds === 'number' ? maxRounds : 0,
+            });
+            const preview = (0, session_migration_1.previewMigration)(content, targetTool);
+            res.json(preview);
+        }
+        catch (err) {
+            if ((_a = err.message) === null || _a === void 0 ? void 0 : _a.includes('not found')) {
+                res.status(404).json({ error: err.message });
+            }
+            else {
+                res.status(500).json({ error: err.message || 'Migration preview failed' });
+            }
+        }
+    })));
+    app.post('/api/sessions/:id/migrate', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () {
+        var _a;
+        const sessionId = req.params.id;
+        const { targetTool, includeThinking, includeToolCalls, maxRounds, editedPrompt } = req.body || {};
+        if (!targetTool || !['claude-code', 'codex'].includes(targetTool)) {
+            res.status(400).json({ error: 'Invalid targetTool. Must be "claude-code" or "codex".' });
+            return;
+        }
+        try {
+            const content = yield (0, session_migration_1.extractSessionContent)(dbManager, sessionId, {
+                sourceSessionId: sessionId,
+                targetTool,
+                includeThinking: includeThinking === true,
+                includeToolCalls: includeToolCalls !== false,
+                maxRounds: typeof maxRounds === 'number' ? maxRounds : 0,
+            });
+            const result = (0, session_migration_1.migrateSession)(content, targetTool, editedPrompt);
+            res.json(result);
+        }
+        catch (err) {
+            if ((_a = err.message) === null || _a === void 0 ? void 0 : _a.includes('not found')) {
+                res.status(404).json({ error: err.message });
+            }
+            else {
+                res.status(500).json({ error: err.message || 'Migration failed' });
+            }
+        }
+    })));
+    app.post('/api/sessions/:id/migrate-launch', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () {
+        var _a;
+        const sessionId = req.params.id;
+        const { targetTool, includeThinking, includeToolCalls, maxRounds } = req.body || {};
+        if (!targetTool || !['claude-code', 'codex'].includes(targetTool)) {
+            res.status(400).json({ error: 'Invalid targetTool. Must be "claude-code" or "codex".' });
+            return;
+        }
+        try {
+            // First extract content and generate prompt
+            const content = yield (0, session_migration_1.extractSessionContent)(dbManager, sessionId, {
+                sourceSessionId: sessionId,
+                targetTool,
+                includeThinking: includeThinking === true,
+                includeToolCalls: includeToolCalls !== false,
+                maxRounds: typeof maxRounds === 'number' ? maxRounds : 0,
+            });
+            const { prompt } = (0, session_migration_1.migrateSession)(content, targetTool);
+            // Resolve the project directory from session metadata
+            const projectDir = (0, session_launcher_1.resolveProjectDir)(sessionId, content.sourceTool);
+            // Write prompt to temp file
+            const tempFilePath = (0, session_launcher_1.writePromptToTempFile)(prompt, sessionId);
+            // Try to launch the target tool with the resolved project directory
+            const result = yield (0, session_launcher_1.launchTargetWithFallback)(targetTool, tempFilePath, prompt, projectDir || undefined);
+            // Schedule cleanup
+            (0, session_launcher_1.cleanupTempFile)(tempFilePath);
+            res.json(result);
+        }
+        catch (err) {
+            if ((_a = err.message) === null || _a === void 0 ? void 0 : _a.includes('not found')) {
+                res.status(404).json({ error: err.message });
+            }
+            else {
+                res.status(500).json({ error: err.message || 'Launch migration failed' });
+            }
+        }
+    })));
     app.get('/api/docs/recommend-vendors', asyncHandler((_req, res) => __awaiter(void 0, void 0, void 0, function* () {
         const resp = yield fetch('https://unpkg.com/aicodeswitch/docs/vendors-recommand.md');
         if (!resp.ok) {
@@ -1885,7 +2031,22 @@ ${instruction}
         res.json(result);
     })));
     app.put('/api/mcps/:id', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () {
-        const result = yield dbManager.updateMCP(req.params.id, req.body);
+        const updateData = req.body;
+        const oldMcp = dbManager.getMCP(req.params.id);
+        const result = yield dbManager.updateMCP(req.params.id, updateData);
+        // 如果targets发生变化，同步MCP配置到对应工具
+        if (updateData.targets !== undefined) {
+            const newTargets = updateData.targets;
+            const oldTargets = (oldMcp === null || oldMcp === void 0 ? void 0 : oldMcp.targets) || [];
+            // 需要同步的所有target（新增的 + 移除的都需要处理）
+            const allAffectedTargets = new Set([...newTargets, ...oldTargets]);
+            for (const target of allAffectedTargets) {
+                const activeRouteId = dbManager.getActiveRouteIdForTool(target);
+                if (activeRouteId) {
+                    yield writeMCPConfig(target);
+                }
+            }
+        }
         res.json(result);
     })));
     app.delete('/api/mcps/:id', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () {
@@ -1947,10 +2108,83 @@ ${instruction}
                 return true;
             }
             else if (targetType === 'codex') {
-                // Codex使用TOML格式，我们暂时不直接写入
-                // 需要后续处理Codex的MCP配置格式
-                // TODO: 实现 Codex MCP 配置写入
-                console.log('[MCP] Codex MCP配置写入暂未实现');
+                // Codex使用TOML格式的 config.toml，MCP配置格式为 [mcp_servers.<name>]
+                const codexDir = path_1.default.join(homeDir, '.codex');
+                const codexConfigPath = path_1.default.join(codexDir, 'config.toml');
+                if (!fs_1.default.existsSync(codexDir)) {
+                    fs_1.default.mkdirSync(codexDir, { recursive: true });
+                }
+                // 读取当前 config.toml
+                let currentConfig = {};
+                if (fs_1.default.existsSync(codexConfigPath)) {
+                    try {
+                        currentConfig = (0, config_merge_1.parseToml)(fs_1.default.readFileSync(codexConfigPath, 'utf-8'));
+                    }
+                    catch (error) {
+                        console.warn('[MCP] Failed to parse Codex config.toml:', error);
+                    }
+                }
+                // 清除已有的代理写入的 mcp_servers 条目（通过metadata追踪）
+                const mcpMetaPath = path_1.default.join(codexDir, '.aicodeswitch_mcp_servers.json');
+                let previousMcpIds = [];
+                if (fs_1.default.existsSync(mcpMetaPath)) {
+                    try {
+                        previousMcpIds = JSON.parse(fs_1.default.readFileSync(mcpMetaPath, 'utf8'));
+                        for (const id of previousMcpIds) {
+                            if (currentConfig.mcp_servers && currentConfig.mcp_servers[id]) {
+                                delete currentConfig.mcp_servers[id];
+                            }
+                        }
+                    }
+                    catch (_a) {
+                        // ignore
+                    }
+                }
+                // 确保mcp_servers对象存在
+                if (!currentConfig.mcp_servers) {
+                    currentConfig.mcp_servers = {};
+                }
+                // 写入所有启用的MCP
+                const writtenMcpIds = [];
+                for (const mcp of mcps) {
+                    const mcpConfig = {};
+                    if (mcp.type === 'stdio') {
+                        mcpConfig.command = mcp.command || '';
+                        if (mcp.args && mcp.args.length > 0) {
+                            mcpConfig.args = mcp.args;
+                        }
+                        // stdio 类型的环境变量写在 [mcp_servers.name.env] 子表中
+                        if (mcp.env && Object.keys(mcp.env).length > 0) {
+                            mcpConfig.env = Object.assign({}, mcp.env);
+                        }
+                    }
+                    else if (mcp.type === 'http') {
+                        // Codex 使用 Streamable HTTP 传输，url 字段
+                        mcpConfig.url = mcp.url || '';
+                        // HTTP 类型可选的 headers
+                        if (mcp.headers && Object.keys(mcp.headers).length > 0) {
+                            mcpConfig.headers = Object.assign({}, mcp.headers);
+                        }
+                    }
+                    else if (mcp.type === 'sse') {
+                        // SSE 传输也使用 url 字段
+                        mcpConfig.url = mcp.url || '';
+                        if (mcp.headers && Object.keys(mcp.headers).length > 0) {
+                            mcpConfig.headers = Object.assign({}, mcp.headers);
+                        }
+                    }
+                    currentConfig.mcp_servers[mcp.id] = mcpConfig;
+                    writtenMcpIds.push(mcp.id);
+                }
+                // 如果mcp_servers为空对象，删除该键
+                if (Object.keys(currentConfig.mcp_servers).length === 0) {
+                    delete currentConfig.mcp_servers;
+                }
+                // 写回 config.toml
+                (0, config_merge_1.atomicWriteFile)(codexConfigPath, (0, config_merge_1.stringifyToml)(currentConfig));
+                // 保存已写入的MCP ID列表，用于后续清理
+                fs_1.default.writeFileSync(mcpMetaPath, JSON.stringify(writtenMcpIds, null, 2));
+                console.log(`[MCP] Codex MCP config written: ${writtenMcpIds.length} server(s)`);
                 return true;
             }
             return false;
@@ -1976,6 +2210,45 @@ ${instruction}
                 }
                 return true;
             }
+            else if (targetType === 'codex') {
+                // 从 Codex config.toml 中移除指定的 MCP 条目
+                const homeDir = os_1.default.homedir();
+                const codexDir = path_1.default.join(homeDir, '.codex');
+                const codexConfigPath = path_1.default.join(codexDir, 'config.toml');
+                if (!fs_1.default.existsSync(codexConfigPath)) {
+                    return true;
+                }
+                let currentConfig = {};
+                try {
+                    currentConfig = (0, config_merge_1.parseToml)(fs_1.default.readFileSync(codexConfigPath, 'utf-8'));
+                }
+                catch (error) {
+                    console.warn('[MCP] Failed to parse Codex config.toml for removal:', error);
+                    return false;
+                }
+                if (currentConfig.mcp_servers && currentConfig.mcp_servers[mcpId]) {
+                    delete currentConfig.mcp_servers[mcpId];
+                    // 如果mcp_servers为空对象，删除该键
+                    if (Object.keys(currentConfig.mcp_servers).length === 0) {
+                        delete currentConfig.mcp_servers;
+                    }
+                    (0, config_merge_1.atomicWriteFile)(codexConfigPath, (0, config_merge_1.stringifyToml)(currentConfig));
+                    // 更新metadata
+                    const mcpMetaPath = path_1.default.join(codexDir, '.aicodeswitch_mcp_servers.json');
+                    if (fs_1.default.existsSync(mcpMetaPath)) {
+                        try {
+                            const previousIds = JSON.parse(fs_1.default.readFileSync(mcpMetaPath, 'utf8'));
+                            const updatedIds = previousIds.filter(id => id !== mcpId);
+                            fs_1.default.writeFileSync(mcpMetaPath, JSON.stringify(updatedIds, null, 2));
+                        }
+                        catch (_a) {
+                            // ignore
+                        }
+                    }
+                    console.log(`[MCP] Removed MCP ${mcpId} from Codex config`);
+                }
+                return true;
+            }
             return false;
         }
         catch (error) {
@@ -1983,7 +2256,29 @@ ${instruction}
             return false;
         }
     });
-};
+    // 服务启动时同步MCP配置到已激活的工具
+    const allMcps = dbManager.getMCPs();
+    const targetsToSync = new Set();
+    for (const mcp of allMcps) {
+        if (mcp.targets) {
+            for (const target of mcp.targets) {
+                targetsToSync.add(target);
+            }
+        }
+    }
+    for (const target of targetsToSync) {
+        const activeRouteId = dbManager.getActiveRouteIdForTool(target);
+        if (activeRouteId) {
+            try {
+                yield writeMCPConfig(target);
+                console.log(`[Startup MCP Sync] MCP config synced for ${target}`);
+            }
+            catch (error) {
+                console.error(`[Startup MCP Sync] Failed to sync MCP config for ${target}:`, error);
+            }
+        }
+    }
+});
 const start = () => __awaiter(void 0, void 0, void 0, function* () {
     fs_1.default.mkdirSync(dataDir, { recursive: true });
     // 自动检测数据库类型并执行迁移（如果需要）
@@ -1999,11 +2294,16 @@ const start = () => __awaiter(void 0, void 0, void 0, function* () {
     catch (error) {
         console.error('[Server] Tool config sync failed:', error);
     }
+    // 清理旧的迁移临时文件
+    try {
+        (0, session_launcher_1.cleanupOldTempFiles)();
+    }
+    catch ( /* ignore */_a) { /* ignore */ }
     const proxyServer = new proxy_server_1.ProxyServer(dbManager, app);
     // Initialize proxy server and register proxy routes last
     proxyServer.initialize();
     // Register admin routes first
-    registerRoutes(dbManager, proxyServer);
+    yield registerRoutes(dbManager, proxyServer);
     yield proxyServer.registerProxyRoutes();
     app.use(express_1.default.static(path_1.default.resolve(__dirname, '../ui')));
     // 404 处理程序 - 确保返回 JSON 而不是 HTML（放在所有路由和静态文件之后）

package/dist/server/proxy-server.js

@@ -60,6 +60,7 @@ const type_migration_1 = require("./type-migration");
 const original_config_reader_1 = require("./original-config-reader");
 const compact_1 = require("./conversions/compact");
 const coding_plan_1 = require("./coding-plan");
+const coding_plan_headers_1 = require("./coding-plan-headers");
 const SUPPORTED_TARGETS = ['claude-code', 'codex'];
 /** 默认模型列表 */
 const DEFAULT_MODELS = [
@@ -314,14 +315,30 @@ class ProxyServer {
                 res.status(404).json({ error: { message: `API path ${apiPath} is not bound to any route. Please configure it in Route Mapping settings.` } });
                 return;
             }
-            // 加载绑定的路由
+            // 推断客户端格式
+            const clientFormat = apiPathToClientFormat(apiPath);
+            // 加载绑定的路由（默认从 API 路径绑定获取）
             const allRoutes = this.dbManager.getRoutes();
-            const route = allRoutes.find((r) => r.id === binding.routeId);
+            let route = allRoutes.find((r) => r.id === binding.routeId);
+            // 会话级路由覆盖：优先检查会话是否绑定了特定路由
+            const sessionId = this.extractSessionIdForFormat(req, clientFormat);
+            if (sessionId) {
+                const session = this.dbManager.getSession(sessionId);
+                if (session === null || session === void 0 ? void 0 : session.routeId) {
+                    const boundRoute = allRoutes.find((r) => r.id === session.routeId);
+                    if (boundRoute) {
+                        console.log(`[SESSION-ROUTE] API path ${apiPath} session ${sessionId} using bound route: ${boundRoute.name}`);
+                        route = boundRoute;
+                    }
+                    else {
+                        console.log(`[SESSION-ROUTE] Bound route ${session.routeId} not found for session ${sessionId}, clearing binding`);
+                        this.dbManager.unbindSessionRoute(sessionId).catch(console.error);
+                    }
+                }
+            }
             if (!route) {
                 return res.status(404).json({ error: { message: `Bound route '${binding.routeId}' not found or inactive. Please check Route Mapping settings.` } });
             }
-            // 推断客户端格式
-            const clientFormat = apiPathToClientFormat(apiPath);
             // 复用完整的代理请求处理
             yield this.handleApiPathProxyRequest(req, res, route, clientFormat, apiPath);
         }));
@@ -872,6 +889,24 @@ class ProxyServer {
         }
         if (!tool)
             return undefined;
+        // 优先检查会话级路由绑定
+        const sessionId = this.defaultExtractSessionId(req, tool);
+        if (sessionId) {
+            const session = this.dbManager.getSession(sessionId);
+            if (session === null || session === void 0 ? void 0 : session.routeId) {
+                const boundRoute = this.dbManager.getRoute(session.routeId);
+                if (boundRoute) {
+                    console.log(`[SESSION-ROUTE] Session ${sessionId} using bound route: ${boundRoute.name} (${boundRoute.id})`);
+                    return boundRoute;
+                }
+                else {
+                    // 路由已被删除，自动清除绑定
+                    console.log(`[SESSION-ROUTE] Bound route ${session.routeId} not found for session ${sessionId}, clearing binding`);
+                    this.dbManager.unbindSessionRoute(sessionId).catch(console.error);
+                }
+            }
+        }
+        // 回退到全局工具绑定
         const routeId = this.dbManager.getActiveRouteIdForTool(tool);
         if (!routeId)
             return undefined;
@@ -1040,7 +1075,9 @@ class ProxyServer {
                 const isBlacklisted = yield this.dbManager.isServiceBlacklisted(service.id, routeId, rule.contentType);
                 if (isBlacklisted)
                     continue;
-                return service.name;
+                const vendors = this.dbManager.getVendors();
+                const vendor = vendors.find(v => v.id === service.vendorId);
+                return vendor ? `${vendor.name}-${service.name}` : service.name;
             }
             return undefined;
         });
@@ -1049,7 +1086,7 @@ class ProxyServer {
         if (!forwardedToServiceName) {
             return '';
         }
-        return `；已自动转发给 ${forwardedToServiceName} 服务继续处理`;
+        return `；已自动转发给「${forwardedToServiceName}」服务继续处理`;
     }
     /**
      * 解析规则的有效超时时间（毫秒）。
@@ -2427,6 +2464,10 @@ class ProxyServer {
             const bodyStr = JSON.stringify(requestBody);
             headers['content-length'] = Buffer.byteLength(bodyStr, 'utf8').toString();
         }
+        // 编程套餐 Headers 覆盖：当服务启用了编程套餐时，替换为编程工具的标准 Headers
+        if (service.enableCodingPlan) {
+            (0, coding_plan_headers_1.applyCodingPlanHeaders)(headers, sourceType);
+        }
         return headers;
     }
     resolveEffectiveApiKey(service) {
@@ -2599,6 +2640,23 @@ class ProxyServer {
         }
         return rawUserId;
     }
+    /**
+     * 根据客户端格式提取 session ID（用于标准 API 路径的会话级路由覆盖）
+     */
+    extractSessionIdForFormat(request, format) {
+        var _a, _b;
+        if (format === 'claude') {
+            const rawUserId = (_b = (_a = request.body) === null || _a === void 0 ? void 0 : _a.metadata) === null || _b === void 0 ? void 0 : _b.user_id;
+            return ProxyServer.extractSessionIdFromUserId(rawUserId);
+        }
+        // 对于 completions/responses/gemini 格式，尝试从 headers 中提取
+        const sessionId = request.headers['session-id'] || request.headers['session_id'];
+        if (typeof sessionId === 'string')
+            return sessionId;
+        if (Array.isArray(sessionId))
+            return sessionId[0] || null;
+        return null;
+    }
     /**
      * 提取会话标题（默认方法）
      * 对于新会话，尝试从第一条消息的内容中提取标题
@@ -2685,6 +2743,7 @@ class ProxyServer {
     formatSessionTitle(text) {
         // 去除多余空白和换行符，替换为单个空格
         let formatted = text
+            .replace(/<\/?session>/g, '') // 移除 <session></session> 标签
             .replace(/\s+/g, ' ') // 多个空白字符替换为单个空格
             .replace(/[\r\n]+/g, ' ') // 换行符替换为空格
             .trim();
@@ -2761,10 +2820,10 @@ class ProxyServer {
      * @param targetModel 目标模型名称（可选）
      * @returns 转换后往服务商API接口的数据
      */
-    transformRequestToUpstream(tool, source, payloadData, targetModel, providerConfig) {
+    transformRequestToUpstream(tool, source, payloadData, targetModel, providerConfig, serverToolConfig) {
         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 });
+        const result = (0, index_1.transformRequest)({ fromFormat: clientFormat, toFormat: upstreamFormat, body: payloadData, providerConfig, serverToolConfig });
         const body = result.body;
         // 模型覆盖：OpenAI 模型族保持原样，其余覆盖为 targetModel
         if (targetModel) {
@@ -2898,6 +2957,12 @@ class ProxyServer {
             const useOriginalConfig = (options === null || options === void 0 ? void 0 : options.useOriginalConfig) === true;
             let relayedForLog = !useOriginalConfig;
             let originalToolRequestBody = this.cloneRequestBody(req.body || {});
+            // 请求体安全性清理：修复控制字符、无效 JSON arguments、undefined 值等问题
+            const sanitizeResult = (0, index_1.sanitizeRequestBody)(originalToolRequestBody);
+            if (sanitizeResult.changes.length > 0) {
+                console.log(`[Body-Sanitize] ${sanitizeResult.changes.length} fix(es): ${sanitizeResult.changes.join('; ')}`);
+            }
+            originalToolRequestBody = sanitizeResult.body;
             let requestBody = this.cloneRequestBody(originalToolRequestBody) || {};
             let usageForLog;
             let logged = false;
@@ -3286,7 +3351,8 @@ class ProxyServer {
                 const effectiveApiUrl = this.resolveEffectiveApiUrl(service);
                 const effectiveModel = rule.targetModel || (requestBody === null || requestBody === void 0 ? void 0 : requestBody.model);
                 const providerConfig = (0, index_1.getReasoningConfig)(service.name || '', effectiveApiUrl || '', effectiveModel || '');
-                const transformedRequestBody = this.transformRequestToUpstream(targetType, sourceType, payloadForTransform, rule.targetModel, providerConfig);
+                const serverToolConfig = (0, index_1.getServerToolSupport)(service.name || '', effectiveApiUrl || '');
+                const transformedRequestBody = this.transformRequestToUpstream(targetType, sourceType, payloadForTransform, rule.targetModel, providerConfig, serverToolConfig);
                 requestBody = (_b = transformedRequestBody !== null && transformedRequestBody !== void 0 ? transformedRequestBody : this.cloneRequestBody(originalToolRequestBody)) !== null && _b !== void 0 ? _b : {};
                 // 对最终即将发送到上游的 Claude compact 请求再做一次兜底清理，
                 // 避免中间转换/覆盖步骤重新引入未配对的 tool_use。
@@ -3405,7 +3471,9 @@ class ProxyServer {
                     const parser = new streaming_1.SSEParserTransform();
                     const eventCollector = new chunk_collector_1.SSEEventCollectorTransform();
                     const serializer = new streaming_1.SSESerializerTransform();
-                    const downstreamChunkCollector = new chunk_collector_1.ChunkCollectorTransform();
+                    const downstreamChunkCollector = new chunk_collector_1.ChunkCollectorTransform(() => {
+                        rules_status_service_1.rulesStatusBroadcaster.refreshRuleInUse(route.id, rule.id);
+                    });
                     const compactResponseSanitizer = rule.contentType === 'compact' && targetType === 'claude-code'
                         ? new ClaudeCompactResponseSanitizer()
                         : null;
@@ -3921,6 +3989,12 @@ class ProxyServer {
             console.log(`\x1b[32m[ApiPathProxy]\x1b[0m path=${apiPath}, clientFormat=${clientFormat}, session=-, rule=${rule.id}(${rule.contentType}), vendor=${(vendor === null || vendor === void 0 ? void 0 : vendor.name) || '-'}, service=${service.name}`);
             const failoverEnabled = (options === null || options === void 0 ? void 0 : options.failoverEnabled) === true;
             let requestBody = this.cloneRequestBody(req.body || {});
+            // 请求体安全性清理：修复控制字符、无效 JSON arguments、undefined 值等问题
+            const sanitizeResult = (0, index_1.sanitizeRequestBody)(requestBody);
+            if (sanitizeResult.changes.length > 0) {
+                console.log(`[Body-Sanitize] ${sanitizeResult.changes.length} fix(es): ${sanitizeResult.changes.join('; ')}`);
+            }
+            requestBody = sanitizeResult.body;
             let usageForLog;
             let responseBodyForLog;
             let downstreamResponseBodyForLog;
@@ -3972,7 +4046,8 @@ class ProxyServer {
             const effectiveApiUrl = this.resolveEffectiveApiUrl(service);
             const effectiveModel = rule.targetModel || (requestBody === null || requestBody === void 0 ? void 0 : requestBody.model);
             const providerConfig = (0, index_1.getReasoningConfig)(service.name || '', effectiveApiUrl || '', effectiveModel || '');
-            const transformedRequestBody = this.transformRequestByFormat(clientFormat, sourceType, payloadForTransform, rule.targetModel, providerConfig);
+            const serverToolConfig = (0, index_1.getServerToolSupport)(service.name || '', effectiveApiUrl || '');
+            const transformedRequestBody = this.transformRequestByFormat(clientFormat, sourceType, payloadForTransform, rule.targetModel, providerConfig, serverToolConfig);
             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)) {
@@ -4079,7 +4154,9 @@ class ProxyServer {
                     const parser = new streaming_1.SSEParserTransform();
                     const eventCollector = new chunk_collector_1.SSEEventCollectorTransform();
                     const serializer = new streaming_1.SSESerializerTransform();
-                    const downstreamChunkCollector = new chunk_collector_1.ChunkCollectorTransform();
+                    const downstreamChunkCollector = new chunk_collector_1.ChunkCollectorTransform(() => {
+                        rules_status_service_1.rulesStatusBroadcaster.refreshRuleInUse(route.id, rule.id);
+                    });
                     responseHeadersForLog = this.normalizeResponseHeaders(responseHeaders);
                     const { converter, extractUsage } = this.transformSSEByFormat(clientFormat, sourceType);
                     this.copyResponseHeaders(responseHeaders, res);
@@ -4184,9 +4261,9 @@ class ProxyServer {
     /**
      * 使用显式 clientFormat 进行请求转换（取代 tool → format 的硬编码映射）
      */
-    transformRequestByFormat(clientFormat, source, payloadData, targetModel, providerConfig) {
+    transformRequestByFormat(clientFormat, source, payloadData, targetModel, providerConfig, serverToolConfig) {
         const upstreamFormat = (0, index_1.sourceTypeToFormat)(source);
-        const result = (0, index_1.transformRequest)({ fromFormat: clientFormat, toFormat: upstreamFormat, body: payloadData, providerConfig });
+        const result = (0, index_1.transformRequest)({ fromFormat: clientFormat, toFormat: upstreamFormat, body: payloadData, providerConfig, serverToolConfig });
         const body = result.body;
         if (targetModel) {
             const isOpenAIModel = /^gpt-|o[123]/i.test(targetModel);

package/dist/server/rules-status-service.js

@@ -251,6 +251,22 @@ class RulesStatusBroadcaster {
             timestamp: Date.now(),
         });
     }
+    /**
+     * 刷新规则使用中的不活动定时器（轻量级，仅重置定时器，不修改状态）
+     * 用于 streaming 过程中持续保持 in_use 状态
+     */
+    refreshRuleInUse(routeId, ruleId) {
+        const currentStatus = this.ruleStates.get(ruleId);
+        // 仅当状态已经是 in_use 时才刷新定时器
+        if ((currentStatus === null || currentStatus === void 0 ? void 0 : currentStatus.status) !== 'in_use')
+            return;
+        const timeoutKey = `${routeId}:${ruleId}`;
+        this.clearRuleTimeout(timeoutKey);
+        const timeout = setTimeout(() => {
+            this.markRuleIdle(routeId, ruleId);
+        }, this.INACTIVITY_TIMEOUT);
+        this.ruleTimeouts.set(timeoutKey, timeout);
+    }
     /**
      * 更新规则使用量
      */