@vrs-soft/wecom-aibot-mcp 2.4.25 → 2.6.0

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/channel-server.js

@@ -225,6 +225,16 @@ function connectSSE(ccId) {
     const sseUrl = ccId ? `${MCP_URL}/sse/${ccId}?ccId=${ccId}` : `${MCP_URL}/sse`;
     logger.info('Connecting to SSE', { url: sseUrl, ccId, mcpServerReady: mcpServer ? 'yes' : 'no' });
     sseAbortController = new AbortController();
+    // Watchdog：每 15s 检查最后一次收到 chunk 的时间，>45s 无数据则主动 abort 触发重连。
+    // 修复 daemon 端 SSE keep-alive 单向失效问题（NAT 在 client→daemon 方向闭合时
+    // daemon 写心跳失败把 entry 清掉，但 channel-server 的 fetch read 永不返回）。
+    let watchdogTimer = null;
+    const clearWatchdog = () => {
+        if (watchdogTimer) {
+            clearInterval(watchdogTimer);
+            watchdogTimer = null;
+        }
+    };
     // SSE fetch 配置：添加 keep-alive headers 确保连接稳定
     fetch(sseUrl, {
         method: 'GET',
@@ -269,15 +279,26 @@ function connectSSE(ccId) {
         const decoder = new TextDecoder();
         let buffer = '';
         let messageCount = 0;
-        // 添加心跳监控
-        const heartbeatInterval = setInterval(() => {
-            logChannel('SSE heartbeat', { connected: sseConnected, messages: messageCount });
-        }, 30000);
+        let lastChunkAt = Date.now();
+        let currentEvent = 'message'; // SSE event type，由 `event: xxx` 行设置；空行复位
+        // Watchdog：>45s 没收到任何 chunk（含 daemon 端的 `: heartbeat` 注释）
+        // 视为单向 TCP 死链，主动 abort 让 catch 分支触发 reconnect。
+        watchdogTimer = setInterval(() => {
+            const idleMs = Date.now() - lastChunkAt;
+            logChannel('SSE watchdog', { connected: sseConnected, messages: messageCount, idleMs });
+            if (idleMs > 45000) {
+                logger.info('SSE 心跳超时（>45s 无数据），主动 abort 触发重连', { ccId, idleMs });
+                try {
+                    sseAbortController?.abort();
+                }
+                catch { /* ignore */ }
+            }
+        }, 15000);
         while (true) {
             const { done, value } = await reader.read();
             if (done) {
                 logChannel('SSE stream ended');
-                clearInterval(heartbeatInterval);
+                clearWatchdog();
                 sseConnected = false;
                 // 非主动断开时自动重连
                 if (!sseAbortController?.signal.aborted) {
@@ -286,6 +307,7 @@ function connectSSE(ccId) {
                 }
                 break;
             }
+            lastChunkAt = Date.now();
             const chunk = decoder.decode(value, { stream: true });
             logChannel('SSE chunk received', { bytes: chunk.length, preview: chunk.slice(0, 100) });
             buffer += chunk;
@@ -296,28 +318,49 @@ function connectSSE(ccId) {
                 logChannel('SSE line', { line: line.slice(0, 80) });
                 if (line.startsWith('data: ')) {
                     const data = line.slice(6);
-                    logChannel('📩 SSE MESSAGE RECEIVED', { data: data.slice(0, 100) });
+                    logChannel('📩 SSE MESSAGE RECEIVED', { data: data.slice(0, 100), event: currentEvent });
                     try {
                         const msg = JSON.parse(data);
                         messageCount++;
-                        logChannel('✅ 消息解析成功', { messageNumber: messageCount, msg });
-                        // 推送 notifications/claude/channel 唤醒 Claude agent
+                        logChannel('✅ 消息解析成功', { messageNumber: messageCount, event: currentEvent, msg });
                         if (mcpServer) {
-                            // content 成为 <channel> 标签正文，meta 成为标签属性（只允许字母/数字/下划线）
-                            const message = msg.message || {};
-                            const notification = {
-                                method: 'notifications/claude/channel',
-                                params: {
-                                    content: message.content || JSON.stringify(msg),
-                                    meta: {
-                                        from: message.from || '',
-                                        chatid: message.chatid || '',
-                                        chattype: message.chattype || 'single',
-                                        cc_id: msg.ccId || '',
-                                        quote_content: message.quoteContent || '',
+                            let notification;
+                            if (currentEvent === 'cc_message') {
+                                // CC 间消息：用 cc:<fromCc> 作为 source 前缀，便于 agent 区分非 wecom 来源
+                                notification = {
+                                    method: 'notifications/claude/channel',
+                                    params: {
+                                        content: msg.content || '',
+                                        meta: {
+                                            source: `cc:${msg.fromCc || ''}`,
+                                            from_cc: msg.fromCc || '',
+                                            to_cc: msg.toCc || '',
+                                            chattype: 'cc',
+                                            cc_id: msg.toCc || '',
+                                            kind: msg.kind || 'notify',
+                                            reply_to: msg.replyTo || '',
+                                            msg_id: msg.msgId || '',
+                                        },
+                                    },
+                                };
+                            }
+                            else {
+                                // 默认 wecom 消息（event: message 或无 event 头）
+                                const message = msg.message || {};
+                                notification = {
+                                    method: 'notifications/claude/channel',
+                                    params: {
+                                        content: message.content || JSON.stringify(msg),
+                                        meta: {
+                                            from: message.from || '',
+                                            chatid: message.chatid || '',
+                                            chattype: message.chattype || 'single',
+                                            cc_id: msg.ccId || '',
+                                            quote_content: message.quoteContent || '',
+                                        },
                                     },
-                                },
-                            };
+                                };
+                            }
                             logChannel('📤 发送 notification', { notification });
                             try {
                                 mcpServer.server.notification(notification);
@@ -336,10 +379,12 @@ function connectSSE(ccId) {
                     }
                 }
                 else if (line.startsWith('event: ')) {
-                    logChannel('SSE event type', { type: line.slice(7) });
+                    currentEvent = line.slice(7).trim();
+                    logChannel('SSE event type', { type: currentEvent });
                 }
                 else if (line === '') {
-                    // 事件分隔符，忽略
+                    // 事件分隔符：复位 event type 到默认 'message'
+                    currentEvent = 'message';
                 }
                 else if (line.startsWith(':')) {
                     // SSE 注释（如 ": heartbeat"），忽略，不要写回 buffer
@@ -350,13 +395,18 @@ function connectSSE(ccId) {
                 }
             }
         }
-        clearInterval(heartbeatInterval);
+        clearWatchdog();
     }).catch((err) => {
+        clearWatchdog();
         logger.error('SSE error', { error: String(err) });
         sseConnected = false;
-        // 非主动断开时自动重连
-        if (!sseAbortController?.signal.aborted) {
-            logger.info('SSE 出错，3 秒后重连', { ccId });
+        // watchdog abort 或网络异常都走这里：触发 reconnect
+        // 注意 abort() 后 signal.aborted=true，但这是 watchdog 自己造成的，仍需要重连
+        const isWatchdogAbort = sseAbortController?.signal.aborted && String(err).includes('aborted');
+        if (!sseAbortController?.signal.aborted || isWatchdogAbort) {
+            logger.info('SSE 出错，3 秒后重连', { ccId, watchdogAbort: isWatchdogAbort });
+            // watchdog abort 后需要新建 controller，否则下次 connectSSE 会立即被 abort 状态干扰
+            sseAbortController = null;
             setTimeout(() => { httpSessionId = null; connectSSE(ccId); }, 3000);
         }
     });
@@ -402,6 +452,19 @@ function registerChannelTools(server) {
         return forwardToHttpMcp('check_connection', {});
     });
     // ============================================
+    // 工具 4a: CC 间通信 — send_to_cc / list_active_ccs（v2.6.0+）
+    // ============================================
+    server.tool('send_to_cc', '向同一 daemon 上的另一个 CC 发送消息。目标 CC 收到时会作为 <channel source="cc:..."> 推送唤醒。仅支持同 daemon 间互通。', {
+        cc_id: z.string().describe('自己的 CC 标识'),
+        to_cc: z.string().describe('目标 CC 标识'),
+        content: z.string().describe('消息内容（支持 Markdown）'),
+        kind: z.enum(['request', 'reply', 'notify']).optional().default('notify').describe('消息语义'),
+        reply_to: z.string().optional().describe('可选：关联的请求 msgId'),
+    }, async (params) => forwardToHttpMcp('send_to_cc', params));
+    server.tool('list_active_ccs', '列出同一 daemon 上当前在线的所有 CC', {
+        cc_id: z.string().describe('自己的 CC 标识'),
+    }, async (params) => forwardToHttpMcp('list_active_ccs', params));
+    // ============================================
     // 工具 4: 获取待处理消息
     // ============================================
     server.tool('get_pending_messages', '获取待处理的微信消息。支持长轮询：传入 timeout_ms 后阻塞等待，有消息立即返回，无消息等到超时。超时后继续轮询，不要停止。', {

package/dist/client.d.ts

@@ -46,6 +46,9 @@ declare class WecomClient extends EventEmitter {
     private reconnectAttempt;
     private lastDisconnectTime;
     private disconnectNotifyCount;
+    private daemonReconnectTimer;
+    private daemonReconnectAttempts;
+    private intentionallyDisconnected;
     constructor(botId: string, secret: string, targetUserId: string, robotName: string);
     getAuthUrl(): string;
     private setupEventHandlers;
@@ -54,6 +57,8 @@ declare class WecomClient extends EventEmitter {
     private replyApprovalResult;
     connect(): void;
     disconnect(): void;
+    private scheduleDaemonReconnect;
+    private clearDaemonReconnect;
     isConnected(): boolean;
     getDefaultTargetUser(): string;
     verifyTargetUser(userId?: string): Promise<{

package/dist/client.js

@@ -56,6 +56,11 @@ class WecomClient extends EventEmitter {
     reconnectAttempt = 0; // 重连尝试次数
     lastDisconnectTime = 0; // 最后断线时间
     disconnectNotifyCount = 0; // 断线通知次数（最多1次）
+    // daemon-level 重连兜底：SDK 内部的 reconnect 偶尔会因被服务端踢断（"New connection established"）
+    // 而沉默卡住。下面这套是 daemon 层的 safety net，指数退避 5s/10s/30s/60s，最多 100 次。
+    daemonReconnectTimer = null;
+    daemonReconnectAttempts = 0;
+    intentionallyDisconnected = false;
     constructor(botId, secret, targetUserId, robotName) {
         super();
         this.botId = botId;
@@ -87,6 +92,7 @@ class WecomClient extends EventEmitter {
             this.wasReconnecting = false;
             this.reconnectAttempt = 0;
             this.disconnectNotifyCount = 0; // 重连成功后重置断线通知计数
+            this.clearDaemonReconnect(); // 重连成功后清理 daemon-level safety net
             logAuthenticated();
             // 重连成功后发送通知
             if (wasReconnecting) {
@@ -109,6 +115,10 @@ class WecomClient extends EventEmitter {
                     logger.error('wecom', `发送断线通知失败: ${err}`);
                 });
             }
+            // 兜底重连：SDK 重连失败时由 daemon 层接手
+            if (!this.intentionallyDisconnected) {
+                this.scheduleDaemonReconnect();
+            }
         });
         this.wsClient.on('reconnecting', (attempt) => {
             this.reconnectAttempt = attempt;
@@ -285,12 +295,51 @@ class WecomClient extends EventEmitter {
     }
     // 连接
     connect() {
+        this.intentionallyDisconnected = false;
         this.wsClient.connect();
     }
     // 断开
     disconnect() {
+        this.intentionallyDisconnected = true;
+        this.clearDaemonReconnect();
         this.wsClient.disconnect();
     }
+    // daemon-level 重连：SDK 内部 reconnect 卡住时由这里接手
+    // 指数退避：5s → 10s → 30s → 60s（封顶）；最多 100 次
+    scheduleDaemonReconnect() {
+        if (this.daemonReconnectTimer)
+            return; // 已经在等待
+        if (this.daemonReconnectAttempts >= 100) {
+            logger.error('wecom', `[${this.robotName}] daemon-level reconnect 100 次仍未成功，放弃`);
+            return;
+        }
+        const backoff = [5000, 10000, 30000, 60000];
+        const delay = backoff[Math.min(this.daemonReconnectAttempts, backoff.length - 1)];
+        this.daemonReconnectTimer = setTimeout(() => {
+            this.daemonReconnectTimer = null;
+            if (this.connected || this.intentionallyDisconnected) {
+                // 已经恢复或已显式断开，不需要重连
+                return;
+            }
+            this.daemonReconnectAttempts++;
+            logger.info('wecom', `[${this.robotName}] daemon-level reconnect attempt ${this.daemonReconnectAttempts}`);
+            try {
+                this.wsClient.connect();
+            }
+            catch (err) {
+                logger.error('wecom', `[${this.robotName}] daemon-level reconnect failed: ${err.message}`);
+            }
+            // 无论成功失败都排下一轮，若已连上下次 timeout 触发时 connected=true 会直接 return
+            this.scheduleDaemonReconnect();
+        }, delay);
+    }
+    clearDaemonReconnect() {
+        if (this.daemonReconnectTimer) {
+            clearTimeout(this.daemonReconnectTimer);
+            this.daemonReconnectTimer = null;
+        }
+        this.daemonReconnectAttempts = 0;
+    }
     // 检查连接状态
     isConnected() {
         return this.connected;

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 };
 }

package/dist/hooks/permission-hook.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export {};