@xmanrui/dsh-im 2.6.0 → 3.0.1

package/src/channels/qq/markdown-reply.mjs

@@ -2,10 +2,11 @@
 // 平台拒绝 markdown 时逐条回退纯文本。
 
 import { t } from '../shared/i18n.mjs';
+import { ApiError } from '@tencent-connect/qqbot-nodejs';
 
 const DEFAULT_CHUNK_LIMIT = 4_500;
-const CODE_FENCE_OPEN = /^```/;
-const GFM_TABLE_LINE = /^\|.+\|$/;
+const CODE_FENCE_OPEN = /^( {0,3})(`{3,}|~{3,})(.*)$/;
+const MARKDOWN_REJECTION_CODES = new Set([40_034_090]);
 const PASSIVE_REPLY_LIMIT = Object.freeze({ c2c: 4, group: 5 });
 const PARTIAL_REPLY_NOTICE = () => t('回答较长，后续内容未能通过 QQ 完整发送，请回复“继续”。');
 
@@ -19,32 +20,253 @@ function safeSliceIndex(value, limit) {
   return Math.max(1, index);
 }
 
+function openingFence(line) {
+  const normalized = line.endsWith('\r') ? line.slice(0, -1) : line;
+  const match = CODE_FENCE_OPEN.exec(normalized);
+  if (!match) return null;
+  // CommonMark forbids backticks in the info string of a backtick fence.
+  if (match[2][0] === '`' && match[3].includes('`')) return null;
+  return { delimiter: match[2], info: match[3], indent: match[1].length };
+}
+
+function closesFence(line, opening) {
+  const match = /^ {0,3}(`{3,}|~{3,})[ \t]*$/.exec(line);
+  return Boolean(match
+    && match[1][0] === opening.delimiter[0]
+    && match[1].length >= opening.delimiter.length);
+}
+
+function longestLeadingRun(text, character) {
+  let longest = 0;
+  for (const line of text.split('\n')) {
+    let offset = 0;
+    while (offset < 3 && line[offset] === ' ') offset += 1;
+    let length = 0;
+    while (line[offset + length] === character) length += 1;
+    longest = Math.max(longest, length);
+  }
+  return longest;
+}
+
+function safeCodeFence(text, info) {
+  const backticks = '`'.repeat(Math.max(3, longestLeadingRun(text, '`') + 1));
+  const tildes = '~'.repeat(Math.max(3, longestLeadingRun(text, '~') + 1));
+  if (info.includes('`')) return tildes;
+  return backticks.length <= tildes.length ? backticks : tildes;
+}
+
+function removeFenceIndent(line, indent) {
+  let index = 0;
+  let column = 0;
+  let remaining = indent;
+  while (remaining > 0 && index < line.length) {
+    if (line[index] === ' ') {
+      index += 1;
+      column += 1;
+      remaining -= 1;
+      continue;
+    }
+    if (line[index] === '\t') {
+      const width = 4 - (column % 4);
+      if (width <= remaining) {
+        index += 1;
+        column += width;
+        remaining -= width;
+        continue;
+      }
+      return `${' '.repeat(width - remaining)}${line.slice(index + 1)}`;
+    }
+    break;
+  }
+  return line.slice(index);
+}
+
+function normalizeFencedContent(lines, indent) {
+  return indent === 0 ? lines : lines.map((line) => removeFenceIndent(line, indent));
+}
+
+function splitRawText(text, limit) {
+  if (text.length <= limit) return [text];
+  const parts = [];
+  let remaining = text;
+  while (remaining.length > limit) {
+    let index = safeSliceIndex(remaining, limit);
+    const newline = remaining.lastIndexOf('\n', index - 1);
+    if (newline >= 0) index = newline + 1;
+    parts.push(remaining.slice(0, index));
+    remaining = remaining.slice(index);
+  }
+  if (remaining || parts.length === 0) parts.push(remaining);
+  return parts;
+}
+
+function splitAsFencedCode(text, info, limit) {
+  if (limit < 8) return splitRawText(text, limit).map((part) => ({
+    markdown: part,
+    plain: part,
+  }));
+  const delimiter = safeCodeFence(text, info);
+  let opening = `${delimiter}${info}`;
+  if (opening.length + delimiter.length + 2 >= limit) opening = delimiter;
+  const payloadLimit = limit - opening.length - delimiter.length - 2;
+  if (payloadLimit < 1) return splitRawText(text, limit).map((part) => ({
+    markdown: part,
+    plain: part,
+  }));
+  return splitRawText(text, payloadLimit).map((part) => (
+    {
+      markdown: `${opening}\n${part}${part.endsWith('\n') ? '' : '\n'}${delimiter}`,
+      plain: part,
+    }
+  ));
+}
+
+function hasClosingBacktickRun(text, start, length) {
+  for (let index = start; index < text.length;) {
+    if (text[index] !== '`') {
+      index += 1;
+      continue;
+    }
+    let end = index + 1;
+    while (text[end] === '`') end += 1;
+    if (end - index === length) return true;
+    index = end;
+  }
+  return false;
+}
+
+function gfmTableCells(line) {
+  const normalized = line.endsWith('\r') ? line.slice(0, -1) : line;
+  if (normalized.startsWith('    ') || normalized.startsWith('\t')) return null;
+  const text = normalized.trim();
+  if (!text) return null;
+
+  const cells = [];
+  let cell = '';
+  let separators = 0;
+  let codeRun = 0;
+  for (let index = 0; index < text.length;) {
+    const character = text[index];
+    if (character === '\\' && index + 1 < text.length) {
+      cell += text.slice(index, index + 2);
+      index += 2;
+      continue;
+    }
+    if (character === '`') {
+      let end = index + 1;
+      while (text[end] === '`') end += 1;
+      const length = end - index;
+      if (codeRun === length) {
+        codeRun = 0;
+      } else if (codeRun === 0 && hasClosingBacktickRun(text, end, length)) {
+        codeRun = length;
+      }
+      cell += text.slice(index, end);
+      index = end;
+      continue;
+    }
+    if (character === '|' && codeRun === 0) {
+      cells.push(cell);
+      cell = '';
+      separators += 1;
+      index += 1;
+      continue;
+    }
+    cell += character;
+    index += 1;
+  }
+  if (separators === 0) return null;
+  cells.push(cell);
+  if (cells[0].trim() === '') cells.shift();
+  if (cells.at(-1)?.trim() === '') cells.pop();
+  return cells.length > 0 ? cells : null;
+}
+
+function gfmTableStart(lines, index) {
+  const headerCells = gfmTableCells(lines[index]);
+  const separatorCells = gfmTableCells(lines[index + 1] ?? '');
+  if (!headerCells || !separatorCells || headerCells.length !== separatorCells.length) return null;
+  if (!separatorCells.every((cell) => /^\s*:?-+:?\s*$/.test(cell))) return null;
+  return { headerCells };
+}
+
+function supportedTableBodyCells(line) {
+  const normalized = line.endsWith('\r') ? line.slice(0, -1) : line;
+  const content = normalized.replace(/^ {0,3}/, '');
+  if (openingFence(normalized)
+    || /^(?:#{1,6}(?:[ \t]+|$)|>|(?:[-+*]|\d{1,9}[.)])[ \t]+)/.test(content)) {
+    return null;
+  }
+  return gfmTableCells(normalized);
+}
+
+function splitOversizedTable(lines, limit) {
+  const source = lines.join('\n');
+  if (lines.length < 2 || !gfmTableStart(lines, 0)) {
+    return splitAsFencedCode(source, 'text', limit);
+  }
+  const prefix = `${lines[0]}\n${lines[1]}`;
+  const rows = lines.slice(2);
+  if (prefix.length > limit
+    || rows.some((row) => `${prefix}\n${row}`.length > limit)) {
+    return splitAsFencedCode(source, 'text', limit);
+  }
+  const chunks = [];
+  let current = prefix;
+  let currentRows = [];
+  for (const row of rows) {
+    const candidate = `${current}\n${row}`;
+    if (candidate.length > limit) {
+      chunks.push({
+        markdown: current,
+        plain: chunks.length === 0 ? current : currentRows.join('\n'),
+      });
+      current = `${prefix}\n${row}`;
+      currentRows = [row];
+    } else {
+      current = candidate;
+      currentRows.push(row);
+    }
+  }
+  chunks.push({
+    markdown: current,
+    plain: chunks.length === 0 ? current : currentRows.join('\n'),
+  });
+  return chunks;
+}
+
 /**
  * 按换行边界切分 Markdown 文本：
- * - 不在代码块中间断开；
- * - 不在 GFM 表格中间断开；
+ * - 可容纳的代码块和可识别的 GFM pipe table 保持完整；
+ * - 超长代码块会补齐围栏，超长表格会为每段重复表头；
  * - 超长行在 limit 处硬切，避免单行超限无法投递。
  */
-export function chunkMarkdownText(text, limit = DEFAULT_CHUNK_LIMIT) {
+function chunkMarkdownParts(text, limit = DEFAULT_CHUNK_LIMIT) {
   const value = typeof text === 'string' ? text : '';
   const bound = Number.isInteger(limit) && limit > 0 ? limit : DEFAULT_CHUNK_LIMIT;
-  if (value.length <= bound) return value ? [value] : [];
+  if (value.length <= bound) return value ? [{ markdown: value, plain: value }] : [];
 
-  const lines = value.split('\n');
+  // Once splitting is required, normalize line endings so a chunk never ends
+  // with a dangling CR whose paired LF moved to the next QQ message.
+  const lines = value.replace(/\r\n?/g, '\n').split('\n');
   const chunks = [];
-  let current = '';
-  let inCodeBlock = false;
-  let tableBuffer = [];
+  let current = null;
+
+  const flushCurrent = () => {
+    if (current === null) return;
+    if (current.length > 0) chunks.push({ markdown: current, plain: current });
+    current = null;
+  };
 
   const appendBlock = (block) => {
     if (block.length <= bound) {
-      if (!current) {
+      if (current === null) {
         current = block;
         return;
       }
       const candidate = `${current}\n${block}`;
       if (candidate.length > bound) {
-        chunks.push(current);
+        if (current.length > 0) chunks.push({ markdown: current, plain: current });
         current = block;
       } else {
         current = candidate;
@@ -52,85 +274,112 @@ export function chunkMarkdownText(text, limit = DEFAULT_CHUNK_LIMIT) {
       return;
     }
     // 超大块：收束当前块后按 bound 硬切，保证每块可投递。
-    if (current) {
-      chunks.push(current);
-      current = '';
-    }
+    flushCurrent();
     let remaining = block;
     while (remaining.length > bound) {
       const index = safeSliceIndex(remaining, bound);
-      chunks.push(remaining.slice(0, index));
+      const part = remaining.slice(0, index);
+      chunks.push({ markdown: part, plain: part });
       remaining = remaining.slice(index);
     }
     current = remaining;
   };
 
-  const flushTable = () => {
-    if (tableBuffer.length === 0) return;
-    const block = tableBuffer.join('\n');
-    tableBuffer = [];
-    appendBlock(block);
-  };
-
   const appendLine = (line) => {
     let remaining = line;
     // 超长行先硬切，保证每块不超过 bound。
     while (remaining.length > bound) {
-      if (current) {
-        chunks.push(current);
-        current = '';
-      }
+      flushCurrent();
       const index = safeSliceIndex(remaining, bound);
-      chunks.push(remaining.slice(0, index));
+      const part = remaining.slice(0, index);
+      chunks.push({ markdown: part, plain: part });
       remaining = remaining.slice(index);
     }
     appendBlock(remaining);
   };
 
-  for (const line of lines) {
-    if (CODE_FENCE_OPEN.test(line)) {
-      flushTable();
-      if (!inCodeBlock && current) {
-        // 代码块开启：先收束当前块，让整个代码块从新块开始。
-        chunks.push(current);
-        current = '';
+  for (let index = 0; index < lines.length;) {
+    const fence = openingFence(lines[index]);
+    if (fence) {
+      flushCurrent();
+      let end = index + 1;
+      while (end < lines.length && !closesFence(lines[end], fence)) end += 1;
+      const hasClosingFence = end < lines.length;
+      const blockLines = lines.slice(index, hasClosingFence ? end + 1 : lines.length);
+      const block = blockLines.join('\n');
+      if (block.length <= bound) {
+        appendBlock(block);
+      } else {
+        const contentLines = blockLines.slice(1, hasClosingFence ? -1 : undefined);
+        const content = normalizeFencedContent(contentLines, fence.indent).join('\n');
+        chunks.push(...splitAsFencedCode(content, fence.info, bound));
       }
-      inCodeBlock = !inCodeBlock;
-      appendLine(line);
-      continue;
-    }
-    if (inCodeBlock) {
-      appendLine(line);
+      index = hasClosingFence ? end + 1 : lines.length;
       continue;
     }
-    if (GFM_TABLE_LINE.test(line)) {
-      tableBuffer.push(line);
+
+    if (gfmTableStart(lines, index)) {
+      let end = index + 2;
+      while (end < lines.length && supportedTableBodyCells(lines[end])) end += 1;
+      const tableLines = lines.slice(index, end);
+      const table = tableLines.join('\n');
+      if (table.length <= bound) {
+        appendBlock(table);
+      } else {
+        flushCurrent();
+        chunks.push(...splitOversizedTable(tableLines, bound));
+      }
+      index = end;
       continue;
     }
-    flushTable();
-    appendLine(line);
+
+    appendLine(lines[index]);
+    index += 1;
   }
 
-  flushTable();
-  if (current) chunks.push(current);
-  return chunks;
+  flushCurrent();
+  return chunks.filter(({ markdown, plain }) => markdown.length > 0 || plain.length > 0);
+}
+
+export function chunkMarkdownText(text, limit = DEFAULT_CHUNK_LIMIT) {
+  return chunkMarkdownParts(text, limit).map(({ markdown }) => markdown);
 }
 
 function nextMsgSeq() {
-  // 与 SDK getNextMsgSeq 相同的随机策略：被动回复同 msg_id 的多条消息
-  // 各自带不同 msg_seq，避免平台去重（错误码 40054005）。
+  // 与 SDK getNextMsgSeq 相同的 16-bit 随机 seed；同批分片在 seed 上递增，
+  // 保证同一个被动回复 msg_id 内不发生随机碰撞。
   const timePart = Date.now() % 100_000_000;
   const random = Math.floor(Math.random() * 65_536);
   return (timePart ^ random) % 65_536;
 }
 
+function isMarkdownRejection(error) {
+  return error instanceof ApiError
+    && error.httpStatus >= 400
+    && error.httpStatus < 500
+    && MARKDOWN_REJECTION_CODES.has(Number(error.bizCode));
+}
+
+function sendPlainText(bot, target, content, msgSeq) {
+  if (typeof bot?.send === 'function') {
+    return bot.send({
+      target,
+      msgType: 0,
+      content,
+      extra: { msg_seq: msgSeq },
+    });
+  }
+  return bot.sendText(target, content);
+}
+
 /**
  * 以 markdown（msg_type=2）发送回复；单条被平台拒绝时回退纯文本（msg_type=0）。
  * 返回每条消息的平台响应，供调用方提取 provider message ids。
  */
 export async function sendMarkdownReply(bot, target, text, { logger } = {}) {
-  const chunks = chunkMarkdownText(text);
+  const chunks = chunkMarkdownParts(text);
   const results = [];
+  const firstMsgSeq = nextMsgSeq();
   const passiveLimit = target?.msgId ? PASSIVE_REPLY_LIMIT[target.scope] : null;
   const overflow = passiveLimit !== null && chunks.length > passiveLimit;
   const passiveContentCount = overflow ? passiveLimit - 1 : chunks.length;
@@ -143,13 +392,19 @@ export async function sendMarkdownReply(bot, target, text, { logger } = {}) {
     if (partialNoticeSent || !target?.msgId) return;
     partialNoticeSent = true;
     try {
-      results.push(await bot.sendText(target, PARTIAL_REPLY_NOTICE()));
+      results.push(await sendPlainText(
+        bot,
+        target,
+        PARTIAL_REPLY_NOTICE(),
+        (firstMsgSeq + chunks.length) & 0xFFFF,
+      ));
     } catch (error) {
       logger?.warn?.('[dsh-im:qq] unable to send partial reply notice:', error);
     }
   };
 
   for (const [index, chunk] of chunks.entries()) {
+    const msgSeq = (firstMsgSeq + index) & 0xFFFF;
     const deliveryTarget = overflow && index >= passiveContentCount
       ? proactiveTarget
       : target;
@@ -158,16 +413,29 @@ export async function sendMarkdownReply(bot, target, text, { logger } = {}) {
         results.push(await bot.send({
           target: deliveryTarget,
           msgType: 2,
-          markdown: { content: chunk },
-          extra: { msg_seq: nextMsgSeq() },
+          markdown: { content: chunk.markdown },
+          extra: { msg_seq: msgSeq },
         }));
         continue;
       } catch (error) {
+        if (!isMarkdownRejection(error)) {
+          logger?.warn?.(
+            '[dsh-im:qq] markdown delivery outcome is uncertain; refusing a duplicate-prone retry:',
+            error,
+          );
+          if (results.length === 0) throw error;
+          await sendPartialNotice();
+          break;
+        }
         logger?.warn?.('[dsh-im:qq] markdown delivery failed; retrying as plain text:', error);
       }
     }
+    // Synthetic Markdown can represent an empty fenced-code body even though
+    // its plain equivalent is empty. Never turn that into an invalid QQ text
+    // message after a definite Markdown rejection (or on legacy text clients).
+    if (chunk.plain.length === 0) continue;
     try {
-      results.push(await bot.sendText(deliveryTarget, chunk));
+      results.push(await sendPlainText(bot, deliveryTarget, chunk.plain, msgSeq));
     } catch (error) {
       if (results.length === 0) throw error;
       await sendPartialNotice();

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

@@ -776,16 +776,8 @@ export class QqHarnessBridge {
       const content = hasImages
         ? await promptContentForMessage(promptMessage, { signal: this.#signal })
         : undefined;
-      // QQ C2C keeps one stream bubble. Progress is collected but never submitted:
-      // some clients reject replacing an already visible stream frame, which would
-      // otherwise leave a stale progress bubble plus a separate fallback answer.
-      if (message.kind === 'c2c' && target?.msgId && typeof this.#bot.openStream === 'function') {
-        try {
-          stream = this.#bot.openStream({ target });
-        } catch (error) {
-          this.#logger.warn?.('[dsh-im:qq] unable to start a QQ stream; using markdown fallback:', error);
-        }
-      }
+      // QQ stream_messages can acknowledge a final frame without rendering it in
+      // some C2C clients. Standard Markdown delivery is the reliable reply path.
       const toolErrors = [];
       let answer;
       let artifacts = [];

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

@@ -124,6 +124,9 @@ export class QqRuntime {
       logger: sdkLogger,
       transport: 'websocket',
       tokenPrefetch: 'sync',
+      // sendText is reserved for literal notices/connection tests. Markdown
+      // replies use the explicit msg_type=2 path in sendMarkdownReply().
+      markdownSupport: false,
     });
     if (!bot || typeof bot.start !== 'function' || typeof bot.stop !== 'function') {
       throw new TypeError('QQ bot factory returned an invalid client');

package/src/channels/shared/connection-test.mjs

@@ -29,7 +29,7 @@ export function connectionTestTarget(state) {
 
 export function connectionTestMessage(botName, channelLabel = t('机器人')) {
   const name = cleanText(botName) ?? channelLabel;
-  return `${t('✅ DeepSeek Harness 连接测试成功')}\n${t('这条消息由插件页面中的“{name}”机器人卡片发出。', { name })}`;
+  return `${t('✅ DeepSeek Harness 连接测试成功')}\n${t('这条消息由「IM机器人」设置页中的“{name}”机器人卡片发出。', { name })}`;
 }
 
 export function connectionTestTargetUnavailable(channelLabel = t('机器人')) {

package/src/channels/shared/i18n-en/feishu.mjs

@@ -18,8 +18,8 @@ export default {
   '机器人正在移除或已重新接入，无法操作原会话的工作区。':
     'The bot is being removed or has been reconnected; the original session’s workspace cannot be changed.',
   '操作失败，请稍后重试。': 'The operation failed. Please try again later.',
-  '结果文件「{name}」已生成，但机器人缺少飞书文件上传权限 im:resource。请私聊机器人执行 /repair 命令，或者在插件页面点击“补全权限”按钮并扫码。完成飞书要求的发布审批后重试。':
-    'The result file "{name}" was generated, but the bot lacks the Feishu file-upload scope im:resource. Run /repair in a direct chat with the bot, or click the “Complete permissions” button on the plugin page and scan the QR code. Complete any publishing approval Feishu requires, then try again.',
+  '结果文件「{name}」已生成，但机器人缺少飞书文件上传权限 im:resource。请私聊机器人执行 /repair 命令，或者在「IM机器人」设置页点击“补全权限”按钮并扫码。完成飞书要求的发布审批后重试。':
+    'The result file "{name}" was generated, but the bot lacks the Feishu file-upload scope im:resource. Run /repair in a direct chat with the bot, or click the “Complete permissions” button on the IM Bot settings page and scan the QR code. Complete any publishing approval Feishu requires, then try again.',
   '结果文件「{name}」超过飞书 30 MB 上限，未发送。':
     'The result file "{name}" exceeds the Feishu 30 MB limit and was not sent.',
   '结果文件「{name}」为空，飞书不允许发送空文件。':
@@ -28,8 +28,8 @@ export default {
     'The result file "{name}" was temporarily rate-limited by Feishu and could not be sent. Please try again later.',
   '结果文件「{name}」已生成，但暂时未能发送，请稍后重试。':
     'The result file "{name}" was generated but could not be sent right now. Please try again later.',
-  '处理失败，请稍后重试。如果问题持续，请在 DeepSeek Harness 的飞书插件页面检查连接状态。':
-    'Message processing failed. Please try again later. If the problem persists, check the connection status on the Feishu plugin page in DeepSeek Harness.',
+  '处理失败，请稍后重试。如果问题持续，请在 DeepSeek Harness 的「IM机器人」设置页检查飞书连接状态。':
+    'Message processing failed. Please try again later. If the problem persists, check the Feishu connection status on the IM Bot settings page in DeepSeek Harness.',
   '已开启全新 Harness 会话。': 'A brand-new Harness session has started.',
   '飞书机器人与 DeepSeek Harness 连接正常。':
     'The Feishu bot is connected to DeepSeek Harness and working normally.',
@@ -338,8 +338,8 @@ export default {
   '飞书机器人': 'Feishu bot',
 
   // feishu/message-utils.mjs
-  '飞书机器人缺少图片读取权限 im:message:readonly（飞书显示为“获取单聊、群组消息”）。请私聊机器人执行 /repair 命令，或者在插件页面点击“补全权限”按钮并扫码。按飞书提示发布新版本、完成必要审批后，再重新发送图片。':
-    'The Feishu bot is missing the image-read scope im:message:readonly, shown by Feishu as “Read direct and group messages.” Run /repair in a direct chat with the bot, or click the “Complete permissions” button on the plugin page and scan the QR code. Publish a new version and complete any approval requested by Feishu, then resend the image.',
+  '飞书机器人缺少图片读取权限 im:message:readonly（飞书显示为“获取单聊、群组消息”）。请私聊机器人执行 /repair 命令，或者在「IM机器人」设置页点击“补全权限”按钮并扫码。按飞书提示发布新版本、完成必要审批后，再重新发送图片。':
+    'The Feishu bot is missing the image-read scope im:message:readonly, shown by Feishu as “Read direct and group messages.” Run /repair in a direct chat with the bot, or click the “Complete permissions” button on the IM Bot settings page and scan the QR code. Publish a new version and complete any approval requested by Feishu, then resend the image.',
 
   // feishu/feishu-runtime.mjs — callback probe notices
   '✅ 修复完成：已实测收到 card.action.trigger，菜单按钮现在可用。':

package/src/channels/shared/i18n-en/shared-c.mjs

@@ -73,8 +73,8 @@ export default {
   // connection-test.mjs
   '✅ DeepSeek Harness 连接测试成功':
     '✅ DeepSeek Harness connection test succeeded',
-  '这条消息由插件页面中的“{name}”机器人卡片发出。':
-    'This message was sent from the "{name}" bot card on the plugin page.',
+  '这条消息由「IM机器人」设置页中的“{name}”机器人卡片发出。':
+    'This message was sent from the "{name}" bot card on the IM Bot settings page.',
   '{channelLabel}尚未收到可用于测试的私聊消息。':
     'The {channelLabel} has not received a direct message that can be used for testing yet.',
   '机器人': 'bot',