@szc-ft/mcp-szcd-client 0.12.0 → 0.12.2

package/scripts/lib/qwen-code.js

@@ -263,8 +263,8 @@ function safeExecSync(command) {
 /**
  * 同步 Qwen Code 配置中的 MCP 服务器 URL
  * 
- * 优先更新 Extension 扩展目录中的 qwen-extension.json，
- * 同时更新 settings.json（兜底，给非扩展模式用户使用）。
+ * 扩展模式下 MCP 由 qwen-extension.json 声明，
+ * 只需更新扩展目录中的配置，不再往 settings.json 写 mcpServers。
  * 
  * @param {string} targetUrl - 新的 MCP 服务器基础 URL（如 http://localhost:3456）
  * @param {string} serverName - MCP 服务器名称
@@ -272,26 +272,31 @@ function safeExecSync(command) {
 export function syncMcpUrl(targetUrl, serverName) {
     const mcpUrl = `${targetUrl}/mcp`;
 
-    // 1. CLI 命令同步
-    if (isCommandAvailable("qwen")) {
-        safeExecSync(`qwen mcp remove --scope user ${serverName} 2>/dev/null`);
-        const result = safeExecSync(
-            `qwen mcp add --transport http --scope user ${serverName} ${mcpUrl}`,
-        );
-        if (result === true || result === "already_exists") {
-            console.log(`✓ Qwen Code CLI synced: ${mcpUrl}`);
-        } else {
-            console.warn(`⚠️  Qwen Code CLI sync failed (settings.json will be updated directly)`);
-        }
-    } else {
-        console.log("⏭️  Skipping Qwen Code CLI sync: qwen not found");
-    }
-
-    // 2. 更新 Extension 扩展目录中的 qwen-extension.json
+    // 1. 更新 Extension 扩展目录中的 qwen-extension.json（主路径）
     syncExtensionConfig(targetUrl, serverName);
 
-    // 3. 直接文件操作同步 ~/.qwen/settings.json（兜底）
-    syncQwenCodeSettingsDirect(targetUrl, serverName);
+    // 2. 清理 settings.json 中可能残留的 mcpServers（扩展模式下不需要）
+    cleanupSettingsMcpEntry(serverName);
+}
+
+/**
+ * 清理 settings.json 中的 mcpServers 条目
+ * 扩展模式下 MCP 由扩展声明，settings.json 中不应存在
+ */
+function cleanupSettingsMcpEntry(serverName) {
+    const settingsPath = getQwenCodeSettingsPath();
+    if (!fs.existsSync(settingsPath)) return;
+
+    const settings = readJsonFile(settingsPath);
+    if (!settings.mcpServers || !settings.mcpServers[serverName]) return;
+
+    delete settings.mcpServers[serverName];
+    if (Object.keys(settings.mcpServers).length === 0) {
+        delete settings.mcpServers;
+    }
+
+    writeJsonFile(settingsPath, settings);
+    console.log(`✓ Cleaned up mcpServers in ~/.qwen/settings.json (extension mode)`);
 }
 
 /**
@@ -313,50 +318,18 @@ function syncExtensionConfig(targetUrl, serverName) {
     }
 
     const mcpUrl = `${targetUrl}/mcp`;
-    if (manifest.mcpServers[serverName].url === mcpUrl) {
+    const entry = manifest.mcpServers[serverName];
+    if (entry.type === "http" && entry.url === mcpUrl) {
         console.log(`⏭️  Extension qwen-extension.json already up-to-date: ${mcpUrl}`);
         return;
     }
 
-    manifest.mcpServers[serverName].url = mcpUrl;
+    entry.type = "http";
+    entry.url = mcpUrl;
     writeJsonFile(manifestPath, manifest);
     console.log(`✓ Updated extension qwen-extension.json: ${mcpUrl}`);
 }
 
-/**
- * 直接文件操作同步 ~/.qwen/settings.json（独立于 deps）
- */
-function syncQwenCodeSettingsDirect(targetUrl, serverName) {
-    const settingsPath = getQwenCodeSettingsPath();
-    const mcpUrl = `${targetUrl}/mcp`;
-
-    let settings = {};
-    if (fs.existsSync(settingsPath)) {
-        try {
-            settings = JSON.parse(fs.readFileSync(settingsPath, "utf8"));
-        } catch { /* 忽略 */ }
-    }
-
-    if (!settings.mcpServers) settings.mcpServers = {};
-
-    const current = settings.mcpServers[serverName];
-    if (current && current.type === "http" && current.url === mcpUrl) {
-        console.log(`⏭️  Qwen Code ~/.qwen/settings.json already up-to-date: ${mcpUrl}`);
-        return;
-    }
-
-    settings.mcpServers[serverName] = {
-        type: "http",
-        url: mcpUrl,
-        timeout: 30000,
-    };
-
-    const dir = path.dirname(settingsPath);
-    if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
-    fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2));
-    console.log(`✓ Updated Qwen Code ~/.qwen/settings.json: ${mcpUrl}`);
-}
-
 // ==================== 导出 ====================
 
 export function setupQwenCode(deps) {

package/scripts/update-mcp-url.js

@@ -26,6 +26,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import os from "node:os";
+import { execSync } from "node:child_process";
 import { syncMcpUrl as syncTraeCli } from "./lib/trae-cli.js";
 import { syncMcpUrl as syncTraeIde } from "./lib/trae-ide.js";
 import { syncMcpUrl as syncClaudeCode } from "./lib/claude-code.js";
@@ -70,6 +71,53 @@ function getMcpServerName() {
     return config.MCP_SERVER_NAME || DEFAULT_MCP_SERVER_NAME;
 }
 
+// ==================== 更新源文件 ====================
+
+/**
+ * 更新 agents/platforms.json 中的 MCP URL，然后重新构建 qwen-extension.json
+ * 这样 qwen 扩展的源文件和构建产物都保持一致
+ */
+function updatePlatformsJson(targetUrl) {
+    // 从脚本位置推断包根目录
+    const scriptsDir = path.dirname(new URL(import.meta.url).pathname);
+    const packageRoot = path.dirname(scriptsDir);
+    const platformsPath = path.join(packageRoot, "agents", "platforms.json");
+
+    if (!fs.existsSync(platformsPath)) {
+        console.log("⏭️  Skipping platforms.json update: file not found");
+        return;
+    }
+
+    const mcpUrl = `${targetUrl}/mcp`;
+    const platforms = JSON.parse(fs.readFileSync(platformsPath, "utf8"));
+
+    if (!platforms.platforms || !platforms.platforms.qwen || !platforms.platforms.qwen.mcp) {
+        console.log("⏭️  Skipping platforms.json update: qwen.mcp not found");
+        return;
+    }
+
+    if (platforms.platforms.qwen.mcp.url === mcpUrl) {
+        console.log(`⏭️  platforms.json qwen.mcp already up-to-date: ${mcpUrl}`);
+        return;
+    }
+
+    platforms.platforms.qwen.mcp.url = mcpUrl;
+    fs.writeFileSync(platformsPath, JSON.stringify(platforms, null, 4) + "\n");
+    console.log(`✓ Updated platforms.json: qwen.mcp.url → ${mcpUrl}`);
+
+    // 重新构建 qwen-extension.json
+    const buildScript = path.join(packageRoot, "agents", "build.js");
+    if (fs.existsSync(buildScript)) {
+        try {
+            execSync(`node "${buildScript}"`, { stdio: "pipe", cwd: packageRoot });
+            console.log(`✓ Rebuilt qwen-extension.json from platforms.json`);
+        } catch (e) {
+            console.log(`⚠️  Failed to rebuild agents: ${e.message}`);
+            console.log(`   Run manually: npm run build:agents`);
+        }
+    }
+}
+
 // ==================== 确定目标 URL ====================
 
 function resolveTargetUrl(inputUrl) {
@@ -125,7 +173,10 @@ function main() {
     // 1. 更新 szcd 自身配置文件
     updateConfigFile(targetUrl);
 
-    // 2. 委托各 lib 模块同步对应 IDE 配置
+    // 2. 更新源文件 platforms.json 中的 MCP URL 并重新构建
+    updatePlatformsJson(targetUrl);
+
+    // 3. 委托各 lib 模块同步对应 IDE 配置
     syncTraeCli(targetUrl, serverName);
     syncTraeIde(targetUrl, serverName);
     syncClaudeCode(targetUrl, serverName);