@vrs-soft/wecom-aibot-mcp 3.3.0 → 3.3.2

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。
@@ -89,18 +89,20 @@ async function sendWecomMediaFromFile(args) {
     }
     const filename = args.filename || path.basename(abs);
     const buf = fs.readFileSync(abs);
+    // v3.3.1: 所有可能包含 CJK 的 header 值必须 encodeURIComponent —— HTTP header 值受 ISO-8859-1 限制，
+    //         node fetch 见到 char > 255 直接抛 ByteString TypeError。daemon 端 getHeaderStr 会 decodeURIComponent。
     const headers = {
         'Content-Type': 'application/octet-stream',
         'Content-Length': String(buf.length),
-        'X-Target-User': args.target_user,
+        'X-Target-User': encodeURIComponent(args.target_user),
         'X-Media-Type': args.media_type,
         'X-Filename': encodeURIComponent(filename),
-        'X-Cc-Id': args.cc_id, // v3.2.5: daemon 用 ccId 查 registry 找到正确的 robot（群聊必须用 CC 自己的机器人）
+        'X-Cc-Id': encodeURIComponent(args.cc_id),
     };
     if (MCP_AUTH_TOKEN)
         headers['Authorization'] = `Bearer ${MCP_AUTH_TOKEN}`;
     if (args.robot_name)
-        headers['X-Robot'] = args.robot_name;
+        headers['X-Robot'] = encodeURIComponent(args.robot_name);
     if (args.video_title)
         headers['X-Video-Title'] = encodeURIComponent(args.video_title);
     if (args.video_description)
@@ -146,14 +148,15 @@ async function uploadFileToHttp(args) {
         headers['Authorization'] = `Bearer ${MCP_AUTH_TOKEN}`;
     if (args.ttl_seconds)
         headers['X-TTL'] = String(args.ttl_seconds);
+    // v3.3.1: 同上，CJK ccId / tags 必须 URL 编码
     if (args.kind === 'document') {
-        headers['X-From-CC'] = args.cc_id;
-        headers['X-To-CC'] = args.to_cc || '';
+        headers['X-From-CC'] = encodeURIComponent(args.cc_id);
+        headers['X-To-CC'] = encodeURIComponent(args.to_cc || '');
     }
     else {
-        headers['X-Owner-CC'] = args.cc_id;
+        headers['X-Owner-CC'] = encodeURIComponent(args.cc_id);
         if (args.tags && args.tags.length > 0)
-            headers['X-Tags'] = args.tags.join(',');
+            headers['X-Tags'] = encodeURIComponent(args.tags.join(','));
     }
     try {
         const res = await fetch(`${MCP_URL}${endpoint}`, { method: 'POST', headers, body: buf });
@@ -844,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/package.json

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