@rezti/dsh-rez-wechat 0.1.20 → 0.1.22

package/README.md

@@ -19,7 +19,7 @@ dsh plugin --profile web add @rezti/dsh-rez-suite
 
 - 左侧工作区分组是 **微信**，不是 Ungrouped
 - 连续消息延续同一会话
-- 模型跟网页默认（网页选了 Kimi，微信也走 Kimi）
+- 模型跟网页默认（官方默认 DeepSeek-V4-Flash；不要因为微信通道去切 Kimi）
 - 网页归档后再从微信说话会自动回到侧栏（官方会藏空白会话，所以「重启对话」会先打一句招呼）
 - 网页端选择题（Selection）会编成 `1. 2. 3.` 发到微信；回复数字或选项原文即可继续，不必在网页点选
 - 思考过程不会发到微信；多段正文会保留换行

package/lib/channel.js

@@ -167,7 +167,7 @@ export class WeixinChannel {
         if (this.runChild !== undefined && this.runChild.exitCode === null)
             return;
         this.phase = 'listening';
-        this.hint = '微信通道已在后台听着。消息会进网页「微信」文件夹的同一会话，模型跟网页默认（例如 Kimi）。';
+        this.hint = '微信通道已在后台听着。消息会进网页「微信」文件夹的同一会话，模型跟网页默认（DeepSeek-V4-Flash）。';
         const child = spawn('npx', ['-y', 'dsh-wechat-bridge', 'run', '--data-dir', DATA_DIR], {
             env: weixinRunEnv(),
             stdio: ['ignore', 'pipe', 'pipe'],

package/lib/index.js

@@ -7,7 +7,7 @@ export const name = 'rez-wechat';
 export const inject = ['systemPrompt', 'webServer', 'rezSso'];
 const GUIDANCE = [
     '企业微信有两层，不要混：① 房间消息通道 = 官方 @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__*。网页端必须开着。工商查询请切到法务助理，避免串房间。',
+    '个人微信是 QClaw 同款 ClawBot 通道：在 Rez 面板「微信」页扫码一次，然后直接在微信里说话。消息进入网页左侧「微信」文件夹并延续同一会话，模型跟网页默认（官方默认 DeepSeek-V4-Flash，不要因为微信去切 Kimi）。网页端归档了也能从微信自动恢复到侧栏（空白会话网页会藏起来，所以新开的会话会先打一句招呼再出现）。网页端出现选择题时会编成纯文本发到微信，回复数字或选项原文即可；思考过程不会转发。发「重启对话」会新开一条可见的网页会话并把旧的归档。通道断了点「重新连接」（已登录不必再扫码）。不要再跑 npx weixin-mcp login，也不要调用 mcp__weixin__*。网页端必须开着。工商查询请切到法务助理，避免串房间。',
     '这是 ClawBot 客服会话，不是用个人微信号管好友/群。对外发消息必须先征得用户批准。',
 ].join('');
 function isLoopbackRequest(request) {

package/lib/web-shim-cli.js

@@ -3,6 +3,10 @@
  * Executable stand-in for `dsh`. dsh-wechat-bridge spawns:
  *   $DSH_BRIDGE_DSH --profile headless <task>
  * stdout is the WeChat reply; logs go to stderr.
+ *
+ * Must process.exit: native fetch keeps the event loop alive, and the bridge
+ * holds a per-chat lock until this child exits. Without an explicit exit the
+ * first WeChat turn can reply, then every follow-up waits forever.
  */
 import { parseHeadlessArgv, runHeadlessViaWeb } from './web-shim.js';
 const parsed = parseHeadlessArgv(process.argv.slice(1));
@@ -20,3 +24,4 @@ catch (error) {
     process.stderr.write(`dsh-web-shim: ${message}\n`);
     process.stdout.write(`${message}\n`);
 }
+process.exit(0);

package/lib/web-shim.d.ts

@@ -4,8 +4,7 @@
  *
  * Headless always mints a fresh Agent (DeepSeek default, Ungrouped cwd hash).
  * Web RPC reuses one session under ~/.dsh/workspaces/微信 so the sidebar
- * folder is named 微信, turns continue, and the model follows the web default
- * (Kimi if that is what the user selected).
+ * folder is named 微信, turns continue, and the model follows the web default.
  */
 export declare const WECHAT_WORKSPACE_NAME = "\u5FAE\u4FE1";
 export declare const DEFAULT_WEB_URL = "http://127.0.0.1:3080";
@@ -75,6 +74,8 @@ export declare function ensureWechatInboxAgents(cwd: string): void;
 export declare function sessionStorePath(env?: NodeJS.ProcessEnv, home?: string): string;
 export declare function loadSessionStore(path: string): SessionStore;
 export declare function saveSessionStore(path: string, store: SessionStore): void;
+/** Drop the sticky session pointer for one room/chat key (WeCom restart / stuck recovery). */
+export declare function clearSessionStoreKey(path: string, key: string): void;
 /** dsh 0.1.5+ wire endpoint is `namespace/method` (slash), not `namespace.method`. */
 export declare function normalizeRpcEndpoint(method: string): string;
 /**
@@ -131,4 +132,7 @@ export declare function runHeadlessViaWeb(opts: {
     env?: NodeJS.ProcessEnv;
     rpc?: RpcFn;
     timeoutMs?: number;
+    signal?: AbortSignal;
+    /** Personal WeChat restores via suite unarchive HTTP; WeCom must not. Default true. */
+    sidebarUnarchive?: boolean;
 }): Promise<string>;

package/lib/web-shim.js

@@ -4,8 +4,7 @@
  *
  * Headless always mints a fresh Agent (DeepSeek default, Ungrouped cwd hash).
  * Web RPC reuses one session under ~/.dsh/workspaces/微信 so the sidebar
- * folder is named 微信, turns continue, and the model follows the web default
- * (Kimi if that is what the user selected).
+ * folder is named 微信, turns continue, and the model follows the web default.
  */
 import { randomUUID } from 'node:crypto';
 import { chmodSync, existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
@@ -270,6 +269,14 @@ export function saveSessionStore(path, store) {
     mkdirSync(dirname(path), { recursive: true });
     writeFileSync(path, JSON.stringify(store, null, 2), 'utf8');
 }
+/** Drop the sticky session pointer for one room/chat key (WeCom restart / stuck recovery). */
+export function clearSessionStoreKey(path, key) {
+    const store = loadSessionStore(path);
+    if (store.sessions[key] === undefined)
+        return;
+    delete store.sessions[key];
+    saveSessionStore(path, store);
+}
 /** dsh 0.1.5+ wire endpoint is `namespace/method` (slash), not `namespace.method`. */
 export function normalizeRpcEndpoint(method) {
     if (method.includes('/'))
@@ -813,7 +820,10 @@ export function pickWechatModel(models, env = process.env) {
         const provider = env.REZ_WECHAT_PROVIDER?.trim();
         return provider !== undefined && provider !== '' ? { provider, model: forced } : { model: forced };
     }
-    if (env.REZ_WECHAT_PREFER_KIMI === '0')
+    // Follow the web default (official agent-default-model is DeepSeek-V4-Flash).
+    // Do not switch a DeepSeek session onto Kimi: session/selectModel also writes
+    // the global default, so a WeChat message would make the next restart land on Kimi.
+    if (env.REZ_WECHAT_PREFER_KIMI !== '1')
         return undefined;
     const current = currentModelRef(models);
     if (current !== undefined && looksLikeKimi(`${current.provider ?? ''} ${current.model}`))
@@ -966,13 +976,30 @@ async function maybeSelectModel(rpc, sessionId, env) {
         }
     }
 }
-/** 0.1.5 replaced session.history with session/page. */
+/** Prefer session/page (0.1.5 surface); fall back to session/history (apiproxy). */
 async function fetchSessionHistory(rpc, sessionId, maxMessages = 40) {
-    return historyEvents(await rpc('session/page', {
-        address: { kind: 'session', sessionId },
-        throughSeq: Number.MAX_SAFE_INTEGER,
-        maxMessages,
-    }));
+    const attempts = [
+        {
+            method: 'session/page',
+            params: {
+                address: { kind: 'session', sessionId },
+                // Official tip-of-log sentinel. MAX_SAFE_INTEGER is "past cursor" and always 400s.
+                throughSeq: -1,
+                maxMessages,
+            },
+        },
+        { method: 'session/history', params: { sessionId, maxMessages } },
+    ];
+    let lastError;
+    for (const attempt of attempts) {
+        try {
+            return historyEvents(await rpc(attempt.method, attempt.params));
+        }
+        catch (error) {
+            lastError = error;
+        }
+    }
+    throw lastError instanceof Error ? lastError : new Error(String(lastError));
 }
 async function sessionAlive(rpc, sessionId) {
     try {
@@ -1097,11 +1124,14 @@ function composeWechatReply(events, ignorePending) {
     }
     return { text: visible, pendingQuestions };
 }
-async function waitForAssistant(rpc, sessionId, beforeText, timeoutMs, ignorePending, stuckText = STUCK_ACK) {
+async function waitForAssistant(rpc, sessionId, beforeText, timeoutMs, ignorePending, stuckText = STUCK_ACK, signal) {
     const deadline = Date.now() + timeoutMs;
     let last = { text: '', pendingQuestions: [] };
     let idleOnce = false;
     while (Date.now() < deadline) {
+        if (signal?.aborted === true) {
+            throw new Error('本轮已被新消息打断（可发「重启对话」或再问一句）');
+        }
         let events = [];
         try {
             events = await fetchSessionHistory(rpc, sessionId, 40);
@@ -1142,6 +1172,8 @@ export async function runHeadlessViaWeb(opts) {
     const customRpc = opts.rpc !== undefined;
     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 signal = opts.signal;
+    const sidebarUnarchive = opts.sidebarUnarchive !== false && !customRpc;
     const workspaceId = await ensureWorkspace(rpc, workspace);
     const folder = basename(workspace) || WECHAT_WORKSPACE_NAME;
     const restart = isRestartCommand(text);
@@ -1153,6 +1185,7 @@ export async function runHeadlessViaWeb(opts) {
     // the user asked to restart or the old session is already gone.
     if (restart) {
         sessionId = undefined;
+        clearSessionStoreKey(storeFile, key);
     }
     else if (sessionId !== undefined) {
         const alive = await sessionAlive(rpc, sessionId);
@@ -1162,15 +1195,17 @@ export async function runHeadlessViaWeb(opts) {
     if (sessionId === undefined) {
         sessionId = await createSession(rpc, workspace, workspaceId);
         await maybeSelectModel(rpc, sessionId, env);
-        await ensureSessionVisible(rpc, sessionId, env, workspaceId, !customRpc);
+        await ensureSessionVisible(rpc, sessionId, env, workspaceId, sidebarUnarchive);
         if (previousId !== undefined && previousId !== sessionId) {
             await abortSessionTurn(rpc, previousId);
             await archiveSession(rpc, previousId);
         }
     }
     else {
-        await ensureSessionVisible(rpc, sessionId, env, workspaceId, !customRpc);
+        await ensureSessionVisible(rpc, sessionId, env, workspaceId, sidebarUnarchive);
     }
+    if (signal?.aborted === true)
+        throw new Error('本轮已被新消息打断');
     const promptText = restart ? RESTART_SEED : text;
     let before = '';
     let events = [];
@@ -1205,13 +1240,20 @@ export async function runHeadlessViaWeb(opts) {
         }
         await rpc('session/prompt', promptPayload(sessionId, promptText));
     }
-    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);
+    const reply = await waitForAssistant(rpc, sessionId, before, timeoutMs, questions, stuckAck(folder), signal);
+    // Stuck / approval-blocked sessions poison the sticky pointer — drop it so
+    // the next WeCom/WeChat turn opens a fresh web session instead of hanging.
+    if (reply.text === stuckAck(folder)) {
+        clearSessionStoreKey(storeFile, key);
+    }
+    else {
+        store.sessions[key] = {
+            sessionId,
+            updatedAt: Date.now(),
+            ...(reply.pendingQuestions.length > 0 ? { pendingQuestions: reply.pendingQuestions } : {}),
+        };
+        saveSessionStore(storeFile, store);
+    }
     if (restart && (reply.text === stuckAck(folder) || reply.text === ''))
         return restartAck(folder);
     return reply.text;

package/lib/wecom-channel.d.ts

@@ -32,7 +32,9 @@ export type WecomClientFactory = (opts: {
     botId: string;
     secret: string;
 }) => WecomWsClient | Promise<WecomWsClient>;
-export type WecomRunTurn = (room: string, text: string) => Promise<string>;
+export type WecomRunTurn = (room: string, text: string, signal?: AbortSignal) => Promise<string>;
+/** Cap how long one WeCom turn can block the per-room queue (stuck Kimi / approval). */
+export declare const WECOM_TURN_TIMEOUT_MS = 90000;
 export declare function extractWecomText(frame: unknown): string;
 export declare function wecomMsgid(frame: unknown): string;
 export declare function createOfficialWecomClient(opts: {
@@ -62,6 +64,11 @@ export declare class WecomChannel {
     private dropBindings;
     private bind;
     private enqueue;
+    /**
+     * Abort the in-flight turn as soon as a new text arrives (before the serial
+     * queue reaches it). Otherwise「重启对话」waits behind a hung「正在处理…」.
+     */
+    private enqueueText;
     private rememberMsgid;
     private handleText;
     private handleNonText;

package/lib/wecom-channel.js

@@ -4,9 +4,11 @@
  */
 import { join } from 'node:path';
 import { dshHome } from '@rezti/dsh-rez-sso';
-import { runHeadlessViaWeb } from './web-shim.js';
+import { clearSessionStoreKey, isRestartCommand, runHeadlessViaWeb, } from './web-shim.js';
 import { loadWecomChannels, publicWecomBots, saveWecomChannels, applyWecomBotPatch, WECOM_BINDABLE_ROOMS, } from './wecom-store.js';
 export const WECOM_NON_TEXT_HINT = '请发文字。图片和文件请走网页端或 Nextcloud。';
+/** Cap how long one WeCom turn can block the per-room queue (stuck Kimi / approval). */
+export const WECOM_TURN_TIMEOUT_MS = 90_000;
 const MAX_SEEN_MSGIDS = 200;
 export function extractWecomText(frame) {
     if (typeof frame !== 'object' || frame === null)
@@ -85,13 +87,16 @@ export async function createOfficialWecomClient(opts) {
         logger: quietLogger,
     });
 }
-async function defaultRunTurn(room, text) {
+async function defaultRunTurn(room, text, signal) {
     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,
+        ...(signal !== undefined ? { signal } : {}),
+        timeoutMs: WECOM_TURN_TIMEOUT_MS,
+        sidebarUnarchive: false,
         env: {
             ...process.env,
             REZ_WECHAT_WORKSPACE: join(home, 'workspaces', room),
@@ -192,11 +197,11 @@ export class WecomChannel {
                 const why = error instanceof Error ? error.message : String(error);
                 row.hint = `「${bot.room}」连接失败：${why}`;
             });
-            client.on('message.text', (frame) => { this.enqueue(row, () => this.handleText(row, frame)); });
-            client.on('message.mixed', (frame) => { this.enqueue(row, () => this.handleText(row, frame)); });
+            client.on('message.text', (frame) => { this.enqueueText(row, frame); });
+            client.on('message.mixed', (frame) => { this.enqueueText(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.handleText(row, frame)); });
+            client.on('message.voice', (frame) => { this.enqueueText(row, frame); });
             client.on('message.video', (frame) => { this.enqueue(row, () => this.handleNonText(row, frame)); });
             client.on('event.enter_chat', (frame) => {
                 this.enqueue(row, async () => {
@@ -219,6 +224,20 @@ export class WecomChannel {
             console.error(`[wecom] ${row.bot.room}: ${why}`);
         });
     }
+    /**
+     * Abort the in-flight turn as soon as a new text arrives (before the serial
+     * queue reaches it). Otherwise「重启对话」waits behind a hung「正在处理…」.
+     */
+    enqueueText(row, frame) {
+        const text = extractWecomText(frame);
+        if (text.length > 0) {
+            row.turnAbort?.abort();
+            if (isRestartCommand(text)) {
+                clearSessionStoreKey(join(this.home, 'dsh-rez-wecom', row.bot.room, 'web-sessions.json'), row.bot.room);
+            }
+        }
+        this.enqueue(row, () => this.handleText(row, frame));
+    }
     rememberMsgid(row, frame) {
         const id = wecomMsgid(frame);
         if (id.length === 0)
@@ -239,14 +258,45 @@ export class WecomChannel {
             await row.client.replyStream(frame, streamId, WECOM_NON_TEXT_HINT, true);
             return;
         }
+        const turnAbort = new AbortController();
+        row.turnAbort = turnAbort;
+        const timeout = AbortSignal.timeout(WECOM_TURN_TIMEOUT_MS);
+        const signal = AbortSignal.any([turnAbort.signal, timeout]);
         try {
             await row.client.replyStream(frame, streamId, '正在处理…', false);
-            const reply = await this.runTurn(row.bot.room, text);
+            const reply = await this.runTurn(row.bot.room, text, signal);
+            if (turnAbort.signal.aborted) {
+                await row.client.replyStream(frame, streamId, '已取消（收到新消息）', true);
+                return;
+            }
             await row.client.replyStream(frame, streamId, reply.length > 0 ? reply : '（空回复）', true);
         }
         catch (error) {
             const why = error instanceof Error ? error.message : String(error);
-            await row.client.replyStream(frame, streamId, `处理失败：${why}`, true);
+            const superseded = turnAbort.signal.aborted && !timeout.aborted;
+            if (superseded) {
+                try {
+                    await row.client.replyStream(frame, streamId, '已取消（收到新消息）', true);
+                }
+                catch { /* WS may already be closed */ }
+                return;
+            }
+            const timedOut = timeout.aborted || /aborted|timeout|TimeoutError|打断/i.test(why);
+            const message = timedOut
+                ? '处理超时。请发「重启对话」再试，或到网页左侧该房间看是否在等批准。'
+                : `处理失败：${why}`;
+            try {
+                await row.client.replyStream(frame, streamId, message, true);
+            }
+            catch {
+                /* WS may already be closed */
+            }
+            // Poisoned sticky session: force the next turn to mint a fresh web session.
+            clearSessionStoreKey(join(this.home, 'dsh-rez-wecom', row.bot.room, 'web-sessions.json'), row.bot.room);
+        }
+        finally {
+            if (row.turnAbort === turnAbort)
+                delete row.turnAbort;
         }
     }
     async handleNonText(row, frame) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rezti/dsh-rez-wechat",
-  "version": "0.1.20",
+  "version": "0.1.22",
   "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": {