@xmanrui/dsh-im 2.4.0 → 2.6.0

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

@@ -29,6 +29,7 @@ import {
 import {
   fetchImageBuffer,
   hasInboundImages,
+  imagePromptDiagnostic,
   imagePromptUserMessage,
   promptContentForMessage,
 } from '../shared/image-prompt.mjs';
@@ -45,6 +46,12 @@ import {
   createDeliveryReceipt,
   providerMessageIdsFor,
 } from '../shared/semantic/delivery.mjs';
+import {
+  channelDeliveryFailure,
+  clearLastMessageFailure,
+  messageFailureText,
+  setLastMessageFailure,
+} from '../shared/message-failure.mjs';
 import { sendMarkdownReply } from './markdown-reply.mjs';
 import { t } from '../shared/i18n.mjs';
 
@@ -216,9 +223,15 @@ function answerTextForDelivery(answer, artifacts) {
 }
 
 function qqArtifactError(error, { dispatched = false } = {}) {
-  if (error?.code?.startsWith?.('artifact-') || error?.name === 'UploadDailyLimitExceededError') {
+  if (error?.code?.startsWith?.('artifact-')) {
     return error;
   }
+  if (error?.name === 'UploadDailyLimitExceededError') {
+    const wrapped = new Error('QQ daily file upload limit exceeded', { cause: error });
+    wrapped.name = error.name;
+    wrapped.code = 'artifact-rate-limited';
+    return wrapped;
+  }
   const status = Number(error?.httpStatus);
   const wrapped = new Error('QQ file delivery failed', { cause: error });
   if (status === 401 || status === 403) wrapped.code = 'artifact-permission-required';
@@ -341,6 +354,7 @@ export function createQqBridgeStatus() {
     lastReplyAt: null,
     lastRejectedAt: null,
     lastError: null,
+    lastMessageError: null,
   };
 }
 
@@ -470,8 +484,12 @@ export class QqHarnessBridge {
       ).catch((error) => {
         if (error?.code === 'turn-stopped' || this.#signal?.aborted) return;
         this.#status.lastError = error?.message ?? String(error);
-        this.#logger.error?.('[dsh-im:qq] failed to process a command:', error);
-        return this.#bot.sendText(message.replyTarget, t('消息处理失败，请稍后重试。'))
+        const failure = setLastMessageFailure(this.#status, error);
+        this.#logger.error?.(
+          `[dsh-im:qq] failed to process a command [${failure.referenceId}]:`,
+          error,
+        );
+        return this.#bot.sendText(message.replyTarget, messageFailureText(failure))
           .catch(() => undefined);
       }).finally(() => {
         this.#acceptedMessageIds.delete(messageId);
@@ -614,8 +632,12 @@ export class QqHarnessBridge {
     }).catch(async (error) => {
       if (this.#signal?.aborted) return;
       this.#status.lastError = error?.message ?? String(error);
-      this.#logger.error?.('[dsh-im:qq] failed to process a batch input message:', error);
-      await this.#bot.sendText(message.replyTarget, t('消息处理失败，请稍后重试。'))
+      const failure = setLastMessageFailure(this.#status, error);
+      this.#logger.error?.(
+        `[dsh-im:qq] failed to process a batch input message [${failure.referenceId}]:`,
+        error,
+      );
+      await this.#bot.sendText(message.replyTarget, messageFailureText(failure))
         .catch(() => undefined);
     }).finally(() => {
       this.#acceptedMessageIds.delete(messageId);
@@ -627,7 +649,7 @@ export class QqHarnessBridge {
 
   async #deliverArtifacts(target, replyTo, artifacts = [], baseReceipt = null) {
     if (artifacts.length === 0) {
-      return { receipt: baseReceipt, failureNoticeVisible: false };
+      return { receipt: baseReceipt, failureNoticeVisible: false, artifactSendErrors: 0 };
     }
     const delivery = await deliverOutboundArtifacts({
       artifacts,
@@ -645,9 +667,13 @@ export class QqHarnessBridge {
         signal: this.#signal,
         timeoutMs: this.#fileUploadTimeoutMs,
       }),
-      sendFailureNotice: (artifact, error) => this.#bot.sendText(
+      onFailure: (artifact, error) => setLastMessageFailure(this.#status, error, {
+        userMessage: artifactFailureText(artifact?.fileName, error),
+        reason: error?.code,
+      }),
+      sendFailureNotice: (_artifact, _error, failure) => this.#bot.sendText(
         target,
-        artifactFailureText(artifact?.fileName, error),
+        messageFailureText(failure),
       ),
       logger: this.#logger,
     });
@@ -658,6 +684,7 @@ export class QqHarnessBridge {
     return {
       receipt: delivery.receipt,
       failureNoticeVisible: delivery.failureNoticeVisible,
+      artifactSendErrors: delivery.artifactSendErrors,
     };
   }
 
@@ -676,6 +703,12 @@ export class QqHarnessBridge {
       this.#status.messagesReceived += 1;
       this.#status.lastMessageAt = new Date().toISOString();
     }
+    let messageRecorded = alreadyRecorded;
+    const markMessageSeen = async () => {
+      if (messageRecorded) return;
+      await this.#state.markSeen(messageId);
+      messageRecorded = true;
+    };
     if (this.#ownerUserOpenid !== '*' && sender !== this.#ownerUserOpenid) {
       this.#status.messagesRejected += 1;
       this.#status.lastRejectedAt = new Date().toISOString();
@@ -694,25 +727,25 @@ export class QqHarnessBridge {
     try {
       if (!text && !hasImages && !hasFiles) {
         await this.#bot.sendText(target, t('目前支持文字、图片和文件消息。'));
-        await this.#state.markSeen(messageId);
+        await markMessageSeen();
         return;
       }
       const command = text.toLowerCase();
       if (!hasImages && !hasFiles && command === '/help') {
         await this.#bot.sendText(target, helpText());
-        await this.#state.markSeen(messageId);
+        await markMessageSeen();
         return;
       }
       if (!hasImages && !hasFiles && command === '/status') {
         await this.#harness.ensureRunning({ signal: this.#signal });
         await this.#bot.sendText(target, t('QQ 机器人与 DeepSeek Harness 连接正常。'));
-        await this.#state.markSeen(messageId);
+        await markMessageSeen();
         return;
       }
       if (!hasImages && !hasFiles && command === '/new') {
         await this.#state.clearSession(key);
         await this.#bot.sendText(target, t('已开启新会话。请发送你的问题。'));
-        await this.#state.markSeen(messageId);
+        await markMessageSeen();
         return;
       }
       const workspaceCommand = hasImages || hasFiles
@@ -722,7 +755,7 @@ export class QqHarnessBridge {
         for (const reply of workspaceCommand.messages ?? [workspaceCommand.message]) {
           await this.#bot.sendText(target, reply);
         }
-        await this.#state.markSeen(messageId);
+        await markMessageSeen();
         return;
       }
       const compactCommand = hasImages || hasFiles
@@ -736,7 +769,7 @@ export class QqHarnessBridge {
           );
       if (compactCommand) {
         await this.#bot.sendText(target, compactCommand.message);
-        await this.#state.markSeen(messageId);
+        await markMessageSeen();
         return;
       }
 
@@ -757,6 +790,9 @@ export class QqHarnessBridge {
       let answer;
       let artifacts = [];
       try {
+        // Persist consumption before handing the prompt to Harness. Provider
+        // redelivery after a failed error notice must never execute it twice.
+        await markMessageSeen();
         ({ answer, artifacts = [] } = await askInWorkspaceSession({
           harness: this.#harness,
           state: this.#state,
@@ -771,10 +807,13 @@ export class QqHarnessBridge {
             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);
+                const name = (nonEmptyString(update.toolName) ?? t('工具'))
+                  .replace(/[\r\n]+/gu, ' ')
+                  .slice(0, 80);
+                toolErrors.push(t(
+                  '工具调用「{name}」未成功，请检查工具配置或稍后重试。',
+                  { name },
+                ));
               }
             },
             onInteraction: (interaction) => this.#handleInteraction(interaction, {
@@ -836,7 +875,7 @@ export class QqHarnessBridge {
           });
         }
       } catch (error) {
-        textSendError = error;
+        textSendError = channelDeliveryFailure(error);
         this.#logger.warn?.('[dsh-im:qq] final text delivery failed; continuing with result files:', error);
       }
       const delivery = await this.#deliverArtifacts(target, messageId, artifacts, textReceipt);
@@ -846,10 +885,15 @@ export class QqHarnessBridge {
       if (textSendError && !artifactDispatched && !delivery.failureNoticeVisible) {
         throw textSendError;
       }
-      await this.#state.markSeen(messageId);
+      if (textSendError && delivery.artifactSendErrors === 0) {
+        setLastMessageFailure(this.#status, textSendError);
+      }
       this.#status.messagesReplied += 1;
       this.#status.lastReplyAt = new Date().toISOString();
       this.#status.lastError = null;
+      if (!textSendError && delivery.artifactSendErrors === 0) {
+        clearLastMessageFailure(this.#status);
+      }
       return delivery.receipt;
     } catch (error) {
       let batchFailureMessage = null;
@@ -872,7 +916,7 @@ export class QqHarnessBridge {
         } catch (sendError) {
           this.#logger.warn?.('[dsh-im:qq] unable to announce a stopped QQ turn:', sendError);
         }
-        await this.#state.markSeen(messageId);
+        await markMessageSeen();
         return;
       }
       try {
@@ -882,16 +926,23 @@ export class QqHarnessBridge {
       }
       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);
+      const userMessage = inboundFileUserMessage(error)
+        ?? imagePromptUserMessage(error);
+      const failure = setLastMessageFailure(this.#status, error, {
+        userMessage,
+        reason: imagePromptDiagnostic(error)?.reason,
+      });
+      this.#logger.error?.(
+        `[dsh-im:qq] failed to process an inbound message [${failure.referenceId}]:`,
+        error,
+      );
       try {
-        const errorMessage = inboundFileUserMessage(error)
-          ?? imagePromptUserMessage(error)
-          ?? t('消息处理失败，请稍后重试。');
+        const errorMessage = messageFailureText(failure);
         await this.#bot.sendText(
           target,
           batchFailureMessage ? `${errorMessage}\n\n${batchFailureMessage}` : errorMessage,
         );
-        await this.#state.markSeen(messageId);
+        await markMessageSeen();
       } catch (sendError) {
         this.#logger.error?.('[dsh-im:qq] failed to send the safe error reply:', sendError);
       }
@@ -1166,11 +1217,15 @@ export class QqHarnessBridge {
   async #handleInteractionFailure(message, messageId, error) {
     if (this.#signal?.aborted) return;
     this.#status.lastError = error?.message ?? String(error);
-    this.#logger.error?.('[dsh-im:qq] failed to process an interaction reply:', error);
+    const failure = setLastMessageFailure(this.#status, error);
+    this.#logger.error?.(
+      `[dsh-im:qq] failed to process an interaction reply [${failure.referenceId}]:`,
+      error,
+    );
     if (!this.#state.hasSeen(messageId)) {
       await this.#state.markSeen(messageId).catch(() => undefined);
     }
-    await this.#bot.sendText(message.replyTarget, t('消息处理失败，请稍后重试。'))
+    await this.#bot.sendText(message.replyTarget, messageFailureText(failure))
       .catch(() => undefined);
   }
 }

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

@@ -2,6 +2,7 @@ import { randomUUID } from 'node:crypto';
 
 import { connectionTestMessage } from '../shared/connection-test.mjs';
 import { t } from '../shared/i18n.mjs';
+import { publicMessageFailure } from '../shared/message-failure.mjs';
 import { deriveQqBotIdentity, maskQqAppId } from './config-store.mjs';
 
 const ACTIVE_ATTEMPT_STATES = new Set(['starting', 'pending', 'refreshing', 'connecting']);
@@ -319,6 +320,7 @@ export class QqController {
           messagesReceived: runtimeStatus?.messagesReceived ?? 0,
           messagesReplied: runtimeStatus?.messagesReplied ?? 0,
         },
+        lastMessageError: publicMessageFailure(runtimeStatus?.lastMessageError),
         error: structuredClone(this.#errors.get(config.botId) ?? null),
       };
     });

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

@@ -532,6 +532,41 @@ export class HarnessInteractionError extends Error {
   }
 }
 
+export class HarnessTurnError extends Error {
+  constructor(code, { reason, providerCode } = {}) {
+    super(`Harness turn failed (${code})`);
+    this.name = 'HarnessTurnError';
+    this.code = code;
+    this.promptAccepted = true;
+    if (reason && typeof reason === 'object') this.reason = reason;
+    if (typeof providerCode === 'string' && providerCode) this.providerCode = providerCode;
+  }
+}
+
+function harnessTurnError(reason) {
+  const kind = nonEmptyText(reason?.kind) ?? nonEmptyText(reason);
+  if (kind === 'error') {
+    const failure = reason?.error ?? reason?.failure;
+    return new HarnessTurnError('harness-turn-failed', {
+      reason,
+      providerCode: nonEmptyText(failure?.code) ?? undefined,
+    });
+  }
+  if (kind === 'max-tokens') return new HarnessTurnError('model-max-tokens', { reason });
+  if (kind === 'blocked') return new HarnessTurnError('turn-blocked', { reason });
+  if (['interrupted', 'stopped', 'cancelled', 'canceled'].includes(kind)) {
+    return new HarnessTurnError('turn-interrupted', { reason });
+  }
+  if (kind === 'aborted') return new HarnessTurnError('turn-aborted', { reason });
+  if (kind === 'completed') return new HarnessTurnError('model-empty-response', { reason });
+  return new HarnessTurnError('harness-turn-failed', { reason });
+}
+
+function harnessTurnSucceeded(reason) {
+  if (reason === null || reason === undefined) return true;
+  return (nonEmptyText(reason?.kind) ?? nonEmptyText(reason)) === 'completed';
+}
+
 export class HarnessClient {
   #baseUrl;
   #workspace;
@@ -1282,6 +1317,9 @@ export class HarnessClient {
           }
           if (!tracker.finished) continue;
           turnFinished = true;
+          if (!ownership?.stopRequested && !harnessTurnSucceeded(tracker.reason)) {
+            throw harnessTurnError(tracker.reason);
+          }
           // An accepted /stop revokes attachment delivery even when Harness
           // preserved a useful partial text answer for the existing UX.
           const artifactCount = ownership?.stopRequested
@@ -1292,11 +1330,9 @@ export class HarnessClient {
           }
           if (artifactCount > 0) return '';
           if (ownership?.stopRequested) throw turnStoppedError();
-          throw new Error(
-            `Harness turn ended without a text reply${tracker.reason ? ` (${JSON.stringify(tracker.reason)})` : ''}`,
-          );
+          throw harnessTurnError(tracker.reason);
         }
-        throw new Error(`Harness reply timed out after ${Math.round(timeoutMs / 1_000)} seconds`);
+        throw new HarnessTurnError('harness-reply-timeout');
       } catch (error) {
         // Once cancellation was accepted, transport/poll failures and timeouts
         // describe the convergence of that stop, not an unrelated ask failure.

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

@@ -27,6 +27,83 @@ export default {
   '结果文件「{name}」已生成，但当前渠道暂时未能发送，请稍后重试。':
     'The result file "{name}" was generated, but this channel could not send it right now. Please try again later.',
   '消息处理失败，请稍后重试。': 'Failed to process the message. Please try again later.',
+  '卡片已结束，请查看后续消息。': 'This card has ended. Please check the next message.',
+  '工具调用「{name}」未成功，请检查工具配置或稍后重试。': 'Tool call "{name}" did not succeed. Check the tool configuration or try again later.',
+  '无法连接处理服务，消息尚未提交。请确认 DeepSeek Harness 正在运行后重试。':
+    'Could not connect to the processing service, so the message was not submitted. Make sure DeepSeek Harness is running, then try again.',
+  '处理服务响应超时，消息尚未开始处理。请稍后重试。':
+    'The processing service timed out before the message started. Please try again later.',
+  '暂时无法确认任务状态，任务可能已经开始。请先等待或发送 /stop，不要立即重复提交。':
+    'The task status could not be confirmed and the task may have started. Wait or send /stop before submitting it again.',
+  '消息提交结果未能确认，任务可能已经开始。请先等待或发送 /status 查看状态，不要立即重复提交。':
+    'The message submission could not be confirmed and the task may have started. Wait or send /status before submitting it again.',
+  '暂时无法读取任务进度，任务可能仍在运行。请先等待或发送 /stop，不要立即重复提交。':
+    'Task progress is temporarily unavailable and the task may still be running. Wait or send /stop before submitting it again.',
+  '处理服务拒绝了机器人连接。请管理员检查 Harness 地址、代理或访问配置后重试。':
+    'The processing service rejected the bot connection. Ask an administrator to check the Harness address, proxy, or access settings.',
+  '机器人与 DeepSeek Harness 的接口不兼容。请管理员检查 Harness 地址并更新相关版本。':
+    'The bot and DeepSeek Harness use incompatible APIs. Ask an administrator to check the Harness address and update the related components.',
+  'DeepSeek Harness 暂时无法完成请求，请稍后重试。':
+    'DeepSeek Harness could not complete the request. Please try again later.',
+  '等待模型回复超时，任务可能仍在运行。请先等待或发送 /stop，不要立即重复提交。':
+    'Waiting for the model reply timed out and the task may still be running. Wait or send /stop before submitting it again.',
+  '模型凭据缺失或已失效。请管理员检查模型配置后重试。':
+    'The model credentials are missing or invalid. Ask an administrator to check the model settings.',
+  '模型额度或余额不足，本次任务未完成。请管理员补充额度或切换模型后重试。':
+    'The model quota or balance is insufficient. Ask an administrator to add quota or switch models, then try again.',
+  '模型服务正在限流，本次任务未完成。请稍后重试。':
+    'The model service is rate-limiting requests. Please try again later.',
+  '当前会话内容超过模型上下文上限。请发送 /compact 或 /new 后重试。':
+    'This conversation exceeds the model context limit. Send /compact or /new, then try again.',
+  '当前模型不存在或暂不可用。请发送 /models 查看并使用 /model 切换模型。':
+    'The current model does not exist or is unavailable. Send /models and use /model to switch models.',
+  '当前模型不存在或不支持所选配置。请发送 /models，并使用 /model 重新选择。':
+    'The current model does not exist or does not support the selected settings. Send /models and use /model to choose again.',
+  '当前模型不支持这类内容或所选配置。请调整内容、模型或推理等级后重试。':
+    'The current model does not support this content or the selected settings. Adjust the content, model, or reasoning effort and try again.',
+  '当前模型不支持所选配置。请切换模型或推理等级后重试。':
+    'The current model does not support the selected settings. Switch the model or reasoning effort, then try again.',
+  '模型服务响应超时，本次任务未完成。请稍后重试。':
+    'The model service timed out and the task did not finish. Please try again later.',
+  '暂时无法连接模型服务，本次任务未完成。请稍后重试。':
+    'The model service is temporarily unreachable and the task did not finish. Please try again later.',
+  '模型服务暂时异常，本次任务未完成。请稍后重试。':
+    'The model service is temporarily unavailable and the task did not finish. Please try again later.',
+  '模型回复中断或格式异常，本次任务未完成。请重试。':
+    'The model reply was interrupted or malformed, so the task did not finish. Please try again.',
+  '模型没有返回可显示的内容。请重试；若持续发生，请切换模型。':
+    'The model returned no displayable content. Try again, or switch models if this keeps happening.',
+  '模型拒绝处理当前内容。请调整问题内容后重试。':
+    'The model rejected the current content. Revise the request and try again.',
+  '模型达到输出长度上限，但没有生成可显示的结果。请缩小任务范围后重试。':
+    'The model reached its output limit without producing a displayable result. Reduce the task scope and try again.',
+  '任务正在等待无法在当前渠道完成的操作。请在 DeepSeek Harness 中处理后再试。':
+    'The task is waiting for an action that cannot be completed in this channel. Handle it in DeepSeek Harness, then try again.',
+  '任务被意外中断，本次未完成。请重试。':
+    'The task was unexpectedly interrupted and did not finish. Please try again.',
+  '当前会话已不存在。请发送 /new 创建新会话后重试。':
+    'The current Session no longer exists. Send /new to create one, then try again.',
+  '当前会话仍在处理上一项任务。请等待完成，或发送 /stop 后重试。':
+    'The current Session is still processing the previous task. Wait for it to finish, or send /stop before trying again.',
+  '工作区或会话状态刚刚发生变化。请重新发送这条消息。':
+    'The Workspace or Session state just changed. Please send this message again.',
+  '当前工作区不存在或暂不可用。请重新选择工作区后重试。':
+    'The current Workspace does not exist or is unavailable. Select another Workspace and try again.',
+  '当前 Agent Preset 不存在或暂不可用。请发送 /presetlist 后重新选择。':
+    'The current Agent Preset does not exist or is unavailable. Send /presetlist and select another one.',
+  '回复已经生成，但机器人没有发送权限。请联系管理员检查渠道权限或重新绑定机器人。':
+    'The reply was generated, but the bot cannot send it. Ask an administrator to check channel permissions or reconnect the bot.',
+  '回复已经生成，但当前渠道正在限流，暂时无法发送。请稍后重试。':
+    'The reply was generated, but this channel is rate-limiting messages. Please try again later.',
+  '回复发送结果未能确认。请先检查聊天内是否已经收到，不要立即重复提交。':
+    'Reply delivery could not be confirmed. Check whether it already arrived before submitting the task again.',
+  '回复已经生成，但当前渠道暂时无法发送。请稍后重试。':
+    'The reply was generated, but this channel could not send it. Please try again later.',
+  '当前消息包含无法处理的图片或文件。请调整后重新发送。':
+    'This message contains an image or file that cannot be processed. Adjust it and send it again.',
+  '任务未完成，暂时无法确定原因。请重试；若持续发生，请将参考号提供给管理员。':
+    'The task did not finish and the cause could not be determined. Try again; if it persists, give the reference ID to an administrator.',
+  '错误码：{code}；参考号：{referenceId}': 'Error code: {code}; reference: {referenceId}',
   '{label}机器人': '{label} bot',
   '目前支持文字和图片消息。': 'Only text and image messages are supported at the moment.',
   '目前支持文字、图片和文件消息。':