@xmanrui/dsh-im 1.3.0 → 1.5.0

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

@@ -0,0 +1,176 @@
+// QQ markdown 回复投递：长文尽量按结构边界切分，以 msg_type=2 发送，
+// 平台拒绝 markdown 时逐条回退纯文本。
+
+const DEFAULT_CHUNK_LIMIT = 4_500;
+const CODE_FENCE_OPEN = /^```/;
+const GFM_TABLE_LINE = /^\|.+\|$/;
+const PASSIVE_REPLY_LIMIT = Object.freeze({ c2c: 4, group: 5 });
+const PARTIAL_REPLY_NOTICE = '回答较长，后续内容未能通过 QQ 完整发送，请回复“继续”。';
+
+function safeSliceIndex(value, limit) {
+  let index = Math.min(limit, value.length);
+  const before = value.charCodeAt(index - 1);
+  const after = value.charCodeAt(index);
+  if (before >= 0xD800 && before <= 0xDBFF && after >= 0xDC00 && after <= 0xDFFF) {
+    index -= 1;
+  }
+  return Math.max(1, index);
+}
+
+/**
+ * 按换行边界切分 Markdown 文本：
+ * - 不在代码块中间断开；
+ * - 不在 GFM 表格中间断开；
+ * - 超长行在 limit 处硬切，避免单行超限无法投递。
+ */
+export function chunkMarkdownText(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] : [];
+
+  const lines = value.split('\n');
+  const chunks = [];
+  let current = '';
+  let inCodeBlock = false;
+  let tableBuffer = [];
+
+  const appendBlock = (block) => {
+    if (block.length <= bound) {
+      if (!current) {
+        current = block;
+        return;
+      }
+      const candidate = `${current}\n${block}`;
+      if (candidate.length > bound) {
+        chunks.push(current);
+        current = block;
+      } else {
+        current = candidate;
+      }
+      return;
+    }
+    // 超大块：收束当前块后按 bound 硬切，保证每块可投递。
+    if (current) {
+      chunks.push(current);
+      current = '';
+    }
+    let remaining = block;
+    while (remaining.length > bound) {
+      const index = safeSliceIndex(remaining, bound);
+      chunks.push(remaining.slice(0, index));
+      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 = '';
+      }
+      const index = safeSliceIndex(remaining, bound);
+      chunks.push(remaining.slice(0, index));
+      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 = '';
+      }
+      inCodeBlock = !inCodeBlock;
+      appendLine(line);
+      continue;
+    }
+    if (inCodeBlock) {
+      appendLine(line);
+      continue;
+    }
+    if (GFM_TABLE_LINE.test(line)) {
+      tableBuffer.push(line);
+      continue;
+    }
+    flushTable();
+    appendLine(line);
+  }
+
+  flushTable();
+  if (current) chunks.push(current);
+  return chunks;
+}
+
+function nextMsgSeq() {
+  // 与 SDK getNextMsgSeq 相同的随机策略：被动回复同 msg_id 的多条消息
+  // 各自带不同 msg_seq，避免平台去重（错误码 40054005）。
+  const timePart = Date.now() % 100_000_000;
+  const random = Math.floor(Math.random() * 65_536);
+  return (timePart ^ random) % 65_536;
+}
+
+/**
+ * 以 markdown（msg_type=2）发送回复；单条被平台拒绝时回退纯文本（msg_type=0）。
+ * 返回每条消息的平台响应，供调用方提取 provider message ids。
+ */
+export async function sendMarkdownReply(bot, target, text, { logger } = {}) {
+  const chunks = chunkMarkdownText(text);
+  const results = [];
+  const passiveLimit = target?.msgId ? PASSIVE_REPLY_LIMIT[target.scope] : null;
+  const overflow = passiveLimit !== null && chunks.length > passiveLimit;
+  const passiveContentCount = overflow ? passiveLimit - 1 : chunks.length;
+  const proactiveTarget = target?.msgId
+    ? { scope: target.scope, targetId: target.targetId }
+    : target;
+  let partialNoticeSent = false;
+
+  const sendPartialNotice = async () => {
+    if (partialNoticeSent || !target?.msgId) return;
+    partialNoticeSent = true;
+    try {
+      results.push(await bot.sendText(target, PARTIAL_REPLY_NOTICE));
+    } catch (error) {
+      logger?.warn?.('[dsh-im:qq] unable to send partial reply notice:', error);
+    }
+  };
+
+  for (const [index, chunk] of chunks.entries()) {
+    const deliveryTarget = overflow && index >= passiveContentCount
+      ? proactiveTarget
+      : target;
+    if (typeof bot?.send === 'function') {
+      try {
+        results.push(await bot.send({
+          target: deliveryTarget,
+          msgType: 2,
+          markdown: { content: chunk },
+          extra: { msg_seq: nextMsgSeq() },
+        }));
+        continue;
+      } catch (error) {
+        logger?.warn?.('[dsh-im:qq] markdown delivery failed; retrying as plain text:', error);
+      }
+    }
+    try {
+      results.push(await bot.sendText(deliveryTarget, chunk));
+    } catch (error) {
+      if (results.length === 0) throw error;
+      await sendPartialNotice();
+      break;
+    }
+  }
+  return results;
+}

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

@@ -32,16 +32,14 @@ import {
   prefetchInboundFiles,
 } from '../shared/inbound-file.mjs';
 import {
-  materializeOutboundArtifact,
-  releaseOutboundArtifact,
   trackOutboundArtifactProviderPromise,
 } from '../shared/semantic/artifact.mjs';
+import { deliverOutboundArtifacts } from '../shared/semantic/artifact-delivery.mjs';
 import {
-  createArtifactFailureReceipt,
   createDeliveryReceipt,
-  mergeDeliveryReceipts,
   providerMessageIdsFor,
 } from '../shared/semantic/delivery.mjs';
+import { sendMarkdownReply } from './markdown-reply.mjs';
 
 const INTERACTION_RESOLVED_TEXT = '这个问题已在其他客户端处理，无需再次回答。';
 const DEFAULT_FILE_UPLOAD_TIMEOUT_MS = 120_000;
@@ -209,7 +207,7 @@ function qqArtifactError(error, { dispatched = false } = {}) {
   if (status === 401 || status === 403) wrapped.code = 'artifact-permission-required';
   else if (status === 413) wrapped.code = 'artifact-too-large';
   else if (status === 429) wrapped.code = 'artifact-rate-limited';
-  else if (status === 400 || status === 404) {
+  else if ([400, 404, 405, 406, 410, 415, 422].includes(status)) {
     wrapped.code = 'artifact-provider-rejected';
   } else {
     wrapped.code = dispatched ? 'artifact-delivery-uncertain' : 'artifact-provider-failed';
@@ -244,6 +242,68 @@ function waitWithSignal(promise, signal) {
   });
 }
 
+/** Send one materialized artifact through QQ's native image message. */
+export async function sendQqImage(
+  bot,
+  target,
+  file,
+  { signal, timeoutMs = DEFAULT_FILE_UPLOAD_TIMEOUT_MS } = {},
+) {
+  signal?.throwIfAborted();
+  if (typeof bot?.sendImage !== 'function') {
+    const unavailable = new Error('QQ image delivery is unavailable');
+    unavailable.code = 'artifact-provider-unavailable';
+    throw unavailable;
+  }
+
+  try {
+    const timeout = AbortSignal.timeout(timeoutMs);
+    const waitSignal = signal ? AbortSignal.any([signal, timeout]) : timeout;
+    const pending = bot.sendImage(
+      target,
+      { buffer: file.bytes },
+      { onProgress: () => signal?.throwIfAborted() },
+    );
+    trackOutboundArtifactProviderPromise(file, pending);
+    return await waitWithSignal(pending, waitSignal);
+  } catch (error) {
+    if (signal?.aborted) throw abortReason(signal);
+    throw qqArtifactError(error, { dispatched: true });
+  }
+}
+
+async function sendQqFile(
+  bot,
+  target,
+  file,
+  { signal, timeoutMs = DEFAULT_FILE_UPLOAD_TIMEOUT_MS } = {},
+) {
+  signal?.throwIfAborted();
+  if (typeof bot?.sendFile !== 'function') {
+    const unavailable = new Error('QQ file delivery is unavailable');
+    unavailable.code = 'artifact-provider-unavailable';
+    throw unavailable;
+  }
+
+  try {
+    const timeout = AbortSignal.timeout(timeoutMs);
+    const waitSignal = signal ? AbortSignal.any([signal, timeout]) : timeout;
+    const pending = bot.sendFile(
+      target,
+      { buffer: file.bytes },
+      {
+        fileName: file.fileName,
+        onProgress: () => signal?.throwIfAborted(),
+      },
+    );
+    trackOutboundArtifactProviderPromise(file, pending);
+    return await waitWithSignal(pending, waitSignal);
+  } catch (error) {
+    if (signal?.aborted) throw abortReason(signal);
+    throw qqArtifactError(error, { dispatched: true });
+  }
+}
+
 function canClaimInteractionReply(message, pending) {
   return pending.questions[pending.index]
     && nonEmptyString(message?.senderId) === pending.actor
@@ -490,80 +550,35 @@ export class QqHarnessBridge {
     if (artifacts.length === 0) {
       return { receipt: baseReceipt, failureNoticeVisible: false };
     }
-    const receipts = baseReceipt ? [baseReceipt] : [];
-    let failureNoticeVisible = false;
-    for (const artifact of artifacts) {
-      this.#signal?.throwIfAborted();
-      try {
-        if (typeof this.#bot.sendFile !== 'function') {
-          const unavailable = new Error('QQ file delivery is unavailable');
-          unavailable.code = 'artifact-provider-unavailable';
-          throw unavailable;
-        }
-        const file = await materializeOutboundArtifact(artifact, {
-          signal: this.#signal,
-        });
-        this.#signal?.throwIfAborted();
-        let result;
-        try {
-          const timeout = AbortSignal.timeout(this.#fileUploadTimeoutMs);
-          const waitSignal = this.#signal ? AbortSignal.any([this.#signal, timeout]) : timeout;
-          const pending = this.#bot.sendFile(
-            target,
-            { buffer: file.bytes },
-            {
-              fileName: file.fileName,
-              onProgress: () => this.#signal?.throwIfAborted(),
-            },
-          );
-          trackOutboundArtifactProviderPromise(file, pending);
-          result = await waitWithSignal(pending, waitSignal);
-        } catch (error) {
-          if (this.#signal?.aborted) throw abortReason(this.#signal);
-          throw qqArtifactError(error, { dispatched: true });
-        }
-        this.#signal?.throwIfAborted();
-        const messageId = nonEmptyString(result?.message?.id);
-        receipts.push(createDeliveryReceipt({
-          deliveryId: file.deliveryKey,
-          presentation: 'qq-file',
-          providerMessageIds: messageId ? [messageId] : [],
-          artifacts: [{ artifactId: file.artifactId, outcome: 'sent' }],
-        }));
-        this.#status.artifactsSent = (this.#status.artifactsSent ?? 0) + 1;
-      } catch (rawError) {
-        if (this.#signal?.aborted) throw rawError;
-        const error = qqArtifactError(rawError);
-        this.#status.artifactSendErrors = (this.#status.artifactSendErrors ?? 0) + 1;
-        this.#logger.warn?.(
-          `[dsh-im:qq] result file delivery failed (${error?.code ?? error?.name ?? 'unknown'})`,
-        );
-        let providerMessageIds = [];
-        try {
-          const notice = await this.#bot.sendText(target, artifactFailureText(artifact?.fileName, error));
-          failureNoticeVisible = true;
-          providerMessageIds = providerMessageIdsFor(notice);
-        } catch (noticeError) {
-          if (this.#signal?.aborted) throw noticeError;
-          this.#logger.warn?.('[dsh-im:qq] unable to send the safe result-file failure notice');
-        }
-        receipts.push(createArtifactFailureReceipt({
-          artifactId: artifact?.artifactId ?? 'unknown',
-          deliveryId: artifact?.deliveryKey ?? artifact?.artifactId ?? 'unknown',
-          error,
-          providerMessageIds,
-        }));
-      } finally {
-        releaseOutboundArtifact(artifact);
-      }
-    }
-    return {
-      receipt: mergeDeliveryReceipts({
-        deliveryId: replyTo,
-        presentation: baseReceipt ? 'qq-text-and-files' : 'qq-files',
-        receipts,
+    const delivery = await deliverOutboundArtifacts({
+      artifacts,
+      baseReceipt,
+      deliveryId: replyTo,
+      aggregatePresentation: baseReceipt ? 'qq-text-and-files' : 'qq-files',
+      alwaysMerge: true,
+      channelKey: 'qq',
+      signal: this.#signal,
+      sendImage: (file) => sendQqImage(this.#bot, target, file, {
+        signal: this.#signal,
+        timeoutMs: this.#fileUploadTimeoutMs,
+      }),
+      sendFile: (file) => sendQqFile(this.#bot, target, file, {
+        signal: this.#signal,
+        timeoutMs: this.#fileUploadTimeoutMs,
       }),
-      failureNoticeVisible,
+      sendFailureNotice: (artifact, error) => this.#bot.sendText(
+        target,
+        artifactFailureText(artifact?.fileName, error),
+      ),
+      logger: this.#logger,
+    });
+    this.#status.artifactsSent = (this.#status.artifactsSent ?? 0)
+      + delivery.artifactsSent;
+    this.#status.artifactSendErrors = (this.#status.artifactSendErrors ?? 0)
+      + delivery.artifactSendErrors;
+    return {
+      receipt: delivery.receipt,
+      failureNoticeVisible: delivery.failureNoticeVisible,
     };
   }
 
@@ -644,14 +659,17 @@ export class QqHarnessBridge {
       const content = hasImages
         ? await promptContentForMessage(promptMessage, { signal: this.#signal })
         : undefined;
-      let streamFinished = false;
+      // 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 a text reply:', error);
+          this.#logger.warn?.('[dsh-im:qq] unable to start a QQ stream; using markdown fallback:', error);
         }
       }
+      const toolErrors = [];
       let answer;
       let artifacts = [];
       try {
@@ -666,14 +684,15 @@ export class QqHarnessBridge {
             timeoutMs: this.#replyTimeoutMs,
             signal: this.#signal,
             control: { owner: this, key },
-            onUpdate: stream ? async (update) => {
-              const progress = update.type === 'text'
-                ? update.text
-                : update.type === 'tool'
-                  ? `正在使用${update.name}…`
-                  : update.text;
-              if (progress) await stream.update(progress);
-            } : undefined,
+            progressMode: 'all',
+            onUpdate: (update) => {
+              if (update.error) {
+                const label = nonEmptyString(update.toolName)
+                  ? `Tool call ${update.toolName}` : 'Tool call';
+                const text = `${label}\nError: ${update.error}`;
+                toolErrors.push(text);
+              }
+            },
             onInteraction: (interaction) => this.#handleInteraction(interaction, {
               key,
               actor: sender,
@@ -691,31 +710,41 @@ export class QqHarnessBridge {
         ]);
       }
       this.#signal?.throwIfAborted();
-      const displayAnswer = answerTextForDelivery(answer, artifacts);
+      const answerText = answerTextForDelivery(answer, artifacts);
+      const displayAnswer = toolErrors.length > 0
+        ? `${answerText}\n\n---\n\n${toolErrors.join('\n\n')}`
+        : answerText;
       let textReceipt = null;
       let textSendError = null;
       try {
+        let streamFinished = false;
         if (stream) {
           try {
             await stream.update(displayAnswer);
-            await stream.complete();
             streamFinished = true;
             textReceipt = createDeliveryReceipt({
               deliveryId: messageId,
               presentation: 'qq-text',
               providerMessageIds: providerMessageIdsFor(stream),
             });
+            try {
+              await stream.complete();
+            } catch (error) {
+              this.#logger.warn?.('[dsh-im:qq] QQ stream completion failed after visible final content:', error);
+            }
           } catch (error) {
             stream.cancel?.();
-            this.#logger.warn?.('[dsh-im:qq] QQ stream finalization failed; using a text reply:', error);
+            this.#logger.warn?.('[dsh-im:qq] QQ stream update failed; using markdown fallback:', error);
           }
         }
         if (!streamFinished) {
-          const sent = await this.#bot.sendText(target, displayAnswer);
+          const deliveries = await sendMarkdownReply(this.#bot, target, displayAnswer, {
+            logger: this.#logger,
+          });
           textReceipt = createDeliveryReceipt({
             deliveryId: messageId,
             presentation: 'qq-text',
-            providerMessageIds: providerMessageIdsFor(sent),
+            providerMessageIds: deliveries.flatMap((delivery) => providerMessageIdsFor(delivery)),
           });
         }
       } catch (error) {
@@ -736,22 +765,24 @@ export class QqHarnessBridge {
       return delivery.receipt;
     } catch (error) {
       if (error?.code === 'turn-stopped') {
-        if (stream) {
-          try {
-            await stream.cancel?.();
-          } catch (streamError) {
-            this.#logger.warn?.('[dsh-im:qq] unable to cancel a stopped QQ stream:', streamError);
-          }
-          try {
-            await this.#bot.sendText(target, '已停止。');
-          } catch (sendError) {
-            this.#logger.warn?.('[dsh-im:qq] unable to announce a stopped QQ turn:', sendError);
-          }
+        try {
+          stream?.cancel?.();
+        } catch (streamError) {
+          this.#logger.warn?.('[dsh-im:qq] unable to cancel a stopped QQ stream:', streamError);
+        }
+        try {
+          await this.#bot.sendText(target, '已停止。');
+        } catch (sendError) {
+          this.#logger.warn?.('[dsh-im:qq] unable to announce a stopped QQ turn:', sendError);
         }
         await this.#state.markSeen(messageId);
         return;
       }
-      stream?.cancel?.();
+      try {
+        stream?.cancel?.();
+      } catch (streamError) {
+        this.#logger.warn?.('[dsh-im:qq] unable to cancel a failed QQ stream:', streamError);
+      }
       if (this.#signal?.aborted) return;
       this.#status.lastError = error?.message ?? String(error);
       this.#logger.error?.('[dsh-im:qq] failed to process an inbound message:', error);

package/src/channels/shared/harness-client.mjs

@@ -255,6 +255,21 @@ function assistantMessageText(event) {
     .trim();
 }
 
+function nonEmptyText(value) {
+  return typeof value === 'string' && value.trim() ? value.trim() : null;
+}
+
+/** Flatten a tool/result error payload into a displayable one-line reason. */
+function toolResultErrorText(error) {
+  if (!error || typeof error !== 'object') return null;
+  const message = nonEmptyText(error.message);
+  if (message) return message;
+  const name = nonEmptyText(error.name);
+  const code = nonEmptyText(error.code);
+  if (name || code) return [name ?? 'Error', code].filter(Boolean).join(': ');
+  return null;
+}
+
 function consumeInteractionOwnership(ownership, entries) {
   const ordered = [...entries]
     .map((entry) => entry?.event ?? entry)
@@ -325,6 +340,8 @@ export class HarnessReplyTracker {
   #latestText = '';
   #finished = false;
   #reason = null;
+  #toolNames = new Map();
+  #lastToolName = null;
 
   constructor({ promptRpcId, afterSeq = -1 }) {
     this.#promptRpcId = promptRpcId;
@@ -351,8 +368,20 @@ export class HarnessReplyTracker {
     return this.#targetTurn;
   }
 
-  consume(entries) {
-    let update = null;
+  consumeAll(entries) {
+    const updates = [];
+    // 同一批轮询内的 text 帧只保留最新累积，其余事件逐帧透出，
+    // 让消费方能按顺序看到每个工具调用与结果。
+    const pushUpdate = (update) => {
+      if (update.type === 'text' && updates.length > 0) {
+        const last = updates[updates.length - 1];
+        if (last.type === 'text') {
+          updates[updates.length - 1] = update;
+          return;
+        }
+      }
+      updates.push(update);
+    };
     const ordered = [...entries]
       .map((entry) => entry?.event ?? entry)
       .filter(Boolean)
@@ -394,7 +423,7 @@ export class HarnessReplyTracker {
           .trim();
         if (text && text !== this.#latestText) {
           this.#latestText = text;
-          update = { type: 'text', text };
+          pushUpdate({ type: 'text', text });
         }
         continue;
       }
@@ -403,18 +432,38 @@ export class HarnessReplyTracker {
         const text = assistantMessageText(event);
         if (text && text !== this.#latestText) {
           this.#latestText = text;
-          update = { type: 'text', text };
+          pushUpdate({ type: 'text', text });
         }
         continue;
       }
 
       if (event.type === 'tool/call') {
-        update = { type: 'tool', name: event.data?.name ?? '工具' };
+        const name = nonEmptyText(event.data?.name) ?? '工具';
+        const callId = nonEmptyText(event.data?.callId)
+          ?? nonEmptyText(event.data?.subCallId);
+        if (callId) this.#toolNames.set(callId, name);
+        this.#lastToolName = name;
+        pushUpdate({ type: 'tool', name, ...(callId ? { callId } : {}) });
       } else if (event.type === 'tool/result') {
-        update = { type: 'status', text: '正在整理结果…' };
+        const callId = nonEmptyText(event.data?.message?.source?.callId)
+          ?? nonEmptyText(event.data?.callId)
+          ?? nonEmptyText(event.data?.subCallId);
+        const toolName = (callId ? this.#toolNames.get(callId) : null)
+          ?? this.#lastToolName;
+        const error = toolResultErrorText(event.data?.error);
+        pushUpdate({
+          type: 'status',
+          text: '正在整理结果…',
+          ...(toolName ? { toolName } : {}),
+          ...(error ? { error } : {}),
+        });
       }
     }
-    return update;
+    return updates;
+  }
+
+  consume(entries) {
+    return this.consumeAll(entries).at(-1) ?? null;
   }
 }
 
@@ -1036,6 +1085,7 @@ export class HarnessClient {
     const timeoutMs = options.timeoutMs ?? 600_000;
     const signal = options.signal;
     const onUpdate = typeof options.onUpdate === 'function' ? options.onUpdate : null;
+    const progressMode = options.progressMode === 'all' ? 'all' : 'latest';
     const onArtifact = typeof options.onArtifact === 'function' ? options.onArtifact : null;
     const onInteraction = typeof options.onInteraction === 'function'
       ? options.onInteraction
@@ -1189,12 +1239,15 @@ export class HarnessClient {
             this.#consumeInteractionOwnerships(sessionId, history.events ?? []);
             if (!wasActive && ownership.active) ownership.reconnect?.();
           }
-          const update = tracker.consume(history.events ?? []);
-          if (update && onUpdate) {
-            try {
-              await onUpdate(update);
-            } catch (error) {
-              console.warn(`[${this.#logPrefix}] ignored a progress update failure:`, error.message);
+          const updates = tracker.consumeAll(history.events ?? []);
+          if (onUpdate) {
+            const visibleUpdates = progressMode === 'all' ? updates : updates.slice(-1);
+            for (const update of visibleUpdates) {
+              try {
+                await onUpdate(update);
+              } catch (error) {
+                console.warn(`[${this.#logPrefix}] ignored a progress update failure:`, error.message);
+              }
             }
           }
           if (!tracker.finished) continue;