@vrs-soft/wecom-aibot-mcp 2.4.25 → 3.0.0-rc.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';
@@ -182,23 +182,36 @@ function isServerRunning() {
         return false;
     }
 }
-// 通过端口查找进程 PID（fallback，当 PID 文件不存在时）
+// 通过端口查找进程 PID（fallback，当 PID 文件不存在时）。
+// Windows 用 netstat -ano；Unix 优先 lsof，回退 ss。
 function findPidByPort(port) {
-    try {
-        // Linux: ss -tlnp | grep :18963
-        const output = execSync(`ss -tlnp 2>/dev/null | grep ':${port}'`, { encoding: 'utf-8' });
-        const match = output.match(/pid=(\d+)/);
-        if (match)
-            return parseInt(match[1]);
+    if (process.platform === 'win32') {
+        try {
+            const output = execSync(`netstat -ano -p TCP`, { encoding: 'utf-8' });
+            // 行形如: "  TCP    127.0.0.1:18963   0.0.0.0:0   LISTENING   1234"
+            const re = new RegExp(`^\\s*TCP\\s+\\S+:${port}\\s+\\S+\\s+LISTENING\\s+(\\d+)`, 'm');
+            const m = output.match(re);
+            if (m)
+                return parseInt(m[1], 10);
+        }
+        catch { /* ignore */ }
+        return null;
     }
-    catch { /* ignore */ }
     try {
-        // macOS: lsof -ti :18963
+        // macOS / Linux 都装了 lsof
         const output = execSync(`lsof -ti :${port} 2>/dev/null`, { encoding: 'utf-8' }).trim();
         if (output)
             return parseInt(output.split('\n')[0]);
     }
     catch { /* ignore */ }
+    try {
+        // Linux 备选：ss -tlnp
+        const output = execSync(`ss -tlnp 2>/dev/null | grep ':${port}'`, { encoding: 'utf-8' });
+        const match = output.match(/pid=(\d+)/);
+        if (match)
+            return parseInt(match[1]);
+    }
+    catch { /* ignore */ }
     return null;
 }
 // 停止服务
@@ -373,9 +386,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 +408,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')) {
@@ -418,7 +446,13 @@ async function main() {
         const CLAUDE_CONFIG_FILE = path.join(os.homedir(), '.claude.json');
         const CLAUDE_SETTINGS_FILE = path.join(os.homedir(), '.claude', 'settings.local.json');
         const VERSION_FILE = path.join(os.homedir(), '.wecom-aibot-mcp', 'version.json');
-        const HOOK_SCRIPT = path.join(os.homedir(), '.wecom-aibot-mcp', 'permission-hook.sh');
+        const HOOK_SCRIPTS = [
+            path.join(os.homedir(), '.wecom-aibot-mcp', 'permission-hook.js'),
+            path.join(os.homedir(), '.wecom-aibot-mcp', 'stop-hook.js'),
+            // 旧版 .sh 残留
+            path.join(os.homedir(), '.wecom-aibot-mcp', 'permission-hook.sh'),
+            path.join(os.homedir(), '.wecom-aibot-mcp', 'stop-hook.sh'),
+        ];
         // 1. 删除 ~/.claude.json 中的 wecom-aibot 配置
         if (fs.existsSync(CLAUDE_CONFIG_FILE)) {
             const content = fs.readFileSync(CLAUDE_CONFIG_FILE, 'utf-8');
@@ -451,10 +485,12 @@ async function main() {
             fs.unlinkSync(VERSION_FILE);
             console.log('[mcp] 已删除 ~/.wecom-aibot-mcp/version.json');
         }
-        // 4. 删除 hook 脚本
-        if (fs.existsSync(HOOK_SCRIPT)) {
-            fs.unlinkSync(HOOK_SCRIPT);
-            console.log('[mcp] 已删除 ~/.wecom-aibot-mcp/permission-hook.sh');
+        // 4. 删除 hook 脚本（含旧版 .sh）
+        for (const p of HOOK_SCRIPTS) {
+            if (fs.existsSync(p)) {
+                fs.unlinkSync(p);
+                console.log(`[mcp] 已删除 ${p}`);
+            }
         }
         // 5. 重新安装全局配置
         logger.log('\n[mcp] 正在重新安装...');

package/dist/channel-server.js

@@ -12,50 +12,10 @@
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
 import { z } from 'zod';
-import { execSync } from 'child_process';
 import { VERSION, installSkill } from './config-wizard.js';
 import { addPermissionHook, registerActiveProject, unregisterActiveProject, updateWechatModeConfig } from './project-config.js';
 import { logger } from './logger.js';
-/**
- * 沿进程树向上查找 Claude Code TUI 的 PID。
- *
- * 背景：本地 dev (`command: "node"`) 时 channel-server 是 Claude TUI 的直接子进程，
- *   process.ppid = Claude TUI ✓
- * 但 npx 部署 (`command: "npx"`) 时多了一层 npx：
- *   Claude TUI → npx → node bin.js (channel-server)
- *   process.ppid = npx ❌
- * permission-hook.sh 从 hook 自身向上查 active-projects.json 时只能命中 Claude TUI
- * 这条祖先链。如果注册的是 npx 的 PID，hook 永远找不到 → 静默 exit 0 → 跳过审批。
- *
- * 此函数从 startPid 起向上遍历，找到第一个命令名为 "claude" 的进程，返回其 PID。
- * 找不到时回退到 startPid（保持旧行为，至少 dev 场景不退化）。
- */
-function findClaudePid(startPid) {
-    let pid = startPid;
-    for (let i = 0; i < 8; i++) {
-        if (!pid || pid <= 1)
-            break;
-        try {
-            const comm = execSync(`ps -p ${pid} -o comm=`, { stdio: ['ignore', 'pipe', 'ignore'] })
-                .toString()
-                .trim();
-            // ps comm= 返回执行文件 basename。Claude Code TUI 安装名就是 "claude"
-            if (comm === 'claude' || comm.endsWith('/claude'))
-                return pid;
-            const ppidStr = execSync(`ps -p ${pid} -o ppid=`, { stdio: ['ignore', 'pipe', 'ignore'] })
-                .toString()
-                .trim();
-            const ppid = parseInt(ppidStr, 10);
-            if (!ppid || ppid === pid)
-                break;
-            pid = ppid;
-        }
-        catch {
-            break;
-        }
-    }
-    return startPid;
-}
+import { findClaudePid } from './platform.js';
 const MCP_URL = process.env.MCP_URL || 'http://127.0.0.1:18963';
 const MCP_AUTH_TOKEN = process.env.MCP_AUTH_TOKEN;
 // 构建带 auth 的 fetch headers

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;
 }): {