@vrs-soft/wecom-aibot-mcp 2.4.7 → 2.4.8

package/dist/channel-server.js

@@ -187,7 +187,8 @@ function connectSSE(ccId) {
     }
     sseConnected = true;
     sseCurrentCcId = ccId;
-    const sseUrl = ccId ? `${MCP_URL}/sse/${ccId}` : `${MCP_URL}/sse`;
+    // SSE URL 添加 ccId 查询参数用于授权验证
+    const sseUrl = ccId ? `${MCP_URL}/sse/${ccId}?ccId=${ccId}` : `${MCP_URL}/sse`;
     logChannel('Connecting to SSE', { url: sseUrl, ccId, mcpServerReady: mcpServer ? 'yes' : 'no' });
     sseAbortController = new AbortController();
     // SSE fetch 配置：添加 keep-alive headers 确保连接稳定

package/dist/client.d.ts

@@ -13,6 +13,7 @@ interface ApprovalRecord {
     keepaliveCount?: number;
     operationHash?: string;
     consumed?: boolean;
+    ccId?: string;
 }
 interface MessageRecord {
     seq: number;
@@ -114,5 +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, PendingMessage, MAX_PENDING_MESSAGES };

package/dist/client.js

@@ -12,7 +12,7 @@
 import AiBot from '@wecom/aibot-node-sdk';
 import { EventEmitter } from 'events';
 import { logConnected, logAuthenticated, logDisconnected, logReconnecting, logError, } from './connection-log.js';
-import { publishWecomMessage } from './message-bus.js';
+import { publishWecomMessage, publishApprovalEvent } from './message-bus.js';
 import { hashOperation } from './utils/hash.js';
 import { logger } from './logger.js';
 // 最大待处理消息数量
@@ -199,9 +199,14 @@ class WecomClient extends EventEmitter {
         const cardEvent = event.template_card_event;
         const taskId = cardEvent?.task_id;
         const eventKey = cardEvent?.event_key; // 用户点击的按钮 key
-        logger.log('wecom', `taskId=${taskId}, eventKey=${eventKey}, approvals keys: ${[...this.approvals.keys()].join(',')}`);
-        if (!taskId)
+        // 打印当前 approvals Map 的所有 keys（诊断用）
+        const allTaskIds = [...this.approvals.keys()];
+        logger.log('wecom', `审批响应详情: taskId=${taskId}, eventKey=${eventKey}`);
+        logger.log('wecom', `当前 approvals keys (${allTaskIds.length}个): ${allTaskIds.join(',')}`);
+        if (!taskId) {
+            logger.log('wecom', `taskId 为空，cardEvent: ${JSON.stringify(cardEvent)}`);
             return;
+        }
         logger.log('wecom', `收到审批响应: taskId=${taskId}, key=${eventKey}`);
         const approval = this.approvals.get(taskId);
         if (approval && !approval.resolved) {
@@ -209,6 +214,15 @@ class WecomClient extends EventEmitter {
             approval.result = eventKey;
             approval.timestamp = Date.now();
             this.emit('approval_resolved', { taskId, result: approval.result });
+            logger.log('wecom', `审批已解决: taskId=${taskId}, result=${approval.result}`);
+            // 发布审批事件到消息总线（用于 SSE 推送）
+            publishApprovalEvent({
+                robotName: this.robotName,
+                taskId,
+                result: approval.result,
+                ccId: approval.ccId,
+                timestamp: Date.now(),
+            });
             // 发送确认消息给用户
             const resultText = eventKey === 'allow-once' ? '✅ 已允许（本次）'
                 : eventKey === 'allow-always' ? '✅ 已允许（永久）'
@@ -224,7 +238,7 @@ class WecomClient extends EventEmitter {
             logger.log('wecom', `审批已解决，跳过点击: ${taskId}, resolved=${approval.resolved}, result=${approval.result}`);
         }
         else {
-            logger.log('wecom', `审批记录不存在: ${taskId}`);
+            logger.log('wecom', `审批记录不存在: ${taskId}, 可能原因: 1) taskId 不匹配 2) 审批已过期清理 3) 审批由其他 client 创建`);
         }
     }
     // 使用 reply 方法回复审批结果（会有引用效果）
@@ -355,6 +369,7 @@ class WecomClient extends EventEmitter {
             toolInput,
             description, // 保存审批请求原文
             operationHash,
+            ccId, // 保存 ccId，用于 SSE 推送审批结果
         });
         // 断线时将审批请求加入队列，等待重连后发送
         if (!this.connected) {
@@ -368,13 +383,14 @@ class WecomClient extends EventEmitter {
             // 返回 taskId，审批记录已创建，等待重连后发送
             return taskId;
         }
-        // 发送模板卡片
+        // 发送模板卡片（在 description 中显示 taskId 便于用户识别）
+        const displayDesc = description + `\n\n📋 TaskID: ${taskId}`;
         await this.wsClient.sendMessage(userId, {
             msgtype: 'template_card',
             template_card: {
                 card_type: 'button_interaction',
                 main_title: { title },
-                sub_title_text: description,
+                sub_title_text: displayDesc,
                 button_list: [
                     { text: '允许', key: 'allow-once', style: 1 },
                     { text: '默认', key: 'allow-always', style: 1 },
@@ -399,13 +415,14 @@ class WecomClient extends EventEmitter {
             return false;
         }
         const userId = targetUser || this.targetUserId;
-        // 发送模板卡片
+        // 发送模板卡片（在 description 中显示 taskId 便于用户识别）
+        const displayDesc = description + `\n\n📋 TaskID: ${taskId}`;
         await this.wsClient.sendMessage(userId, {
             msgtype: 'template_card',
             template_card: {
                 card_type: 'button_interaction',
                 main_title: { title },
-                sub_title_text: description,
+                sub_title_text: displayDesc,
                 button_list: [
                     { text: '允许', key: 'allow-once', style: 1 },
                     { text: '默认', key: 'allow-always', style: 1 },
@@ -646,7 +663,7 @@ class WecomClient extends EventEmitter {
         };
     }
 }
-// 单例实例
+// 单例实例（用于配置验证等场景）
 let instance = null;
 export function initClient(botId, secret, targetUserId, robotName) {
     if (instance) {
@@ -656,10 +673,6 @@ export function initClient(botId, secret, targetUserId, robotName) {
     instance.connect();
     return instance;
 }
-export function getClient() {
-    if (!instance) {
-        throw new Error('WecomClient 未初始化，请先调用 initClient');
-    }
-    return instance;
-}
+// 注意：无参数版本的 getClient() 已删除
+// 请使用 connection-manager.ts 的 getClient(robotName) 获取已连接的客户端
 export { WecomClient, MAX_PENDING_MESSAGES };

package/dist/config-wizard.js

@@ -19,7 +19,7 @@ const SERVER_CONFIG_FILE = path.join(CONFIG_DIR, 'server.json'); // HTTP Server
 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');
-const TASK_COMPLETED_HOOK_SCRIPT_PATH = path.join(CONFIG_DIR, 'task-completed-hook.sh');
+const STOP_HOOK_SCRIPT_PATH = path.join(CONFIG_DIR, 'stop-hook.sh');
 // Skill 模板路径（包内）- 使用 fileURLToPath 确保跨平台兼容
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -656,19 +656,19 @@ fi
     fs.writeFileSync(HOOK_SCRIPT_PATH, script, { mode: 0o755 });
     console.log(`[config] Hook 脚本已写入: ${HOOK_SCRIPT_PATH}`);
 }
-// 生成并写入 TaskCompleted hook 脚本
-// 用于任务完成后自动恢复微信消息轮询
-function writeTaskCompletedHookScript() {
+// 生成并写入 Stop hook 脚本
+// HTTP 模式使用：阻止 Claude 停止，提示调用 get_pending_messages 恢复轮询
+function writeStopHookScript() {
     const script = `#!/bin/bash
-# wecom-aibot-mcp TaskCompleted hook
-# 任务完成后检查是否需要恢复微信消息轮询
+# wecom-aibot-mcp Stop hook
+# HTTP 模式使用：阻止 Claude 停止，提示调用 get_pending_messages 恢复轮询
 #
 # 固定端口: 18963
 # 检查 $(pwd)/.claude/wecom-aibot.json 的 wechatMode 和 autoApprove 字段
 
 MCP_PORT=18963
 
-# 先保存输入（TaskCompleted 事件数据）
+# 先保存输入（Stop 事件数据）
 INPUT=$(cat)
 
 # 日志输出：--debug 模式下输出到 stderr，否则静默
@@ -679,7 +679,7 @@ log_debug() {
   fi
 }
 
-log_debug "[$(date)] TaskCompleted hook called. INPUT: \${INPUT:0:200}"
+log_debug "[$(date)] Stop hook called. INPUT: \${INPUT:0:200}"
 
 # 检查项目目录的微信模式配置文件
 PROJECT_DIR=$(pwd)
@@ -687,9 +687,9 @@ CONFIG_FILE="$PROJECT_DIR/.claude/wecom-aibot.json"
 
 log_debug "[$(date)] Checking config: $CONFIG_FILE"
 
-# 配置文件不存在，不在微信模式
+# 配置文件不存在，不在微信模式，允许停止
 if [[ ! -f "$CONFIG_FILE" ]]; then
-  log_debug "[$(date)] No config file, exit 0 (allow complete)"
+  log_debug "[$(date)] No config file, exit 0 (allow stop)"
   exit 0
 fi
 
@@ -697,7 +697,7 @@ fi
 WECHAT_MODE=$(jq -r '.wechatMode // false' "$CONFIG_FILE" 2>/dev/null)
 log_debug "[$(date)] wechatMode: $WECHAT_MODE"
 if [[ "$WECHAT_MODE" != "true" ]]; then
-  log_debug "[$(date)] wechatMode not true, exit 0 (allow complete)"
+  log_debug "[$(date)] wechatMode not true, exit 0 (allow stop)"
   exit 0
 fi
 
@@ -705,7 +705,7 @@ fi
 AUTO_APPROVE=$(jq -r '.autoApprove // false' "$CONFIG_FILE" 2>/dev/null)
 log_debug "[$(date)] autoApprove: $AUTO_APPROVE"
 if [[ "$AUTO_APPROVE" != "true" ]]; then
-  log_debug "[$(date)] autoApprove not true, exit 0 (allow complete)"
+  log_debug "[$(date)] autoApprove not true, exit 0 (allow stop)"
   exit 0
 fi
 
@@ -727,15 +727,15 @@ if ! echo "$HEALTH" | jq -e '.status == "ok"' > /dev/null 2>&1; then
         [[ -n "$REMOTE_TOKEN" ]] && AUTH_ARGS=(-H "Authorization: Bearer $REMOTE_TOKEN")
         log_debug "[$(date)] Using remote server: $MCP_BASE_URL"
       else
-        log_debug "[$(date)] MCP Server offline, exit 0 (allow complete)"
+        log_debug "[$(date)] MCP Server offline, exit 0 (allow stop)"
         exit 0
       fi
     else
-      log_debug "[$(date)] MCP Server offline, exit 0 (allow complete)"
+      log_debug "[$(date)] MCP Server offline, exit 0 (allow stop)"
       exit 0
     fi
   else
-    log_debug "[$(date)] MCP Server offline, exit 0 (allow complete)"
+    log_debug "[$(date)] MCP Server offline, exit 0 (allow stop)"
     exit 0
   fi
 fi
@@ -744,20 +744,20 @@ fi
 CC_ID=$(jq -r '.ccId // empty' "$CONFIG_FILE" 2>/dev/null)
 log_debug "[$(date)] ccId: $CC_ID"
 if [[ -z "$CC_ID" ]]; then
-  log_debug "[$(date)] No ccId in config, exit 0 (allow complete)"
+  log_debug "[$(date)] No ccId in config, exit 0 (allow stop)"
   exit 0
 fi
 
 # 处于微信模式且 autoApprove 为 true，需要恢复轮询
-# 使用 exit code 2 阻止任务完成，并提示 Claude 调用 MCP 工具
-log_debug "[$(date)] ✅ WeChat mode active, blocking completion to resume polling"
+# 使用 exit code 2 阻止停止，并提示 Claude 调用 MCP 工具
+log_debug "[$(date)] ✅ WeChat mode active, blocking stop to resume polling"
 log_debug "[$(date)] ccId=$CC_ID, will prompt Claude to call get_pending_messages"
 echo "任务已完成，请调用 mcp__wecom-aibot__get_pending_messages(cc_id=\"$CC_ID\", timeout_ms=30000) 恢复微信消息轮询" >&2
 exit 2
 `;
     ensureConfigDir();
-    fs.writeFileSync(TASK_COMPLETED_HOOK_SCRIPT_PATH, script, { mode: 0o755 });
-    console.log(`[config] TaskCompleted Hook 脚本已写入: ${TASK_COMPLETED_HOOK_SCRIPT_PATH}`);
+    fs.writeFileSync(STOP_HOOK_SCRIPT_PATH, script, { mode: 0o755 });
+    console.log(`[config] Stop Hook 脚本已写入: ${STOP_HOOK_SCRIPT_PATH}`);
 }
 // 写入 MCP Server 配置到 ~/.claude.json
 function writeMcpServerConfig(config, instanceName) {
@@ -996,7 +996,7 @@ export function getDocMcpUrl(robotName) {
         error: `有多个机器人配置了文档 MCP URL，请通过 robot_name 参数指定使用哪个机器人。已配置文档能力的机器人: ${robotsWithDoc.map(r => r.name).join(', ')}`,
     };
 }
-// 写入 MCP 工具权限 + 注册 PermissionRequest hook 到 Claude settings
+// 写入 MCP 工具权限到 Claude settings
 function writeMcpPermissions() {
     try {
         // 确保目录存在
@@ -1020,18 +1020,11 @@ function writeMcpPermissions() {
             if (!existingPerms.has(perm))
                 settings.permissions.allow.push(perm);
         }
-        // 注册全局 PermissionRequest hook（支持 channel 模式，hook 内部有 wechatMode 检查）
-        if (!settings.hooks)
-            settings.hooks = {};
-        if (!settings.hooks['PermissionRequest'])
-            settings.hooks['PermissionRequest'] = [];
-        const hookCommand = HOOK_SCRIPT_PATH;
-        const alreadyRegistered = settings.hooks['PermissionRequest'].some((entry) => entry.hooks?.some?.((h) => h.command === hookCommand));
-        if (!alreadyRegistered) {
-            settings.hooks['PermissionRequest'].push({ hooks: [{ type: 'command', command: hookCommand }] });
-        }
+        // 注意：PermissionRequest hook 通过项目级 settings.json 配置，不注册全局 hook
+        // HTTP 模式：enter_headless_mode 在项目目录写入 hook
+        // Channel 模式：由 Claude Code 自动审批，不需要 hook
         fs.writeFileSync(CLAUDE_SETTINGS_FILE, JSON.stringify(settings, null, 2));
-        // 确保 hook 脚本文件存在
+        // 确保 hook 脚本文件存在（供项目级 hook 引用）
         writeHookScript();
     }
     catch (err) {
@@ -1042,7 +1035,7 @@ function writeMcpPermissions() {
 // 确保 hook 已安装（幂等，可多次调用）
 export function ensureHookInstalled() {
     writeMcpPermissions();
-    writeTaskCompletedHookScript();
+    writeStopHookScript();
 }
 // 确保所有全局配置已写入（强制覆盖，不依赖智能体）
 export function ensureGlobalConfigs(mode = 'full', remoteOptions) {

package/dist/headless-state.d.ts

@@ -50,7 +50,7 @@ export declare function isHeadlessMode(projectDir?: string): boolean;
  * 清理所有孤儿状态文件
  *
  * 扫描全局索引，检查每个项目的状态文件是否存在
- * 如果状态文件不存在，从索引中移除并清理 Hook 配置
+ * 如果状态文件不存在，从索引中移除
  */
 export declare function cleanupOrphanFiles(): void;
 /**

package/dist/headless-state.js

@@ -17,8 +17,8 @@ const CONFIG_DIR = path.join(os.homedir(), '.wecom-aibot-mcp');
 const HEADLESS_INDEX_FILE = path.join(CONFIG_DIR, 'headless-index.json');
 // 项目状态文件路径
 const PROJECT_STATE_FILE = 'headless.json';
-// Hook 脚本路径
-const HOOK_SCRIPT_PATH = path.join(CONFIG_DIR, 'permission-hook.sh');
+// 注意：Hook 配置由 tools/index.ts 通过 project-config.ts 的函数统一管理
+// PERMISSION_HOOK_SCRIPT_PATH 定义在 project-config.ts 中
 /**
  * 确保配置目录存在
  */
@@ -85,8 +85,7 @@ export function enterHeadlessMode(projectDir, agentName, robotName) {
         index.push(projectDir);
         writeHeadlessIndex(index);
     }
-    // 3. 写入项目级 Hook 配置
-    configureProjectHook(projectDir);
+    // 3. Hook 配置由 tools/index.ts 的 enter_headless_mode 工具调用 addPermissionHook 管理
     return state;
 }
 /**
@@ -114,8 +113,7 @@ export function exitHeadlessMode(projectDir) {
     const index = readHeadlessIndex();
     const newIndex = index.filter(p => p !== state.projectDir);
     writeHeadlessIndex(newIndex);
-    // 3. 清除项目级 Hook 配置
-    clearProjectHook(state.projectDir);
+    // 3. Hook 配置由 tools/index.ts 的 exit_headless_mode 工具调用 removePermissionHook 管理
     return state;
 }
 /**
@@ -159,77 +157,13 @@ export function isHeadlessMode(projectDir) {
     const dir = projectDir || process.cwd();
     return fs.existsSync(getProjectHeadlessFile(dir));
 }
-/**
- * 配置项目级 Hook
- */
-function configureProjectHook(projectDir) {
-    const settingsDir = path.join(projectDir, '.claude');
-    const settingsPath = path.join(settingsDir, 'settings.json');
-    // 确保目录存在
-    if (!fs.existsSync(settingsDir)) {
-        fs.mkdirSync(settingsDir, { recursive: true });
-    }
-    // 读取现有配置
-    let settings = {};
-    if (fs.existsSync(settingsPath)) {
-        try {
-            const content = fs.readFileSync(settingsPath, 'utf-8');
-            settings = JSON.parse(content);
-        }
-        catch (err) {
-            logger.error(`[headless] 读取 settings.json 失败: ${settingsPath}`, err);
-        }
-    }
-    // 设置 PermissionRequest hook
-    if (!settings.hooks) {
-        settings.hooks = {};
-    }
-    settings.hooks['PermissionRequest'] = [
-        {
-            matcher: '',
-            hooks: [
-                {
-                    type: 'command',
-                    command: HOOK_SCRIPT_PATH,
-                    timeout: 600,
-                },
-            ],
-        },
-    ];
-    // 写入配置
-    fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2));
-    logger.log(`[headless] 已配置项目 Hook: ${settingsPath}`);
-}
-/**
- * 清除项目级 Hook 配置
- */
-function clearProjectHook(projectDir) {
-    const settingsPath = path.join(projectDir, '.claude', 'settings.json');
-    if (!fs.existsSync(settingsPath)) {
-        return;
-    }
-    try {
-        const content = fs.readFileSync(settingsPath, 'utf-8');
-        const settings = JSON.parse(content);
-        if (settings.hooks && settings.hooks['PermissionRequest']) {
-            delete settings.hooks['PermissionRequest'];
-            // 如果 hooks 对象为空，删除整个 hooks 字段
-            if (Object.keys(settings.hooks).length === 0) {
-                delete settings.hooks;
-            }
-            fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2));
-            logger.log(`[headless] 已清除项目 Hook: ${settingsPath}`);
-        }
-    }
-    catch (err) {
-        logger.error(`[headless] 清除项目 Hook 失败: ${settingsPath}`, err);
-    }
-}
+// 注意：configureProjectHook 和 clearProjectHook 已移除
+// Hook 配置由 tools/index.ts 通过 project-config.ts 的函数统一管理
 /**
  * 清理所有孤儿状态文件
  *
  * 扫描全局索引，检查每个项目的状态文件是否存在
- * 如果状态文件不存在，从索引中移除并清理 Hook 配置
+ * 如果状态文件不存在，从索引中移除
  */
 export function cleanupOrphanFiles() {
     ensureConfigDir();
@@ -241,8 +175,7 @@ export function cleanupOrphanFiles() {
             validProjects.push(projectDir);
         }
         else {
-            // 状态文件不存在，清理 Hook 配置
-            clearProjectHook(projectDir);
+            // 状态文件不存在，仅从索引移除，Hook 清理由用户手动处理
             logger.log(`[headless] 清理孤儿项目: ${projectDir}`);
         }
     }

package/dist/http-server.js

@@ -23,7 +23,7 @@ import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/
 import { isInitializeRequest } from '@modelcontextprotocol/sdk/types.js';
 import { registerTools } from './tools/index.js';
 import { getClient, getConnectionState, getAllConnectionStates, connectAllRobots } from './connection-manager.js';
-import { subscribeWecomMessage, getSubscriberCount } from './message-bus.js';
+import { subscribeWecomMessage } from './message-bus.js';
 import { listAllRobots, VERSION, getAuthToken } from './config-wizard.js';
 import { logger } from './logger.js';
 // ESM 兼容的 __dirname
@@ -44,10 +44,20 @@ function sanitizeAgentName(agentName) {
     // 简化名称：移除特殊字符，限制长度
     return agentName.replace(/[^a-zA-Z0-9\u4e00-\u9fa5_-]/g, '').slice(0, 20);
 }
-// ccId 生成器（基于 agentName）- 不自动编号
+// ccId 生成器（基于 agentName）- 自动避免冲突
 export function generateCcId(agentName) {
-    const name = agentName ? sanitizeAgentName(agentName) : 'cc';
-    return name; // 直接返回名称，不添加编号
+    const base = agentName ? sanitizeAgentName(agentName) : 'cc';
+    // 无冲突：直接使用
+    if (!ccIdRegistry.has(base))
+        return base;
+    // 有冲突：自动添加数字后缀（-2, -3, ...）
+    for (let i = 2; i <= 99; i++) {
+        const candidate = `${base}-${i}`;
+        if (!ccIdRegistry.has(candidate))
+            return candidate;
+    }
+    // 兜底：使用时间戳保证唯一性
+    return `${base}-${Date.now()}`;
 }
 // 推送微信消息到 MCP 客户端（通过 SSE notification）
 export async function pushMessageToSession(robotName, message) {
@@ -194,6 +204,20 @@ function initMcpServer() {
     subscribeWecomMessage((msg) => {
         handleWecomMessage(msg);
     });
+    // 定时清理过期审批条目（每 5 分钟清理超过 15 分钟的条目）
+    setInterval(() => {
+        const cutoff = Date.now() - 15 * 60 * 1000;
+        let cleaned = 0;
+        for (const [id, entry] of pendingApprovals) {
+            if (entry.createdAt < cutoff) {
+                pendingApprovals.delete(id);
+                cleaned++;
+            }
+        }
+        if (cleaned > 0) {
+            logger.log(`[http] 定时清理过期审批: ${cleaned} 条`);
+        }
+    }, 5 * 60 * 1000);
 }
 // 创建新的 MCP Server 实例
 function createMcpServerInstance() {
@@ -303,13 +327,14 @@ async function handleWecomMessage(msg) {
         logger.log('[http] 无活跃 MCP session，跳过消息处理');
         return;
     }
-    const subscriberCount = getSubscriberCount(msg.robotName);
-    logger.log(`[http] 机器人 ${msg.robotName} 订阅数: ${subscriberCount}`);
-    if (subscriberCount === 0) {
-        logger.log('[http] 无订阅者，跳过消息处理');
+    // HTTP 模式下检查是否有在线 CC（而非 subscriberCount，后者只对 Channel 模式有效）
+    const ccCount = getCCCount();
+    logger.log(`[http] 当前在线 CC 数: ${ccCount}`);
+    if (ccCount === 0) {
+        logger.log('[http] 无在线 CC，跳过消息处理');
         return;
     }
-    if (subscriberCount === 1) {
+    if (ccCount === 1) {
         // 只有一个订阅者，直接广播（SSE 检查已在前面完成）
         logger.log('[http] 单订阅者 HTTP 模式，直接广播');
         for (const [sessionId, sessEntry] of transports) {
@@ -460,7 +485,7 @@ async function sendNoReferencePrompt(msg) {
 ${onlineList.map(id => `• 【${id}】`).join('\n')}
 
 示例：引用【${onlineList[0]}】的消息后回复`;
-    await client.sendText(reply);
+    await client.sendText(reply, msg.chatid); // 发送到原始会话（群聊或单聊）
 }
 export async function startHttpServer(_server, port = HTTP_PORT, httpsConfig) {
     startTime = Date.now();
@@ -468,7 +493,9 @@ export async function startHttpServer(_server, port = HTTP_PORT, httpsConfig) {
     initMcpServer();
     return new Promise((resolve, reject) => {
         const requestHandler = async (req, res) => {
-            res.setHeader('Access-Control-Allow-Origin', '*');
+            // CORS 设置：HTTPS 模式收紧为 'null'，HTTP 本地模式宽松为 '*'
+            const isPublicMode = !!httpsConfig;
+            res.setHeader('Access-Control-Allow-Origin', isPublicMode ? 'null' : '*');
             res.setHeader('Access-Control-Allow-Methods', 'GET, POST, DELETE, OPTIONS');
             res.setHeader('Access-Control-Allow-Headers', 'Content-Type, Authorization, Mcp-Session-Id');
             // 必须暴露 Mcp-Session-Id 头，让客户端能看到
@@ -630,6 +657,23 @@ export async function startHttpServer(_server, port = HTTP_PORT, httpsConfig) {
                 res.end(JSON.stringify({ ok: true, ...result }));
                 return;
             }
+            // ============================================
+            // 调试端点统一拦截
+            // ============================================
+            if (url.startsWith('/debug/')) {
+                // 生产环境禁用所有 debug 端点
+                if (process.env.NODE_ENV === 'production') {
+                    res.writeHead(404);
+                    res.end();
+                    return;
+                }
+                // debug/sampling 额外要求配置了 Auth Token
+                if (url === '/debug/sampling' && !getAuthToken()) {
+                    res.writeHead(403, { 'Content-Type': 'application/json' });
+                    res.end(JSON.stringify({ error: 'debug/sampling 需要配置 Auth Token' }));
+                    return;
+                }
+            }
             // 临时调试端点：手动进入 headless 模式
             if (req.method === 'POST' && url === '/debug/enter_headless') {
                 const ccId = `debug-${Date.now()}`;
@@ -853,6 +897,7 @@ async function handleApprovalRequest(req, res) {
             taskId,
             status: 'pending',
             timestamp: Date.now(),
+            createdAt: Date.now(), // 写入时间，用于定时清理
             tool_name,
             tool_input,
             description,
@@ -878,6 +923,11 @@ function handleApprovalStatus(_req, res, url) {
                 // 更新审批状态
                 if (result !== 'pending') {
                     entry.status = result;
+                    // 延迟 5 分钟删除，给 Hook 最后一次轮询窗口
+                    setTimeout(() => {
+                        pendingApprovals.delete(taskId);
+                        logger.log(`[http] 审批条目已清理: taskId=${taskId}`);
+                    }, 5 * 60 * 1000);
                 }
                 res.writeHead(200, { 'Content-Type': 'application/json' });
                 res.end(JSON.stringify({ status: result, result }));
@@ -892,9 +942,10 @@ function handleApprovalStatus(_req, res, url) {
         });
         return;
     }
-    // 没找到对应的待处理审批，返回 pending
-    res.writeHead(200, { 'Content-Type': 'application/json' });
-    res.end(JSON.stringify({ status: 'pending', result: 'pending' }));
+    // 未找到 → 返回 404，让 Hook 识别"审批已丢失"并退出
+    logger.log(`[http] pendingApprovals 中未找到 taskId=${taskId}`);
+    res.writeHead(404, { 'Content-Type': 'application/json' });
+    res.end(JSON.stringify({ error: 'taskId not found', taskId }));
 }
 async function handleApprovalTimeout(req, res, url) {
     const taskId = url.replace('/approval_timeout/', '');
@@ -917,6 +968,7 @@ async function handleApprovalTimeout(req, res, url) {
         const success = client.setApprovalResult(taskId, result, reason);
         if (success) {
             entry.status = result;
+            pendingApprovals.delete(taskId); // 处理完立即删除
             res.writeHead(200, { 'Content-Type': 'application/json' });
             res.end(JSON.stringify({ success: true, taskId, result }));
         }
@@ -944,15 +996,23 @@ function handleHealthCheck(_req, res) {
     }, null, 2));
 }
 // SSE 连接处理（Channel 模式）
-function handleSSEConnect(req, res, url) {
-    const ccId = decodeURIComponent(url.replace('/sse/', ''));
-    const entry = getCCRegistryEntry(ccId);
+function handleSSEConnect(req, res, _url) {
+    const urlObj = new URL(req.url, 'http://localhost');
+    const targetCcId = decodeURIComponent(urlObj.pathname.replace('/sse/', ''));
+    const requestCcId = urlObj.searchParams.get('ccId'); // 请求方声明的身份
+    const entry = getCCRegistryEntry(targetCcId);
     if (!entry) {
         res.writeHead(404, { 'Content-Type': 'text/plain' });
-        res.end(`CC ${ccId} not found`);
+        res.end(`CC ${targetCcId} not found`);
+        return;
+    }
+    // 请求方 ccId 必须与目标 ccId 一致
+    if (requestCcId && requestCcId !== targetCcId) {
+        res.writeHead(403, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ error: `无权订阅 ccId: ${targetCcId}` }));
         return;
     }
-    const clientId = `${ccId}_${Date.now()}`;
+    const clientId = `${targetCcId}_${Date.now()}`;
     // 设置 SSE headers
     res.writeHead(200, {
         'Content-Type': 'text/event-stream',
@@ -963,12 +1023,12 @@ function handleSSEConnect(req, res, url) {
     // 注册 SSE 客户端
     sseClients.set(clientId, {
         res,
-        ccId,
+        ccId: targetCcId,
         robotName: entry.robotName,
     });
-    logger.log(`[http] SSE 客户端连接: clientId=${clientId}, ccId=${ccId}, robotName=${entry.robotName}`);
+    logger.log(`[http] SSE 客户端连接: clientId=${clientId}, ccId=${targetCcId}, robotName=${entry.robotName}`);
     // 发送连接确认
-    res.write(`event: connected\ndata: {"clientId":"${clientId}","ccId":"${ccId}"}\n\n`);
+    res.write(`event: connected\ndata: {"clientId":"${clientId}","ccId":"${targetCcId}"}\n\n`);
     // 心跳机制：每 15 秒发送注释行保持连接活跃
     const heartbeatInterval = setInterval(() => {
         // SSE 注释行（以冒号开头）会被客户端忽略，但保持连接
@@ -1021,10 +1081,27 @@ async function handleNotify(req, res) {
         res.end(JSON.stringify({ error: err.message }));
     }
 }
+// push_notification 允许的 method 白名单
+const PUSH_NOTIFICATION_ALLOWED_METHODS = new Set([
+    'notifications/message',
+    'notifications/progress',
+    'notifications/resources/updated',
+    'notifications/tools/list_changed',
+]);
 async function handlePushNotification(req, res) {
     try {
         const body = await readRequestBody(req);
         const { method, params } = JSON.parse(body);
+        // method 白名单校验
+        const effectiveMethod = method || 'notifications/message';
+        if (!PUSH_NOTIFICATION_ALLOWED_METHODS.has(effectiveMethod)) {
+            res.writeHead(400, { 'Content-Type': 'application/json' });
+            res.end(JSON.stringify({
+                error: `不允许的 method: ${effectiveMethod}`,
+                allowed: Array.from(PUSH_NOTIFICATION_ALLOWED_METHODS),
+            }));
+            return;
+        }
         if (transports.size === 0) {
             res.writeHead(503, { 'Content-Type': 'application/json' });
             res.end(JSON.stringify({ error: '无活跃 MCP session' }));
@@ -1035,7 +1112,7 @@ async function handlePushNotification(req, res) {
         for (const [sessionId, entry] of transports) {
             try {
                 await entry.server.server.notification({
-                    method: method || 'notifications/message',
+                    method: effectiveMethod,
                     params: params || {}
                 });
                 sent++;
@@ -1045,7 +1122,7 @@ async function handlePushNotification(req, res) {
             }
         }
         res.writeHead(200, { 'Content-Type': 'application/json' });
-        res.end(JSON.stringify({ success: true, method: method || 'notifications/message', sessions: sent }));
+        res.end(JSON.stringify({ success: true, method: effectiveMethod, sessions: sent }));
     }
     catch (err) {
         logger.error('[http] 推送通知失败:', err);

package/dist/index.d.ts

@@ -10,7 +10,9 @@
  */
 export { WecomClient, initClient } from './client.js';
 export { connectRobot, disconnectRobot, getClient, getConnectionState, getAllConnectionStates, } from './connection-manager.js';
-export { startHttpServer, stopHttpServer, HTTP_PORT, HOOK_SCRIPT_PATH, } from './http-server.js';
+export { startHttpServer, stopHttpServer, HTTP_PORT, } from './http-server.js';
 export type { ApprovalRequest } from './http-server.js';
+export { PERMISSION_HOOK_SCRIPT_PATH, STOP_HOOK_SCRIPT_PATH, } from './project-config.js';
+export { PERMISSION_HOOK_SCRIPT_PATH as HOOK_SCRIPT_PATH } from './project-config.js';
 export { registerTools } from './tools/index.js';
 export { listAllRobots, runConfigWizard } from './config-wizard.js';

package/dist/index.js

@@ -13,7 +13,11 @@ export { WecomClient, initClient } from './client.js';
 // 连接管理模块
 export { connectRobot, disconnectRobot, getClient, getConnectionState, getAllConnectionStates, } from './connection-manager.js';
 // HTTP 服务模块
-export { startHttpServer, stopHttpServer, HTTP_PORT, HOOK_SCRIPT_PATH, } from './http-server.js';
+export { startHttpServer, stopHttpServer, HTTP_PORT, } from './http-server.js';
+// Hook 脚本路径（统一从 project-config.ts 导出）
+export { PERMISSION_HOOK_SCRIPT_PATH, STOP_HOOK_SCRIPT_PATH, } from './project-config.js';
+// 向后兼容别名
+export { PERMISSION_HOOK_SCRIPT_PATH as HOOK_SCRIPT_PATH } from './project-config.js';
 // 工具注册
 export { registerTools } from './tools/index.js';
 // 配置向导

package/dist/message-bus.d.ts

@@ -23,16 +23,31 @@ export interface WecomMessage {
     timestamp: number;
     quoteContent?: string;
 }
+export interface ApprovalEvent {
+    robotName: string;
+    taskId: string;
+    result: 'allow-once' | 'allow-always' | 'deny';
+    ccId?: string;
+    timestamp: number;
+}
 export declare function getSubscriberCount(robotName: string): number;
 declare const wecomMessage$: Subject<WecomMessage>;
 /**
  * 发布微信消息（由 WecomClient 调用）
  */
 export declare function publishWecomMessage(msg: WecomMessage): void;
+/**
+ * 发布审批事件（由 WecomClient 调用）
+ */
+export declare function publishApprovalEvent(event: ApprovalEvent): void;
 /**
  * 订阅所有微信消息
  */
 export declare function subscribeWecomMessage(callback: (msg: WecomMessage) => void): import("rxjs").Subscription;
+/**
+ * 订阅所有审批事件
+ */
+export declare function subscribeApprovalEvent(callback: (event: ApprovalEvent) => void): import("rxjs").Subscription;
 /**
  * 订阅特定机器人的微信消息（带订阅计数）
  */

package/dist/message-bus.js

@@ -35,6 +35,7 @@ function decrementSubscriberCount(robotName) {
 // 消息总线（RxJS Subject）
 // ============================================
 const wecomMessage$ = new Subject();
+const approvalEvent$ = new Subject();
 // ============================================
 // 发布/订阅接口
 // ============================================
@@ -44,12 +45,24 @@ const wecomMessage$ = new Subject();
 export function publishWecomMessage(msg) {
     wecomMessage$.next(msg);
 }
+/**
+ * 发布审批事件（由 WecomClient 调用）
+ */
+export function publishApprovalEvent(event) {
+    approvalEvent$.next(event);
+}
 /**
  * 订阅所有微信消息
  */
 export function subscribeWecomMessage(callback) {
     return wecomMessage$.subscribe(callback);
 }
+/**
+ * 订阅所有审批事件
+ */
+export function subscribeApprovalEvent(callback) {
+    return approvalEvent$.subscribe(callback);
+}
 /**
  * 订阅特定机器人的微信消息（带订阅计数）
  */

package/dist/project-config.d.ts

@@ -114,6 +114,8 @@ export declare function validateConfig(config: Partial<ProjectConfig>): boolean;
  * 获取项目 settings.json 路径
  */
 export declare function getProjectSettingsPath(projectDir: string): string;
+export declare const PERMISSION_HOOK_SCRIPT_PATH: string;
+export declare const STOP_HOOK_SCRIPT_PATH: string;
 /**
  * 添加 PermissionRequest hook 到项目 settings.json
  */
@@ -130,16 +132,17 @@ export declare function removePermissionHook(projectDir: string): {
     existed: boolean;
 };
 /**
- * 添加 TaskCompleted hook 到项目 settings.json
+ * 添加 Stop hook 到项目 settings.json
+ * HTTP 模式使用：阻止 Claude 停止，提示调用 get_pending_messages 恢复轮询
  */
-export declare function addTaskCompletedHook(projectDir: string): {
+export declare function addStopHook(projectDir: string): {
     success: boolean;
     path: string;
 };
 /**
- * 删除 TaskCompleted hook 从项目 settings.json
+ * 删除 Stop hook 从项目 settings.json
  */
-export declare function removeTaskCompletedHook(projectDir: string): {
+export declare function removeStopHook(projectDir: string): {
     success: boolean;
     path: string;
     existed: boolean;

package/dist/project-config.js

@@ -249,23 +249,26 @@ export function validateConfig(config) {
 export function getProjectSettingsPath(projectDir) {
     return path.join(projectDir, '.claude', 'settings.json');
 }
+// ============================================
+// Hook 脚本路径（统一定义）
+// ============================================
+const CONFIG_DIR = path.join(os.homedir(), '.wecom-aibot-mcp');
+export const PERMISSION_HOOK_SCRIPT_PATH = path.join(CONFIG_DIR, 'permission-hook.sh');
+export const STOP_HOOK_SCRIPT_PATH = path.join(CONFIG_DIR, 'stop-hook.sh');
 /**
  * PermissionRequest hook 配置
  */
 const PERMISSION_HOOK = {
     matcher: '',
-    hooks: [{ type: 'command', command: '~/.wecom-aibot-mcp/permission-hook.sh' }],
+    hooks: [{ type: 'command', command: PERMISSION_HOOK_SCRIPT_PATH }],
 };
 /**
- * TaskCompleted hook 脚本路径
+ * Stop hook 配置
+ * 用于 HTTP 模式：阻止 Claude 停止，提示调用 get_pending_messages 恢复轮询
  */
-const TASK_COMPLETED_HOOK_SCRIPT_PATH = path.join(os.homedir(), '.wecom-aibot-mcp', 'task-completed-hook.sh');
-/**
- * TaskCompleted hook 配置
- */
-const TASK_COMPLETED_HOOK = {
+const STOP_HOOK = {
     matcher: '',
-    hooks: [{ type: 'command', command: TASK_COMPLETED_HOOK_SCRIPT_PATH }],
+    hooks: [{ type: 'command', command: STOP_HOOK_SCRIPT_PATH }],
 };
 /**
  * 添加 PermissionRequest hook 到项目 settings.json
@@ -335,9 +338,10 @@ export function removePermissionHook(projectDir) {
     }
 }
 /**
- * 添加 TaskCompleted hook 到项目 settings.json
+ * 添加 Stop hook 到项目 settings.json
+ * HTTP 模式使用：阻止 Claude 停止，提示调用 get_pending_messages 恢复轮询
  */
-export function addTaskCompletedHook(projectDir) {
+export function addStopHook(projectDir) {
     const settingsPath = getProjectSettingsPath(projectDir);
     const settingsDir = path.dirname(settingsPath);
     // 确保目录存在
@@ -355,26 +359,26 @@ export function addTaskCompletedHook(projectDir) {
             // ignore
         }
     }
-    // 添加 hooks.TaskCompleted
+    // 添加 hooks.Stop
     if (!settings.hooks) {
         settings.hooks = {};
     }
-    settings.hooks.TaskCompleted = [TASK_COMPLETED_HOOK];
+    settings.hooks.Stop = [STOP_HOOK];
     // 写入配置
     try {
         fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2));
-        logger.log(`[project-config] 已添加 TaskCompleted hook: ${settingsPath}`);
+        logger.log(`[project-config] 已添加 Stop hook: ${settingsPath}`);
         return { success: true, path: settingsPath };
     }
     catch (err) {
-        logger.error(`[project-config] 添加 TaskCompleted hook 失败: ${err}`);
+        logger.error(`[project-config] 添加 Stop hook 失败: ${err}`);
         return { success: false, path: settingsPath };
     }
 }
 /**
- * 删除 TaskCompleted hook 从项目 settings.json
+ * 删除 Stop hook 从项目 settings.json
  */
-export function removeTaskCompletedHook(projectDir) {
+export function removeStopHook(projectDir) {
     const settingsPath = getProjectSettingsPath(projectDir);
     if (!fs.existsSync(settingsPath)) {
         return { success: true, path: settingsPath, existed: false };
@@ -382,22 +386,22 @@ export function removeTaskCompletedHook(projectDir) {
     try {
         const content = fs.readFileSync(settingsPath, 'utf-8');
         const settings = JSON.parse(content);
-        // 删除 hooks.TaskCompleted
-        if (settings.hooks && settings.hooks.TaskCompleted) {
-            delete settings.hooks.TaskCompleted;
+        // 删除 hooks.Stop
+        if (settings.hooks && settings.hooks.Stop) {
+            delete settings.hooks.Stop;
             // 如果 hooks 为空，删除整个 hooks 字段
             if (Object.keys(settings.hooks).length === 0) {
                 delete settings.hooks;
             }
             // 写入配置
             fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2));
-            logger.log(`[project-config] 已删除 TaskCompleted hook: ${settingsPath}`);
+            logger.log(`[project-config] 已删除 Stop hook: ${settingsPath}`);
             return { success: true, path: settingsPath, existed: true };
         }
         return { success: true, path: settingsPath, existed: false };
     }
     catch (err) {
-        logger.error(`[project-config] 删除 TaskCompleted hook 失败: ${err}`);
+        logger.error(`[project-config] 删除 Stop hook 失败: ${err}`);
         return { success: false, path: settingsPath, existed: false };
     }
 }

package/dist/tools/index.js

@@ -25,7 +25,7 @@ import { callDocTool } from '../doc-proxy.js';
 import { connectRobot, disconnectRobot, getClient, getConnectionState, } from '../connection-manager.js';
 import { registerCcId, unregisterCcId, getRobotByCcId, getProjectDirByCcId, generateCcId, } from '../http-server.js';
 import { subscribeWecomMessageByCcId } from '../message-bus.js';
-import { updateWechatModeConfig, loadWechatModeConfig, addPermissionHook, removePermissionHook, addTaskCompletedHook, removeTaskCompletedHook } from '../project-config.js';
+import { updateWechatModeConfig, loadWechatModeConfig, addPermissionHook, removePermissionHook, addStopHook, removeStopHook } from '../project-config.js';
 import { logger } from '../logger.js';
 // 辅助函数：从 ccId 获取客户端
 async function getConnectedClient(ccId) {
@@ -436,8 +436,8 @@ npx @vrs-soft/wecom-aibot-mcp
         const skillResult = installSkill(projectDir);
         // 添加 PermissionRequest hook 到项目 settings.json
         const hookResult = addPermissionHook(projectDir);
-        // HTTP 模式添加 TaskCompleted hook（Channel 模式不需要，消息自动推送）
-        const taskCompletedHookResult = mode === 'http' ? addTaskCompletedHook(projectDir) : { added: false, message: 'Channel 模式不需要 TaskCompleted hook' };
+        // HTTP 模式添加 Stop hook（Channel 模式不需要，消息自动推送）
+        const stopHookResult = mode === 'http' ? addStopHook(projectDir) : { success: false, path: '' };
         // 发送确认消息（头部标注来源 ccId 和 mode）
         const modeDesc = mode === 'channel' ? 'Channel模式，消息自动推送' : 'HTTP模式，请定期轮询获取消息';
         await result.client.sendText(`【${finalCcId}】已进入微信模式(${modeDesc})，使用机器人「${selectedRobot.name}」。`);
@@ -452,11 +452,11 @@ npx @vrs-soft/wecom-aibot-mcp
                         agentName: effectiveAgentName, // 返回使用的 agentName
                         mode,
                         hook: hookResult,
-                        taskCompletedHook: taskCompletedHookResult,
+                        stopHook: stopHookResult,
                         skill: skillResult, // skill 安装结果（如果 success=false，包含 skillUrl）
-                        sseEndpoint: mode === 'channel' ? `http://127.0.0.1:18963/sse/${finalCcId}` : undefined,
+                        sseEndpoint: mode === 'channel' ? `http://127.0.0.1:18963/sse/${finalCcId}?ccId=${finalCcId}` : undefined,
                         message: mode === 'channel'
-                            ? `连接 SSE endpoint: http://127.0.0.1:18963/sse/${finalCcId} 接收推送消息`
+                            ? `连接 SSE endpoint: http://127.0.0.1:18963/sse/${finalCcId}?ccId=${finalCcId} 接收推送消息`
                             : '已进入微信模式(HTTP)',
                     }),
                 }],
@@ -491,8 +491,8 @@ npx @vrs-soft/wecom-aibot-mcp
         updateWechatModeConfig(projectDir, { wechatMode: false });
         // 删除 PermissionRequest hook 从项目 settings.json
         const hookResult = removePermissionHook(projectDir);
-        // 删除 TaskCompleted hook 从项目 settings.json
-        const taskCompletedHookResult = removeTaskCompletedHook(projectDir);
+        // 删除 Stop hook 从项目 settings.json
+        const stopHookResult = removeStopHook(projectDir);
         return {
             content: [{
                     type: 'text',
@@ -501,7 +501,7 @@ npx @vrs-soft/wecom-aibot-mcp
                         headless: false,
                         robotName,
                         hook: hookResult,
-                        taskCompletedHook: taskCompletedHookResult,
+                        stopHook: stopHookResult,
                         message: '审批将使用默认 UI',
                     }),
                 }],

package/package.json

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