@xmanrui/dsh-im 2.2.0 → 2.3.0

package/src/channels/wecom/wecom-bridge.mjs

@@ -5,6 +5,12 @@ import {
   validHarnessQuestion,
 } from '../shared/harness-question.mjs';
 import { HarnessApprovalQueue } from '../shared/harness-approval.mjs';
+import {
+  BatchInputManager,
+  batchInputBusyMessage,
+  batchInputGroupUnsupportedMessage,
+  isBatchInputCommand,
+} from '../shared/batch-input.mjs';
 import { runCompactCommand } from '../shared/compact-command.mjs';
 import {
   isControlCommand,
@@ -63,6 +69,9 @@ function helpText() {
     t('/preset --default  跟随 Host 默认'),
     t('/stop  停止当前任务'),
     t('/steer 补充指令  纠偏当前任务'),
+    t('/batch  开始批量输入（仅私聊，最多 10 条文字）'),
+    t('/send  提交当前批次'),
+    t('/cancel  取消当前批次'),
     t('/status  检查连接状态'),
     t('/help  显示本帮助'),
   ].join('\n');
@@ -254,6 +263,10 @@ function interactionReplyText(frame) {
   return bodyOf(frame).msgtype === 'text' ? messageText(frame) : '';
 }
 
+function isNativeWecomText(frame) {
+  return bodyOf(frame).msgtype === 'text' && Boolean(nonEmptyString(messageText(frame)));
+}
+
 function splitUtf8(text, maxBytes = MAX_REPLY_BYTES) {
   const source = String(text ?? '').trim();
   if (!source) return [];
@@ -466,6 +479,7 @@ export class WecomHarnessBridge {
   #approvalTasks = new Set();
   #commandTasks = new Set();
   #approvals;
+  #batchInputs = new BatchInputManager();
   #prefetchedImageCount = 0;
 
   constructor({
@@ -523,6 +537,40 @@ export class WecomHarnessBridge {
     const pending = this.#pendingInteractions.get(key);
     const commandMessage = wecomInboundMessage(frame, this.#client);
     const commandText = nonEmptyString(commandMessage.content) ?? '';
+    const batchCommand = isBatchInputCommand(commandText);
+    const batchStatus = this.#batchInputs.status(key);
+    if (batchCommand && body.chattype === 'group') {
+      return this.#finishBatchResult(
+        frame,
+        messageId,
+        chatId,
+        { message: batchInputGroupUnsupportedMessage() },
+      );
+    }
+    if (body.chattype === 'single'
+      && (batchCommand || batchStatus.phase === 'collecting')) {
+      const exactBatchStart = /^\/batch$/iu.test(commandText);
+      const result = exactBatchStart
+        && batchStatus.phase === 'idle'
+        && (this.#queues.has(key) || pending || this.#approvals.hasPending(key))
+        ? { handled: true, kind: 'busy', message: batchInputBusyMessage() }
+        : this.#batchInputs.handle(key, commandText, {
+            plainText: isNativeWecomText(frame),
+          });
+      if (result.handled) {
+        if (result.kind === 'submit') {
+          return this.#enqueueMessage({
+            ...frame,
+            body: {
+              ...body,
+              msgtype: 'text',
+              text: { content: result.prompt },
+            },
+          }, messageId, key, { batchSubmission: result });
+        }
+        return this.#finishBatchResult(frame, messageId, chatId, result);
+      }
+    }
     const commandRunner = hasInboundFiles(commandMessage) ? null : isControlCommand(commandText)
       ? runControlCommand
       : (isModelCommand(commandText)
@@ -616,6 +664,7 @@ export class WecomHarnessBridge {
   #enqueueMessage(frame, messageId, key, {
     releaseMessageId = true,
     alreadyRecorded = false,
+    batchSubmission = null,
   } = {}) {
     // WeCom image URLs expire after five minutes, while a conversation turn
     // may legally stay queued longer. Start the authenticated SDK download as
@@ -637,7 +686,11 @@ export class WecomHarnessBridge {
     const previous = this.#queues.get(key) ?? Promise.resolve();
     const current = previous
       .catch(() => undefined)
-      .then(() => this.#process(frame, { alreadyRecorded, preparedMessage }))
+      .then(() => this.#process(frame, {
+        alreadyRecorded,
+        preparedMessage,
+        batchSubmission,
+      }))
       .finally(() => {
         this.#prefetchedImageCount -= reservedImages;
         if (releaseMessageId) this.#acceptedMessageIds.delete(messageId);
@@ -647,6 +700,29 @@ export class WecomHarnessBridge {
     return current;
   }
 
+  #finishBatchResult(frame, messageId, chatId, result) {
+    let task;
+    task = Promise.resolve().then(async () => {
+      if (this.#state.hasSeen(messageId)) return;
+      await this.#state.markSeen(messageId);
+      this.#status.messagesReceived += 1;
+      this.#status.lastMessageAt = new Date().toISOString();
+      if (result.message) await this.#sendImmediate(frame, chatId, result.message);
+      this.#status.lastError = null;
+    }).catch(async (error) => {
+      if (this.#signal?.aborted) return;
+      this.#status.lastError = error?.message ?? String(error);
+      this.#logger.error?.('[dsh-im:wecom] failed to process a batch input message');
+      await this.#sendImmediate(frame, chatId, t('消息处理失败，请稍后重试。'))
+        .catch(() => undefined);
+    }).finally(() => {
+      this.#acceptedMessageIds.delete(messageId);
+      this.#commandTasks.delete(task);
+    });
+    this.#commandTasks.add(task);
+    return task;
+  }
+
   async waitForIdle() {
     await Promise.allSettled([
       ...this.#queues.values(),
@@ -748,7 +824,11 @@ export class WecomHarnessBridge {
     };
   }
 
-  async #process(frame, { alreadyRecorded = false, preparedMessage } = {}) {
+  async #process(frame, {
+    alreadyRecorded = false,
+    preparedMessage,
+    batchSubmission = null,
+  } = {}) {
     if (this.#signal?.aborted) return;
     const body = bodyOf(frame);
     const messageId = typeof body.msgid === 'string' ? body.msgid : '';
@@ -767,6 +847,7 @@ export class WecomHarnessBridge {
     const key = conversationKey(frame);
     let streamId = null;
     let streamStarted = false;
+    let batchSettled = batchSubmission === null;
     try {
       if (!text && !hasImages && !hasFiles) {
         await this.#sendImmediate(frame, chatId, t('目前支持文字、图片、文件和语音转写消息。'));
@@ -855,6 +936,10 @@ export class WecomHarnessBridge {
           files: message.files,
         },
       });
+      if (batchSubmission) {
+        this.#batchInputs.complete(key, batchSubmission.token);
+        batchSettled = true;
+      }
 
       this.#signal?.throwIfAborted();
       const displayAnswer = answerTextForDelivery(answer, artifacts);
@@ -915,6 +1000,15 @@ export class WecomHarnessBridge {
       this.#status.lastError = null;
       return delivery.receipt;
     } catch (error) {
+      let batchFailureMessage = null;
+      if (!batchSettled && batchSubmission) {
+        if (error?.code === 'turn-stopped') {
+          this.#batchInputs.complete(key, batchSubmission.token);
+        } else {
+          batchFailureMessage = this.#batchInputs.fail(key, batchSubmission.token).message ?? null;
+        }
+        batchSettled = true;
+      }
       if (error?.code === 'turn-stopped') {
         if (streamStarted && streamId) {
           await this.#client.replyStream(frame, streamId, t('已停止。'), true)
@@ -929,11 +1023,14 @@ export class WecomHarnessBridge {
       const errorText = inboundFileUserMessage(error)
         ?? imagePromptUserMessage(error)
         ?? t('消息处理失败，请稍后重试。');
+      const visibleError = batchFailureMessage
+        ? `${errorText}\n\n${batchFailureMessage}`
+        : errorText;
       try {
         if (streamStarted && streamId) {
-          await this.#client.replyStream(frame, streamId, errorText, true);
+          await this.#client.replyStream(frame, streamId, visibleError, true);
         } else {
-          await this.#sendImmediate(frame, chatId, errorText);
+          await this.#sendImmediate(frame, chatId, visibleError);
         }
         await this.#state.markSeen(messageId);
       } catch {

package/src/channels/weixin/weixin-bridge.mjs

@@ -12,6 +12,11 @@ import {
   validHarnessQuestion,
 } from '../shared/harness-question.mjs';
 import { HarnessApprovalQueue } from '../shared/harness-approval.mjs';
+import {
+  BatchInputManager,
+  batchInputBusyMessage,
+  isBatchInputCommand,
+} from '../shared/batch-input.mjs';
 import { runCompactCommand } from '../shared/compact-command.mjs';
 import {
   isControlCommand,
@@ -70,6 +75,9 @@ const HELP_TEXT = () => [
   t('/preset --default  跟随 Host 默认'),
   t('/stop  停止当前任务'),
   t('/steer 补充指令  纠偏当前任务'),
+  t('/batch  开始批量输入（仅私聊，最多 10 条文字）'),
+  t('/send  提交当前批次'),
+  t('/cancel  取消当前批次'),
   t('/status  检查连接状态'),
   t('/help  显示本帮助'),
 ].join('\n');
@@ -104,6 +112,15 @@ function hasWeixinFileItems(message) {
     && message.item_list.some((item) => item?.file_item && typeof item.file_item === 'object');
 }
 
+function isNativeWeixinText(message) {
+  return Array.isArray(message?.item_list)
+    && message.item_list.length > 0
+    && message.item_list.every((item) => (
+      item?.type === 1 && typeof item.text_item?.text === 'string'
+    ))
+    && Boolean(nonEmptyString(extractWeixinText(message)));
+}
+
 function canClaimInteractionReply(message, pending) {
   return pending.questions[pending.index]
     && nonEmptyString(message?.from_user_id) === pending.actor
@@ -176,6 +193,7 @@ export class WeixinHarnessBridge {
   #approvalTasks = new Set();
   #commandTasks = new Set();
   #approvals;
+  #batchInputs = new BatchInputManager();
 
   constructor({
     api,
@@ -227,6 +245,35 @@ export class WeixinHarnessBridge {
     const runId = nonEmptyString(message?.run_id) ?? undefined;
     const pending = this.#pendingInteractions.get(key);
     const commandText = nonEmptyString(extractWeixinText(message)) ?? '';
+    const batchCommand = isBatchInputCommand(commandText);
+    const batchStatus = this.#batchInputs.status(key);
+    if (sender === this.#ownerUserId
+      && (batchCommand || batchStatus.phase === 'collecting')) {
+      const exactBatchStart = /^\/batch$/iu.test(commandText);
+      const result = exactBatchStart
+        && batchStatus.phase === 'idle'
+        && (this.#queues.has(key) || pending || this.#approvals.hasPending(key))
+        ? { handled: true, kind: 'busy', message: batchInputBusyMessage() }
+        : this.#batchInputs.handle(key, commandText, {
+            plainText: isNativeWeixinText(message),
+          });
+      if (result.handled) {
+        if (result.kind === 'submit') {
+          return this.#enqueueMessage({
+            ...message,
+            item_list: [{ type: 1, text_item: { text: result.prompt } }],
+          }, messageId, key, { batchSubmission: result });
+        }
+        return this.#finishBatchResult(
+          message,
+          messageId,
+          sender,
+          contextToken,
+          runId,
+          result,
+        );
+      }
+    }
     const commandRunner = hasWeixinFileItems(message) ? null : isControlCommand(commandText)
       ? runControlCommand
       : (isModelCommand(commandText)
@@ -314,6 +361,7 @@ export class WeixinHarnessBridge {
   #enqueueMessage(message, messageId, key, {
     releaseMessageId = true,
     alreadyRecorded = false,
+    batchSubmission = null,
   } = {}) {
     const preparedMessage = message.from_user_id === this.#ownerUserId
       ? prefetchInboundFiles(
@@ -324,7 +372,11 @@ export class WeixinHarnessBridge {
     const previous = this.#queues.get(key) ?? Promise.resolve();
     const current = previous
       .catch(() => undefined)
-      .then(() => this.#process(message, key, { alreadyRecorded, preparedMessage }))
+      .then(() => this.#process(message, key, {
+        alreadyRecorded,
+        preparedMessage,
+        batchSubmission,
+      }))
       .finally(() => {
         if (releaseMessageId) this.#acceptedMessageIds.delete(messageId);
         if (this.#queues.get(key) === current) this.#queues.delete(key);
@@ -333,6 +385,33 @@ export class WeixinHarnessBridge {
     return current;
   }
 
+  #finishBatchResult(message, messageId, sender, contextToken, runId, result) {
+    let task;
+    task = Promise.resolve().then(async () => {
+      if (this.#state.hasSeen(messageId)) return;
+      await this.#state.markSeen(messageId);
+      this.#status.messagesReceived += 1;
+      this.#status.lastMessageAt = new Date().toISOString();
+      if (result.message) {
+        await this.#send(sender, result.message, contextToken, runId);
+      }
+      this.#status.lastError = null;
+      this.#status.lastMessageError = null;
+    }).catch(async (error) => {
+      if (this.#signal?.aborted) return;
+      this.#status.lastError = error?.message ?? String(error);
+      this.#status.lastMessageError = safeMessageError(error);
+      this.#logger.error?.('[dsh-weixin] failed to process a batch input message:', error);
+      await this.#send(sender, GENERIC_PROCESSING_ERROR(), contextToken, runId)
+        .catch(() => undefined);
+    }).finally(() => {
+      this.#acceptedMessageIds.delete(messageId);
+      this.#commandTasks.delete(task);
+    });
+    this.#commandTasks.add(task);
+    return task;
+  }
+
   async waitForIdle() {
     await Promise.allSettled([
       ...this.#queues.values(),
@@ -380,7 +459,11 @@ export class WeixinHarnessBridge {
     this.#status.lastMessageError = null;
   }
 
-  async #process(message, key, { alreadyRecorded = false, preparedMessage } = {}) {
+  async #process(message, key, {
+    alreadyRecorded = false,
+    preparedMessage,
+    batchSubmission = null,
+  } = {}) {
     this.#signal?.throwIfAborted();
     const messageId = weixinMessageId(message);
     const sender = nonEmptyString(message?.from_user_id);
@@ -398,6 +481,7 @@ export class WeixinHarnessBridge {
 
     const contextToken = typeof message.context_token === 'string' ? message.context_token : undefined;
     const runId = typeof message.run_id === 'string' ? message.run_id : undefined;
+    let batchSettled = batchSubmission === null;
     try {
       const promptMessage = preparedMessage ?? weixinInboundMessage(message, this.#api);
       const text = promptMessage.content;
@@ -479,6 +563,10 @@ export class WeixinHarnessBridge {
             files: promptMessage.files,
           },
         }));
+        if (batchSubmission) {
+          this.#batchInputs.complete(key, batchSubmission.token);
+          batchSettled = true;
+        }
       } finally {
         await Promise.allSettled([
           this.#cancelPendingInteraction(key),
@@ -515,6 +603,15 @@ export class WeixinHarnessBridge {
       this.#status.lastMessageError = null;
       return delivery.receipt;
     } catch (error) {
+      let batchFailureMessage = null;
+      if (!batchSettled && batchSubmission) {
+        if (error?.code === 'turn-stopped') {
+          this.#batchInputs.complete(key, batchSubmission.token);
+        } else {
+          batchFailureMessage = this.#batchInputs.fail(key, batchSubmission.token).message ?? null;
+        }
+        batchSettled = true;
+      }
       if (error?.code === 'turn-stopped') {
         await this.#state.markSeen(messageId);
         return;
@@ -529,7 +626,7 @@ export class WeixinHarnessBridge {
       try {
         await this.#send(
           sender,
-          userMessage,
+          batchFailureMessage ? `${userMessage}\n\n${batchFailureMessage}` : userMessage,
           contextToken,
           runId,
         );

package/src/channels/weixin/weixin-runtime.mjs

@@ -73,6 +73,23 @@ function delay(ms, signal) {
   });
 }
 
+export function orderWeixinMessages(messages) {
+  if (!Array.isArray(messages) || messages.length < 2) return Array.isArray(messages) ? messages : [];
+  const orderField = ['seq', 'create_time_ms'].find((field) => messages.every((message) => (
+    (typeof message?.[field] === 'number' && Number.isFinite(message[field]))
+      || (typeof message?.[field] === 'string'
+        && message[field].trim()
+        && Number.isFinite(Number(message[field])))
+  )));
+  if (!orderField) return messages;
+  return messages
+    .map((message, index) => ({ message, index, order: Number(message[orderField]) }))
+    .sort((left, right) => (
+      left.order - right.order || left.index - right.index
+    ))
+    .map(({ message }) => message);
+}
+
 export function createWeixinRuntimeStatus() {
   return {
     startedAt: null,
@@ -234,7 +251,7 @@ export class WeixinRuntime {
         this.#status.lastCheckedAt = Date.now();
         this.#status.lastError = null;
 
-        for (const message of response?.msgs ?? []) {
+        for (const message of orderWeixinMessages(response?.msgs)) {
           void this.#bridge.accept(message).catch((error) => {
             if (signal.aborted) return;
             this.#logger.error?.(

package/src/channels/whatsapp/whatsapp-runtime.mjs

@@ -1,4 +1,4 @@
-import { createHash } from 'node:crypto';
+import { createHash, randomBytes } from 'node:crypto';
 
 import {
   areJidsSameUser,
@@ -217,9 +217,9 @@ export function normalizeWhatsappMessage(message, accountJid, {
   const fromMe = message.key.fromMe === true;
   const selfChat = fromMe && !group
     && [remoteJid, alternateRemoteJid].some((jid) => jid && areJidsSameUser(jid, accountJid));
-  if (fromMe && !selfChat) return null;
-  const senderJid = selfChat ? accountJid : group ? message.key.participant : remoteJid;
-  const senderAlternateJid = group ? message.key.participantAlt : alternateRemoteJid;
+  if (fromMe && !selfChat && !group) return null;
+  const senderJid = fromMe ? accountJid : group ? message.key.participant : remoteJid;
+  const senderAlternateJid = group && !fromMe ? message.key.participantAlt : alternateRemoteJid;
   if (typeof senderJid !== 'string' || !senderJid) return null;
   const viewOnce = hasViewOnceWrapper(message.message);
   const content = normalizeMessageContent(message.message);
@@ -239,9 +239,11 @@ export function normalizeWhatsappMessage(message, accountJid, {
     kind: group ? 'group' : 'direct',
     conversationId: remoteJid,
     content: messageText(content),
+    plainText: typeof content?.conversation === 'string'
+      || typeof content?.extendedTextMessage?.text === 'string',
     images: image ? [image] : [],
     files: file ? [file] : [],
-    addressed: !group || mentioned || replyToSelf,
+    addressed: !group || fromMe || mentioned || replyToSelf,
     selfChat,
     replyTarget: { jid: remoteJid, quoted: message, selfChat },
   };
@@ -272,6 +274,14 @@ class RecentWhatsappOutboundIds {
   }
 
   remember(id) {
+    this.#store(id);
+  }
+
+  reserve(id) {
+    this.#store(id);
+  }
+
+  #store(id) {
     if (typeof id !== 'string' || !id) return;
     this.#purge();
     this.#ids.set(id, Date.now() + 5 * 60_000);
@@ -360,10 +370,23 @@ export class WhatsappBotClient {
     await this.#stopTyping(target.jid);
     const providerMessageIds = [];
     for (const [index, chunk] of splitMessageText(text, 4_000).entries()) {
+      const messageId = randomBytes(10).toString('hex').toUpperCase();
+      const options = {
+        ...(index === 0 && target.quoted ? { quoted: target.quoted } : {}),
+        messageId,
+      };
+      // Linked-account group messages are valid inbound prompts in open mode.
+      // Reserve our own id before dispatch so an early local echo cannot loop
+      // back through the bridge as another owner-authored group prompt.
+      if (typeof this.#outboundIds.reserve === 'function') {
+        this.#outboundIds.reserve(messageId);
+      } else {
+        this.#outboundIds.remember(messageId);
+      }
       const result = await this.#socket.sendMessage(
         target.jid,
         { text: chunk },
-        index === 0 && target.quoted ? { quoted: target.quoted } : undefined,
+        options,
       );
       this.#outboundIds.remember(result?.key?.id);
       if (typeof result?.key?.id === 'string' && result.key.id) {