@xmanrui/dsh-im 4.38.0 → 4.38.1

package/locale/en.json

@@ -1,6 +1,6 @@
 {
   "meta": {
-    "title": "IM bots",
+    "title": "IM bots (dsh-im)",
     "description": "Connect Telegram, WhatsApp, Slack, Discord, Matrix, WeChat, Feishu, WeCom, DingTalk, and QQ to DSH."
   }
 }

package/locale/zh.json

@@ -1,6 +1,6 @@
 {
   "meta": {
-    "title": "IM 机器人",
+    "title": "IM 机器人 (dsh-im)",
     "description": "把微信、飞书、企微、钉钉、QQ、Telegram、WhatsApp、Slack、Discord、Matrix接入DSH。"
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xmanrui/dsh-im",
-  "version": "4.38.0",
+  "version": "4.38.1",
   "icon": "./assets/logo-plugin-message-link-gradient.webp",
   "description": "把微信、飞书、企微、钉钉、QQ、Telegram、WhatsApp、Slack、Discord、Matrix接入DSH。 Connect Telegram, WhatsApp, Slack, Discord, Matrix, WeChat, Feishu, WeCom, DingTalk, and QQ to DSH.",
   "keywords": [

package/plugin-src/host/delivery-adapter.mjs

@@ -404,7 +404,15 @@ export function createDeliveryAdapter({ channel, workspaces, coreController, sta
       if (typeof coreController.sendProactiveText !== 'function') {
         throw new TypeError('delivery controller cannot send proactive text');
       }
-      await coreController.sendProactiveText(botId, target, text, options);
+      const result = await coreController.sendProactiveText(botId, target, text, options);
+      // Rich senders may report failure without throwing. Never report these
+      // as success, or retry an uncertain send that may already be visible.
+      if (result === false || result?.sent === false
+        || result?.deliveryOutcome === 'failed' || result?.deliveryOutcome === 'unknown') {
+        const error = new Error('Session sync delivery was not confirmed');
+        error.code = result?.deliveryOutcome === 'unknown' ? 'send-result-unknown' : 'delivery-failed';
+        throw error;
+      }
       return { sent: true };
     },
   });

package/plugin-src/host/delivery-service.mjs

@@ -341,11 +341,12 @@ export class DeliveryService {
     return false;
   }
 
-  async sendSessionSyncText(botId, targetId, sessionId, text, { signal } = {}) {
+  async sendSessionSyncText(botId, targetId, sessionId, text, { signal, format = 'plain' } = {}) {
     const id = botIdOf(botId);
     const targetKey = targetIdOf(targetId);
     if (typeof sessionId !== 'string' || !sessionId
-      || typeof text !== 'string' || !text.trim()) {
+      || typeof text !== 'string' || !text.trim()
+      || (format !== 'plain' && format !== 'markdown')) {
       throw deliveryError('bad-request', 'Invalid session sync delivery');
     }
     cancellation(signal);
@@ -354,7 +355,7 @@ export class DeliveryService {
       throw deliveryError('session-sync-unavailable', 'Session sync is unavailable');
     }
     try {
-      await adapter.sendSessionSyncText(id, targetKey, sessionId, text, { signal });
+      await adapter.sendSessionSyncText(id, targetKey, sessionId, text, { signal, format });
       return { sent: true };
     } catch (error) {
       if (signal?.aborted || error?.name === 'AbortError' || error?.code === 'ABORT_ERR') {

package/plugin-src/host/session-sync-coordinator.mjs

@@ -6,7 +6,7 @@ import {
 import { deliverSessionSyncMirror } from '../../src/channels/shared/session-sync-registry.mjs';
 
 const DSH_USER_PREFIX = '[来自 DSH]\n';
-const DSH_ASSISTANT_PREFIX = '[DSH 助手]\n';
+const DSH_ASSISTANT_PREFIX = '[DSH 助手]\n\n';
 
 function completedTurn(reason) {
   return (typeof reason === 'string' ? reason : reason?.kind) === 'completed';
@@ -55,7 +55,7 @@ export function createSessionSyncCoordinator({ deliveryService, logger = console
     );
   };
 
-  const deliver = async (sessionId, targets, text, phase) => {
+  const deliver = async (sessionId, targets, text, phase, format = 'plain') => {
     const unique = new Map();
     for (const target of targets) {
       if (validRecipient(target)) unique.set(recipientKey(target), target);
@@ -67,6 +67,9 @@ export function createSessionSyncCoordinator({ deliveryService, logger = console
         target.targetId,
         sessionId,
         text,
+        // Feishu has already tried its dedicated mirror card. Preserve its
+        // existing plain fallback instead of attempting another rich card.
+        { format: target.channel === 'feishu' ? 'plain' : format },
       )
     )));
     const successful = new Map();
@@ -165,13 +168,14 @@ export function createSessionSyncCoordinator({ deliveryService, logger = console
         return false;
       }
     }));
-    const plain = recipients.filter((_target, index) => !rendered[index]);
-    if (plain.length === 0) return;
+    const fallback = recipients.filter((_target, index) => !rendered[index]);
+    if (fallback.length === 0) return;
     await deliver(
       sessionId,
-      plain,
+      fallback,
       `${DSH_ASSISTANT_PREFIX}${state.assistant.text}`,
       'assistant delivery',
+      'markdown',
     );
   };
 

package/src/channels/dingtalk/dingtalk-api.mjs

@@ -3,6 +3,7 @@ import { extname } from 'node:path';
 
 import { fetchImageBuffer, ImagePromptError } from '../shared/image-prompt.mjs';
 import { t } from '../shared/i18n.mjs';
+import { chunkMarkdownParts } from '../shared/markdown-chunks.mjs';
 import { DINGTALK_MENU_TEMPLATE_ID, dingtalkMenuCardData } from './dingtalk-menu.mjs';
 
 export const DINGTALK_REGISTRATION_BASE_URL = 'https://oapi.dingtalk.com/';
@@ -402,6 +403,7 @@ function positiveNumber(value, fallback) {
 }
 
 export function createDingtalkApi({
+  logger = console,
   fetchImpl = fetch,
   registrationBaseUrl = process.env.DINGTALK_REGISTRATION_BASE_URL
     || DINGTALK_REGISTRATION_BASE_URL,
@@ -1075,37 +1077,52 @@ export function createDingtalkApi({
       return true;
     },
 
-    async sendRobotText({ clientId, clientSecret, target, text, signal }) {
+    async sendRobotText({ clientId, clientSecret, target, text, signal, format = 'plain' }) {
       if (typeof text !== 'string' || !text.trim()) throw new TypeError('text is required');
-      const content = text;
       const normalizedTarget = normalizeFileTarget(target);
       const token = await accessToken({ clientId, clientSecret, signal });
-      const body = {
-        robotCode: normalizedTarget.robotCode,
-        msgKey: 'sampleText',
-        msgParam: JSON.stringify({ content }),
-        ...(normalizedTarget.type === 'group'
-          ? { openConversationId: normalizedTarget.openConversationId }
-          : { userIds: [normalizedTarget.userId] }),
-      };
       const pathname = normalizedTarget.type === 'group'
         ? 'v1.0/robot/groupMessages/send'
         : 'v1.0/robot/oToMessages/batchSend';
-      const response = await requestJson(fetchImpl, endpoint(apiBase, pathname), {
-        body,
-        headers: { 'x-acs-dingtalk-access-token': token },
-        signal,
-        action: '主动文字消息发送',
-      });
-      const rejection = rejectedProviderResponse(response);
-      if (rejection) {
-        throw new DingtalkApiError(
-          'send-rejected',
-          '钉钉服务拒绝了主动文字消息。',
-          { providerCode: rejection },
-        );
+      const send = async (content, markdown) => {
+        const response = await requestJson(fetchImpl, endpoint(apiBase, pathname), {
+          body: {
+            robotCode: normalizedTarget.robotCode,
+            msgKey: markdown ? 'sampleMarkdown' : 'sampleText',
+            msgParam: JSON.stringify(markdown ? { title: 'DSH', text: content } : { content }),
+            ...(normalizedTarget.type === 'group'
+              ? { openConversationId: normalizedTarget.openConversationId }
+              : { userIds: [normalizedTarget.userId] }),
+          },
+          headers: { 'x-acs-dingtalk-access-token': token },
+          signal,
+          action: '主动文字消息发送',
+        });
+        const rejection = rejectedProviderResponse(response);
+        if (rejection) {
+          throw new DingtalkApiError('send-rejected', '钉钉服务拒绝了主动文字消息。', {
+            providerCode: rejection,
+          });
+        }
+        return response;
+      };
+      if (format !== 'markdown') return send(text, false);
+      // Conservative Unicode payload size; reuse QQ's fence/table-aware split.
+      const chunks = chunkMarkdownParts(text, 1_000);
+      let result;
+      for (const chunk of chunks) {
+        try {
+          result = await send(chunk.markdown, true);
+        } catch (error) {
+          // A missing message model is a definite format rejection. Do not
+          // retry auth/target failures, rate limits or ambiguous transport errors.
+          if (signal?.aborted || error?.providerCode !== 'sendMessage.model.notMatch'
+            || !(error.code === 'send-rejected' || error.status === 400)) throw error;
+          logger.warn?.('[dsh-im:dingtalk] Markdown rejected; sending this chunk as text');
+          if (chunk.plain) result = await send(chunk.plain, false);
+        }
       }
-      return response;
+      return result;
     },
 
     async sendFile(request) {

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

@@ -163,7 +163,7 @@ export class DingtalkRuntime {
     maxMessageChars = 4_000,
     connectTimeoutMs = 15_000,
     connectPollIntervalMs = 25,
-    api = createDingtalkApi(),
+    api = createDingtalkApi({ logger }),
     streamFactory = defaultStreamFactory,
   }) {
     if (!config || !nonEmptyString(config.clientId) || !nonEmptyString(clientSecret)) {
@@ -443,7 +443,7 @@ export class DingtalkRuntime {
     }, options);
   }
 
-  async sendProactiveText(target, text, { signal } = {}) {
+  async sendProactiveText(target, text, { signal, format = 'plain' } = {}) {
     const userId = typeof target?.route?.userId === 'string'
       ? target.route.userId.trim() : '';
     const openConversationId = typeof target?.route?.openConversationId === 'string'
@@ -471,6 +471,7 @@ export class DingtalkRuntime {
           ...(target.kind === 'user' ? { userId } : { openConversationId }),
         },
         text,
+        format,
         signal: signal ?? this.#abortController.signal,
       });
     } catch (cause) {

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

@@ -1,5 +1,7 @@
 import { extractConnectionEvidence, createConnectionDiagnostics, atConnectionStage } from '../shared/connection-error.mjs';
 import { createEditableMessageStream, splitMessageText } from '../shared/editable-message-stream.mjs';
+import { chunkMarkdownText } from '../shared/markdown-chunks.mjs';
+import { createTextDeliveryBlock } from '../shared/semantic/delivery.mjs';
 import { fetchFileStream } from '../shared/file-download.mjs';
 import { fetchImageBuffer } from '../shared/image-prompt.mjs';
 import { t } from '../shared/i18n.mjs';
@@ -428,10 +430,19 @@ export class DiscordBotClient {
     this.#signal = signal;
   }
 
-  async sendText(target, text) {
+  sendText(target, text) {
+    return this.#sendText(target, text, false);
+  }
+
+  sendDelivery(target, value) {
+    const block = createTextDeliveryBlock(value);
+    return this.#sendText(target, block.text, block.format === 'markdown');
+  }
+
+  async #sendText(target, text, markdown) {
     const notice = !this.#deliveredNotices.has(target) && target?.notice
       ? String(target.notice) : null;
-    const chunks = splitMessageText(notice ? `${notice}\n\n${text}` : text, 1_900);
+    const chunks = (markdown ? chunkMarkdownText : splitMessageText)(notice ? `${notice}\n\n${text}` : text, 1_900);
     const providerMessageIds = [];
     for (const [index, chunk] of chunks.entries()) {
       const result = await this.#api.createMessage({

package/src/channels/feishu/bridge.mjs

@@ -1,6 +1,7 @@
 import { BusyMessageDispatcher, canAutomaticallySteer } from '../shared/busy-message-dispatcher.mjs';
 import { isPermissionCommand, runPermissionCommand } from '../shared/permission-command.mjs';
 import { randomUUID } from 'node:crypto';
+import { chunkMarkdownText } from '../shared/markdown-chunks.mjs';
 import QRCode from 'qrcode';
 import { waitForFeishuOperation } from './feishu-channel.mjs';
 import {
@@ -4790,7 +4791,13 @@ export class FeishuHarnessBridge {
 
   /** Replace the draft interval with `text` chunked into splitter-safe blocks. */
   #writeStepCardAnswer(card, text) {
-    const blocks = splitStepPostMarkdown(text, STEP_STREAM_ANSWER_CHUNK_MAX_BYTES)
+    // JSON can expand one UTF-16 unit to six bytes (for example a control
+    // character). Leave room for the element wrapper, and let the existing
+    // Markdown splitter reopen fences in each independently rendered block.
+    const chunks = Buffer.byteLength(JSON.stringify(text), 'utf8') + 128 <= STEP_STREAM_ANSWER_CHUNK_MAX_BYTES
+      ? [text]
+      : chunkMarkdownText(text, Math.floor((STEP_STREAM_ANSWER_CHUNK_MAX_BYTES - 128) / 6));
+    const blocks = chunks
       .map((chunk) => ({ kind: 'message', text: chunk }));
     if (card.answerStart !== null) {
       card.blocks.splice(card.answerStart, card.answerEnd - card.answerStart + 1, ...blocks);

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

@@ -36,6 +36,7 @@ import {
   extractOutboundMentions,
   hasRoomMention,
 } from './matrix-rich-text.mjs';
+import { chunkMarkdownParts } from '../shared/markdown-chunks.mjs';
 
 const RECONNECT_DELAYS_MS = Object.freeze([1_000, 3_000, 5_000, 10_000, 30_000]);
 const SYNC_LONG_POLL_MS = 30_000;
@@ -917,14 +918,23 @@ export class MatrixRuntime {
       ? target.threadId : null;
     const replyToEventId = typeof target?.replyToEventId === 'string' && isMatrixEventId(target.replyToEventId)
       ? target.replyToEventId : null;
-    const chunks = splitMessageText(text, this.#config.maxMessageLength);
+    const chunks = options.format === 'markdown'
+      ? chunkMarkdownParts(text, this.#config.maxMessageLength)
+      : splitMessageText(text, this.#config.maxMessageLength).map(plain => ({ markdown: plain, plain }));
     const providerMessageIds = [];
     for (const chunk of chunks) {
-      const content = buildMatrixTextContent({
-        text: chunk,
-        mentionUserIds: extractOutboundMentions(chunk),
-        roomMention: this.#config.allowRoomMentions && hasRoomMention(chunk),
-      });
+      let content;
+      try {
+        content = buildMatrixTextContent({
+          text: chunk.markdown,
+          mentionUserIds: extractOutboundMentions(chunk.markdown),
+          roomMention: this.#config.allowRoomMentions && hasRoomMention(chunk.markdown),
+        });
+      } catch {
+        this.#logger.warn?.('[dsh-im:matrix] Rich text could not be prepared; sending plain text');
+        if (!chunk.plain) continue;
+        content = { msgtype: 'm.text', body: chunk.plain };
+      }
       applyMatrixRelations(content, { threadId, replyToEventId });
       const result = await this.#sendRoomEvent(roomId, 'm.room.message', content, {
         ...(options.signal ? { signal: options.signal } : {}),