@rezti/dsh-rez-wechat 0.1.15 → 0.1.17

package/README.md

@@ -6,11 +6,12 @@
 dsh plugin --profile web add @rezti/dsh-rez-suite
 ```
 
-以后升级只记：`dsh plugin --profile web add @rezti/dsh-rez-suite@latest`。不要再单独 add 本包。
+以后升级只记：`dsh plugin --profile web update @rezti/dsh-rez-suite`。不要再单独 add 本包。
 
 | 能力 | 做法 |
 |---|---|
-| 企业微信智能机器人 | 官方 `@wecom/aibot-node-sdk`。设置页给每个 Harness 房间绑一个 BotID + Secret。同事在企微跟哪个 bot 说话，消息进网页左侧那个房间。密钥 `~/.dsh/wecom-channels.json`（mode 600），不进 compose。 |
+| 企业微信智能机器人 | 官方 `@wecom/aibot-node-sdk`。设置页给每个 Harness 房间绑一个 BotID + Secret。同事在企微跟哪个 bot 说话，消息进网页左侧那个房间的**同一条会话**。密钥 `~/.dsh/wecom-channels.json`（mode 600），不进 compose。 |
+| 企业微信办公能力 | 官方 [`wecom-cli`](https://github.com/WecomTeam/wecom-cli) >=1.1（通讯录/在线文档/表格/待办/日程/会议/邮件/微盘等）。**不是** MCP。`rez_status.wecomCli.modules` 是品类目录。房间里种了官方 `wecomcli-*` 技能。CLI 报未授权才说该模块未开通。不要用旧的「超过 10 人只能用文档」说法。 |
 | 旧群机器人 Webhook（兼容） | 一个 bot 都没绑、且仍配置了 `REZ_WECHAT_WEBHOOK` 时，才拉起 `wecom-mcp` |
 | 个人微信（QClaw / ClawBot） | dsh Web 设置面板扫码，之后直接在微信里说话。消息进左侧 **微信** 文件夹的同一会话，模型跟网页默认。 |
 
@@ -26,9 +27,10 @@ dsh plugin --profile web add @rezti/dsh-rez-suite
 
 企微智能机器人（Accio 同款按房间绑定）：
 
-- 可绑房间：搞钱、产品、运营、人事助理、财务助理、法务助理、设计、实验室（不要绑「微信」个人通道）
+- 可绑房间：搞钱、产品、运营、人事助理、财务助理、法务助理、设计、发布、电商、实验室（不要绑「微信」个人通道）
+- 同一房间固定一条网页会话；只有「重启对话」才新开并把旧的归档
 - 会话标题是房间名；网页必须开着
-- 收文本 / 混排文字、流式回复、进入会话欢迎语；图片/文件/语音请走网页端或 Nextcloud
+- 收文本 / 混排文字 / 单聊语音（官方已转写成 `voice.content`，当普通文字进房间）、流式回复、进入会话欢迎语；图片和文件请走网页端或 Nextcloud。个人微信语音不转写。群聊语音官方不保证有转写。
 - BotID / Secret 在企业微信管理后台 → 智能机器人（[开发前必读](https://developer.work.weixin.qq.com/document/path/101805) / [长连接](https://developer.work.weixin.qq.com/document/path/101463)）
 
 扫码 UI 在 suite 面板；通道本身在本包。不要对同一 profile 既 add suite 又 add wechat，会重复注册。

package/lib/index.js

@@ -6,7 +6,7 @@ import { WECOM_BINDABLE_ROOMS } from './wecom-store.js';
 export const name = 'rez-wechat';
 export const inject = ['systemPrompt', 'webServer', 'rezSso'];
 const GUIDANCE = [
-    '企业微信智能机器人走官方 @wecom/aibot-node-sdk（BotID + Secret 长连接）。设置页按 Harness 房间各绑一个 bot：同事在企微跟哪个机器人说话，消息就进网页左侧那个房间（人事/财务/法务/设计/实验室/老板三室）。密钥写在 ~/.dsh/wecom-channels.json，不要写进 compose。没有绑定任何 bot 且仍配置了 REZ_WECHAT_WEBHOOK 时，才兼容旧的 wecom-mcp 群发。不要自写 WebSocket，也不要引导去填群 Webhook。',
+    '企业微信有两层，不要混：① 房间消息通道 = 官方 @wecom/aibot-node-sdk（设置页 BotID + Secret 长连接），同事在企微跟哪个 bot 说话就进哪个 Harness 房间（人事/财务/法务/设计/发布/电商/实验室/老板三室），并固定同一条网页会话；只有同事说「重启对话」才新开并把旧的归档。② 办公能力 = 官方 wecom-cli >=1.1（通讯录/在线文档/在线表格/智能表格/智能文档/待办/日程/会议/邮件/微盘/消息），本企业已开通，看 rez_status.wecomCli.modules，按房间 wecomcli-* 技能执行。不要因为状态页没有企微 MCP 就说没有企微能力，也不要说「超过 10 人只能用文档」。CLI 报未授权才说该模块未开通。密钥写在 ~/.dsh/wecom-channels.json，不要写进 compose。没有绑定任何 bot 且仍配置了 REZ_WECHAT_WEBHOOK 时，才兼容旧的 wecom-mcp 群发，不要引导去填群 Webhook。不要自写 WebSocket/HTTP 客户端。',
     '个人微信是 QClaw 同款 ClawBot 通道：在 Rez 面板「微信」页扫码一次，然后直接在微信里说话。消息进入网页左侧「微信」文件夹并延续同一会话，模型跟网页默认（在网页里选了 Kimi 就会走 Kimi）。网页端归档了也能从微信自动恢复到侧栏（空白会话网页会藏起来，所以新开的会话会先打一句招呼再出现）。网页端出现选择题时会编成纯文本发到微信，回复数字或选项原文即可；思考过程不会转发。发「重启对话」会新开一条可见的网页会话并把旧的归档。通道断了点「重新连接」（已登录不必再扫码）。不要再跑 npx weixin-mcp login，也不要调用 mcp__weixin__*。网页端必须开着。工商查询请切到法务助理，避免串房间。',
     '这是 ClawBot 客服会话，不是用个人微信号管好友/群。对外发消息必须先征得用户批准。',
 ].join('');

package/lib/web-shim.d.ts

@@ -38,12 +38,19 @@ export declare function parseHeadlessArgv(argv: string[]): {
 } | {
     error: string;
 };
+/**
+ * Personal WeChat follow-ups wrap history in 桥接上下文. Use this only to
+ * slice the latest user line. Do not mint a new web session from it — WeCom
+ * turns are always plain text and must reuse the room's stored session.
+ */
 export declare function isFreshBridgeTurn(task: string): boolean;
 /** WeChat /new is handled by dsh-wechat-bridge. Chinese "重启对话" is a normal message and must be detected here. */
 export declare function isRestartCommand(text: string): boolean;
-export declare const RESTART_ACK = "\u5DF2\u65B0\u5F00\u7F51\u9875\u4F1A\u8BDD\uFF08\u5DE6\u4FA7\u300C\u5FAE\u4FE1\u300D\u6587\u4EF6\u5939\uFF09\u3002\u4E4B\u540E\u76F4\u63A5\u8BF4\u8BDD\u5373\u53EF\u3002\u518D\u53D1\u300C\u91CD\u542F\u5BF9\u8BDD\u300D\u4F1A\u518D\u5F00\u4E00\u6761\uFF1B\u65E7\u4F1A\u8BDD\u4F1A\u5F52\u6863\uFF0C\u7F51\u9875\u4FA7\u680F\u66F4\u5E72\u51C0\u3002";
+export declare function restartAck(folder?: string): string;
+export declare function stuckAck(folder?: string): string;
+export declare const RESTART_ACK: string;
 export declare const RESTART_SEED = "\u65B0\u4F1A\u8BDD\u5DF2\u5F00\u59CB\u3002\u8BF7\u7528\u4E00\u53E5\u4E2D\u6587\u6253\u62DB\u547C\uFF0C\u4E0D\u8981\u89E3\u91CA\u5185\u90E8\u6B65\u9AA4\u3002";
-export declare const STUCK_ACK = "\u7F51\u9875\u7AEF\u8FD9\u6761\u4F1A\u8BDD\u5361\u4F4F\u4E86\uFF08\u5728\u7B49\u6279\u51C6\uFF0C\u6216\u6A21\u578B\u628A\u5185\u90E8\u63A8\u7406\u53D1\u51FA\u6765\u4E86\uFF09\u3002\u8BF7\u770B\u7F51\u9875\u5DE6\u4FA7\u300C\u5FAE\u4FE1\u300D\u6587\u4EF6\u5939\uFF0C\u6216\u53D1\u300C\u91CD\u542F\u5BF9\u8BDD\u300D\u3002";
+export declare const STUCK_ACK: string;
 export declare const RPC_TIMEOUT_MS = 15000;
 export declare const QUESTION_HINT = "\u56DE\u590D\u6570\u5B57\u6216\u9009\u9879\u539F\u6587\u5373\u53EF\u3002";
 export declare function stripThinkTags(text: string): string;

package/lib/web-shim.js

@@ -32,6 +32,11 @@ export function parseHeadlessArgv(argv) {
         return { error: 'missing headless task' };
     return { task };
 }
+/**
+ * Personal WeChat follow-ups wrap history in 桥接上下文. Use this only to
+ * slice the latest user line. Do not mint a new web session from it — WeCom
+ * turns are always plain text and must reuse the room's stored session.
+ */
 export function isFreshBridgeTurn(task) {
     return !task.includes('【桥接上下文】');
 }
@@ -44,9 +49,15 @@ export function isRestartCommand(text) {
         return true;
     return /^(重启对话|重新开始|新对话|开启新对话|重置对话)[。.!！]?$/.test(t);
 }
-export const RESTART_ACK = '已新开网页会话（左侧「微信」文件夹）。之后直接说话即可。再发「重启对话」会再开一条；旧会话会归档，网页侧栏更干净。';
+export function restartAck(folder = WECHAT_WORKSPACE_NAME) {
+    return `已新开网页会话（左侧「${folder}」文件夹）。之后直接说话即可。再发「重启对话」会再开一条；旧会话会归档，网页侧栏更干净。`;
+}
+export function stuckAck(folder = WECHAT_WORKSPACE_NAME) {
+    return `网页端这条会话卡住了（在等批准，或模型把内部推理发出来了）。请看网页左侧「${folder}」文件夹，或发「重启对话」。`;
+}
+export const RESTART_ACK = restartAck();
 export const RESTART_SEED = '新会话已开始。请用一句中文打招呼，不要解释内部步骤。';
-export const STUCK_ACK = '网页端这条会话卡住了（在等批准，或模型把内部推理发出来了）。请看网页左侧「微信」文件夹，或发「重启对话」。';
+export const STUCK_ACK = stuckAck();
 export const RPC_TIMEOUT_MS = 15_000;
 export const QUESTION_HINT = '回复数字或选项原文即可。';
 const SKIP_CONTENT_TYPES = new Set(['reasoning', 'thinking', 'tool-call', 'tool-result', 'image']);
@@ -905,7 +916,7 @@ function composeWechatReply(events, ignorePending) {
     }
     return { text: visible, pendingQuestions };
 }
-async function waitForAssistant(rpc, sessionId, beforeText, timeoutMs, ignorePending) {
+async function waitForAssistant(rpc, sessionId, beforeText, timeoutMs, ignorePending, stuckText = STUCK_ACK) {
     const deadline = Date.now() + timeoutMs;
     let last = { text: '', pendingQuestions: [] };
     let idleOnce = false;
@@ -923,7 +934,7 @@ async function waitForAssistant(rpc, sessionId, beforeText, timeoutMs, ignorePen
             return composed;
         }
         if (turnIsBlocked(events))
-            return { text: STUCK_ACK, pendingQuestions: [] };
+            return { text: stuckText, pendingQuestions: [] };
         if (composed.text !== '')
             last = composed;
         const idle = turnIsIdle(events);
@@ -937,7 +948,7 @@ async function waitForAssistant(rpc, sessionId, beforeText, timeoutMs, ignorePen
     }
     if (last.text !== '' && last.text !== beforeText)
         return last;
-    return { text: STUCK_ACK, pendingQuestions: [] };
+    return { text: stuckText, pendingQuestions: [] };
 }
 export async function runHeadlessViaWeb(opts) {
     const env = opts.env ?? process.env;
@@ -951,20 +962,22 @@ export async function runHeadlessViaWeb(opts) {
     const rpc = opts.rpc ?? ((method, params) => postRpc(webBaseUrl(env), method, params));
     const timeoutMs = opts.timeoutMs ?? Number(env.DSH_BRIDGE_TIMEOUT_MS ?? 10 * 60 * 1000);
     const workspaceId = await ensureWorkspace(rpc, workspace);
+    const folder = basename(workspace) || WECHAT_WORKSPACE_NAME;
     const restart = isRestartCommand(text);
-    const fresh = isFreshBridgeTurn(opts.task) || restart;
     const store = loadSessionStore(storeFile);
     const storedPending = restart ? undefined : store.sessions[key]?.pendingQuestions;
     let sessionId = store.sessions[key]?.sessionId;
     const previousId = sessionId;
-    if (sessionId !== undefined && !fresh) {
+    // WeCom sends plain text (no 桥接上下文). Reuse the stored session unless
+    // the user asked to restart or the old session is already gone.
+    if (restart) {
+        sessionId = undefined;
+    }
+    else if (sessionId !== undefined) {
         const alive = await sessionAlive(rpc, sessionId);
         if (!alive)
             sessionId = undefined;
     }
-    else {
-        sessionId = undefined;
-    }
     if (sessionId === undefined) {
         sessionId = await createSession(rpc, workspace, workspaceId);
         await maybeSelectModel(rpc, sessionId, env);
@@ -1019,14 +1032,14 @@ export async function runHeadlessViaWeb(opts) {
             content: [{ type: 'text', text: promptText }],
         });
     }
-    const reply = await waitForAssistant(rpc, sessionId, before, timeoutMs, questions);
+    const reply = await waitForAssistant(rpc, sessionId, before, timeoutMs, questions, stuckAck(folder));
     store.sessions[key] = {
         sessionId,
         updatedAt: Date.now(),
         ...(reply.pendingQuestions.length > 0 ? { pendingQuestions: reply.pendingQuestions } : {}),
     };
     saveSessionStore(storeFile, store);
-    if (restart && (reply.text === STUCK_ACK || reply.text === ''))
-        return RESTART_ACK;
+    if (restart && (reply.text === stuckAck(folder) || reply.text === ''))
+        return restartAck(folder);
     return reply.text;
 }

package/lib/wecom-channel.d.ts

@@ -3,7 +3,7 @@
  * Uses @wecom/aibot-node-sdk (botId + secret). Do not hand-roll the WS.
  */
 import { type WecomBotPublic, type WecomBotRecord } from './wecom-store.js';
-export declare const WECOM_NON_TEXT_HINT = "\u8BF7\u53D1\u6587\u5B57\u3002\u56FE\u7247\u3001\u6587\u4EF6\u548C\u8BED\u97F3\u8BF7\u8D70\u7F51\u9875\u7AEF\u6216 Nextcloud\u3002";
+export declare const WECOM_NON_TEXT_HINT = "\u8BF7\u53D1\u6587\u5B57\u3002\u56FE\u7247\u548C\u6587\u4EF6\u8BF7\u8D70\u7F51\u9875\u7AEF\u6216 Nextcloud\u3002";
 export type WecomBindingPhase = 'idle' | 'connecting' | 'authenticated' | 'error';
 export interface WecomBindingStatus {
     room: string;

package/lib/wecom-channel.js

@@ -6,7 +6,7 @@ import { join } from 'node:path';
 import { dshHome } from '@rezti/dsh-rez-sso';
 import { runHeadlessViaWeb } from './web-shim.js';
 import { loadWecomChannels, publicWecomBots, saveWecomChannels, applyWecomBotPatch, WECOM_BINDABLE_ROOMS, } from './wecom-store.js';
-export const WECOM_NON_TEXT_HINT = '请发文字。图片、文件和语音请走网页端或 Nextcloud。';
+export const WECOM_NON_TEXT_HINT = '请发文字。图片和文件请走网页端或 Nextcloud。';
 const MAX_SEEN_MSGIDS = 200;
 export function extractWecomText(frame) {
     if (typeof frame !== 'object' || frame === null)
@@ -18,6 +18,10 @@ export function extractWecomText(frame) {
     const fromText = textContent(rec.text);
     if (fromText.length > 0)
         return fromText;
+    // Official AI-bot voice is already ASR text (single chat). See work.weixin path/100719.
+    const fromVoice = textContent(rec.voice);
+    if (fromVoice.length > 0)
+        return fromVoice;
     if (typeof rec.content === 'string' && rec.content.trim().length > 0)
         return rec.content.trim();
     const mixed = rec.mixed;
@@ -29,7 +33,8 @@ export function extractWecomText(frame) {
                 if (typeof item !== 'object' || item === null)
                     continue;
                 const row = item;
-                const nested = textContent(row.text) || (typeof row.content === 'string' ? row.content.trim() : '');
+                const nested = textContent(row.text) || textContent(row.voice)
+                    || (typeof row.content === 'string' ? row.content.trim() : '');
                 if (nested.length > 0)
                     parts.push(nested);
             }
@@ -82,6 +87,8 @@ export async function createOfficialWecomClient(opts) {
 }
 async function defaultRunTurn(room, text) {
     const home = dshHome();
+    // Pass the user text as-is. Session stickiness is per-room in web-sessions.json;
+    // do not wrap WeCom turns in 桥接上下文 just to reuse a dialog.
     return runHeadlessViaWeb({
         task: text,
         cwd: room,
@@ -173,7 +180,7 @@ export class WecomChannel {
             row.client = client;
             client.on('authenticated', () => {
                 row.phase = 'authenticated';
-                row.hint = `「${bot.room}」已接入。同事在企微跟这个机器人说话，会进网页左侧该房间。`;
+                row.hint = `「${bot.room}」已接入。同事在企微跟这个机器人说话，会进网页左侧该房间的同一条会话。`;
             });
             client.on('disconnected', (reason) => {
                 if (row.phase === 'authenticated')
@@ -189,13 +196,13 @@ export class WecomChannel {
             client.on('message.mixed', (frame) => { this.enqueue(row, () => this.handleText(row, frame)); });
             client.on('message.image', (frame) => { this.enqueue(row, () => this.handleNonText(row, frame)); });
             client.on('message.file', (frame) => { this.enqueue(row, () => this.handleNonText(row, frame)); });
-            client.on('message.voice', (frame) => { this.enqueue(row, () => this.handleNonText(row, frame)); });
+            client.on('message.voice', (frame) => { this.enqueue(row, () => this.handleText(row, frame)); });
             client.on('message.video', (frame) => { this.enqueue(row, () => this.handleNonText(row, frame)); });
             client.on('event.enter_chat', (frame) => {
                 this.enqueue(row, async () => {
                     await client.replyWelcome(frame, {
                         msgtype: 'text',
-                        text: { content: `您好，我是「${bot.room}」。直接发文字即可。` },
+                        text: { content: `您好，我是「${bot.room}」。直接发文字或语音即可。` },
                     });
                 });
             });

package/lib/wecom-store.d.ts

@@ -2,7 +2,7 @@
  * Accio-style WeCom AI bot bindings: one botId+secret per Harness room.
  * Secrets stay in ~/.dsh/wecom-channels.json (mode 600), not compose env.
  */
-export declare const WECOM_BINDABLE_ROOMS: readonly ["搞钱", "产品", "运营", "人事助理", "财务助理", "法务助理", "设计", "实验室"];
+export declare const WECOM_BINDABLE_ROOMS: readonly ["搞钱", "产品", "运营", "人事助理", "财务助理", "法务助理", "设计", "发布", "电商", "实验室"];
 export type WecomBindableRoom = (typeof WECOM_BINDABLE_ROOMS)[number];
 export interface WecomBotRecord {
     room: string;

package/lib/wecom-store.js

@@ -13,6 +13,8 @@ export const WECOM_BINDABLE_ROOMS = [
     '财务助理',
     '法务助理',
     '设计',
+    '发布',
+    '电商',
     '实验室',
 ];
 export const WECOM_SECRET_MASK = '********';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rezti/dsh-rez-wechat",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "description": "ReZ-TI WeChat/WeCom bridges. Personal WeChat is QClaw/ClawBot scan-and-chat via dsh-wechat-bridge; WeCom AI bots use the official @wecom/aibot-node-sdk (BotID + Secret) bound per Harness room.",
   "type": "module",
   "engines": {