aicodeswitch 5.1.1 → 5.1.2

package/dist/server/config-managed-fields.js

@@ -38,6 +38,7 @@ exports.CODEX_CONFIG_MANAGED_FIELDS = [
     { path: ['requires_openai_auth'] },
     { path: ['enableRouteSelection'] },
     { path: ['model_providers', 'aicodeswitch'], isSection: true },
+    { path: ['mcp_servers'], isSection: true, optional: true },
 ];
 /**
  * Codex auth.json 管理字段定义

package/dist/server/conversions/body-sanitizer.js

@@ -0,0 +1,138 @@
+"use strict";
+/**
+ * Request body sanitizer for AICodeSwitch proxy.
+ *
+ * Defensively cleans incoming request bodies before format transformation
+ * and upstream forwarding. Catches issues that originate from client bugs
+ * (e.g. Codex sending improperly escaped content) so that upstream APIs
+ * receive well-formed JSON.
+ *
+ * Sanitization steps:
+ * 1. Strip illegal C0 control characters from string values
+ * 2. Fix `function_call.arguments` that are not valid JSON strings
+ * 3. Remove `undefined` values from the object tree
+ * 4. Guard against circular references and excessive depth
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sanitizeRequestBody = sanitizeRequestBody;
+// C0 control characters except TAB (0x09), LF (0x0A), CR (0x0D).
+// These are the only three control chars allowed in JSON strings (RFC 8259 §7).
+const CONTROL_CHAR_REGEX = /[\x00-\x08\x0b\x0c\x0e-\x1f]/g;
+const MAX_DEPTH = 64;
+/**
+ * Deep-sanitize a request body object.
+ *
+ * @param body - The parsed request body (a plain JS object).
+ * @returns A new object with fixes applied and a list of human-readable
+ *          change descriptions (empty when nothing was modified).
+ */
+function sanitizeRequestBody(body) {
+    if (body === null || body === undefined || typeof body !== 'object') {
+        return { body, changes: [] };
+    }
+    const changes = [];
+    const seen = new WeakSet();
+    const result = sanitizeValue(body, '', changes, seen, 0);
+    return { body: result, changes };
+}
+// ---------------------------------------------------------------------------
+// Internal helpers
+// ---------------------------------------------------------------------------
+function sanitizeValue(value, path, changes, seen, depth) {
+    // Primitive types ----------------------------------------------------------
+    if (value === null)
+        return null;
+    if (value === undefined) {
+        changes.push(`removed undefined at ${path || '$'}`);
+        return null; // replaced with null rather than silently dropped
+    }
+    if (typeof value === 'string') {
+        return sanitizeString(value, path, changes);
+    }
+    if (typeof value !== 'object') {
+        return value; // numbers, booleans — pass through
+    }
+    // Guard: depth -------------------------------------------------------------
+    if (depth >= MAX_DEPTH) {
+        changes.push(`max depth exceeded at ${path || '$'}`);
+        return value;
+    }
+    // Guard: circular reference ------------------------------------------------
+    if (seen.has(value)) {
+        changes.push(`circular reference at ${path || '$'}`);
+        return '[Circular]';
+    }
+    seen.add(value);
+    // Arrays -------------------------------------------------------------------
+    if (Array.isArray(value)) {
+        return value.map((item, i) => {
+            const itemPath = `${path}[${i}]`;
+            const sanitized = sanitizeValue(item, itemPath, changes, seen, depth + 1);
+            // Fix function_call.arguments inside Responses API input arrays
+            if (sanitized !== null &&
+                typeof sanitized === 'object' &&
+                !Array.isArray(sanitized) &&
+                sanitized.type === 'function_call') {
+                fixFunctionCallArguments(sanitized, itemPath, changes);
+            }
+            return sanitized;
+        });
+    }
+    // Plain objects ------------------------------------------------------------
+    const result = {};
+    for (const [key, val] of Object.entries(value)) {
+        // Remove undefined values entirely
+        if (val === undefined) {
+            changes.push(`removed undefined key ${path}.${key}`);
+            continue;
+        }
+        const childPath = path ? `${path}.${key}` : key;
+        result[key] = sanitizeValue(val, childPath, changes, seen, depth + 1);
+    }
+    // Post-process: fix function_call.arguments in input arrays
+    if (Array.isArray(result.input)) {
+        for (let i = 0; i < result.input.length; i++) {
+            const item = result.input[i];
+            if (item !== null &&
+                typeof item === 'object' &&
+                !Array.isArray(item) &&
+                item.type === 'function_call') {
+                fixFunctionCallArguments(item, `${path}.input[${i}]`, changes);
+            }
+        }
+    }
+    return result;
+}
+/**
+ * Strip illegal control characters from a string value.
+ */
+function sanitizeString(str, path, changes) {
+    if (!CONTROL_CHAR_REGEX.test(str))
+        return str;
+    const cleaned = str.replace(CONTROL_CHAR_REGEX, '');
+    changes.push(`stripped control chars at ${path || '$'}`);
+    return cleaned;
+}
+/**
+ * Ensure `arguments` on a function_call item is a valid JSON string.
+ *
+ * The Responses API spec requires `arguments` to be a JSON-encoded string.
+ * If Codex sends a malformed string (e.g. containing raw unescaped content),
+ * we wrap it so downstream code can safely `JSON.parse` it.
+ */
+function fixFunctionCallArguments(item, path, changes) {
+    const args = item.arguments;
+    if (typeof args !== 'string' || args === '')
+        return;
+    // Already valid JSON — nothing to do
+    try {
+        JSON.parse(args);
+        return;
+    }
+    catch (_a) {
+        // Malformed — wrap it
+    }
+    // Wrap the raw string so JSON.parse will succeed downstream
+    item.arguments = JSON.stringify({ _raw: args });
+    changes.push(`fixed invalid arguments at ${path}`);
+}

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.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.sourceTypeToFormat = exports.detectRequestFormat = void 0;
 exports.transformRequest = transformRequest;
 exports.transformResponse = transformResponse;
 exports.createStreamConverter = createStreamConverter;
@@ -26,6 +26,12 @@ Object.defineProperty(exports, "sourceTypeToFormat", { enumerable: true, get: fu
 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");
+var providers_js_3 = require("./server-tool/providers.js");
+Object.defineProperty(exports, "getServerToolSupport", { enumerable: true, get: function () { return providers_js_3.getServerToolSupport; } });
+const mapper_js_1 = require("./server-tool/mapper.js");
+// --- Body sanitizer ---
+var body_sanitizer_js_1 = require("./body-sanitizer.js");
+Object.defineProperty(exports, "sanitizeRequestBody", { enumerable: true, get: function () { return body_sanitizer_js_1.sanitizeRequestBody; } });
 // --- Compact API ---
 var compact_js_1 = require("./compact.js");
 Object.defineProperty(exports, "extractConversationText", { enumerable: true, get: function () { return compact_js_1.extractConversationText; } });
@@ -84,7 +90,7 @@ const request_js_13 = require("./pairs/gemini-responses/request.js");
 const response_js_12 = require("./pairs/gemini-responses/response.js");
 const streaming_js_12 = require("./pairs/gemini-responses/streaming.js");
 // --- Provider-driven post-processing ---
-const mapper_js_1 = require("./thinking/mapper.js");
+const mapper_js_2 = require("./thinking/mapper.js");
 const effort_js_1 = require("./thinking/effort.js");
 // ============================================================
 // Public API: Request Transformation
@@ -197,63 +203,69 @@ function createStreamConverter(options) {
  * with provider-driven post-processing for completions targets.
  */
 function buildTargetBody(options) {
-    const { fromFormat, toFormat, body, sanitizeBody, providerConfig } = options;
+    const { fromFormat, toFormat, sanitizeBody, providerConfig, serverToolConfig } = options;
+    // Pre-processing: convert server_tool_use → tool_use when upstream doesn't support it.
+    // Must happen before format conversion so all pair transformers handle the blocks correctly.
+    let processedBody = options.body;
+    if (fromFormat === 'claude' && !(serverToolConfig === null || serverToolConfig === void 0 ? void 0 : serverToolConfig.supportsServerToolUse)) {
+        processedBody = (0, mapper_js_1.convertServerToolUseToToolUse)(processedBody);
+    }
     // Dispatch to the correct conversion pair
     const key = `${fromFormat}->${toFormat}`;
     let result;
     switch (key) {
         // --- claude → * ---
         case 'claude->completions':
-            result = (0, request_js_1.claudeToCompletions)(body);
+            result = (0, request_js_1.claudeToCompletions)(processedBody);
             break;
         case 'claude->responses':
-            result = (0, request_js_2.claudeToResponses)(body);
+            result = (0, request_js_2.claudeToResponses)(processedBody);
             break;
         case 'claude->gemini':
-            result = (0, request_js_3.claudeToGemini)(body);
+            result = (0, request_js_3.claudeToGemini)(processedBody);
             break;
         // --- responses → * ---
         case 'responses->completions':
-            result = (0, request_js_8.responsesToCompletions)(body);
+            result = (0, request_js_8.responsesToCompletions)(processedBody);
             break;
         case 'responses->claude':
-            result = (0, request_js_7.responsesToClaude)(body);
+            result = (0, request_js_7.responsesToClaude)(processedBody);
             break;
         case 'responses->gemini':
-            result = (0, request_js_9.responsesToGeminiRequest)(body);
+            result = (0, request_js_9.responsesToGeminiRequest)(processedBody);
             break;
         case 'responses->responses': {
             if (sanitizeBody) {
                 // Responses 格式降级兼容：委托给 responses-responses pair 处理
-                result = (0, request_js_10.downgradeResponsesRequest)(body);
+                result = (0, request_js_10.downgradeResponsesRequest)(processedBody);
             }
             else {
-                result = body;
+                result = processedBody;
             }
             break;
         }
         // --- completions → * ---
         case 'completions->claude':
-            result = (0, request_js_4.completionsToClaude)(body);
+            result = (0, request_js_4.completionsToClaude)(processedBody);
             break;
         case 'completions->responses':
-            result = (0, request_js_5.completionsToResponses)(body);
+            result = (0, request_js_5.completionsToResponses)(processedBody);
             break;
         case 'completions->gemini':
-            result = (0, request_js_6.completionsToGemini)(body);
+            result = (0, request_js_6.completionsToGemini)(processedBody);
             break;
         // --- gemini → * ---
         case 'gemini->claude':
-            result = (0, request_js_11.geminiToClaude)(body);
+            result = (0, request_js_11.geminiToClaude)(processedBody);
             break;
         case 'gemini->completions':
-            result = (0, request_js_12.geminiToCompletions)(body);
+            result = (0, request_js_12.geminiToCompletions)(processedBody);
             break;
         case 'gemini->responses':
-            result = (0, request_js_13.geminiToResponsesRequest)(body);
+            result = (0, request_js_13.geminiToResponsesRequest)(processedBody);
             break;
         default:
-            result = body;
+            result = processedBody;
     }
     // --- Provider-driven post-processing for completions targets ---
     if (toFormat === 'completions' && providerConfig) {
@@ -261,21 +273,26 @@ function buildTargetBody(options) {
         if (isReasoningContentCompletion) {
             // 修复历史：确保 assistant + tool_calls 消息有 reasoning_content
             if (result.messages) {
-                result.messages = (0, mapper_js_1.fixThinkingHistory)(result.messages, 'completions');
+                result.messages = (0, mapper_js_2.fixThinkingHistory)(result.messages, 'completions');
             }
             // 剥离 stream_options（reasoning_content 提供商通常不支持）
             delete result.stream_options;
         }
         // 注入 thinking 参数（如 thinking: { type: 'enabled' }）和 effort 参数
         if (providerConfig.supportsThinking || providerConfig.supportsEffort) {
-            const effort = body.thinking ? (0, effort_js_1.claudeThinkingToReasoningEffort)(body.thinking) : null;
+            const effort = processedBody.thinking ? (0, effort_js_1.claudeThinkingToReasoningEffort)(processedBody.thinking) : null;
             result = (0, providers_js_2.applyReasoningConfig)(result, providerConfig, effort);
         }
     }
+    // --- Provider-driven: convert redacted_thinking → thinking for providers that don't support redacted_thinking ---
+    // DeepSeek 等 provider 的 Anthropic 端点不识别 redacted_thinking，需要转换为 thinking 块
+    if (toFormat === 'claude' && (providerConfig === null || providerConfig === void 0 ? void 0 : providerConfig.supportsThinking) && result.messages) {
+        result.messages = (0, mapper_js_2.convertRedactedThinkingForProvider)(result.messages);
+    }
     // --- Safety net for Claude upstream: ensure thinking blocks alongside tool_use ---
     // When thinking mode is enabled, Claude requires thinking blocks in assistant messages with tool_use
     if (toFormat === 'claude' && result.thinking && result.messages) {
-        result.messages = (0, mapper_js_1.fixThinkingHistory)(result.messages, 'claude');
+        result.messages = (0, mapper_js_2.fixThinkingHistory)(result.messages, 'claude');
     }
     return result;
 }

package/dist/server/conversions/server-tool/mapper.js

@@ -0,0 +1,49 @@
+"use strict";
+/**
+ * Server tool use content block transformation.
+ *
+ * Converts server_tool_use blocks to regular tool_use blocks so that upstream
+ * providers which do not recognise the server_tool_use type can still process
+ * the conversation history correctly.
+ *
+ * Conversion is simple: only the `type` field changes from 'server_tool_use'
+ * to 'tool_use'. The `id`, `name`, and `input` fields are preserved, and
+ * matching `tool_result` blocks (which reference by `tool_use_id`) remain valid.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertServerToolUseToToolUse = convertServerToolUseToToolUse;
+/**
+ * Convert all server_tool_use content blocks in the request body to tool_use.
+ *
+ * Scans assistant messages in body.messages and replaces the block type.
+ * Returns a shallow-cloned body with modified messages; original body is not mutated.
+ */
+function convertServerToolUseToToolUse(body) {
+    if (!(body === null || body === void 0 ? void 0 : body.messages) || !Array.isArray(body.messages)) {
+        return body;
+    }
+    let modified = false;
+    const newMessages = body.messages.map((msg) => {
+        // server_tool_use only appears in assistant messages
+        if (msg.role !== 'assistant' || !Array.isArray(msg.content)) {
+            return msg;
+        }
+        let msgModified = false;
+        const newContent = msg.content.map((block) => {
+            if ((block === null || block === void 0 ? void 0 : block.type) === 'server_tool_use') {
+                msgModified = true;
+                return Object.assign(Object.assign({}, block), { type: 'tool_use' });
+            }
+            return block;
+        });
+        if (msgModified) {
+            modified = true;
+            return Object.assign(Object.assign({}, msg), { content: newContent });
+        }
+        return msg;
+    });
+    if (!modified) {
+        return body;
+    }
+    return Object.assign(Object.assign({}, body), { messages: newMessages });
+}

package/dist/server/conversions/server-tool/providers.js

@@ -0,0 +1,40 @@
+"use strict";
+/**
+ * Server tool use (server_tool_use) provider support detection.
+ *
+ * server_tool_use is a Claude-specific content block type used by built-in
+ * server-side tools (e.g. webReader). Most third-party Claude-compatible APIs
+ * do not accept this type in request messages. This module detects whether the
+ * upstream provider supports it natively, following the same pattern as
+ * thinking/providers.ts.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SUPPORTED_CONFIG = exports.DEFAULT_CONFIG = void 0;
+exports.getServerToolSupport = getServerToolSupport;
+/**
+ * Providers known to support server_tool_use content blocks in request messages.
+ * Detection is based on URL / provider name substring matching.
+ */
+const SUPPORTED_PATTERNS = [
+    'api.anthropic.com',
+    'anthropic',
+];
+const SUPPORTED_CONFIG = { supportsServerToolUse: true };
+exports.SUPPORTED_CONFIG = SUPPORTED_CONFIG;
+const DEFAULT_CONFIG = { supportsServerToolUse: false };
+exports.DEFAULT_CONFIG = DEFAULT_CONFIG;
+/**
+ * Detect whether the upstream provider supports server_tool_use content blocks.
+ *
+ * @param providerName  Service name (e.g. "Anthropic", "OpenRouter")
+ * @param baseUrl       Service API URL
+ */
+function getServerToolSupport(providerName, baseUrl) {
+    const haystack = `${providerName} ${baseUrl}`.toLowerCase();
+    for (const pattern of SUPPORTED_PATTERNS) {
+        if (haystack.includes(pattern)) {
+            return SUPPORTED_CONFIG;
+        }
+    }
+    return DEFAULT_CONFIG;
+}

package/dist/server/conversions/thinking/mapper.js

@@ -7,6 +7,7 @@ exports.thinkingToReasoningContent = thinkingToReasoningContent;
 exports.reasoningContentToThinking = reasoningContentToThinking;
 exports.reasoningToThinking = reasoningToThinking;
 exports.thinkingToReasoningSummary = thinkingToReasoningSummary;
+exports.convertRedactedThinkingForProvider = convertRedactedThinkingForProvider;
 exports.fixThinkingHistory = fixThinkingHistory;
 exports.redactedThinkingPlaceholder = redactedThinkingPlaceholder;
 /** Claude thinking text → reasoning_content string */
@@ -29,6 +30,26 @@ function reasoningToThinking(summary) {
 function thinkingToReasoningSummary(thinking) {
     return [{ type: 'summary_text', text: thinking }];
 }
+/**
+ * 将 assistant 消息中的 redacted_thinking 块转换为 thinking 块。
+ * 用于不支持 redacted_thinking 的上游 provider（如 DeepSeek Anthropic 端点）。
+ *
+ * DeepSeek V4 模型的 Anthropic 兼容端点在 thinking 模式下仅识别 content[].thinking，
+ * 不识别 redacted_thinking 类型。Claude Code 在多轮对话中会将历史 thinking 压缩为
+ * redacted_thinking 以节省 token，因此需要在转发前做转换。
+ */
+function convertRedactedThinkingForProvider(messages) {
+    return messages.map(msg => {
+        if (msg.role !== 'assistant' || !Array.isArray(msg.content))
+            return msg;
+        const hasRedacted = msg.content.some((b) => b.type === 'redacted_thinking');
+        if (!hasRedacted)
+            return msg;
+        return Object.assign(Object.assign({}, msg), { content: msg.content.map((b) => b.type === 'redacted_thinking'
+                ? { type: 'thinking', thinking: '[thinking content redacted]' }
+                : b) });
+    });
+}
 /** Fix history messages: ensure thinking/reasoning_content is present alongside tool use */
 function fixThinkingHistory(messages, format) {
     return messages.map(msg => {

package/dist/server/main.js

@@ -922,7 +922,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' }));
     // 鉴权相关路由 - 公开访问
@@ -1885,7 +1885,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 +1962,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 +2064,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 +2110,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 });
     // 自动检测数据库类型并执行迁移（如果需要）
@@ -2003,7 +2152,7 @@ const start = () => __awaiter(void 0, void 0, void 0, function* () {
     // 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

@@ -2761,10 +2761,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 +2898,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 +3292,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。
@@ -3921,6 +3928,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 +3985,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)) {
@@ -4184,9 +4198,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aicodeswitch",
-  "version": "5.1.1",
+  "version": "5.1.2",
   "description": "A tool to help you manage AI programming tools to access large language models locally. It allows your Claude Code, Codex and other tools to no longer be limited to official models.",
   "author": "tangshuang",
   "license": "GPL-3.0",