@rezti/dsh-rez-wechat 0.1.21 → 0.1.22

package/lib/web-shim.d.ts

@@ -74,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;
 /**
@@ -130,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

@@ -269,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('/'))
@@ -975,7 +983,8 @@ async function fetchSessionHistory(rpc, sessionId, maxMessages = 40) {
             method: 'session/page',
             params: {
                 address: { kind: 'session', sessionId },
-                throughSeq: Number.MAX_SAFE_INTEGER,
+                // Official tip-of-log sentinel. MAX_SAFE_INTEGER is "past cursor" and always 400s.
+                throughSeq: -1,
                 maxMessages,
             },
         },
@@ -1115,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);
@@ -1160,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);
@@ -1171,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);
@@ -1180,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 = [];
@@ -1223,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.21",
+  "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": {