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

package/dist/config-wizard.js

@@ -448,15 +448,42 @@ case "$TOOL_NAME" in
     ;;
 esac
 
-# 检查项目目录的微信模式配置文件
-PROJECT_DIR=$(pwd)
-CONFIG_FILE="$PROJECT_DIR/.claude/wecom-aibot.json"
+# 通过进程树匹配活跃项目（以 Claude 进程为准，不依赖 pwd）
+ACTIVE_INDEX="$HOME/.wecom-aibot-mcp/active-projects.json"
+log_debug "[$(date)] Checking active-projects index via PID tree (pid=$$, ppid=$PPID)"
 
-log_debug "[$(date)] Checking config: $CONFIG_FILE"
+if [[ ! -f "$ACTIVE_INDEX" ]]; then
+  log_debug "[$(date)] No active-projects index, exit 0"
+  exit 0
+fi
+
+# 沿进程树向上查找，深度 8 层
+PROJECT_DIR=""
+SEARCH_PID=$PPID
+for i in {1..8}; do
+  if [[ -z "$SEARCH_PID" ]] || [[ "$SEARCH_PID" -le 1 ]]; then
+    break
+  fi
+  MATCH=$(jq -r --argjson p "$SEARCH_PID" '.[] | select(.pid==$p) | .projectDir' "$ACTIVE_INDEX" 2>/dev/null)
+  if [[ -n "$MATCH" ]]; then
+    PROJECT_DIR="$MATCH"
+    log_debug "[$(date)] Found project via PID $SEARCH_PID (depth $i): $PROJECT_DIR"
+    break
+  fi
+  SEARCH_PID=$(ps -o ppid= -p "$SEARCH_PID" 2>/dev/null | tr -d ' ')
+done
+
+if [[ -z "$PROJECT_DIR" ]]; then
+  log_debug "[$(date)] No PID match in process tree, exit 0"
+  exit 0
+fi
+
+CONFIG_FILE="$PROJECT_DIR/.claude/wecom-aibot.json"
+log_debug "[$(date)] Found project: $PROJECT_DIR"
 
 # 配置文件不存在，不在微信模式
 if [[ ! -f "$CONFIG_FILE" ]]; then
-  log_debug "[$(date)] No config file, exit 0"
+  log_debug "[$(date)] No wecom-aibot.json config, exit 0"
   exit 0
 fi
 
@@ -468,37 +495,48 @@ if [[ "$WECHAT_MODE" != "true" ]]; then
   exit 0
 fi
 
-# 确定 MCP Server 地址（本地优先，失败则尝试远程 channel 配置）
+# 确定 MCP Server 地址
+# channel 模式直接使用远程地址，http 模式先试本地再回退远程
+MODE=$(jq -r '.mode // "http"' "$CONFIG_FILE" 2>/dev/null)
 MCP_BASE_URL="http://127.0.0.1:$MCP_PORT"
 AUTH_ARGS=()
 
-HEALTH=$(curl -s -m 2 "$MCP_BASE_URL/health" 2>/dev/null)
-log_debug "[$(date)] Local health check: $HEALTH"
-if ! echo "$HEALTH" | jq -e '.status == "ok"' > /dev/null 2>&1; then
-  log_debug "[$(date)] Local server not available, trying remote channel config..."
+_try_remote() {
   CLAUDE_JSON="$HOME/.claude.json"
-  if [[ -f "$CLAUDE_JSON" ]]; then
-    REMOTE_URL=$(jq -r '.mcpServers["wecom-aibot-channel"].env.MCP_URL // empty' "$CLAUDE_JSON" 2>/dev/null)
-    REMOTE_TOKEN=$(jq -r '.mcpServers["wecom-aibot-channel"].env.MCP_AUTH_TOKEN // empty' "$CLAUDE_JSON" 2>/dev/null)
-    if [[ -n "$REMOTE_URL" ]]; then
-      REMOTE_HEALTH=$(curl -s -m 5 \${REMOTE_TOKEN:+-H "Authorization: Bearer $REMOTE_TOKEN"} "$REMOTE_URL/health" 2>/dev/null)
-      log_debug "[$(date)] Remote health check ($REMOTE_URL): $REMOTE_HEALTH"
-      if echo "$REMOTE_HEALTH" | jq -e '.status == "ok"' > /dev/null 2>&1; then
-        MCP_BASE_URL="$REMOTE_URL"
-        [[ -n "$REMOTE_TOKEN" ]] && AUTH_ARGS=(-H "Authorization: Bearer $REMOTE_TOKEN")
-        log_debug "[$(date)] Using remote server: $MCP_BASE_URL"
-      else
-        log_debug "[$(date)] Remote health check failed, exit 0"
-        exit 0
-      fi
-    else
-      log_debug "[$(date)] No remote URL configured, exit 0"
-      exit 0
-    fi
-  else
+  if [[ ! -f "$CLAUDE_JSON" ]]; then
     log_debug "[$(date)] No ~/.claude.json found, exit 0"
     exit 0
   fi
+  REMOTE_URL=$(jq -r '.mcpServers["wecom-aibot-channel"].env.MCP_URL // empty' "$CLAUDE_JSON" 2>/dev/null)
+  REMOTE_TOKEN=$(jq -r '.mcpServers["wecom-aibot-channel"].env.MCP_AUTH_TOKEN // empty' "$CLAUDE_JSON" 2>/dev/null)
+  if [[ -z "$REMOTE_URL" ]]; then
+    log_debug "[$(date)] No remote URL configured, exit 0"
+    exit 0
+  fi
+  REMOTE_HEALTH=$(curl -s -m 5 \${REMOTE_TOKEN:+-H "Authorization: Bearer $REMOTE_TOKEN"} "$REMOTE_URL/health" 2>/dev/null)
+  log_debug "[$(date)] Remote health check ($REMOTE_URL): $REMOTE_HEALTH"
+  if echo "$REMOTE_HEALTH" | jq -e '.status == "ok"' > /dev/null 2>&1; then
+    MCP_BASE_URL="$REMOTE_URL"
+    [[ -n "$REMOTE_TOKEN" ]] && AUTH_ARGS=(-H "Authorization: Bearer $REMOTE_TOKEN")
+    log_debug "[$(date)] Using remote server: $MCP_BASE_URL"
+  else
+    log_debug "[$(date)] Remote health check failed, exit 0"
+    exit 0
+  fi
+}
+
+if [[ "$MODE" == "channel" ]]; then
+  # channel 模式：直接使用远程地址，跳过本地检查
+  log_debug "[$(date)] Channel mode, using remote server directly"
+  _try_remote
+else
+  # http 模式：本地优先，失败则尝试远程
+  HEALTH=$(curl -s -m 2 "$MCP_BASE_URL/health" 2>/dev/null)
+  log_debug "[$(date)] Local health check: $HEALTH"
+  if ! echo "$HEALTH" | jq -e '.status == "ok"' > /dev/null 2>&1; then
+    log_debug "[$(date)] Local server not available, trying remote channel config..."
+    _try_remote
+  fi
 fi
 
 # 读取当前项目使用的机器人名称和 ccId
@@ -588,12 +626,14 @@ fi
 # 规则：删除命令→拒绝，项目内操作→允许，项目外操作→拒绝
 log_debug "[$(date)] Executing smart auto-approval"
 
-# 检查是否是删除命令
+# 检查是否是删除命令（仅匹配命令行本身，不匹配 heredoc 内容）
 IS_DELETE=0
 if [[ "$TOOL_NAME" == "Bash" ]]; then
-  CMD=$(echo "$TOOL_INPUT" | jq -r '.command // empty')
-  log_debug "[$(date)] Checking delete: CMD=$CMD"
-  if [[ "$CMD" == rm* ]] || [[ "$CMD" == *" rm "* ]] || [[ "$CMD" == *"-rf"* ]]; then
+  # 只取命令的第一行（避免 heredoc 内容干扰）
+  FIRST_LINE=$(echo "$TOOL_INPUT" | jq -r '.command // empty' | head -1)
+  log_debug "[$(date)] Checking delete: FIRST_LINE=$FIRST_LINE"
+  if [[ "$FIRST_LINE" == rm\\ * ]] || [[ "$FIRST_LINE" == rm ]] \\
+     || echo "$FIRST_LINE" | grep -qE '(^|[;&|(] *)(rm |rmdir )'; then
     IS_DELETE=1
   fi
 fi
@@ -615,10 +655,32 @@ IS_IN_PROJECT=0
 case "$TOOL_NAME" in
   Bash)
     CMD=$(echo "$TOOL_INPUT" | jq -r '.command // empty')
-    # 只有明确在项目目录内操作才认为是项目内操作
-    # 相对路径 ./ 或包含项目目录路径
-    if [[ "$CMD" == *"$PROJECT_DIR"* ]] || [[ "$CMD" == ./* ]]; then
+    EXEC_CWD=$(pwd)
+    log_debug "[$(date)] Bash CMD=$CMD, EXEC_CWD=$EXEC_CWD"
+    if [[ "$CMD" == *"$PROJECT_DIR"* ]]; then
+      # 明确包含项目路径 → 项目内
       IS_IN_PROJECT=1
+    elif echo "$CMD" | grep -qE '(^|[ \t])/[a-zA-Z0-9]'; then
+      # 含有绝对路径：过滤掉项目路径和安全系统目录，看是否还有真正的项目外路径
+      OUTSIDE=$(echo "$CMD" | grep -oE '(^| )/[a-zA-Z0-9][^ \t>|;&]*' | tr -d ' ' \
+        | grep -v "^$PROJECT_DIR" \
+        | grep -vE '^(/tmp/|/var/tmp/|/dev/null|/dev/stdin|/dev/stdout|/dev/stderr|/dev/fd/)')
+      if [[ -z "$OUTSIDE" ]]; then
+        # 绝对路径全是项目内或安全临时目录 → 以执行位置为准
+        log_debug "[$(date)] Only safe abs paths, checking EXEC_CWD: $EXEC_CWD"
+        if [[ "$EXEC_CWD" == "$PROJECT_DIR"* ]]; then
+          IS_IN_PROJECT=1
+        fi
+      else
+        log_debug "[$(date)] Outside abs path detected: $OUTSIDE"
+        IS_IN_PROJECT=0
+      fi
+    else
+      # 无绝对路径（相对路径或纯命令如 npm/git）→ 以执行位置为准
+      log_debug "[$(date)] No absolute path, checking EXEC_CWD: $EXEC_CWD"
+      if [[ "$EXEC_CWD" == "$PROJECT_DIR"* ]]; then
+        IS_IN_PROJECT=1
+      fi
     fi
     ;;
   Write|Edit)

package/dist/project-config.d.ts

@@ -20,6 +20,7 @@ export interface WechatModeConfig {
     autoApprove?: boolean;
     autoApproveTimeout?: number;
     heartbeatJobId?: string;
+    mode?: 'channel' | 'http';
 }
 /**
  * 获取项目配置文件路径
@@ -147,3 +148,7 @@ export declare function removeStopHook(projectDir: string): {
     path: string;
     existed: boolean;
 };
+/** 进入微信模式时注册 PID → projectDir */
+export declare function registerActiveProject(claudePid: number, projectDir: string): void;
+/** 退出微信模式时注销 */
+export declare function unregisterActiveProject(projectDir: string): void;

package/dist/project-config.js

@@ -405,3 +405,36 @@ export function removeStopHook(projectDir) {
         return { success: false, path: settingsPath, existed: false };
     }
 }
+// ============================================================
+// 活跃项目索引（PID → projectDir，供 permission hook 使用）
+// ============================================================
+const ACTIVE_PROJECTS_FILE = path.join(os.homedir(), '.wecom-aibot-mcp', 'active-projects.json');
+function readActiveProjects() {
+    if (!fs.existsSync(ACTIVE_PROJECTS_FILE))
+        return [];
+    try {
+        return JSON.parse(fs.readFileSync(ACTIVE_PROJECTS_FILE, 'utf-8'));
+    }
+    catch {
+        return [];
+    }
+}
+function writeActiveProjects(entries) {
+    const dir = path.dirname(ACTIVE_PROJECTS_FILE);
+    if (!fs.existsSync(dir))
+        fs.mkdirSync(dir, { recursive: true });
+    fs.writeFileSync(ACTIVE_PROJECTS_FILE, JSON.stringify(entries, null, 2));
+}
+/** 进入微信模式时注册 PID → projectDir */
+export function registerActiveProject(claudePid, projectDir) {
+    const entries = readActiveProjects().filter(e => e.projectDir !== projectDir);
+    entries.push({ pid: claudePid, projectDir });
+    writeActiveProjects(entries);
+    logger.log(`[project-config] 注册活跃项目: pid=${claudePid} projectDir=${projectDir}`);
+}
+/** 退出微信模式时注销 */
+export function unregisterActiveProject(projectDir) {
+    const entries = readActiveProjects().filter(e => e.projectDir !== projectDir);
+    writeActiveProjects(entries);
+    logger.log(`[project-config] 注销活跃项目: ${projectDir}`);
+}

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, addStopHook, removeStopHook } from '../project-config.js';
+import { updateWechatModeConfig, loadWechatModeConfig, addPermissionHook, removePermissionHook, addStopHook, removeStopHook, registerActiveProject, unregisterActiveProject } from '../project-config.js';
 import { logger } from '../logger.js';
 // 辅助函数：从 ccId 获取客户端
 async function getConnectedClient(ccId) {
@@ -431,7 +431,10 @@ npx @vrs-soft/wecom-aibot-mcp
             ccId: finalCcId,
             autoApprove: auto_approve,
             autoApproveTimeout: auto_approve_timeout,
+            mode,
         });
+        // 注册 PID → projectDir（供 permission hook 通过进程树匹配项目）
+        registerActiveProject(process.ppid ?? process.pid, projectDir);
         // 安装 skill 到项目本地（支持远程部署 MCP）
         const skillResult = installSkill(projectDir);
         // 添加 PermissionRequest hook 到项目 settings.json
@@ -486,9 +489,10 @@ npx @vrs-soft/wecom-aibot-mcp
         }
         // 断开连接
         disconnectRobot(robotName);
-        // 更新项目配置文件中的 wechatMode 为 false
+        // 更新项目配置文件中的 wechatMode 为 false，注销 PID 索引
         const projectDir = project_dir || process.cwd();
         updateWechatModeConfig(projectDir, { wechatMode: false });
+        unregisterActiveProject(projectDir);
         // 删除 PermissionRequest hook 从项目 settings.json
         const hookResult = removePermissionHook(projectDir);
         // 删除 Stop hook 从项目 settings.json

package/package.json

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