@vrs-soft/wecom-aibot-mcp 2.4.24 → 2.4.26

package/dist/bin.js

@@ -13,7 +13,7 @@ import { spawn, execSync } from 'child_process';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as os from 'os';
-import { runConfigWizard, loadConfig, saveConfig, deleteRobotConfigInteractive, uninstall, addMcpConfig, detectUserIdFromMessage, ensureHookInstalled, listAllRobots, ensureGlobalConfigs, getAuthToken, setAuthToken, getHttpsConfig, setHttpsConfig, updateMcpAuthHeaders, runRemoteInstallWizard, VERSION, } from './config-wizard.js';
+import { runConfigWizard, loadConfig, saveConfig, deleteRobotConfigInteractive, uninstall, addMcpConfig, detectUserIdFromMessage, ensureHookInstalled, listAllRobots, ensureGlobalConfigs, getInstalledMode, getAuthToken, setAuthToken, getHttpsConfig, setHttpsConfig, updateMcpAuthHeaders, runRemoteInstallWizard, VERSION, } from './config-wizard.js';
 import { initClient } from './client.js';
 import { registerTools } from './tools/index.js';
 import { startHttpServer, stopHttpServer, HTTP_PORT } from './http-server.js';
@@ -373,9 +373,14 @@ function startMcpServerBackground() {
 }
 async function main() {
     const args = process.argv.slice(2);
-    // 确定安装模式
-    const installMode = args.includes('--http-only') ? 'http-only' :
-        args.includes('--channel-only') ? 'channel-only' : 'full';
+    // 确定安装模式：优先 CLI flag，其次复用 version.json 里上次的 mode（保持 remote / channel-only 等模式不被 --upgrade 打回 full）
+    const explicitMode = args.includes('--http-only') ? 'http-only' :
+        args.includes('--channel-only') ? 'channel-only' : undefined;
+    const prior = getInstalledMode();
+    const installMode = explicitMode || prior.mode || 'full';
+    const remoteOptions = (installMode === 'remote' || installMode === 'remote-channel') && prior.remote?.url
+        ? { url: prior.remote.url, token: prior.remote.token || '' }
+        : undefined;
     // 以下命令跳过顶部 ensureGlobalConfigs，避免覆盖配置
     // --setup: 向导完成后自己调用
     // --channel: 作为 Channel MCP 代理运行，不应改写全局配置
@@ -390,7 +395,17 @@ async function main() {
         args.includes('--clean-cache') || args.includes('--set-token') || args.includes('--config');
     if (!skipEnsure) {
         // 强制覆盖所有全局配置（不依赖智能体）
-        ensureGlobalConfigs(installMode);
+        if (installMode === 'remote' || installMode === 'remote-channel') {
+            if (remoteOptions) {
+                ensureGlobalConfigs(installMode, remoteOptions);
+            }
+            else {
+                console.log(`[mcp] 检测到上次安装模式 ${installMode}，但缺少远程参数；跳过配置写入。如需变更请使用 --setup`);
+            }
+        }
+        else {
+            ensureGlobalConfigs(installMode);
+        }
     }
     // 解析命令行参数
     if (args.includes('--help') || args.includes('-h')) {

package/dist/config-wizard.d.ts

@@ -40,7 +40,15 @@ export declare function getDocMcpUrl(robotName?: string): {
     error?: string;
 };
 export declare function ensureHookInstalled(): void;
-export declare function ensureGlobalConfigs(mode?: 'full' | 'http-only' | 'channel-only' | 'remote' | 'remote-channel', remoteOptions?: {
+export type InstallMode = 'full' | 'http-only' | 'channel-only' | 'remote' | 'remote-channel';
+export declare function getInstalledMode(): {
+    mode?: InstallMode;
+    remote?: {
+        url: string;
+        token?: string;
+    };
+};
+export declare function ensureGlobalConfigs(mode?: InstallMode, remoteOptions?: {
     url: string;
     token: string;
 }): {

package/dist/config-wizard.js

@@ -177,10 +177,19 @@ export function deleteConfig() {
         if (fs.existsSync(CLAUDE_CONFIG_FILE)) {
             const content = fs.readFileSync(CLAUDE_CONFIG_FILE, 'utf-8');
             const claudeConfig = JSON.parse(content);
+            let changed = false;
             if (claudeConfig.mcpServers?.['wecom-aibot']) {
                 delete claudeConfig.mcpServers['wecom-aibot'];
-                fs.writeFileSync(CLAUDE_CONFIG_FILE, JSON.stringify(claudeConfig, null, 2));
                 console.log('[config] 已从 ~/.claude.json 删除 wecom-aibot 配置');
+                changed = true;
+            }
+            if (claudeConfig.mcpServers?.['wecom-aibot-channel']) {
+                delete claudeConfig.mcpServers['wecom-aibot-channel'];
+                console.log('[config] 已从 ~/.claude.json 删除 wecom-aibot-channel 配置');
+                changed = true;
+            }
+            if (changed) {
+                fs.writeFileSync(CLAUDE_CONFIG_FILE, JSON.stringify(claudeConfig, null, 2));
             }
         }
     }
@@ -194,14 +203,27 @@ export function deleteHook() {
         if (fs.existsSync(CLAUDE_SETTINGS_FILE)) {
             const content = fs.readFileSync(CLAUDE_SETTINGS_FILE, 'utf-8');
             const settings = JSON.parse(content);
+            let changed = false;
             if (settings.hooks && settings.hooks['PermissionRequest']) {
                 // 只删除 wecom-aibot 相关的 hook
                 settings.hooks['PermissionRequest'] = settings.hooks['PermissionRequest'].filter((hook) => !hook.hooks?.some?.((h) => h.command?.includes?.('wecom-aibot-mcp')));
                 if (settings.hooks['PermissionRequest'].length === 0) {
                     delete settings.hooks['PermissionRequest'];
                 }
-                fs.writeFileSync(CLAUDE_SETTINGS_FILE, JSON.stringify(settings, null, 2));
                 console.log('[config] 已删除 PermissionRequest hook');
+                changed = true;
+            }
+            // 移除 wecom-aibot 相关的 MCP 权限
+            if (Array.isArray(settings.permissions?.allow)) {
+                const before = settings.permissions.allow.length;
+                settings.permissions.allow = settings.permissions.allow.filter((p) => !/^mcp__wecom-aibot(-channel)?__/.test(p));
+                if (settings.permissions.allow.length !== before) {
+                    console.log(`[config] 已移除 ${before - settings.permissions.allow.length} 条 wecom-aibot MCP 权限`);
+                    changed = true;
+                }
+            }
+            if (changed) {
+                fs.writeFileSync(CLAUDE_SETTINGS_FILE, JSON.stringify(settings, null, 2));
             }
             // 删除 hook 脚本文件
             if (fs.existsSync(HOOK_SCRIPT_PATH)) {
@@ -1064,6 +1086,30 @@ export function ensureHookInstalled() {
     writeMcpPermissions();
     writeStopHookScript();
 }
+// 读取上次安装的模式 + 远程参数（来自 version.json）
+export function getInstalledMode() {
+    if (!fs.existsSync(VERSION_FILE))
+        return {};
+    try {
+        const data = JSON.parse(fs.readFileSync(VERSION_FILE, 'utf-8'));
+        const result = {};
+        if (data.mode)
+            result.mode = data.mode;
+        if (data.remote?.url)
+            result.remote = { url: data.remote.url, token: data.remote.token };
+        return result;
+    }
+    catch {
+        return {};
+    }
+}
+// 写 version.json（统一入口，记录 mode + 远程参数，用于后续 --upgrade 复用）
+function writeVersionFile(mode, remoteOptions) {
+    const payload = { version: VERSION, installedAt: Date.now(), mode };
+    if (remoteOptions?.url)
+        payload.remote = { url: remoteOptions.url, ...(remoteOptions.token ? { token: remoteOptions.token } : {}) };
+    fs.writeFileSync(VERSION_FILE, JSON.stringify(payload, null, 2));
+}
 // 确保所有全局配置已写入（强制覆盖，不依赖智能体）
 export function ensureGlobalConfigs(mode = 'full', remoteOptions) {
     ensureConfigDir();
@@ -1085,7 +1131,7 @@ export function ensureGlobalConfigs(mode = 'full', remoteOptions) {
         // 只写权限配置和 Hook（可选，用于本地调试）
         writeMcpPermissions();
         console.log('[config] 已写入权限配置到 ~/.claude/settings.local.json');
-        fs.writeFileSync(VERSION_FILE, JSON.stringify({ version: VERSION, installedAt: Date.now() }, null, 2));
+        writeVersionFile(mode);
         return { upgraded, previousVersion };
     }
     // remote 模式：仅写入远程 HTTP MCP 配置（带 token headers），不装 Channel/Hook
@@ -1108,7 +1154,7 @@ export function ensureGlobalConfigs(mode = 'full', remoteOptions) {
         };
         fs.writeFileSync(CLAUDE_CONFIG_FILE, JSON.stringify(claudeConfig, null, 2));
         console.log('[config] remote 模式：已写入远程 HTTP MCP 配置（带 Token）');
-        fs.writeFileSync(VERSION_FILE, JSON.stringify({ version: VERSION, installedAt: Date.now() }, null, 2));
+        writeVersionFile(mode, remoteOptions);
         return { upgraded, previousVersion };
     }
     // remote-channel 模式：远程部署的 Channel 客户端——只写 Channel MCP，不写 HTTP MCP
@@ -1143,7 +1189,7 @@ export function ensureGlobalConfigs(mode = 'full', remoteOptions) {
         // Channel 模式需要权限配置
         writeMcpPermissions();
         console.log('[config] 已写入权限配置到 ~/.claude/settings.local.json');
-        fs.writeFileSync(VERSION_FILE, JSON.stringify({ version: VERSION, installedAt: Date.now() }, null, 2));
+        writeVersionFile(mode, remoteOptions);
         return { upgraded, previousVersion };
     }
     // 1. 强制写入 MCP 配置到 ~/.claude.json
@@ -1211,7 +1257,7 @@ export function ensureGlobalConfigs(mode = 'full', remoteOptions) {
     writeMcpPermissions();
     console.log('[config] 已写入权限配置到 ~/.claude/settings.local.json');
     // 3. 写入版本号
-    fs.writeFileSync(VERSION_FILE, JSON.stringify({ version: VERSION, installedAt: Date.now() }, null, 2));
+    writeVersionFile(mode);
     console.log(`[config] 已记录版本号: ${VERSION}`);
     return { upgraded, previousVersion };
 }
@@ -1450,25 +1496,70 @@ export async function runConfigWizard() {
             docMcpUrl = currentDocUrl;
             console.log('[config] 保持原文档 MCP URL');
         }
-        // 第六步：目标用户（稍后通过消息自动识别）
+        // 第六步：目标用户（默认联系人）
+        // 修改场景：询问是否要重新识别；选 Y 则连接 bot 等待用户消息（与 --add 一致）；选 N 保持原值
+        let targetUserId = targetRobot?.targetUserId || '';
+        if (targetRobot) {
+            console.log(`\n当前默认联系人（targetUserId）: ${targetUserId || '（未设置）'}`);
+            const changeContact = await question(rl, '是否重新识别？(y/N): ');
+            if (changeContact.toLowerCase() === 'y') {
+                // 临时连接 bot 等待用户消息以识别 userid
+                console.log('\n[config] 正在连接企业微信验证凭证...');
+                const { initClient } = await import('./client.js');
+                const tmpClient = initClient(botId, secret, 'placeholder', 'config-detect');
+                // 等待连接（最多10秒）
+                const connected = await new Promise((resolve) => {
+                    const start = Date.now();
+                    const iv = setInterval(() => {
+                        if (tmpClient.isConnected()) {
+                            clearInterval(iv);
+                            resolve(true);
+                        }
+                        else if (Date.now() - start > 10000) {
+                            clearInterval(iv);
+                            resolve(false);
+                        }
+                    }, 500);
+                });
+                if (!connected) {
+                    console.log('[config] ❌ 连接失败（Bot ID/Secret 可能有误），保持原默认联系人');
+                    tmpClient.disconnect();
+                }
+                else {
+                    const detectedUserId = await detectUserIdFromMessage(tmpClient, 180);
+                    tmpClient.disconnect();
+                    if (detectedUserId) {
+                        targetUserId = detectedUserId;
+                        console.log(`[config] ✅ 默认联系人已更新: ${targetUserId}`);
+                    }
+                    else {
+                        console.log('[config] 未识别到用户消息，保持原默认联系人');
+                    }
+                }
+            }
+            else {
+                console.log('[config] 保持原默认联系人');
+            }
+        }
+        // 第七步：确认
         console.log('\n─────────────────────────────────────');
         console.log('配置确认：');
-        console.log(`  机器人名称: ${robotName}`);
-        console.log(`  Bot ID:     ${botId}`);
-        console.log(`  Secret:     ${secret.slice(0, 8)}...${secret.slice(-4)}`);
-        console.log(`  文档 MCP:   ${docMcpUrl ? '✅ 已配置' : '（未配置）'}`);
-        console.log(`  目标用户:   （将通过消息自动识别）`);
+        console.log(`  机器人名称:   ${robotName}`);
+        console.log(`  Bot ID:       ${botId}`);
+        console.log(`  Secret:       ${secret.slice(0, 8)}...${secret.slice(-4)}`);
+        console.log(`  文档 MCP:     ${docMcpUrl ? '✅ 已配置' : '（未配置）'}`);
+        console.log(`  默认联系人:   ${targetUserId || '（将通过消息自动识别）'}`);
         console.log('─────────────────────────────────────\n');
         const confirm = await question(rl, '确认配置？(Y/n): ');
         if (confirm.toLowerCase() === 'n') {
             console.log('[config] 配置已取消');
             process.exit(0);
         }
-        // 返回临时配置（targetUserId 稍后填充）
+        // 返回最终配置
         const config = {
             botId,
             secret,
-            targetUserId: targetRobot?.targetUserId || '', // 修改时保留原值，新建时稍后识别
+            targetUserId, // 修改时保留 / 已变更，新建时为空（稍后识别）
             nameTag: robotName,
             ...(docMcpUrl ? { doc_mcp_url: docMcpUrl } : {}),
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vrs-soft/wecom-aibot-mcp",
-  "version": "2.4.24",
+  "version": "2.4.26",
   "description": "企业微信智能机器人 MCP 服务 - Claude Code 审批通道",
   "type": "module",
   "main": "dist/index.js",