@vrs-soft/wecom-aibot-mcp 1.2.0 → 1.2.1

package/README.md

@@ -44,7 +44,7 @@ PermissionRequest Hook 拦截
               ↓
      ┌────────────────────────┐
      │ 检查 headless 模式状态  │
-     │ (检查 .claude/headless.json)
+     │ (检查 .claude/wecom-aibot.json)
      └────────────────────────┘
               │
       ┌───────┴───────┐

package/dist/approval-manager.d.ts

@@ -0,0 +1,38 @@
+/**
+ * 审批管理器
+ *
+ * 负责：
+ * 1. 存储 pendingApprovals Map（http-server 审批记录）
+ * 2. 持久化到 approval-state.json，MCP 重启后恢复
+ * 3. 恢复时将 approvalRecord 注入对应的 WecomClient
+ *
+ * 与 WecomClient.approvals 的关系：
+ * - WecomClient.approvals 记录企业微信卡片状态（用户点击后更新）
+ * - approval-manager 记录 http-server 层的审批条目
+ * - MCP 重启后，WecomClient 实例是全新的，需要 injectApprovalRecord 恢复
+ */
+export interface ApprovalEntry {
+    taskId: string;
+    status: 'pending' | 'allow-once' | 'allow-always' | 'deny';
+    timestamp: number;
+    tool_name: string;
+    tool_input: Record<string, unknown>;
+    description: string;
+    robotName: string;
+}
+/**
+ * 设置配置目录（仅用于测试）
+ */
+export declare function setConfigDir(dir: string): void;
+export declare function addApproval(entry: ApprovalEntry): void;
+export declare function getApproval(taskId: string): ApprovalEntry | undefined;
+export declare function updateApprovalStatus(taskId: string, status: 'allow-once' | 'allow-always' | 'deny'): void;
+export declare function getPendingApprovals(): Map<string, ApprovalEntry>;
+export declare function saveApprovalState(): void;
+/**
+ * 从文件恢复审批状态，并将审批记录注入对应的 WecomClient
+ * 需在 connectAllRobots() 完成后调用，确保 client 已存在
+ */
+export declare function loadApprovalState(getClientFn: (robotName: string) => Promise<import('./client.js').WecomClient | null>): Promise<void>;
+export declare function startAutoSave(): void;
+export declare function stopAutoSave(): void;

package/dist/approval-manager.js

@@ -0,0 +1,129 @@
+/**
+ * 审批管理器
+ *
+ * 负责：
+ * 1. 存储 pendingApprovals Map（http-server 审批记录）
+ * 2. 持久化到 approval-state.json，MCP 重启后恢复
+ * 3. 恢复时将 approvalRecord 注入对应的 WecomClient
+ *
+ * 与 WecomClient.approvals 的关系：
+ * - WecomClient.approvals 记录企业微信卡片状态（用户点击后更新）
+ * - approval-manager 记录 http-server 层的审批条目
+ * - MCP 重启后，WecomClient 实例是全新的，需要 injectApprovalRecord 恢复
+ */
+import * as fs from 'fs';
+import * as path from 'path';
+import * as os from 'os';
+import { atomicWriteFileSync } from './utils/atomic-write.js';
+const pendingApprovals = new Map();
+// 支持测试环境覆盖
+let CONFIG_DIR = path.join(os.homedir(), '.wecom-aibot-mcp');
+let APPROVAL_STATE_FILE = path.join(CONFIG_DIR, 'approval-state.json');
+/**
+ * 设置配置目录（仅用于测试）
+ */
+export function setConfigDir(dir) {
+    CONFIG_DIR = dir;
+    APPROVAL_STATE_FILE = path.join(CONFIG_DIR, 'approval-state.json');
+}
+let saveInterval = null;
+// ────────────────────────────────────────────
+// 审批 CRUD
+// ────────────────────────────────────────────
+export function addApproval(entry) {
+    pendingApprovals.set(entry.taskId, entry);
+}
+export function getApproval(taskId) {
+    return pendingApprovals.get(taskId);
+}
+export function updateApprovalStatus(taskId, status) {
+    const entry = pendingApprovals.get(taskId);
+    if (entry) {
+        entry.status = status;
+        // 审批完成后从 Map 中移除，避免 pendingApprovals.size 持续增长
+        pendingApprovals.delete(taskId);
+    }
+}
+export function getPendingApprovals() {
+    return pendingApprovals;
+}
+// ────────────────────────────────────────────
+// 持久化
+// ────────────────────────────────────────────
+export function saveApprovalState() {
+    const approvals = [];
+    for (const [taskId, entry] of pendingApprovals) {
+        if (entry.status === 'pending') {
+            approvals.push({ taskId, entry });
+        }
+    }
+    // 无待处理审批时不创建文件
+    if (approvals.length === 0)
+        return;
+    try {
+        fs.mkdirSync(CONFIG_DIR, { recursive: true });
+        atomicWriteFileSync(APPROVAL_STATE_FILE, JSON.stringify({ approvals, savedAt: Date.now() }, null, 2));
+        console.log(`[approval-manager] 已保存 ${approvals.length} 个待处理审批`);
+    }
+    catch (err) {
+        console.error('[approval-manager] 保存审批状态失败:', err);
+    }
+}
+/**
+ * 从文件恢复审批状态，并将审批记录注入对应的 WecomClient
+ * 需在 connectAllRobots() 完成后调用，确保 client 已存在
+ */
+export async function loadApprovalState(getClientFn) {
+    if (!fs.existsSync(APPROVAL_STATE_FILE))
+        return;
+    try {
+        const content = fs.readFileSync(APPROVAL_STATE_FILE, 'utf-8');
+        const state = JSON.parse(content);
+        // 只恢复 10 分钟内的 pending 审批（超时的不再有效）
+        const now = Date.now();
+        const maxAge = 10 * 60 * 1000;
+        let restored = 0;
+        for (const { taskId, entry } of state.approvals) {
+            if (entry.status === 'pending' && now - entry.timestamp < maxAge) {
+                pendingApprovals.set(taskId, entry);
+                // 将审批记录注入对应 WecomClient，使用户点击后能正确路由
+                const client = await getClientFn(entry.robotName);
+                if (client) {
+                    client.injectApprovalRecord(taskId, {
+                        toolName: entry.tool_name,
+                        toolInput: entry.tool_input,
+                    });
+                    console.log(`[approval-manager] 恢复审批: ${taskId} → robot=${entry.robotName}`);
+                    restored++;
+                }
+                else {
+                    console.warn(`[approval-manager] 恢复审批 ${taskId} 失败：机器人 ${entry.robotName} 不在线`);
+                }
+            }
+        }
+        // 恢复完成，删除持久化文件
+        fs.unlinkSync(APPROVAL_STATE_FILE);
+        console.log(`[approval-manager] 共恢复 ${restored} 个审批`);
+    }
+    catch (err) {
+        console.warn('[approval-manager] 恢复审批状态失败:', err);
+    }
+}
+// ────────────────────────────────────────────
+// 定时保存
+// ────────────────────────────────────────────
+export function startAutoSave() {
+    if (saveInterval)
+        return;
+    saveInterval = setInterval(() => {
+        if (pendingApprovals.size > 0) {
+            saveApprovalState();
+        }
+    }, 30000);
+}
+export function stopAutoSave() {
+    if (saveInterval) {
+        clearInterval(saveInterval);
+        saveInterval = null;
+    }
+}

package/dist/bin.js

@@ -86,11 +86,11 @@ function showStatus() {
         console.log('尚未配置机器人，请运行 npx @vrs-soft/wecom-aibot-mcp 启动配置向导');
         return;
     }
-    // 构建机器人占用信息
+    // 构建机器人占用信息（v3.0: ccId 由 cc-registry 管理，连接状态不再含 ccId）
     const robotUsage = new Map();
     for (const conn of connections) {
-        if (conn.agentName) {
-            robotUsage.set(conn.robotName, { agentName: conn.agentName });
+        if (conn.connected) {
+            robotUsage.set(conn.robotName, { ccId: '' });
         }
     }
     console.log(`已配置 ${allRobots.length} 个机器人:\n`);
@@ -101,7 +101,7 @@ function showStatus() {
         console.log(`    Bot ID:     ${robot.botId}`);
         console.log(`    目标用户:   ${robot.targetUserId}`);
         if (usage) {
-            console.log(`    使用者:     ${usage.agentName}`);
+            console.log(`    使用者:     ${usage.ccId}`);
         }
         console.log('');
     }
@@ -174,11 +174,13 @@ async function waitForConnection(client, timeoutMs = 10000) {
 }
 // 启动 MCP Server（前台运行，供 --start 使用）
 async function startMcpServerForeground() {
-    const savedConfig = loadConfig();
-    if (!savedConfig || !savedConfig.botId || !savedConfig.secret || !savedConfig.targetUserId) {
+    // 检查是否有任何机器人配置（支持 config.json 和 robot-*.json）
+    const allRobots = listAllRobots();
+    if (allRobots.length === 0) {
         console.error('[mcp] 未找到配置，请先运行: npx @vrs-soft/wecom-aibot-mcp');
         process.exit(1);
     }
+    console.log(`[mcp] 发现 ${allRobots.length} 个机器人配置: ${allRobots.map(r => r.name).join(', ')}`);
     // 写入 PID 文件
     fs.writeFileSync(PID_FILE, String(process.pid));
     // 确保 hook 已安装
@@ -222,9 +224,9 @@ async function startMcpServerForeground() {
 }
 // 后台启动 MCP Server（使用 spawn）
 function startMcpServerBackground() {
-    // 检查配置是否存在
-    const savedConfig = loadConfig();
-    if (!savedConfig || !savedConfig.botId || !savedConfig.secret || !savedConfig.targetUserId) {
+    // 检查是否有任何机器人配置
+    const allRobots = listAllRobots();
+    if (allRobots.length === 0) {
         console.error('[mcp] 未找到配置，请先运行: npx @vrs-soft/wecom-aibot-mcp');
         process.exit(1);
     }

package/dist/cc-registry.d.ts

@@ -0,0 +1,62 @@
+/**
+ * ccId 注册表
+ *
+ * 管理 ~/.wecom-aibot-mcp/cc-registry.json
+ * 维护 ccId → { robotName, lastActive, createdAt } 的映射
+ *
+ * 文件锁通过 .lock 文件实现（EEXIST 原子性）
+ */
+/**
+ * 设置配置目录（仅用于测试）
+ */
+export declare function setConfigDir(dir: string): void;
+export interface CcRegistryEntry {
+    robotName: string;
+    lastActive: number;
+    createdAt: number;
+    lastNotified?: number;
+}
+type Registry = Record<string, CcRegistryEntry>;
+/**
+ * 公开接口：独立调用时使用（内部会获取锁）
+ */
+export declare function cleanupExpiredEntries(): void;
+export type RegisterResult = 'registered' | 'renewed' | 'occupied';
+/**
+ * 注册 ccId
+ * - 新 ccId → registered
+ * - 已存在且 robotName 相同 → renewed（续期）
+ * - 已存在且 robotName 不同 → occupied（被占用）
+ */
+export declare function registerCcId(ccId: string, robotName: string): RegisterResult;
+/**
+ * 注销 ccId
+ */
+export declare function unregisterCcId(ccId: string): void;
+/**
+ * 检查 ccId 是否已注册
+ */
+export declare function isCcIdRegistered(ccId: string): boolean;
+/**
+ * 更新 ccId 的最后活跃时间
+ */
+export declare function touchCcId(ccId: string): void;
+/**
+ * 获取 ccId 绑定的机器人名称
+ */
+export declare function getCcIdBinding(ccId: string): {
+    robotName: string;
+} | null;
+/**
+ * 获取完整注册表（调试用）
+ */
+export declare function getRegistry(): Registry;
+/**
+ * 启动心跳检测（5 分钟扫描一次）
+ */
+export declare function startHeartbeatMonitor(): void;
+/**
+ * 停止心跳检测
+ */
+export declare function stopHeartbeatMonitor(): void;
+export {};

package/dist/cc-registry.js

@@ -0,0 +1,272 @@
+/**
+ * ccId 注册表
+ *
+ * 管理 ~/.wecom-aibot-mcp/cc-registry.json
+ * 维护 ccId → { robotName, lastActive, createdAt } 的映射
+ *
+ * 文件锁通过 .lock 文件实现（EEXIST 原子性）
+ */
+import * as fs from 'fs';
+import * as path from 'path';
+import * as os from 'os';
+import { atomicWriteFileSync } from './utils/atomic-write.js';
+const EXPIRY_MS = 14 * 24 * 60 * 60 * 1000;
+// 心跳检测常量
+const OFFLINE_THRESHOLD = 10 * 60 * 1000; // 10 分钟无心跳视为离线
+const NOTIFICATION_INTERVAL = 30 * 60 * 1000; // 30 分钟最多通知一次
+// 支持测试环境覆盖
+let CONFIG_DIR = path.join(os.homedir(), '.wecom-aibot-mcp');
+let REGISTRY_FILE = path.join(CONFIG_DIR, 'cc-registry.json');
+let LOCK_FILE = path.join(CONFIG_DIR, 'cc-registry.lock');
+/**
+ * 设置配置目录（仅用于测试）
+ */
+export function setConfigDir(dir) {
+    CONFIG_DIR = dir;
+    REGISTRY_FILE = path.join(CONFIG_DIR, 'cc-registry.json');
+    LOCK_FILE = path.join(CONFIG_DIR, 'cc-registry.lock');
+}
+// ────────────────────────────────────────────
+// 文件锁（基于 EEXIST 原子性）
+// ────────────────────────────────────────────
+function acquireLock() {
+    try {
+        fs.openSync(LOCK_FILE, 'wx');
+        return true;
+    }
+    catch (e) {
+        if (e.code === 'EEXIST')
+            return false;
+        throw e;
+    }
+}
+function releaseLock() {
+    try {
+        fs.unlinkSync(LOCK_FILE);
+    }
+    catch { /* ignore */ }
+}
+function withLock(fn) {
+    const deadline = Date.now() + 3000;
+    while (!acquireLock()) {
+        if (Date.now() > deadline)
+            throw new Error('cc-registry: 获取锁超时');
+        // 自旋等待（锁持有时间极短）
+        const start = Date.now();
+        while (Date.now() - start < 50) { /* busy wait */ }
+    }
+    try {
+        return fn();
+    }
+    finally {
+        releaseLock();
+    }
+}
+// ────────────────────────────────────────────
+// 注册表 I/O
+// ────────────────────────────────────────────
+function readRegistry() {
+    try {
+        return JSON.parse(fs.readFileSync(REGISTRY_FILE, 'utf-8'));
+    }
+    catch {
+        return {};
+    }
+}
+function writeRegistry(registry) {
+    fs.mkdirSync(CONFIG_DIR, { recursive: true });
+    atomicWriteFileSync(REGISTRY_FILE, JSON.stringify(registry, null, 2));
+}
+// ────────────────────────────────────────────
+// 过期清理
+// ────────────────────────────────────────────
+/**
+ * 内部清理：在已持锁的上下文中直接操作传入的 registry 对象。
+ * 不获取锁，调用方负责锁安全。
+ */
+function pruneExpired(registry) {
+    const now = Date.now();
+    let changed = false;
+    for (const [ccId, entry] of Object.entries(registry)) {
+        if (now - entry.lastActive > EXPIRY_MS) {
+            console.log(`[cc-registry] 清理过期条目: ccId=${ccId}, robot=${entry.robotName}`);
+            delete registry[ccId];
+            changed = true;
+        }
+    }
+    return changed;
+}
+/**
+ * 公开接口：独立调用时使用（内部会获取锁）
+ */
+export function cleanupExpiredEntries() {
+    withLock(() => {
+        const registry = readRegistry();
+        if (pruneExpired(registry))
+            writeRegistry(registry);
+    });
+}
+/**
+ * 注册 ccId
+ * - 新 ccId → registered
+ * - 已存在且 robotName 相同 → renewed（续期）
+ * - 已存在且 robotName 不同 → occupied（被占用）
+ */
+export function registerCcId(ccId, robotName) {
+    return withLock(() => {
+        const registry = readRegistry();
+        pruneExpired(registry); // 已在锁内，不二次获取
+        const existing = registry[ccId];
+        if (existing) {
+            if (existing.robotName === robotName) {
+                // 同 ccId + 同 robotName → 续期
+                existing.lastActive = Date.now();
+                writeRegistry(registry);
+                return 'renewed';
+            }
+            else {
+                return 'occupied';
+            }
+        }
+        registry[ccId] = {
+            robotName,
+            lastActive: Date.now(),
+            createdAt: Date.now(),
+        };
+        writeRegistry(registry);
+        return 'registered';
+    });
+}
+/**
+ * 注销 ccId
+ */
+export function unregisterCcId(ccId) {
+    withLock(() => {
+        const registry = readRegistry();
+        delete registry[ccId];
+        writeRegistry(registry);
+    });
+}
+/**
+ * 检查 ccId 是否已注册
+ */
+export function isCcIdRegistered(ccId) {
+    const registry = readRegistry();
+    return ccId in registry;
+}
+/**
+ * 更新 ccId 的最后活跃时间
+ */
+export function touchCcId(ccId) {
+    withLock(() => {
+        const registry = readRegistry();
+        if (registry[ccId]) {
+            registry[ccId].lastActive = Date.now();
+            writeRegistry(registry);
+        }
+    });
+}
+/**
+ * 获取 ccId 绑定的机器人名称
+ */
+export function getCcIdBinding(ccId) {
+    const registry = readRegistry();
+    const entry = registry[ccId];
+    if (!entry)
+        return null;
+    return { robotName: entry.robotName };
+}
+/**
+ * 获取完整注册表（调试用）
+ */
+export function getRegistry() {
+    return readRegistry();
+}
+// ────────────────────────────────────────────
+// 心跳检测
+// ────────────────────────────────────────────
+let heartbeatInterval = null;
+/**
+ * 检查 CC 心跳并发送离线通知
+ */
+async function checkCcHeartbeat() {
+    const registry = readRegistry();
+    const now = Date.now();
+    let changed = false;
+    for (const [ccId, entry] of Object.entries(registry)) {
+        const inactive = now - entry.lastActive;
+        if (inactive > OFFLINE_THRESHOLD) {
+            // 检查是否需要通知（避免重复）
+            const shouldNotify = !entry.lastNotified ||
+                (now - entry.lastNotified > NOTIFICATION_INTERVAL);
+            if (shouldNotify) {
+                await sendOfflineNotification(ccId, entry.robotName);
+                entry.lastNotified = now;
+                changed = true;
+            }
+        }
+    }
+    if (changed) {
+        withLock(() => {
+            const reg = readRegistry();
+            for (const [ccId, entry] of Object.entries(registry)) {
+                if (entry.lastNotified && reg[ccId]) {
+                    reg[ccId].lastNotified = entry.lastNotified;
+                }
+            }
+            writeRegistry(reg);
+        });
+    }
+}
+/**
+ * 发送离线通知到微信
+ */
+async function sendOfflineNotification(ccId, robotName) {
+    try {
+        // 动态导入避免循环依赖
+        const { getClient } = await import('./connection-manager.js');
+        const client = await getClient(robotName);
+        if (!client) {
+            console.log(`[heartbeat] 机器人 ${robotName} 未连接，无法发送离线通知`);
+            return;
+        }
+        const inactiveMinutes = Math.floor((Date.now() - getRegistry()[ccId]?.lastActive || 0) / 60000);
+        const message = `【系统警告】CC "${ccId}" 已超过 ${inactiveMinutes} 分钟无心跳，可能已离线。
+
+可能原因：
+• CC 进程已退出
+• 网络连接中断
+• CC 正在执行长时间任务
+
+建议：请检查终端状态或重新启动 CC。`;
+        await client.sendText(message);
+        console.log(`[heartbeat] 已发送离线通知: ccId=${ccId}, robot=${robotName}`);
+    }
+    catch (err) {
+        console.error(`[heartbeat] 发送离线通知失败:`, err);
+    }
+}
+/**
+ * 启动心跳检测（5 分钟扫描一次）
+ */
+export function startHeartbeatMonitor() {
+    if (heartbeatInterval)
+        return;
+    // 测试期间改为 1 分钟，正式环境改为 5 * 60 * 1000
+    heartbeatInterval = setInterval(() => {
+        checkCcHeartbeat().catch(err => {
+            console.error('[heartbeat] 心跳检测错误:', err);
+        });
+    }, 1 * 60 * 1000);
+    console.log('[heartbeat] 心跳检测已启动（测试模式：1 分钟周期）');
+}
+/**
+ * 停止心跳检测
+ */
+export function stopHeartbeatMonitor() {
+    if (heartbeatInterval) {
+        clearInterval(heartbeatInterval);
+        heartbeatInterval = null;
+        console.log('[heartbeat] 心跳检测已停止');
+    }
+}

package/dist/client.d.ts

@@ -1,4 +1,5 @@
 import { EventEmitter } from 'events';
+declare const MAX_PENDING_MESSAGES = 100;
 interface ApprovalRecord {
     taskId: string;
     resolved: boolean;
@@ -9,11 +10,15 @@ interface ApprovalRecord {
     projectDir?: string;
     lastKeepaliveMinute?: number;
     keepaliveCount?: number;
+    operationHash?: string;
+    consumed?: boolean;
 }
 interface MessageRecord {
+    seq: number;
     msgid: string;
     content: string;
     timestamp: number;
+    serverTime: number;
     from_userid: string;
     chatid: string;
     chattype: 'single' | 'group';
@@ -44,7 +49,8 @@ declare class WecomClient extends EventEmitter {
         error?: string;
     }>;
     sendText(content: string, targetUser?: string): Promise<boolean>;
-    sendApprovalRequest(title: string, description: string, requestId: string, targetUser?: string): Promise<string>;
+    sendApprovalRequest(title: string, description: string, requestId: string, targetUser?: string, toolInput?: Record<string, unknown>, // v3.0: 用于去重
+    ccId?: string): Promise<string>;
     sendQueuedApproval(taskId: string, title: string, description: string, targetUser?: string): Promise<boolean>;
     getApprovalResult(taskId: string): 'pending' | 'allow-once' | 'allow-always' | 'deny';
     getPendingApprovals(): string[];
@@ -52,6 +58,28 @@ declare class WecomClient extends EventEmitter {
     getApprovalRecord(taskId: string): ApprovalRecord | undefined;
     getLatestMessage(afterTimestamp: number): MessageRecord | undefined;
     getPendingMessages(clear?: boolean): MessageRecord[];
+    /**
+     * 根据操作哈希查找已有审批
+     */
+    findApprovalByHash(operationHash: string): ApprovalRecord | null;
+    /**
+     * 检查审批是否可以消费
+     * allow-once 只能消费一次
+     */
+    canConsumeApproval(taskId: string): boolean;
+    /**
+     * 消费审批结果
+     * allow-once 消费后标记为已消费
+     */
+    consumeApproval(taskId: string): 'allow-once' | 'allow-always' | 'deny' | null;
+    /**
+     * 注入审批记录（MCP 重启恢复用）
+     * 如果 taskId 已存在则跳过，避免覆盖用户已点击的结果
+     */
+    injectApprovalRecord(taskId: string, partial: {
+        toolName?: string;
+        toolInput?: Record<string, unknown>;
+    }): void;
     cleanupMessages(maxAgeMs?: number): void;
     private flushPendingMessages;
     getPendingMessageCount(): number;
@@ -63,4 +91,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 };
+export { WecomClient, ApprovalRecord, MessageRecord, MAX_PENDING_MESSAGES };