@xmanrui/dsh-im 4.38.0 → 4.38.2

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

@@ -21,6 +21,7 @@ import {
   isBatchInputCommand,
 } from '../shared/batch-input.mjs';
 import { runCompactCommand } from '../shared/compact-command.mjs';
+import { isSharedLocalCommand } from '../shared/command-permission.mjs';
 import { isClearCommand, runClearCommand } from '../shared/clear-command.mjs';
 import { isHistoryCommand, runHistoryCommand } from '../shared/history-command.mjs';
 import {
@@ -154,10 +155,9 @@ function messageText(frame) {
     : text;
 }
 
-function imageContents(frame) {
-  const body = bodyOf(frame);
-  if (body.msgtype === 'image') return [body.image];
-  if (body.msgtype !== 'mixed' || !Array.isArray(body.mixed?.msg_item)) return [];
+function imageContents(body) {
+  if (body?.msgtype === 'image') return [body.image];
+  if (body?.msgtype !== 'mixed' || !Array.isArray(body.mixed?.msg_item)) return [];
   return body.mixed.msg_item
     .filter((item) => item?.msgtype === 'image')
     .map((item) => item.image);
@@ -259,7 +259,7 @@ export function wecomInboundMessage(frame, client) {
   const replyTo = replyReferenceForBody(body);
   return {
     content: messageText(frame),
-    images: imageContents(frame).map((image) => imageSource(client, image)).filter(Boolean),
+    images: imageContents(body).map((image) => imageSource(client, image)).filter(Boolean),
     files: fileContents(frame).map((file) => fileSource(client, file)).filter(Boolean),
     ...(replyTo ? { replyTo } : {}),
   };
@@ -337,6 +337,25 @@ function imageQueueFullMessage(message) {
   };
 }
 
+function quotedImageGuidance(message) {
+  const lines = [];
+  const directCount = message.images.length;
+  const quotedCount = message.quotedImages?.length ?? 0;
+  if (quotedCount > 0) {
+    if (directCount > 0) lines.push(t('图片 {indexes} 来自当前消息。', {
+      indexes: Array.from({ length: directCount }, (_, index) => index + 1).join(', '),
+    }));
+    lines.push(t('图片 {indexes} 来自被引用消息。图片序号与本轮附件清单一致。', {
+      indexes: Array.from({ length: quotedCount }, (_, index) => directCount + index + 1).join(', '),
+    }));
+  }
+  if (message.missingQuotedImageCount > 0) lines.push(t(
+    '有 {count} 张引用图片未提供可下载资源，未附上这些图片；需要看图时请用户重新发送。',
+    { count: message.missingQuotedImageCount },
+  ));
+  return lines.join('\n');
+}
+
 function interactionReplyText(frame) {
   return bodyOf(frame).msgtype === 'text' ? messageText(frame) : '';
 }
@@ -1082,19 +1101,33 @@ export class WecomHarnessBridge {
     // may legally stay queued longer. Start the authenticated SDK download as
     // soon as the validated callback is accepted, then consume it in order.
     const inboundMessage = wecomInboundMessage(frame, this.#client);
-    const imageCount = inboundMessage.images.length;
+    const directCount = inboundMessage.images.length;
+    const quoteContents = isSharedLocalCommand(inboundMessage.content, {
+      hasImages: hasInboundImages(inboundMessage),
+      hasFiles: hasInboundFiles(inboundMessage),
+    }) ? [] : imageContents(bodyOf(frame).quote);
+    const quotedImages = quoteContents.map((image) => imageSource(this.#client, image)).filter(Boolean);
+    const combinedMessage = { ...inboundMessage, images: [...inboundMessage.images, ...quotedImages] };
+    const imageCount = combinedMessage.images.length;
     let reservedImages = 0;
-    let preparedMessage = inboundMessage;
+    let preparedMessage = combinedMessage;
     if (imageCount > 0) {
       if (this.#prefetchedImageCount + imageCount <= MAX_PREFETCHED_IMAGES) {
         reservedImages = imageCount;
         this.#prefetchedImageCount += reservedImages;
-        preparedMessage = prefetchInboundImages(inboundMessage, this.#signal,
+        preparedMessage = prefetchInboundImages(combinedMessage, this.#signal,
           this.#harness.getImageInputLimits?.() ?? imageInputLimits());
       } else {
-        preparedMessage = imageQueueFullMessage(inboundMessage);
+        preparedMessage = imageQueueFullMessage(combinedMessage);
       }
     }
+    // Keep quoted media separate until local command and interaction routing is done.
+    preparedMessage = {
+      ...preparedMessage,
+      images: preparedMessage.images.slice(0, directCount),
+      quotedImages: preparedMessage.images.slice(directCount),
+      missingQuotedImageCount: quoteContents.length - quotedImages.length,
+    };
     preparedMessage = prefetchInboundFiles(preparedMessage, this.#signal);
     const previous = this.#queues.get(key) ?? Promise.resolve();
     const current = previous
@@ -1390,6 +1423,8 @@ export class WecomHarnessBridge {
       let content = hasImages || hasReply
         ? await promptContentForInboundMessage(message, { signal: this.#signal, deferImages: true })
         : undefined;
+      const imageGuidance = quotedImageGuidance(message);
+      if (imageGuidance) content.push({ type: 'text', text: imageGuidance });
       const snapshot = this.#acceptedMessageIds.get(messageId);
       let contextEnhanced = false;
       if (snapshot) {
@@ -1440,7 +1475,7 @@ export class WecomHarnessBridge {
           }),
           onInteractionResolved: (resolution) => this.#handleInteractionResolved(resolution),
           files: message.files,
-          images: message.images,
+          images: [...message.images, ...(message.quotedImages ?? [])],
         },
       });
       if (batchSubmission) {

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

@@ -4,6 +4,7 @@ import { WSAuthFailureError, WSClient, WSReconnectExhaustedError } from '@wecom/
 import { createWecomBridgeStatus, WecomHarnessBridge } from './wecom-bridge.mjs';
 import { sendRememberedConnectionTest } from '../shared/connection-test.mjs';
 import { t } from '../shared/i18n.mjs';
+import { chunkMarkdownText } from '../shared/markdown-chunks.mjs';
 
 function timeoutError() {
   const error = new Error('Enterprise WeChat WebSocket authentication timed out');
@@ -240,7 +241,7 @@ export class WecomRuntime {
     }, options);
   }
 
-  async sendProactiveText(target, text, { signal } = {}) {
+  async sendProactiveText(target, text, { signal, format = 'plain' } = {}) {
     const chatId = typeof target?.route?.chatId === 'string'
       ? target.route.chatId.trim() : '';
     if ((target?.kind !== 'user' && target?.kind !== 'group') || !chatId) {
@@ -254,10 +255,15 @@ export class WecomRuntime {
       throw error;
     }
     signal?.throwIfAborted();
-    await this.#client.sendMessage(chatId, {
-      msgtype: 'markdown',
-      markdown: { content: text },
-    });
+    // At most three UTF-8 bytes per UTF-16 unit: stay within the existing
+    // bridge's 18,000-byte budget while keeping Markdown structures intact.
+    const chunks = format === 'markdown' ? chunkMarkdownText(text, 6_000) : [text];
+    for (const content of chunks) {
+      signal?.throwIfAborted();
+      await this.#client.sendMessage(chatId, {
+        msgtype: 'markdown', markdown: { content },
+      });
+    }
     return { sent: true };
   }
 

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

@@ -1,5 +1,6 @@
 import { createWeixinDiagnostics } from './connection-error.mjs';
-import { DEFAULT_WEIXIN_MAX_MESSAGE_CHARS, WeixinApiError, rejectedProviderResponse } from './weixin-api.mjs';
+import { DEFAULT_WEIXIN_MAX_MESSAGE_CHARS, WeixinApiError, rejectedProviderResponse, splitWeixinText } from './weixin-api.mjs';
+import { chunkMarkdownText } from '../shared/markdown-chunks.mjs';
 import {
   createWeixinBridgeStatus, WeixinHarnessBridge, weixinSendError, weixinSendFailureOptions,
 } from './weixin-bridge.mjs';
@@ -350,7 +351,7 @@ export class WeixinRuntime {
     return { sent: true };
   }
 
-  async #sendTrackedText({ toUserId, text, signal }) {
+  async #sendTrackedText({ toUserId, text, signal, fullText = text, chunkIndex = 0, chunkCount = 1 }) {
     const sentAt = Date.now();
     const contextToken = this.#state.contextTokenFor?.(toUserId);
     let result;
@@ -366,7 +367,7 @@ export class WeixinRuntime {
     } catch (cause) {
       if (signal?.aborted) throw cause;
       const error = weixinSendError(cause, {
-        baseUrl: this.#config.baseUrl, text, chunk: text, chunkIndex: 0, chunkCount: 1,
+        baseUrl: this.#config.baseUrl, text: fullText, chunk: text, chunkIndex, chunkCount,
         maxMessageChars: this.#maxMessageChars, contextToken,
       });
       const failure = setLastMessageFailure(this.#status,
@@ -402,7 +403,7 @@ export class WeixinRuntime {
     }, options);
   }
 
-  async sendProactiveText(target, text, { signal } = {}) {
+  async sendProactiveText(target, text, { signal, format = 'plain' } = {}) {
     const toUserId = typeof target?.route?.toUserId === 'string'
       ? target.route.toUserId.trim() : '';
     if (target?.kind !== 'user' || !toUserId) {
@@ -415,12 +416,18 @@ export class WeixinRuntime {
       error.code = 'bot-not-connected';
       throw error;
     }
-    signal?.throwIfAborted();
-    await this.#sendTrackedText({
-      toUserId,
-      text,
-      signal: signal ?? this.#abortController.signal,
-    });
+    const sendSignal = signal ?? this.#abortController.signal;
+    sendSignal.throwIfAborted();
+    const chunks = format === 'markdown'
+      ? chunkMarkdownText(text, this.#maxMessageChars)
+      : splitWeixinText(text, this.#maxMessageChars);
+    for (const [chunkIndex, chunk] of chunks.entries()) {
+      sendSignal.throwIfAborted();
+      await this.#sendTrackedText({
+        toUserId, text: chunk, signal: sendSignal,
+        fullText: text, chunkIndex, chunkCount: chunks.length,
+      });
+    }
     return { sent: true };
   }
 }

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

@@ -0,0 +1,59 @@
+// A conservative projection of common Markdown into WhatsApp's text dialect.
+// Unsupported structures stay literal; code and link destinations are protected.
+function inline(text) {
+  const saved = [];
+  let marker = '\u0000';
+  while (text.includes(marker)) marker += '\u0000';
+  const stash = value => `${marker}${saved.push(value) - 1}${marker}`;
+  let value = text.replace(/(`+)([^\n]*?)\1/g, (_match, ticks, code) => (
+    // WhatsApp cannot represent embedded backticks in inline code safely.
+    stash(code.includes('`') ? `${ticks}${code}${ticks}` : `\`${code}\``)
+  ));
+  value = value.replace(/\\([\\`*_{}[\]()#+.!~>-])/g, match => stash(match));
+  value = value.replace(/!?\[([^\]\n]+)\]\((https?:\/\/(?:[^\s()]|\([^\s()]*\))+)(?:\s+"[^"\n]*")?\)/g,
+    (_match, label, url) => stash(`${label} (${url})`));
+  value = value.replace(/https?:\/\/[^\s<>]+/g, url => stash(url));
+  // Leave nested delimiters untouched instead of guessing their meaning.
+  value = value.replace(/(?<![*_])(\*\*|__)([^*_\n]+)\1(?![*_])/g,
+    (_match, _marker, body) => stash(`*${body}*`));
+  value = value.replace(/(?<![\w*_])\*([^*\n]+)\*(?![*_])/g, (_match, body) => `_${body}_`);
+  value = value.replace(/(?<!~)~~([^~\n]+)~~(?!~)/g, '~$1~');
+  const token = new RegExp(`${marker}(\\d+)${marker}`, 'g');
+  // A later protected URL can contain an earlier token; restore both passes.
+  for (let pass = 0; pass <= saved.length && value.includes(marker); pass++) {
+    value = value.replace(token, (match, index) => saved[Number(index)] ?? match);
+  }
+  return value;
+}
+
+export function markdownToWhatsapp(text) {
+  const lines = text.replace(/\r\n?/g, '\n').split('\n');
+  const result = [];
+  let table = false;
+  for (let index = 0; index < lines.length; index++) {
+    const line = lines[index];
+    const open = /^ {0,3}(`{3,}|~{3,})(.*)$/.exec(line);
+    if (open && !(open[1][0] === '`' && open[2].includes('`'))) {
+      let end = index + 1;
+      for (; end < lines.length; end++) {
+        const close = /^ {0,3}(`{3,}|~{3,})[ \t]*$/.exec(lines[end]);
+        if (close && close[1][0] === open[1][0] && close[1].length >= open[1].length) break;
+      }
+      const body = lines.slice(index + 1, end);
+      // Embedded triple backticks cannot be represented by WhatsApp's fence.
+      // Preserve the entire original block instead of changing code boundaries.
+      if (body.some(value => value.includes('```'))) result.push(...lines.slice(index, end + 1));
+      else result.push('```', ...body, '```');
+      index = end;
+      table = false;
+      continue;
+    }
+    if (line.includes('|') && /^\s*\|?\s*:?-+:?\s*\|[\s|:-]*$/.test(lines[index + 1] ?? '')) table = true;
+    if (table && line.includes('|')) { result.push(line); continue; }
+    table = false;
+    const heading = /^ {0,3}#{1,6}\s+(.+?)(?:\s+#+)?\s*$/.exec(line);
+    // A heading with its own inline delimiters stays literal rather than nested.
+    result.push(heading && !/[*_`]/.test(heading[1]) ? `*${heading[1]}*` : inline(line));
+  }
+  return result.join('\n');
+}

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

@@ -14,6 +14,9 @@ import { t } from '../shared/i18n.mjs';
 import { ImagePromptError } from '../shared/image-prompt.mjs';
 import { trackOutboundArtifactProviderPromise } from '../shared/semantic/artifact.mjs';
 import { createWhatsappBridgeStatus, WhatsappHarnessBridge } from './whatsapp-bridge.mjs';
+import { createTextDeliveryBlock } from '../shared/semantic/delivery.mjs';
+import { chunkMarkdownText } from '../shared/markdown-chunks.mjs';
+import { markdownToWhatsapp } from './whatsapp-markdown.mjs';
 import {
   WHATSAPP_ACCESS_MODES,
   normalizeWhatsappAccountJid,
@@ -490,6 +493,25 @@ export class WhatsappBotClient {
     return { providerMessageIds };
   }
 
+  async sendDelivery(target, value) {
+    const block = createTextDeliveryBlock(value);
+    if (block.format === 'plain') return this.sendText(target, block.text);
+    let chunks;
+    try {
+      chunks = chunkMarkdownText(markdownToWhatsapp(block.text), WHATSAPP_TEXT_LIMIT);
+    } catch {
+      this.#logger.warn?.('[dsh-im:whatsapp] Markdown could not be prepared; sending plain text');
+      return this.sendText(target, block.text);
+    }
+    await this.#stopTyping(target.jid);
+    const providerMessageIds = [];
+    for (const [index, chunk] of chunks.entries()) {
+      const result = await this.#sendTextMessage(target, chunk, { quote: index === 0 });
+      providerMessageIds.push(result.key.id);
+    }
+    return { providerMessageIds };
+  }
+
   async #sendTextMessage(target, text, { edit, quote = true } = {}) {
     this.#signal?.throwIfAborted();
     const messageId = randomBytes(10).toString('hex').toUpperCase();
@@ -886,7 +908,7 @@ export class WhatsappRuntime {
     }, options);
   }
 
-  async sendProactiveText(target, text, { signal } = {}) {
+  async sendProactiveText(target, text, { signal, format = 'plain' } = {}) {
     const jid = typeof target?.route?.jid === 'string' ? target.route.jid.trim() : '';
     const validUser = target?.kind === 'user'
       && /^[^@\s]+@(s\.whatsapp\.net|lid)$/.test(jid);
@@ -902,6 +924,9 @@ export class WhatsappRuntime {
       throw error;
     }
     signal?.throwIfAborted();
+    if (format === 'markdown') {
+      return this.#client.sendDelivery({ jid }, createTextDeliveryBlock(text, format));
+    }
     return this.#client.sendText({ jid }, text);
   }