@xmanrui/dsh-im 4.38.0 → 4.38.2

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.2",
   "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/client/connection-error.js

@@ -4,6 +4,8 @@ import { normalizeDiagnosticDetails } from '../../src/channels/shared/diagnostic
 import { CONFIG_ISSUE_LABELS } from '../../src/channels/shared/diagnostic-details.mjs';
 
 const STAGE_LABELS = {
+  'session.prepare': '准备会话', 'prompt.prepare': '准备消息', 'interaction.open': '建立交互通道',
+  'prompt.submit': '提交消息', 'reply.wait': '等待处理结果',
   'credential.verify': '验证凭据', 'permission.check': '检查权限', 'sdk.load': '加载渠道组件',
   operation: '执行渠道操作', 'message.receive': '接收消息', 'message.send': '发送消息', 'connection.test': '发送测试消息',
   'startup.load': '加载渠道配置', 'qr.begin': '申请二维码', 'qr.encode': '生成二维码图片', 'qr.poll': '查询扫码状态',
@@ -15,6 +17,11 @@ const STAGE_LABELS = {
   'connection.poll': '监测连接与消息', 'connection.stop': '停止连接', 'status.read': '读取连接状态',
   rollback: '恢复原账号状态', 'management.request': '访问 DSH 管理接口',
 };
+const SUBMISSION_LABELS = { 'not-submitted': '未提交', accepted: '已确认接收', unknown: '提交结果未知' };
+const STREAM_REASON_LABELS = {
+  'stream-closed-before-open': '打开前关闭', 'stream-failed-before-open': '打开前失败',
+  'stream-failed': '通道连接失败', unknown: '暂未识别',
+};
 
 export function provisioningErrorTitle(error) {
   const stage = error?.details?.stage;
@@ -30,7 +37,7 @@ export function formatConnectionDiagnostic(value) {
   return [
     localizeText(error.message), details.hint ? localizeText(details.hint) : null,
     localizeText('错误码') + ': ' + error.code,
-    ...['channel', 'operation', 'stage', 'method', 'transport', 'reason', 'reasons', 'host', 'durationMs', 'timeoutMs', 'nodeVersion', 'dshVersion', 'platform', 'dependencies', 'proxyConfigured', 'truncated', 'httpStatus', 'providerCode', 'resource', 'file', 'field', 'issue', 'referenceId', 'occurredAt', 'rollback', 'pluginVersion']
+    ...['channel', 'operation', 'stage', 'method', 'transport', 'submissionState', 'attempts', 'lastFailureReason', 'reason', 'reasons', 'host', 'durationMs', 'timeoutMs', 'nodeVersion', 'dshVersion', 'platform', 'dependencies', 'proxyConfigured', 'truncated', 'httpStatus', 'providerCode', 'resource', 'file', 'field', 'issue', 'referenceId', 'occurredAt', 'rollback', 'pluginVersion']
       .filter(field => details[field] !== undefined)
       .map(field => `${field}: ${typeof details[field] === 'object' ? JSON.stringify(details[field]) : details[field]}`),
   ].filter(Boolean).join('\n');
@@ -51,7 +58,10 @@ export function ConnectionError({ error: value, warning = false, showMessage = t
   };
   const fields = [
     ['错误码', error.code], ['失败阶段', localizeText(STAGE_LABELS[details.stage] ?? details.stage ?? '')],
-    ['RPC 方法', details.method], ['调用方式', details.transport === 'host-api' ? localizeText('宿主 API（进程内）') : details.transport === 'http' ? 'HTTP' : undefined],
+    ['RPC 方法', details.method], ['调用方式', details.transport === 'host-api' ? localizeText('宿主 API（进程内）') : details.transport === 'http' ? 'HTTP' : details.transport === 'websocket' ? 'WebSocket' : undefined],
+    ['消息提交状态', localizeText(SUBMISSION_LABELS[details.submissionState] ?? '')],
+    ['连接尝试次数', details.attempts],
+    ['最近一次连接失败', localizeText(STREAM_REASON_LABELS[details.lastFailureReason] ?? details.lastFailureReason ?? '')],
     ['底层原因', details.reason === 'unknown' ? localizeText('暂未识别') : details.reason], ['多个原因', details.reasons?.join(', ')], ['服务域名', details.host], ['请求耗时（毫秒）', details.durationMs], ['超时阈值（毫秒）', details.timeoutMs], ['Node 版本', details.nodeVersion], ['DSH 版本', details.dshVersion], ['依赖版本', details.dependencies ? Object.entries(details.dependencies).map(([name, version]) => `${name}: ${version}`).join(', ') : undefined], ['代理已配置', details.proxyConfigured], ['原因链已截断', details.truncated], ['运行平台', details.platform], ['HTTP 状态', details.httpStatus], ['服务返回码', details.providerCode],
     ['配置文件', details.file], ['配置字段', details.field],
     ['校验原因', details.issue ? localizeText(CONFIG_ISSUE_LABELS[details.issue]) : undefined],

package/plugin-src/host/channels/dingtalk/production.mjs

@@ -116,7 +116,7 @@ export async function createProductionController(ctx, config = {}, internals = {
     ...(fileIngressExecutor ? { fileIngressExecutor } : {}),
     imageInputPolicy: () => getImageInputSettingsStore(config).get(),
   });
-  const modelCatalog = () => listModelCatalog(harness);
+  const modelCatalog = (options) => listModelCatalog(harness, options);
   const coreController = new Controller({
     deviceAuth,
     credentials: ctx.credentials,

package/plugin-src/host/channels/feishu/production.mjs

@@ -219,7 +219,7 @@ export async function createProductionController(ctx, config = {}, internals = {
   const proxyEnv = internals.proxyEnv ?? process.env;
   const wsAgent = createFeishuWebSocketAgent(proxyEnv, internals.createProxyAgent);
 
-  const modelCatalog = () => listModelCatalog(harness);
+  const modelCatalog = (options) => listModelCatalog(harness, options);
   const coreController = new Controller({
     logger,
     registerApp: (options) => lark.registerApp(options),

package/plugin-src/host/channels/matrix/production.mjs

@@ -127,7 +127,7 @@ export async function createProductionController(ctx, config = {}, internals = {
     ...(sessionMaintenanceExecutor ? { sessionMaintenanceExecutor } : {}),
     ...(fileIngressExecutor ? { fileIngressExecutor } : {}),
   });
-  const modelCatalog = () => listModelCatalog(harness);
+  const modelCatalog = (options) => listModelCatalog(harness, options);
   const knownCommandNames = new Set(
     commandsForChannel('matrix').flatMap((entry) => [entry.name, ...entry.aliases.map((alias) => alias.name)]),
   );

package/plugin-src/host/channels/qq/production.mjs

@@ -108,7 +108,7 @@ export async function createProductionController(ctx, config = {}, internals = {
     ...(fileIngressExecutor ? { fileIngressExecutor } : {}),
     imageInputPolicy: () => getImageInputSettingsStore(config).get(),
   });
-  const modelCatalog = () => listModelCatalog(harness);
+  const modelCatalog = (options) => listModelCatalog(harness, options);
   const coreController = new Controller({
     qrAuth,
     credentials: ctx.credentials,

package/plugin-src/host/channels/shared/production.mjs

@@ -126,7 +126,7 @@ export async function createTokenProductionController(ctx, config, internals, de
     ...(fileIngressExecutor ? { fileIngressExecutor } : {}),
     imageInputPolicy: () => getImageInputSettingsStore(config).get(),
   });
-  const modelCatalog = () => listModelCatalog(harness);
+  const modelCatalog = (options) => listModelCatalog(harness, options);
   // Assigned just below. A transport may need to write a rotated token back
   // through the controller, which is only constructible after createRuntime is
   // defined, so the reference is held in a slot rather than captured directly.

package/plugin-src/host/channels/slack/production.mjs

@@ -95,7 +95,7 @@ export async function createProductionController(ctx, config = {}, internals = {
     ...(fileIngressExecutor ? { fileIngressExecutor } : {}),
     imageInputPolicy: () => getImageInputSettingsStore(config).get(),
   });
-  const modelCatalog = () => listModelCatalog(harness);
+  const modelCatalog = (options) => listModelCatalog(harness, options);
   const coreController = new ResolvedController({
     credentials: ctx.credentials,
     configStore: observedConfigStore,

package/plugin-src/host/channels/wecom/production.mjs

@@ -110,7 +110,7 @@ export async function createProductionController(ctx, config = {}, internals = {
     ...(fileIngressExecutor ? { fileIngressExecutor } : {}),
     imageInputPolicy: () => getImageInputSettingsStore(config).get(),
   });
-  const modelCatalog = () => listModelCatalog(harness);
+  const modelCatalog = (options) => listModelCatalog(harness, options);
   const coreController = new Controller({
     qrAuth,
     credentials: ctx.credentials,

package/plugin-src/host/channels/wecom-app/production.mjs

@@ -144,7 +144,7 @@ export async function createProductionController(ctx, config = {}, internals = {
     ...(fileIngressExecutor ? { fileIngressExecutor } : {}),
     imageInputPolicy: () => getImageInputSettingsStore(config).get(),
   });
-  const modelCatalog = () => listModelCatalog(harness);
+  const modelCatalog = (options) => listModelCatalog(harness, options);
   const coreController = new Controller({
     credentials: ctx.credentials,
     configStore: observedConfigStore,

package/plugin-src/host/channels/weixin/production.mjs

@@ -150,7 +150,7 @@ export async function createProductionController(ctx, config = {}, internals = {
     ...(fileIngressExecutor ? { fileIngressExecutor } : {}),
     imageInputPolicy: () => getImageInputSettingsStore(config).get(),
   });
-  const modelCatalog = () => listModelCatalog(harness);
+  const modelCatalog = (options) => listModelCatalog(harness, options);
   const coreController = new Controller({
     api,
     credentials: ctx.credentials,

package/plugin-src/host/channels/whatsapp/production.mjs

@@ -116,7 +116,7 @@ export async function createProductionController(ctx, config = {}, internals = {
     ...(fileIngressExecutor ? { fileIngressExecutor } : {}),
     imageInputPolicy: () => getImageInputSettingsStore(config).get(),
   });
-  const modelCatalog = () => listModelCatalog(harness);
+  const modelCatalog = (options) => listModelCatalog(harness, options);
   const coreController = new Controller({
     configStore: observedConfigStore,
     authPath: paths.authPath,

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/modern-harness-api.mjs

@@ -1,6 +1,6 @@
 import { randomUUID } from 'node:crypto';
 
-import { activeHarnessInteractionOwner, hasActiveHarnessInteractionOwner, harnessToolCallFromEvent, HarnessInteractionError } from '../../src/channels/shared/harness-client.mjs';
+import { activeHarnessInteractionOwner, clearModelCatalogCache, hasActiveHarnessInteractionOwner, harnessToolCallFromEvent, HarnessInteractionError } from '../../src/channels/shared/harness-client.mjs';
 import { extractConnectionEvidence } from '../../src/channels/shared/connection-error.mjs';
 
 const modernApis = new WeakMap();
@@ -857,6 +857,7 @@ class ModernHarnessApi {
   dispose() {
     if (this.#disposed) return;
     this.#disposed = true;
+    clearModelCatalogCache(this);
     for (const subscription of [...this.#mux]) subscription.close();
     this.#assistantStreams.clear();
     for (const pending of [...this.#pendingApprovals.values()]) pending.settle('cancelled');

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({