@xmanrui/dsh-im 4.4.0 → 4.6.0

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

@@ -2,9 +2,11 @@ import {
   DEFAULT_WEIXIN_MAX_MESSAGE_CHARS,
   extractWeixinFiles,
   extractWeixinImages,
+  extractWeixinReplyReference,
   extractWeixinText,
   splitWeixinText,
   weixinMessageId,
+  weixinMessageTimestampMs,
 } from './weixin-api.mjs';
 import {
   harnessAnswerForQuestion,
@@ -38,7 +40,6 @@ import {
   hasInboundImages,
   imagePromptDiagnostic,
   imagePromptUserMessage,
-  promptContentForMessage,
 } from '../shared/image-prompt.mjs';
 import {
   hasInboundFiles,
@@ -47,10 +48,15 @@ import {
 } from '../shared/inbound-file.mjs';
 import { rememberConnectionTestTarget } from '../shared/connection-test.mjs';
 import { deliverOutboundArtifacts } from '../shared/semantic/artifact-delivery.mjs';
+import {
+  hasReplyReference,
+  promptContentForInboundMessage,
+} from '../shared/semantic/reply-reference.mjs';
 import {
   createDeliveryReceipt,
   providerMessageIdsFor,
 } from '../shared/semantic/delivery.mjs';
+import { recoverAssistantTextByTimestamp } from '../shared/session-reply-recovery.mjs';
 import {
   channelDeliveryFailure,
   clearLastMessageFailure,
@@ -67,6 +73,10 @@ const INTERACTION_RESOLVED_TEXT = () => t('这个问题已在其他客户端处
 const DEFAULT_TYPING_KEEPALIVE_MS = 5_000;
 const TYPING_RETRY_DELAY_MS = 60_000;
 const WEIXIN_SEND_DIAGNOSTIC = Symbol('weixin-send-diagnostic');
+const WEIXIN_REPLY_HISTORY_PAGE_SIZE = 100;
+const WEIXIN_REPLY_HISTORY_MAX_PAGES = 3;
+const WEIXIN_REPLY_HISTORY_TIMEOUT_MS = 5_000;
+const WEIXIN_REPLY_HISTORY_MATCH_TOLERANCE_MS = 15_000;
 
 const HELP_TEXT = () => [
   t('微信已连接 DeepSeek Harness。'),
@@ -75,7 +85,7 @@ const HELP_TEXT = () => [
   t('/new  开启一个全新会话'),
   t('/compact  压缩当前会话的较早上下文'),
   t('/history [数量]  查看最近历史消息（默认 3 条，最多 5 条）'),
-  t('/workspace 工作区绝对路径  切换工作区'),
+  t('/workspace 工作区序号或绝对路径  切换工作区'),
   t('/workspacelist  列出工作区绝对路径'),
   t('/sessionlist 或 /sessions [工作区序号或绝对路径]  列出会话 ID 和标题'),
   t('/session Session ID 或当前工作区序号  将当前聊天绑定到指定会话'),
@@ -182,7 +192,20 @@ function weixinSendFailureOptions(error) {
   return undefined;
 }
 
-export function weixinInboundMessage(message, api) {
+export function weixinInboundMessage(message, api, state, { loadReplyContent } = {}) {
+  const toUserId = nonEmptyString(message?.from_user_id);
+  const replyTo = extractWeixinReplyReference(message, {
+    resolveContent: (reference) => state?.recentOutboundTextFor?.({
+      toUserId,
+      ...reference,
+    }),
+    ...(typeof loadReplyContent === 'function' ? {
+      loadContent: (reference, options) => loadReplyContent({
+        toUserId,
+        ...reference,
+      }, options),
+    } : {}),
+  });
   return {
     content: extractWeixinText(message) ?? '',
     images: typeof api?.inboundImages === 'function'
@@ -191,6 +214,7 @@ export function weixinInboundMessage(message, api) {
     files: typeof api?.inboundFiles === 'function'
       ? api.inboundFiles(message)
       : extractWeixinFiles(message),
+    ...(replyTo ? { replyTo } : {}),
   };
 }
 
@@ -375,7 +399,8 @@ export class WeixinHarnessBridge {
         && (this.#queues.has(key) || pending || this.#approvals.hasPending(key))
         ? { handled: true, kind: 'busy', message: batchInputBusyMessage() }
         : this.#batchInputs.handle(key, commandText, {
-            plainText: isNativeWeixinText(message),
+            plainText: isNativeWeixinText(message)
+              && !extractWeixinReplyReference(message),
           });
       if (result.handled) {
         if (result.kind === 'submit') {
@@ -489,7 +514,7 @@ export class WeixinHarnessBridge {
     batchSubmission = null,
   } = {}) {
     const preparedMessage = prefetchInboundFiles(
-      weixinInboundMessage(message, this.#api),
+      this.#inboundMessage(message),
       { signal: this.#signal },
     );
     const previous = this.#queues.get(key) ?? Promise.resolve();
@@ -508,6 +533,54 @@ export class WeixinHarnessBridge {
     return current;
   }
 
+  #inboundMessage(message) {
+    return weixinInboundMessage(message, this.#api, this.#state, {
+      loadReplyContent: (reference, options) => this.#loadReplyContent(reference, options),
+    });
+  }
+
+  async #loadReplyContent(reference, { signal: callerSignal } = {}) {
+    const indexed = this.#state.recentOutboundTextFor?.(reference);
+    if (indexed) return { content: indexed };
+    const quotedAt = [
+      weixinMessageTimestampMs(reference?.messageId),
+      Number(reference?.createTimeMs),
+      Number(reference?.updateTimeMs),
+    ].find(Number.isSafeInteger);
+    if (quotedAt === undefined) return { unavailableReason: 'not-delivered' };
+    const sender = nonEmptyString(reference?.toUserId);
+    const sessionId = sender ? this.#state.sessionFor(conversationKey(sender)) : null;
+    const session = typeof sessionId === 'string' && sessionId
+      ? this.#harness.workspaceSession?.(sessionId)
+      : null;
+    if (typeof session?.readHistory !== 'function') {
+      return { unavailableReason: 'not-delivered' };
+    }
+    const text = await recoverAssistantTextByTimestamp({
+      session,
+      quotedAt,
+      signal: callerSignal,
+      pageSize: WEIXIN_REPLY_HISTORY_PAGE_SIZE,
+      maxPages: WEIXIN_REPLY_HISTORY_MAX_PAGES,
+      timeoutMs: WEIXIN_REPLY_HISTORY_TIMEOUT_MS,
+      toleranceMs: WEIXIN_REPLY_HISTORY_MATCH_TOLERANCE_MS,
+    });
+    if (!text) return { unavailableReason: 'not-delivered' };
+    const messageId = nonEmptyString(reference?.messageId);
+    try {
+      await this.#state.rememberOutboundMessage?.({
+        toUserId: sender,
+        text,
+        sentAt: quotedAt,
+        completedAt: quotedAt,
+        providerMessageIds: messageId ? [messageId] : [],
+      });
+    } catch (error) {
+      this.#logger.warn?.('[dsh-weixin] failed to remember a recovered quote:', error);
+    }
+    return { content: text };
+  }
+
   #finishBatchResult(message, messageId, key, sender, contextToken, runId, result) {
     let task;
     task = Promise.resolve().then(async () => {
@@ -644,11 +717,12 @@ export class WeixinHarnessBridge {
     let batchSettled = batchSubmission === null;
     let promptRecorded = false;
     try {
-      const promptMessage = preparedMessage ?? weixinInboundMessage(message, this.#api);
+      const promptMessage = preparedMessage ?? this.#inboundMessage(message);
       const text = promptMessage.content;
       const hasImages = hasInboundImages(promptMessage);
       const hasFiles = hasInboundFiles(promptMessage);
-      if (!text && !hasImages && !hasFiles) {
+      const hasReply = hasReplyReference(promptMessage);
+      if (!text && !hasImages && !hasFiles && !hasReply) {
         await this.#send(sender, t('目前支持文字、图片、文件，以及微信已转成文字的语音消息。'), contextToken, runId);
         await this.#state.markSeen(messageId);
         return;
@@ -701,15 +775,18 @@ export class WeixinHarnessBridge {
       let artifacts = [];
       await this.#startTyping(sender, contextToken);
       try {
-        let content = hasImages
-          ? await promptContentForMessage(promptMessage, { signal: this.#signal })
+        let content = hasImages || hasReply
+          ? await promptContentForInboundMessage(promptMessage, { signal: this.#signal })
           : undefined;
         const snapshot = this.#acceptedMessageIds.get(messageId);
+        let contextEnhanced = false;
         if (snapshot) {
-          content = enhanceContextContent(content ?? text, snapshot, () => ({
+          const originalContent = content ?? text;
+          content = enhanceContextContent(originalContent, snapshot, () => ({
             channel: 'weixin',
             senderId: sender,
           }));
+          contextEnhanced = content !== originalContent;
         }
         await this.#state.markSeen(messageId);
         promptRecorded = true;
@@ -717,7 +794,9 @@ export class WeixinHarnessBridge {
           harness: this.#harness,
           state: this.#state,
           key,
-          ...(content !== undefined ? { content } : { text }),
+          text,
+          content,
+          contextEnhanced,
           createOptions: { signal: this.#signal },
           existsOptions: { signal: this.#signal },
           askOptions: {
@@ -1149,6 +1228,7 @@ export class WeixinHarnessBridge {
     const chunks = splitWeixinText(text, this.#maxMessageChars);
     for (let chunkIndex = 0; chunkIndex < chunks.length; chunkIndex += 1) {
       const chunk = chunks[chunkIndex];
+      const sentAt = Date.now();
       try {
         const result = await this.#api.sendText({
           baseUrl: this.#baseUrl,
@@ -1159,7 +1239,19 @@ export class WeixinHarnessBridge {
           runId,
           signal: this.#signal,
         });
-        providerMessageIds.push(...providerMessageIdsFor(result));
+        const chunkMessageIds = providerMessageIdsFor(result);
+        providerMessageIds.push(...chunkMessageIds);
+        try {
+          await this.#state.rememberOutboundMessage?.({
+            toUserId,
+            text: chunk,
+            sentAt,
+            completedAt: Date.now(),
+            providerMessageIds: chunkMessageIds,
+          });
+        } catch (error) {
+          this.#logger.warn?.('[dsh-weixin] failed to remember an outbound message:', error);
+        }
       } catch (error) {
         throw weixinSendError(error, {
           baseUrl: this.#baseUrl,

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

@@ -1,5 +1,6 @@
 import { DEFAULT_WEIXIN_MAX_MESSAGE_CHARS, WeixinApiError } from './weixin-api.mjs';
 import { createWeixinBridgeStatus, WeixinHarnessBridge } from './weixin-bridge.mjs';
+import { providerMessageIdsFor } from '../shared/semantic/delivery.mjs';
 import {
   connectionTestTarget,
   connectionTestTargetUnavailable,
@@ -324,9 +325,7 @@ export class WeixinRuntime {
     if (!this.#status.ready || !this.#abortController) {
       throw new Error('Weixin runtime is not connected');
     }
-    await this.#api.sendText({
-      baseUrl: this.#config.baseUrl,
-      token: this.#token,
+    await this.#sendTrackedText({
       toUserId,
       text,
       signal: this.#abortController.signal,
@@ -334,6 +333,29 @@ export class WeixinRuntime {
     return { sent: true };
   }
 
+  async #sendTrackedText({ toUserId, text, signal }) {
+    const sentAt = Date.now();
+    const result = await this.#api.sendText({
+      baseUrl: this.#config.baseUrl,
+      token: this.#token,
+      toUserId,
+      text,
+      signal,
+    });
+    try {
+      await this.#state.rememberOutboundMessage?.({
+        toUserId,
+        text,
+        sentAt,
+        completedAt: Date.now(),
+        providerMessageIds: providerMessageIdsFor(result),
+      });
+    } catch (error) {
+      this.#logger.warn?.('[dsh-weixin] failed to remember an outbound message:', error);
+    }
+    return result;
+  }
+
   async sendProactiveText(target, text, { signal } = {}) {
     const toUserId = typeof target?.route?.toUserId === 'string'
       ? target.route.toUserId.trim() : '';
@@ -348,9 +370,7 @@ export class WeixinRuntime {
       throw error;
     }
     signal?.throwIfAborted();
-    await this.#api.sendText({
-      baseUrl: this.#config.baseUrl,
-      token: this.#token,
+    await this.#sendTrackedText({
       toUserId,
       text,
       signal: signal ?? this.#abortController.signal,

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

@@ -96,6 +96,60 @@ function messageText(content) {
     ?? '';
 }
 
+function whatsappReplyAttachment(kind, media, fallbackName) {
+  if (!media || typeof media !== 'object') return null;
+  const name = typeof media.fileName === 'string' && media.fileName
+    ? media.fileName : typeof fallbackName === 'string' && fallbackName
+      ? fallbackName : undefined;
+  return { kind, ...(name ? { name } : {}) };
+}
+
+function whatsappReplyAttachments(content) {
+  const attachments = [];
+  if (content?.imageMessage) {
+    attachments.push(whatsappReplyAttachment('image', content.imageMessage));
+  }
+  if (content?.documentMessage) {
+    const mediaType = typeof content.documentMessage.mimetype === 'string'
+      ? content.documentMessage.mimetype.toLowerCase() : '';
+    attachments.push(whatsappReplyAttachment(
+      mediaType.startsWith('image/') ? 'image' : 'file',
+      content.documentMessage,
+    ));
+  }
+  if (content?.audioMessage) {
+    attachments.push(whatsappReplyAttachment('audio', content.audioMessage));
+  }
+  if (content?.videoMessage) {
+    attachments.push(whatsappReplyAttachment('video', content.videoMessage));
+  }
+  if (content?.stickerMessage) {
+    const mediaType = typeof content.stickerMessage.mimetype === 'string'
+      ? content.stickerMessage.mimetype.toLowerCase() : '';
+    attachments.push(whatsappReplyAttachment(
+      mediaType.startsWith('video/') || content.stickerMessage.isAnimated === true
+        ? 'video' : 'image',
+      content.stickerMessage,
+    ));
+  }
+  return attachments.filter(Boolean);
+}
+
+function whatsappReplyReference(context) {
+  if (!context?.quotedMessage || typeof context.quotedMessage !== 'object') return undefined;
+  const content = normalizeMessageContent(context.quotedMessage);
+  const messageId = typeof context.stanzaId === 'string' && context.stanzaId
+    ? context.stanzaId : undefined;
+  const authorId = typeof context.participant === 'string' && context.participant
+    ? context.participant : undefined;
+  return {
+    ...(messageId ? { messageId } : {}),
+    ...(authorId ? { authorId } : {}),
+    content: messageText(content),
+    attachments: whatsappReplyAttachments(content),
+  };
+}
+
 function mediaSize(value) {
   if (Number.isSafeInteger(value) && value >= 0) return value;
   let converted;
@@ -260,6 +314,7 @@ export function normalizeWhatsappMessage(message, accountJid, {
     && areJidsSameUser(context.participant, accountJid);
   const image = whatsappImageSource(message, content, download, { viewOnce });
   const file = whatsappFileSource(message, content, download);
+  const replyTo = whatsappReplyReference(context);
   return {
     messageId: `${remoteJid}:${messageId}`,
     providerMessageId: messageId,
@@ -274,6 +329,7 @@ export function normalizeWhatsappMessage(message, accountJid, {
       || typeof content?.extendedTextMessage?.text === 'string',
     images: image ? [image] : [],
     files: file ? [file] : [],
+    ...(replyTo ? { replyTo } : {}),
     addressed: !group || fromMe || mentioned || replyToSelf,
     selfChat,
     replyTarget: { jid: remoteJid, quoted: message, selfChat },