From 69345a42cdf8f952d61f2c8bfe03e73ef2f0806f Mon Sep 17 00:00:00 2001
From: ljf1227 <ljf1227@qq.com>
Date: Tue, 13 Jan 2026 21:39:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20Windows=20MCP=20?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=8D=9F=E5=9D=8F=E9=97=AE=E9=A2=98=E5=B9=B6?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=87=AA=E5=8A=A8=E4=BF=AE=E5=A4=8D=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=20(v1.7.24)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加 applyPlatformCommand 幂等性检查，防止重复处理
- 新增 repairCorruptedMcpArgs 函数自动修复损坏的配置
- 修复 args 数组中重复的 'cmd' 和 'npx' 问题
---
 package.json     |  2 +-
 src/utils/mcp.ts | 52 +++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 1e44c75..64045f5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ccg-workflow",
-  "version": "1.7.23",
+  "version": "1.7.24",
   "description": "Claude-Codex-Gemini 多模型协作系统 - 智能路由多模型开发工作流",
   "type": "module",
   "packageManager": "pnpm@10.17.1",
diff --git a/src/utils/mcp.ts b/src/utils/mcp.ts
index 3dca02b..84e57ac 100644
--- a/src/utils/mcp.ts
+++ b/src/utils/mcp.ts
@@ -87,6 +87,11 @@ export async function writeClaudeCodeConfig(config: ClaudeCodeConfig): Promise<v
 export function applyPlatformCommand(config: McpServerConfig): void {
   // Only process if command exists (avoid wrapping SSE services)
   if (isWindows() && config.command) {
+    // 幂等性检查：如果 command 已经是 'cmd'，说明已处理过，跳过
+    if (config.command === 'cmd') {
+      return
+    }
+
     const mcpCmd = getMcpCommand(config.command)
 
     // Only modify if command needs Windows wrapper (cmd /c)
@@ -143,6 +148,47 @@ export function buildMcpServerConfig(
   return config
 }
 
+/**
+ * Repair corrupted Windows MCP configuration
+ * Fixes issues like duplicated commands in args array
+ *
+ * @param config - MCP server configuration to repair
+ * @returns true if config was repaired, false if no repair needed
+ */
+export function repairCorruptedMcpArgs(config: McpServerConfig): boolean {
+  if (!isWindows() || config.command !== 'cmd' || !config.args) {
+    return false
+  }
+
+  const args = config.args
+  let repaired = false
+
+  // 检测并修复 args 开头的错误模式
+  // 正确格式: ['/c', 'npx', '-y', ...]
+  // 错误格式1: ['cmd', '/c', 'npx', ...] (开头多余的 cmd)
+  // 错误格式2: ['/c', 'npx', 'npx', ...] (重复的命令)
+  // 错误格式3: ['cmd', '/c', 'npx', 'npx', ...] (两种错误的组合)
+
+  // 移除开头多余的 'cmd'
+  if (args[0] === 'cmd') {
+    args.shift()
+    repaired = true
+  }
+
+  // 确保第一个是 '/c'
+  if (args[0] !== '/c') {
+    return repaired
+  }
+
+  // 检测并移除重复的命令 (如 'npx', 'npx')
+  if (args.length >= 3 && args[1] === args[2]) {
+    args.splice(2, 1) // 移除重复的命令
+    repaired = true
+  }
+
+  return repaired
+}
+
 /**
  * Fix Windows MCP configuration by applying platform wrappers
  * This function processes all MCP servers in the config and applies Windows-specific fixes
@@ -161,7 +207,11 @@ export function fixWindowsMcpConfig(config: ClaudeCodeConfig): ClaudeCodeConfig
   // Fix each MCP server configuration
   for (const [serverName, serverConfig] of Object.entries(fixed.mcpServers || {})) {
     if (serverConfig && typeof serverConfig === 'object' && 'command' in serverConfig) {
-      applyPlatformCommand(serverConfig as McpServerConfig)
+      const mcpConfig = serverConfig as McpServerConfig
+      // 先尝试修复损坏的配置
+      repairCorruptedMcpArgs(mcpConfig)
+      // 再应用平台命令包装（幂等，已处理过的会跳过）
+      applyPlatformCommand(mcpConfig)
     }
   }