@vrs-soft/wecom-aibot-mcp 2.4.0 → 2.4.1

package/README.md

@@ -14,7 +14,7 @@
 
 ## 前置条件
 
-企业微信管理后台创建智能机器人，连接方式选「使用长连接」，记录 **Bot ID** 和 **Secret**。
+企业微信管理后台创建智能机器人，连接方式选「使用长连接」，记录 **Bot ID** 和 **Secret** 以及 **DocURL**（文档url）。
 
 ---
 

package/dist/client.d.ts

@@ -25,6 +25,12 @@ interface MessageRecord {
     chattype: 'single' | 'group';
     quoteContent?: string;
 }
+interface PendingMessage {
+    type: 'text' | 'approval';
+    content: any;
+    targetUser?: string;
+    timestamp: number;
+}
 declare class WecomClient extends EventEmitter {
     private wsClient;
     private approvals;
@@ -77,6 +83,10 @@ declare class WecomClient extends EventEmitter {
      * allow-once 消费后标记为已消费
      */
     consumeApproval(taskId: string): 'allow-once' | 'allow-always' | 'deny' | null;
+    /**
+     * 获取所有未解决的审批记录 Map（用于重连时迁移到新 client）
+     */
+    getUnresolvedApprovalMap(): Map<string, ApprovalRecord>;
     /**
      * 注入审批记录（MCP 重启恢复用）
      * 如果 taskId 已存在则跳过，避免覆盖用户已点击的结果
@@ -88,6 +98,15 @@ declare class WecomClient extends EventEmitter {
     cleanupMessages(maxAgeMs?: number): void;
     private flushPendingMessages;
     getPendingMessageCount(): number;
+    /**
+     * 取出所有待发送的审批消息并清空队列（用于 client 迁移）
+     * 仅迁移 approval 类型，text 通知类消息不需要迁移
+     */
+    takePendingApprovalMessages(): PendingMessage[];
+    /**
+     * 注入待发送消息（用于 client 迁移，新 client 连接后会自动重发）
+     */
+    injectPendingMessages(messages: PendingMessage[]): void;
     getReconnectStatus(): {
         wasReconnecting: boolean;
         attempt: number;
@@ -96,4 +115,4 @@ declare class WecomClient extends EventEmitter {
 }
 export declare function initClient(botId: string, secret: string, targetUserId: string, robotName: string): WecomClient;
 export declare function getClient(): WecomClient;
-export { WecomClient, ApprovalRecord, MessageRecord, MAX_PENDING_MESSAGES };
+export { WecomClient, ApprovalRecord, MessageRecord, PendingMessage, MAX_PENDING_MESSAGES };

package/dist/client.js

@@ -528,6 +528,18 @@ class WecomClient extends EventEmitter {
         }
         return approval.result;
     }
+    /**
+     * 获取所有未解决的审批记录 Map（用于重连时迁移到新 client）
+     */
+    getUnresolvedApprovalMap() {
+        const pending = new Map();
+        this.approvals.forEach((approval, taskId) => {
+            if (!approval.resolved) {
+                pending.set(taskId, approval);
+            }
+        });
+        return pending;
+    }
     /**
      * 注入审批记录（MCP 重启恢复用）
      * 如果 taskId 已存在则跳过，避免覆盖用户已点击的结果
@@ -607,6 +619,24 @@ class WecomClient extends EventEmitter {
     getPendingMessageCount() {
         return this.pendingMessages.length;
     }
+    /**
+     * 取出所有待发送的审批消息并清空队列（用于 client 迁移）
+     * 仅迁移 approval 类型，text 通知类消息不需要迁移
+     */
+    takePendingApprovalMessages() {
+        const approvalMessages = this.pendingMessages.filter(m => m.type === 'approval');
+        this.pendingMessages = this.pendingMessages.filter(m => m.type !== 'approval');
+        return approvalMessages;
+    }
+    /**
+     * 注入待发送消息（用于 client 迁移，新 client 连接后会自动重发）
+     */
+    injectPendingMessages(messages) {
+        if (messages.length === 0)
+            return;
+        this.pendingMessages.unshift(...messages);
+        logger.log(`[wecom] 注入待发送消息: ${messages.length} 条`);
+    }
     // 获取重连状态
     getReconnectStatus() {
         return {

package/dist/config-wizard.js

@@ -444,13 +444,14 @@ if ! echo "$HEALTH" | jq -e '.status == "ok"' > /dev/null 2>&1; then
   exit 0
 fi
 
-# 读取当前项目使用的机器人名称
+# 读取当前项目使用的机器人名称和 ccId
 ROBOT_NAME=$(jq -r '.robotName // empty' "$CONFIG_FILE" 2>/dev/null)
+CC_ID=$(jq -r '.ccId // empty' "$CONFIG_FILE" 2>/dev/null)
 
 # 发送审批请求（使用 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" --arg robot_name "$ROBOT_NAME" \\
-  '{"tool_name":$tool_name,"tool_input":$tool_input,"projectDir":$project_dir,"robotName":$robot_name}')
+BODY=$(jq -n --arg tool_name "$TOOL_NAME" --argjson tool_input "$TOOL_INPUT" --arg project_dir "$PROJECT_DIR" --arg robot_name "$ROBOT_NAME" --arg cc_id "$CC_ID" \\
+  '{"tool_name":$tool_name,"tool_input":$tool_input,"projectDir":$project_dir,"robotName":$robot_name,"ccId":$cc_id}')
 
 log_debug "[$(date)] Sending approval request..."
 RESPONSE=$(curl -s -m 10 -X POST "http://127.0.0.1:$MCP_PORT/approve" \\

package/dist/connection-manager.js

@@ -146,7 +146,22 @@ export async function getClient(robotName) {
     const robot = await findRobotConfig(state.robotName);
     if (robot) {
         logger.log(`[connection] 重连机器人: ${robot.name}`);
+        const oldClient = state.client;
+        // 迁移旧 client 的未解决审批记录和待发送审批消息
+        const pendingApprovals = oldClient.getUnresolvedApprovalMap();
+        const pendingApprovalMessages = oldClient.takePendingApprovalMessages();
+        // 先断开旧 client，防止旧 client 重连后与新 client 并存导致事件分流
+        oldClient.disconnect();
         state.client = new WecomClient(robot.botId, robot.secret, robot.targetUserId, robot.name);
+        // 注入审批记录，确保 Hook 轮询和用户点击仍能正常处理
+        pendingApprovals.forEach((approval, taskId) => {
+            state.client.injectApprovalRecord(taskId, {
+                toolName: approval.toolName,
+                toolInput: approval.toolInput,
+            });
+        });
+        // 注入待发送的审批卡片消息，新 client 连接后会自动重发
+        state.client.injectPendingMessages(pendingApprovalMessages);
         state.client.connect();
         const connected = await waitForConnection(state.client, 5000);
         if (connected) {

package/dist/http-server.js

@@ -833,7 +833,7 @@ async function handleApprovalRequest(req, res) {
         }
         const title = `【待审批】${tool_name}`;
         const requestId = `hook_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
-        const taskId = await client.sendApprovalRequest(title, description, requestId);
+        const taskId = await client.sendApprovalRequest(title, description, requestId, undefined, tool_input, ccId);
         logger.log(`[http] 审批请求已发送: ${taskId} (机器人: ${robotName})`);
         // 存储审批并启动超时计时器
         const entry = {
@@ -873,6 +873,9 @@ function handleApprovalStatus(_req, res, url) {
                 res.writeHead(200, { 'Content-Type': 'application/json' });
                 res.end(JSON.stringify({ status: 'pending', result: 'pending' }));
             }
+        }).catch(() => {
+            res.writeHead(200, { 'Content-Type': 'application/json' });
+            res.end(JSON.stringify({ status: 'pending', result: 'pending' }));
         });
         return;
     }

package/package.json

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