@vrs-soft/wecom-aibot-mcp 3.3.1 → 3.3.3

package/dist/channel-server.js

@@ -16,7 +16,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import { execSync } from 'child_process';
 import { VERSION, installSkill } from './config-wizard.js';
-import { addPermissionHook, registerActiveProject, unregisterActiveProject, updateWechatModeConfig } from './project-config.js';
+import { addPermissionHook, registerActiveProject, unregisterActiveProject, updateWechatModeConfig, loadWechatModeConfig } from './project-config.js';
 import { logger } from './logger.js';
 /**
  * 沿进程树向上查找 Claude Code TUI 的 PID。
@@ -847,12 +847,24 @@ function registerChannelTools(server) {
             .describe('运行模式：channel=SSE推送(推荐)，http=轮询(兼容)'),
         auto_approve_timeout: z.number().optional().default(600).describe('超时自动决策等待时间（秒，默认 600 即 10 分钟）'),
     }, async ({ agent_name, cc_id, robot_id, project_dir, mode, auto_approve_timeout }) => {
+        // v3.3.2: 远端 daemon 看不到本地 .claude/wecom-aibot.json，无法走 existingConfig 复用 ccId 的路径。
+        // 这里在 channel-server 本地读保存的 ccId，没有传入 cc_id 时自动塞进去 —— 避免每次 enter
+        // 都因 stale registry entry 撞冲突，生成 商务机器人-2 / -3 之类的奇怪 ccId。
+        const effectiveProjectDir = project_dir || process.cwd();
+        let effectiveCcId = cc_id;
+        if (!effectiveCcId) {
+            const saved = loadWechatModeConfig(effectiveProjectDir);
+            if (saved?.ccId) {
+                effectiveCcId = saved.ccId;
+                logger.info('reuse saved ccId from local wecom-aibot.json', { projectDir: effectiveProjectDir, ccId: saved.ccId });
+            }
+        }
         // 转发请求
         const result = await forwardToHttpMcp('enter_headless_mode', {
             agent_name,
-            cc_id,
+            cc_id: effectiveCcId,
             robot_id,
-            project_dir: project_dir || process.cwd(),
+            project_dir: effectiveProjectDir,
             mode,
             auto_approve_timeout,
         });

package/dist/config-wizard.js

@@ -271,6 +271,9 @@ fi
 MODE=$(jq -r '.mode // "http"' "$CONFIG_FILE" 2>/dev/null)
 MCP_BASE_URL="http://127.0.0.1:$MCP_PORT"
 AUTH_ARGS=()
+# v3.3.3: 远端 daemon 用自签 / Let's Encrypt cert 时若过期或被信任链拒绝，会让 curl 静默失败。
+#         hook 已经用 Bearer token 鉴权，TLS 只是传输加密，因此 https URL 一律加 -k 跳过 cert 校验。
+TLS_OPTS=()
 
 _try_remote() {
   CLAUDE_JSON="$HOME/.claude.json"
@@ -284,7 +287,11 @@ _try_remote() {
     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)
+  # v3.3.3: 远端 https 时 -k 跳 cert 校验（cert 过期/不可信不再卡死 hook）
+  if [[ "$REMOTE_URL" == https://* ]]; then
+    TLS_OPTS=(-k)
+  fi
+  REMOTE_HEALTH=$(curl -s -m 5 "\${TLS_OPTS[@]}" \${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"
@@ -320,7 +327,7 @@ BODY=$(jq -n --arg tool_name "$TOOL_NAME" --argjson tool_input "$TOOL_INPUT" --a
   '{"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 "$MCP_BASE_URL/approve" \\
+RESPONSE=$(curl -s -m 10 "\${TLS_OPTS[@]}" -X POST "$MCP_BASE_URL/approve" \\
   "\${AUTH_ARGS[@]}" \\
   -H "Content-Type: application/json" \\
   -d "$BODY")
@@ -350,7 +357,7 @@ while [[ $POLL_COUNT -lt $MAX_POLL ]]; do
   sleep 2
   POLL_COUNT=$((POLL_COUNT + 1))
 
-  STATUS=$(curl -s -m 3 "\${AUTH_ARGS[@]}" "$MCP_BASE_URL/approval_status/$TASK_ID" 2>/dev/null)
+  STATUS=$(curl -s -m 3 "\${TLS_OPTS[@]}" "\${AUTH_ARGS[@]}" "$MCP_BASE_URL/approval_status/$TASK_ID" 2>/dev/null)
   RESULT=$(echo "$STATUS" | jq -r '.result // empty')
   log_debug "[$(date)] Poll $POLL_COUNT/$MAX_POLL: result=$RESULT"
 
@@ -388,7 +395,7 @@ log_debug "[$(date)] IS_DELETE: $IS_DELETE"
 if [[ $IS_DELETE -eq 1 ]]; then
   log_debug "[$(date)] Auto-deny: delete operation"
   # 通知 MCP Server 发送微信消息
-  curl -s -m 5 -X POST "$MCP_BASE_URL/approval_timeout/$TASK_ID" "\${AUTH_ARGS[@]}" -H "Content-Type: application/json" -d '{"result":"deny","reason":"超时自动拒绝：删除操作需人工确认"}' > /dev/null 2>&1 &
+  curl -s -m 5 "\${TLS_OPTS[@]}" -X POST "$MCP_BASE_URL/approval_timeout/$TASK_ID" "\${AUTH_ARGS[@]}" -H "Content-Type: application/json" -d '{"result":"deny","reason":"超时自动拒绝：删除操作需人工确认"}' > /dev/null 2>&1 &
   printf '%s\\n' '{"hookSpecificOutput":{"hookEventName":"PermissionRequest","decision":{"behavior":"deny","message":"超时自动拒绝：删除操作需人工确认"}}}'
   exit 0
 fi
@@ -449,12 +456,12 @@ log_debug "[$(date)] IS_IN_PROJECT: $IS_IN_PROJECT"
 if [[ $IS_IN_PROJECT -eq 1 ]]; then
   log_debug "[$(date)] Auto-allow: project operation"
   # 通知 MCP Server 发送微信消息
-  curl -s -m 5 -X POST "$MCP_BASE_URL/approval_timeout/$TASK_ID" "\${AUTH_ARGS[@]}" -H "Content-Type: application/json" -d '{"result":"allow-once","reason":"超时自动允许：项目内操作"}' > /dev/null 2>&1 &
+  curl -s -m 5 "\${TLS_OPTS[@]}" -X POST "$MCP_BASE_URL/approval_timeout/$TASK_ID" "\${AUTH_ARGS[@]}" -H "Content-Type: application/json" -d '{"result":"allow-once","reason":"超时自动允许：项目内操作"}' > /dev/null 2>&1 &
   printf '%s\\n' '{"hookSpecificOutput":{"hookEventName":"PermissionRequest","decision":{"behavior":"allow","message":"超时自动允许：项目内操作"}}}'
 else
   log_debug "[$(date)] Auto-deny: outside project"
   # 通知 MCP Server 发送微信消息
-  curl -s -m 5 -X POST "$MCP_BASE_URL/approval_timeout/$TASK_ID" "\${AUTH_ARGS[@]}" -H "Content-Type: application/json" -d '{"result":"deny","reason":"超时自动拒绝：项目外操作需人工确认"}' > /dev/null 2>&1 &
+  curl -s -m 5 "\${TLS_OPTS[@]}" -X POST "$MCP_BASE_URL/approval_timeout/$TASK_ID" "\${AUTH_ARGS[@]}" -H "Content-Type: application/json" -d '{"result":"deny","reason":"超时自动拒绝：项目外操作需人工确认"}' > /dev/null 2>&1 &
   printf '%s\\n' '{"hookSpecificOutput":{"hookEventName":"PermissionRequest","decision":{"behavior":"deny","message":"超时自动拒绝：项目外操作需人工确认"}}}'
 fi
 `;

package/dist/logger.js

@@ -89,12 +89,14 @@ function write(level, msg, data) {
             // 写文件失败不抛
         }
     }
-    // 控制台
+    // 控制台 —— **stdio MCP server 的 stdout 是 JSON-RPC 协议管道，绝不能写非协议内容**
+    // 否则 Claude TUI 解析失败 → 判定 disconnect → channel mcp 不断中断。
+    // 任何级别的日志一律走 stderr。
     if (level === 'error') {
         process.stderr.write(entry);
     }
     else if (debugMode) {
-        process.stdout.write(entry);
+        process.stderr.write(entry);
     }
 }
 // 公共 API

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vrs-soft/wecom-aibot-mcp",
-  "version": "3.3.1",
+  "version": "3.3.3",
   "description": "企业微信智能机器人 MCP 客户端 - 连接 wecom-aibot-server daemon",
   "type": "module",
   "main": "dist/index.js",