@rezti/dsh-rez-wechat 0.1.22 → 0.1.23

package/lib/web-shim.d.ts

@@ -106,6 +106,19 @@ export declare function parseChoice(userText: string, questions: PendingQuestion
     label: string;
 } | undefined;
 export declare function historyEvents(body: unknown): unknown[];
+/** Durable seq, or seq0 for batched frames like text-chunks. Missing → -1. */
+export declare function eventSeq(event: unknown): number;
+export declare function historyCursor(events: unknown[]): number;
+/**
+ * True when a turn that started *after* beforeSeq has ended.
+ * Events without seq are always included (unit fixtures / legacy history).
+ */
+export declare function turnSettledAfter(events: unknown[], beforeSeq: number): boolean;
+/**
+ * Visible assistant text for WeChat.
+ * Web UI streams via text-chunks; final assistant/message is often tool-only.
+ * Prefer longer streamed chunks when they supersede a short mid-turn message.
+ */
 export declare function lastAssistantText(events: unknown[]): string;
 export declare function turnIsIdle(events: unknown[]): boolean;
 export declare function pickWechatModel(models: unknown, env?: NodeJS.ProcessEnv): ModelRef | undefined;

package/lib/web-shim.js

@@ -733,24 +733,105 @@ export function historyEvents(body) {
                         : []);
     return raw.map(unwrapHistoryItem);
 }
+/** Durable seq, or seq0 for batched frames like text-chunks. Missing → -1. */
+export function eventSeq(event) {
+    if (typeof event !== 'object' || event === null)
+        return -1;
+    const rec = event;
+    if (typeof rec.seq === 'number' && Number.isFinite(rec.seq))
+        return rec.seq;
+    if (typeof rec.seq0 === 'number' && Number.isFinite(rec.seq0))
+        return rec.seq0;
+    return -1;
+}
+export function historyCursor(events) {
+    let max = -1;
+    for (const event of events) {
+        const seq = eventSeq(event);
+        if (seq > max)
+            max = seq;
+    }
+    return max;
+}
+/**
+ * True when a turn that started *after* beforeSeq has ended.
+ * Events without seq are always included (unit fixtures / legacy history).
+ */
+export function turnSettledAfter(events, beforeSeq) {
+    let open = 0;
+    let sawStart = false;
+    for (const event of events) {
+        if (typeof event !== 'object' || event === null)
+            continue;
+        const seq = eventSeq(event);
+        if (seq >= 0 && seq <= beforeSeq)
+            continue;
+        const type = event.type;
+        if (type === 'turn/start') {
+            open += 1;
+            sawStart = true;
+        }
+        if (type === 'turn/end')
+            open = Math.max(0, open - 1);
+    }
+    return sawStart && open === 0;
+}
+function textsFromChunkEvent(rec) {
+    const data = typeof rec.data === 'object' && rec.data !== null ? rec.data : rec;
+    const texts = data.texts;
+    if (!Array.isArray(texts))
+        return '';
+    return texts.map(part => typeof part === 'string' ? part : '').join('');
+}
+/**
+ * Visible assistant text for WeChat.
+ * Web UI streams via text-chunks; final assistant/message is often tool-only.
+ * Prefer longer streamed chunks when they supersede a short mid-turn message.
+ */
 export function lastAssistantText(events) {
-    let text = '';
+    let lastUserSeq = -1;
+    for (const event of events) {
+        if (typeof event !== 'object' || event === null)
+            continue;
+        const rec = event;
+        const type = typeof rec.type === 'string' ? rec.type : '';
+        const role = typeof rec.role === 'string' ? rec.role : '';
+        if (type === 'user/message' || role === 'user') {
+            lastUserSeq = Math.max(lastUserSeq, eventSeq(rec));
+        }
+    }
+    let fromMessage = '';
+    const chunkParts = [];
     for (const event of events) {
         if (typeof event !== 'object' || event === null)
             continue;
         const rec = event;
         const type = typeof rec.type === 'string' ? rec.type : '';
+        const seq = eventSeq(rec);
+        const afterUser = lastUserSeq < 0 || seq < 0 || seq > lastUserSeq;
+        if (afterUser && type === 'text-chunks') {
+            const piece = textsFromChunkEvent(rec);
+            if (piece !== '')
+                chunkParts.push(piece);
+            continue;
+        }
         const role = typeof rec.role === 'string' ? rec.role : '';
         const isAssistant = type === 'assistant/message' || role === 'assistant';
-        if (!isAssistant)
+        if (!isAssistant || !afterUser)
             continue;
         const data = typeof rec.data === 'object' && rec.data !== null ? rec.data : rec;
         const message = typeof data.message === 'object' && data.message !== null ? data.message : data;
-        const chunk = flattenVisibleText(message.content ?? data.content ?? rec.content) || (typeof rec.text === 'string' ? stripThinkTags(rec.text) : '');
+        const chunk = flattenVisibleText(message.content ?? data.content ?? rec.content)
+            || (typeof rec.text === 'string' ? stripThinkTags(rec.text) : '');
         if (chunk.trim() !== '')
-            text = chunk;
+            fromMessage = chunk;
     }
-    return text.trim();
+    const fromChunks = chunkParts.join('');
+    const msg = fromMessage.trim();
+    const chunks = fromChunks.trim();
+    if (chunks.length > msg.length)
+        return chunks;
+    return msg || chunks;
 }
 export function turnIsIdle(events) {
     let open = 0;
@@ -1124,10 +1205,11 @@ function composeWechatReply(events, ignorePending) {
     }
     return { text: visible, pendingQuestions };
 }
-async function waitForAssistant(rpc, sessionId, beforeText, timeoutMs, ignorePending, stuckText = STUCK_ACK, signal) {
+async function waitForAssistant(rpc, sessionId, beforeText, beforeSeq, timeoutMs, ignorePending, stuckText = STUCK_ACK, signal) {
     const deadline = Date.now() + timeoutMs;
     let last = { text: '', pendingQuestions: [] };
     let idleOnce = false;
+    const emptyDone = '（本轮无文字回复，请到网页查看）';
     while (Date.now() < deadline) {
         if (signal?.aborted === true) {
             throw new Error('本轮已被新消息打断（可发「重启对话」或再问一句）');
@@ -1148,6 +1230,18 @@ async function waitForAssistant(rpc, sessionId, beforeText, timeoutMs, ignorePen
             return { text: stuckText, pendingQuestions: [] };
         if (composed.text !== '')
             last = composed;
+        const cursorAware = beforeSeq >= 0 || events.some(event => eventSeq(event) >= 0);
+        if (cursorAware && turnSettledAfter(events, beforeSeq)) {
+            if (composed.text !== '' && composed.text !== beforeText)
+                return composed;
+            // Turn finished but no new usable text (tool-only / filtered monologue).
+            return {
+                text: composed.text !== '' && composed.text === beforeText
+                    ? '（本轮已完成，但没有新的文字回复；请到网页查看）'
+                    : emptyDone,
+                pendingQuestions: composed.pendingQuestions,
+            };
+        }
         const idle = turnIsIdle(events);
         if (idle)
             idleOnce = true;
@@ -1208,13 +1302,16 @@ export async function runHeadlessViaWeb(opts) {
         throw new Error('本轮已被新消息打断');
     const promptText = restart ? RESTART_SEED : text;
     let before = '';
+    let beforeSeq = -1;
     let events = [];
     try {
         events = await fetchSessionHistory(rpc, sessionId, 40);
         before = usableAssistantText(lastAssistantText(events));
+        beforeSeq = historyCursor(events);
     }
     catch {
         before = '';
+        beforeSeq = -1;
     }
     const pending = extractPendingQuestions(events);
     const questions = pending.length > 0
@@ -1240,7 +1337,7 @@ export async function runHeadlessViaWeb(opts) {
         }
         await rpc('session/prompt', promptPayload(sessionId, promptText));
     }
-    const reply = await waitForAssistant(rpc, sessionId, before, timeoutMs, questions, stuckAck(folder), signal);
+    const reply = await waitForAssistant(rpc, sessionId, before, beforeSeq, 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)) {

package/lib/wecom-channel.d.ts

@@ -4,6 +4,9 @@
  */
 import { type WecomBotPublic, type WecomBotRecord } from './wecom-store.js';
 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";
+/** WeCom stream payload soft limit; oversize finish frames are dropped by the SDK. */
+export declare const WECOM_REPLY_MAX_CHARS = 20000;
+export declare function clipWecomReply(text: string): string;
 export type WecomBindingPhase = 'idle' | 'connecting' | 'authenticated' | 'error';
 export interface WecomBindingStatus {
     room: string;

package/lib/wecom-channel.js

@@ -7,6 +7,13 @@ import { dshHome } from '@rezti/dsh-rez-sso';
 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。';
+/** WeCom stream payload soft limit; oversize finish frames are dropped by the SDK. */
+export const WECOM_REPLY_MAX_CHARS = 20_000;
+export function clipWecomReply(text) {
+    if (text.length <= WECOM_REPLY_MAX_CHARS)
+        return text;
+    return `${text.slice(0, WECOM_REPLY_MAX_CHARS - 16)}\n…(已截断)`;
+}
 /** 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;
@@ -262,21 +269,28 @@ export class WecomChannel {
         row.turnAbort = turnAbort;
         const timeout = AbortSignal.timeout(WECOM_TURN_TIMEOUT_MS);
         const signal = AbortSignal.any([turnAbort.signal, timeout]);
+        let finished = false;
+        const finish = async (content) => {
+            if (finished)
+                return;
+            finished = true;
+            await row.client.replyStream(frame, streamId, clipWecomReply(content), true);
+        };
         try {
             await row.client.replyStream(frame, streamId, '正在处理…', false);
             const reply = await this.runTurn(row.bot.room, text, signal);
             if (turnAbort.signal.aborted) {
-                await row.client.replyStream(frame, streamId, '已取消（收到新消息）', true);
+                await finish('已取消（收到新消息）');
                 return;
             }
-            await row.client.replyStream(frame, streamId, reply.length > 0 ? reply : '（空回复）', true);
+            await finish(reply.length > 0 ? reply : '（空回复）');
         }
         catch (error) {
             const why = error instanceof Error ? error.message : String(error);
             const superseded = turnAbort.signal.aborted && !timeout.aborted;
             if (superseded) {
                 try {
-                    await row.client.replyStream(frame, streamId, '已取消（收到新消息）', true);
+                    await finish('已取消（收到新消息）');
                 }
                 catch { /* WS may already be closed */ }
                 return;
@@ -286,7 +300,7 @@ export class WecomChannel {
                 ? '处理超时。请发「重启对话」再试，或到网页左侧该房间看是否在等批准。'
                 : `处理失败：${why}`;
             try {
-                await row.client.replyStream(frame, streamId, message, true);
+                await finish(message);
             }
             catch {
                 /* WS may already be closed */
@@ -295,6 +309,12 @@ export class WecomChannel {
             clearSessionStoreKey(join(this.home, 'dsh-rez-wecom', row.bot.room, 'web-sessions.json'), row.bot.room);
         }
         finally {
+            if (!finished) {
+                try {
+                    await finish('（回复中断，请再发一句或「重启对话」）');
+                }
+                catch { /* WS may already be closed */ }
+            }
             if (row.turnAbort === turnAbort)
                 delete row.turnAbort;
         }

package/package.json

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