@vrs-soft/wecom-aibot-mcp 1.0.7 → 1.0.8

package/dist/bin.d.ts

@@ -7,5 +7,10 @@
  * 支持 HTTP Transport 模式：
  * - 固定端口 18963
  * - 支持多 Claude Code 同时连接
+ *
+ * 连接管理：
+ * - 启动时不建立 WebSocket 连接
+ * - enter_headless_mode 时按需建立连接
+ * - exit_headless_mode 时断开连接
  */
 export {};

package/dist/bin.js

@@ -7,30 +7,21 @@
  * 支持 HTTP Transport 模式：
  * - 固定端口 18963
  * - 支持多 Claude Code 同时连接
+ *
+ * 连接管理：
+ * - 启动时不建立 WebSocket 连接
+ * - enter_headless_mode 时按需建立连接
+ * - exit_headless_mode 时断开连接
  */
-import { runConfigWizard, loadConfig, saveConfig, deleteConfig, deleteMcpConfigInteractive, uninstall, addMcpConfig, detectUserIdFromMessage, ensureHookInstalled, } from './config-wizard.js';
+import { runConfigWizard, loadConfig, saveConfig, deleteConfig, deleteMcpConfigInteractive, uninstall, addMcpConfig, detectUserIdFromMessage, ensureHookInstalled, listAllRobots, } from './config-wizard.js';
 import { initClient } from './client.js';
 import { registerTools } from './tools/index.js';
 import { startHttpServer, HTTP_PORT } from './http-server.js';
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import { clearAllProjectHooks } from './headless-state.js';
-const VERSION = '1.0.6';
-// 等待连接验证（最多等待 10 秒）
-async function waitForConnection(client, timeoutMs = 10000) {
-    return new Promise((resolve) => {
-        const startTime = Date.now();
-        const checkInterval = setInterval(() => {
-            if (client.isConnected()) {
-                clearInterval(checkInterval);
-                resolve(true);
-            }
-            else if (Date.now() - startTime > timeoutMs) {
-                clearInterval(checkInterval);
-                resolve(false);
-            }
-        }, 500);
-    });
-}
+import { clearAllProjectHooks, getAllHeadlessStates } from './headless-state.js';
+import { loadStats, cleanupOldLogs } from './connection-log.js';
+import { startKeepaliveMonitor, stopKeepaliveMonitor } from './keepalive-monitor.js';
+const VERSION = '1.0.7';
 function showHelp() {
     console.log(`
 企业微信智能机器人 MCP 服务 v${VERSION}
@@ -46,8 +37,8 @@ function showHelp() {
   --version, -v   显示版本号
   --config        重新配置默认机器人（修改 Bot ID / Secret / 目标用户）
   --add           添加新的机器人配置（多机器人场景）
+  --list          列出所有已配置的机器人
   --delete [名称] 删除指定的机器人配置（无参数则显示列表选择）
-  --status        显示当前配置状态
   --uninstall     卸载并删除所有配置（包括 MCP 配置、hook、skill）
 
 MCP 配置（HTTP Transport）:
@@ -80,16 +71,51 @@ function showVersion() {
     console.log(`wecom-aibot-mcp v${VERSION}`);
 }
 function showStatus() {
-    const config = loadConfig();
-    if (config) {
-        console.log('当前配置:');
-        console.log(`  Bot ID:     ${config.botId}`);
-        console.log(`  Secret:     ${config.secret.slice(0, 8)}...${config.secret.slice(-4)}`);
-        console.log(`  目标用户:   ${config.targetUserId}`);
-    }
-    else {
+    const allRobots = listAllRobots();
+    const headlessStates = getAllHeadlessStates();
+    if (allRobots.length === 0) {
         console.log('尚未配置，请运行 npx @vrs-soft/wecom-aibot-mcp 启动配置向导');
+        return;
     }
+    // 构建机器人占用信息
+    const robotUsage = new Map();
+    for (const { state } of headlessStates) {
+        if (state.robotName) {
+            robotUsage.set(state.robotName, {
+                agentName: state.agentName || '未知',
+                projectDir: state.projectDir,
+            });
+        }
+    }
+    console.log(`已配置 ${allRobots.length} 个机器人:\n`);
+    for (const robot of allRobots) {
+        const defaultTag = robot.isDefault ? ' (默认)' : '';
+        const usage = robotUsage.get(robot.name);
+        const statusTag = usage ? ` [使用中]` : '';
+        console.log(`  ${robot.name}${defaultTag}${statusTag}`);
+        console.log(`    Bot ID:     ${robot.botId}`);
+        console.log(`    目标用户:   ${robot.targetUserId}`);
+        if (usage) {
+            console.log(`    使用者:     ${usage.agentName} (${usage.projectDir})`);
+        }
+        console.log('');
+    }
+}
+// 等待连接验证（用于配置向导验证凭证）
+async function waitForConnection(client, timeoutMs = 10000) {
+    return new Promise((resolve) => {
+        const startTime = Date.now();
+        const checkInterval = setInterval(() => {
+            if (client.isConnected()) {
+                clearInterval(checkInterval);
+                resolve(true);
+            }
+            else if (Date.now() - startTime > timeoutMs) {
+                clearInterval(checkInterval);
+                resolve(false);
+            }
+        }, 500);
+    });
 }
 async function main() {
     const args = process.argv.slice(2);
@@ -102,7 +128,7 @@ async function main() {
         showVersion();
         process.exit(0);
     }
-    if (args.includes('--status')) {
+    if (args.includes('--status') || args.includes('--list')) {
         showStatus();
         process.exit(0);
     }
@@ -129,6 +155,9 @@ async function main() {
     console.log('  ║   Claude Code 审批通道                                 ║');
     console.log('  ╚════════════════════════════════════════════════════════╝');
     console.log('');
+    // 加载统计并清理旧日志（保留 1 小时）
+    loadStats();
+    cleanupOldLogs(1 / 24); // 保留 1 小时
     // 获取或初始化配置
     let config;
     let ranWizard = false; // 是否运行了配置向导
@@ -165,35 +194,33 @@ async function main() {
     ensureHookInstalled();
     // 清理残留的 headless 状态和 Hook 配置
     clearAllProjectHooks();
-    // 初始化 WebSocket 客户端
-    console.log(`[mcp] 初始化企业微信客户端...`);
-    const wecomClient = initClient(config.botId, config.secret, config.targetUserId || 'placeholder');
-    // 等待连接验证
-    console.log('[mcp] 等待连接验证...');
-    const connected = await waitForConnection(wecomClient, 10000);
-    if (!connected) {
-        console.log('[mcp] 连接失败，可能是配置错误或机器人未授权');
-        console.log('[mcp] 请检查上面的错误提示，修复后重新配置');
-        // 删除无效配置，让用户重新输入
-        deleteConfig();
-        if (isInteractive) {
+    // 配置向导模式：验证连接并识别用户 ID
+    if (isInteractive && (ranWizard || reconfig)) {
+        console.log('[mcp] 验证机器人连接...');
+        // 临时建立连接验证凭证
+        const tempClient = initClient(config.botId, config.secret, config.targetUserId || 'placeholder');
+        const connected = await waitForConnection(tempClient, 10000);
+        if (!connected) {
+            console.log('[mcp] 连接失败，可能是配置错误或机器人未授权');
+            console.log('[mcp] 请检查上面的错误提示，修复后重新配置');
+            // 删除无效配置，让用户重新输入
+            deleteConfig();
             console.log('\n请检查：');
             console.log('  1. Bot ID 和 Secret 是否正确');
             console.log('  2. 新建机器人需等待约 2 分钟同步');
             console.log('  3. 是否已完成授权（机器人详情 → 可使用权限 → 授权）');
             console.log('\n修复后重新运行: npx @vrs-soft/wecom-aibot-mcp --config');
+            tempClient.disconnect();
+            process.exit(1);
         }
-        process.exit(1);
-    }
-    // 连接成功
-    if (isInteractive && (ranWizard || reconfig)) {
-        // 需要通过消息自动识别用户 ID
+        // 连接成功
         console.log('\n[mcp] ✅ 机器人连接成功！');
         // 提示用户发送消息来识别用户 ID
-        const userId = await detectUserIdFromMessage(wecomClient, 60);
+        const userId = await detectUserIdFromMessage(tempClient, 180);
         if (!userId) {
             console.log('\n[mcp] 未能在规定时间内识别用户 ID');
             console.log('[mcp] 请重新运行配置：npx @vrs-soft/wecom-aibot-mcp --config');
+            tempClient.disconnect();
             process.exit(1);
         }
         // 更新配置中的用户 ID
@@ -203,30 +230,30 @@ async function main() {
         console.log('\n[mcp] ✅ 配置完成！');
         console.log(`[mcp] 用户 ID: ${userId}`);
         console.log('[mcp] 请重启 Claude Code 以加载 MCP 服务\n');
+        // 配置完成后断开连接
+        tempClient.disconnect();
         process.exit(0);
     }
-    // 创建 MCP Server
+    // 创建 MCP Server（不建立 WebSocket 连接）
     const server = new McpServer({
         name: 'wecom-aibot-mcp',
         version: VERSION,
     });
-    // 注册工具
-    registerTools(server, wecomClient);
-    // 启动 HTTP 服务（包含 MCP endpoint）
+    // 注册工具（不传入 client，由 ConnectionManager 管理）
+    registerTools(server);
+    // 启动 HTTP 服务
     console.log(`[mcp] 启动 MCP HTTP Server (端口: ${HTTP_PORT})...`);
-    await startHttpServer(wecomClient, server);
-    // 定期清理过期消息
-    const cleanupInterval = setInterval(() => {
-        wecomClient.cleanupMessages();
-    }, 60000);
+    await startHttpServer(server);
+    // 启动保活监控
+    startKeepaliveMonitor();
     console.log(`[mcp] MCP Server 已就绪`);
     console.log(`[mcp] HTTP endpoint: http://127.0.0.1:${HTTP_PORT}/mcp`);
     console.log(`[mcp] 健康检查: http://127.0.0.1:${HTTP_PORT}/health`);
-    // 退出处理：清理资源
+    console.log(`[mcp] 微信模式：enter_headless_mode 时建立连接`);
+    // 退出处理
     const gracefulShutdown = () => {
         console.log('[mcp] 正在关闭...');
-        clearInterval(cleanupInterval);
-        wecomClient.disconnect();
+        stopKeepaliveMonitor();
         process.exit(0);
     };
     // 监听进程信号

package/dist/client.d.ts

@@ -4,6 +4,10 @@ interface ApprovalRecord {
     result?: 'allow-once' | 'allow-always' | 'deny';
     timestamp: number;
     toolName?: string;
+    toolInput?: Record<string, unknown>;
+    projectDir?: string;
+    lastKeepaliveMinute?: number;
+    keepaliveCount?: number;
 }
 interface MessageRecord {
     msgid: string;
@@ -41,6 +45,8 @@ declare class WecomClient {
     sendApprovalRequest(title: string, description: string, requestId: string, targetUser?: string): Promise<string>;
     getApprovalResult(taskId: string): 'pending' | 'allow-once' | 'allow-always' | 'deny';
     getPendingApprovals(): string[];
+    getPendingApprovalsRecords(): ApprovalRecord[];
+    getApprovalRecord(taskId: string): ApprovalRecord | undefined;
     getLatestMessage(afterTimestamp: number): MessageRecord | undefined;
     getPendingMessages(clear?: boolean): MessageRecord[];
     cleanupMessages(maxAgeMs?: number): void;

package/dist/client.js

@@ -5,6 +5,7 @@
  * 管理消息队列和审批状态。
  */
 import AiBot from '@wecom/aibot-node-sdk';
+import { logConnected, logAuthenticated, logDisconnected, logReconnecting, logError, } from './connection-log.js';
 class WecomClient {
     wsClient;
     approvals = new Map();
@@ -22,7 +23,7 @@ class WecomClient {
         this.wsClient = new AiBot.WSClient({
             botId,
             secret,
-            heartbeatInterval: 30000,
+            heartbeatInterval: 15000, // 15 秒心跳，更快检测断线
             maxReconnectAttempts: -1, // 无限重连
         });
         this.setupEventHandlers();
@@ -37,14 +38,14 @@ class WecomClient {
     }
     setupEventHandlers() {
         this.wsClient.on('connected', () => {
-            console.log('[wecom] WebSocket 连接已建立');
+            logConnected();
         });
         this.wsClient.on('authenticated', () => {
             const wasReconnecting = this.wasReconnecting;
             this.connected = true;
             this.wasReconnecting = false;
             this.reconnectAttempt = 0;
-            console.log('[wecom] 认证成功，长连接已就绪');
+            logAuthenticated();
             // 重连成功后发送通知
             if (wasReconnecting) {
                 this.sendText('【系统】连接已恢复').catch(err => {
@@ -58,7 +59,7 @@ class WecomClient {
             this.connected = false;
             this.wasReconnecting = true;
             this.lastDisconnectTime = Date.now();
-            console.log(`[wecom] 连接断开: ${reason}`);
+            logDisconnected(reason);
             // 发送断线通知
             this.sendText('【系统】连接中断，正在重连...').catch(err => {
                 console.error('[wecom] 发送断线通知失败:', err);
@@ -66,10 +67,10 @@ class WecomClient {
         });
         this.wsClient.on('reconnecting', (attempt) => {
             this.reconnectAttempt = attempt;
-            console.log(`[wecom] 正在重连 (第 ${attempt} 次)`);
+            logReconnecting(attempt);
         });
         this.wsClient.on('error', (err) => {
-            console.error(`[wecom] 错误: ${err.message}`);
+            logError(err.message);
             // 检测授权相关错误（40058: invalid Request Parameter）
             if (err.message.includes('40058') || err.message.includes('invalid Request Parameter')) {
                 console.log('');
@@ -90,6 +91,7 @@ class WecomClient {
         });
         // 监听模板卡片事件（审批结果）
         this.wsClient.on('event.template_card_event', (frame) => {
+            console.log('[wecom] 收到 template_card_event 事件');
             this.handleApprovalResponse(frame);
         });
         // 监听进入会话事件
@@ -304,6 +306,15 @@ class WecomClient {
             .filter(([_, a]) => !a.resolved)
             .map(([taskId, _]) => taskId);
     }
+    // 获取所有待处理审批记录（供保活监控使用）
+    getPendingApprovalsRecords() {
+        return Array.from(this.approvals.values())
+            .filter(a => !a.resolved);
+    }
+    // 获取单个审批记录
+    getApprovalRecord(taskId) {
+        return this.approvals.get(taskId);
+    }
     // 获取最新消息（用于等待回复）
     getLatestMessage(afterTimestamp) {
         return this.messages.find(m => m.timestamp > afterTimestamp && m.from_userid === this.targetUserId);

package/dist/config-wizard.d.ts

@@ -16,8 +16,18 @@ export declare function deleteMcpConfig(instanceName: string): boolean;
 export declare function deleteMcpConfigInteractive(instanceName?: string): Promise<void>;
 export declare function uninstall(): void;
 export declare function addMcpConfig(): Promise<void>;
+export declare function listAllRobots(): Array<{
+    name: string;
+    botId: string;
+    targetUserId: string;
+    isDefault: boolean;
+}>;
 export declare function ensureHookInstalled(): void;
 export declare function saveConfig(config: WecomConfig, instanceName?: string): void;
+/**
+ * 安装 headless-mode skill 到项目目录
+ */
+export declare function installSkill(projectDir: string): void;
 /**
  * 运行配置向导
  */

package/dist/config-wizard.js

@@ -16,6 +16,9 @@ const BOT_CONFIG_FILE = path.join(CONFIG_DIR, 'config.json');
 const CLAUDE_CONFIG_FILE = path.join(os.homedir(), '.claude.json');
 const CLAUDE_SETTINGS_FILE = path.join(os.homedir(), '.claude', 'settings.local.json');
 const HOOK_SCRIPT_PATH = path.join(CONFIG_DIR, 'permission-hook.sh');
+// Skill 模板路径（包内）
+const SKILL_TEMPLATE_DIR = path.join(path.dirname(new URL(import.meta.url).pathname), '..', 'skills', 'headless-mode');
+const SKILL_TEMPLATE_FILE = path.join(SKILL_TEMPLATE_DIR, 'SKILL.md');
 // MCP 工具权限列表（需要预授权以避免 headless 模式阻断）
 const MCP_TOOL_PERMISSIONS = [
     'mcp__wecom-aibot__*', // 允许所有 wecom-aibot 工具
@@ -222,10 +225,9 @@ function writeHookScript() {
 # HTTP Transport 版本
 #
 # 固定端口: 18963
-# 从 headless-{PID} 读取 projectDir
+# 直接检查 $(pwd)/.claude/headless.json
 
 MCP_PORT=18963
-CONFIG_DIR="$HOME/.wecom-aibot-mcp"
 
 INPUT=$(cat)
 TOOL_NAME=$(echo "$INPUT" | jq -r '.tool_name // empty')
@@ -244,46 +246,12 @@ case "$TOOL_NAME" in
     ;;
 esac
 
-# 查找 headless 状态文件
-HEADLESS_FILE=""
-PARENT_PID=$PPID
-
-for i in {1..5}; do
-  if [[ -z "$PARENT_PID" ]] || [[ "$PARENT_PID" -eq 1 ]]; then
-    break
-  fi
-
-  CANDIDATE="$CONFIG_DIR/headless-$PARENT_PID"
-  if [[ -f "$CANDIDATE" ]]; then
-    HEADLESS_FILE="$CANDIDATE"
-    break
-  fi
-
-  CHILD_PIDS=$(pgrep -P "$PARENT_PID" 2>/dev/null)
-  for CHILD_PID in $CHILD_PIDS; do
-    CANDIDATE="$CONFIG_DIR/headless-$CHILD_PID"
-    if [[ -f "$CANDIDATE" ]]; then
-      HEADLESS_FILE="$CANDIDATE"
-      break 2
-    fi
-  done
-
-  PARENT_PID=$(ps -o ppid= -p "$PARENT_PID" 2>/dev/null | tr -d ' ')
-done
-
-# Fallback: 使用最新的 headless 文件
-if [[ -z "$HEADLESS_FILE" ]]; then
-  HEADLESS_FILE=$(ls -t "$CONFIG_DIR"/headless-* 2>/dev/null | head -1)
-fi
+# 直接检查项目目录的 headless 状态文件
+PROJECT_DIR=$(pwd)
+HEADLESS_FILE="$PROJECT_DIR/.claude/headless.json"
 
 # 不在 headless 模式
-if [[ -z "$HEADLESS_FILE" ]] || [[ ! -f "$HEADLESS_FILE" ]]; then
-  exit 0
-fi
-
-# 从 headless 文件读取 projectDir
-PROJECT_DIR=$(cat "$HEADLESS_FILE" 2>/dev/null | jq -r '.projectDir // empty')
-if [[ -z "$PROJECT_DIR" ]]; then
+if [[ ! -f "$HEADLESS_FILE" ]]; then
   exit 0
 fi
 
@@ -293,7 +261,7 @@ if ! echo "$HEALTH" | jq -e '.status == "ok"' > /dev/null 2>&1; then
   exit 0
 fi
 
-# 发送审批请求
+# 发送审批请求（使用 pwd 作为 projectDir）
 TOOL_INPUT=$(echo "$INPUT" | jq -c '.tool_input // {}')
 BODY=$(jq -n --arg tool_name "$TOOL_NAME" --argjson tool_input "$TOOL_INPUT" --arg project_dir "$PROJECT_DIR" \\
   '{"tool_name":$tool_name,"tool_input":$tool_input,"projectDir":$project_dir}')
@@ -493,7 +461,7 @@ export async function addMcpConfig() {
             return;
         }
         // 通过消息自动识别用户 ID
-        const targetUserId = await detectUserIdFromMessage(client, 60);
+        const targetUserId = await detectUserIdFromMessage(client, 180);
         if (!targetUserId) {
             console.log('\n[config] 未能在规定时间内识别用户 ID');
             console.log('[config] 请重新运行: npx @vrs-soft/wecom-aibot-mcp --add');
@@ -536,7 +504,7 @@ export async function addMcpConfig() {
     }
 }
 // 列出所有机器人配置
-function listAllRobots() {
+export function listAllRobots() {
     const robots = [];
     // 默认配置
     if (fs.existsSync(BOT_CONFIG_FILE)) {
@@ -663,6 +631,27 @@ export function saveConfig(config, instanceName) {
     writeMcpServerConfig(config, instanceName);
     // 写入 MCP 工具权限和 Hook 到 ~/.claude/settings.local.json
     writeMcpPermissions();
+    // 安装 skill 到项目目录
+    installSkill(process.cwd());
+}
+/**
+ * 安装 headless-mode skill 到项目目录
+ */
+export function installSkill(projectDir) {
+    const skillDir = path.join(projectDir, '.claude', 'skills', 'headless-mode');
+    const skillFile = path.join(skillDir, 'SKILL.md');
+    // 确保 skill 目录存在
+    if (!fs.existsSync(skillDir)) {
+        fs.mkdirSync(skillDir, { recursive: true });
+    }
+    // 检查模板文件是否存在
+    if (!fs.existsSync(SKILL_TEMPLATE_FILE)) {
+        console.log('[config] Skill 模板文件不存在，跳过安装');
+        return;
+    }
+    // 写入 skill 文件
+    fs.copyFileSync(SKILL_TEMPLATE_FILE, skillFile);
+    console.log(`[config] 已安装 skill 到 ${skillFile}`);
 }
 // 创建 readline 接口
 function createRL() {

package/dist/connection-log.d.ts

@@ -0,0 +1,36 @@
+/**
+ * 连接状态日志模块
+ *
+ * 记录 WebSocket 连接状态变化，便于分析连接问题
+ */
+interface ConnectionRecord {
+    event: 'connected' | 'authenticated' | 'disconnected' | 'reconnecting' | 'error';
+    timestamp: string;
+    isoTime: string;
+    reason?: string;
+    attempt?: number;
+    errorMessage?: string;
+    connectionDuration?: number;
+}
+interface ConnectionStats {
+    totalConnections: number;
+    totalDisconnections: number;
+    totalReconnects: number;
+    totalErrors: number;
+    lastConnectTime?: string;
+    lastDisconnectTime?: string;
+    longestConnection?: number;
+    totalConnectionTime?: number;
+}
+export declare function loadStats(): ConnectionStats;
+export declare function logConnected(): void;
+export declare function logAuthenticated(): void;
+export declare function logDisconnected(reason: string): void;
+export declare function logReconnecting(attempt: number): void;
+export declare function logError(errorMessage: string): void;
+export declare function getStats(): ConnectionStats;
+export declare function getRecentLogs(count?: number): ConnectionRecord[];
+export declare function cleanupOldLogs(daysToKeep?: number): void;
+export declare function getLogFilePath(): string;
+export declare function getStatsFilePath(): string;
+export {};