@xmanrui/dsh-im 4.36.0 → 4.37.0

package/src/channels/shared/message-failure.mjs

@@ -218,7 +218,7 @@ export function classifyMessageFailure(error, {
     : businessCode;
   if (code === 'REQUEST_TIMEOUT' || code === 'NETWORK_ERROR') details.hint = connectionHint(details);
   return Object.freeze({
-    ...(code === 'INTERNAL_UNKNOWN' || details.reason !== 'unknown' || details.httpStatus || details.providerCode ? { details } : {}),
+    ...(code === 'INTERNAL_UNKNOWN' || details.reason !== 'unknown' || details.httpStatus || details.providerCode || details.method ? { details } : {}),
     code,
     reason: safeReason ?? safeFailureReason(error?.code) ?? code,
     message: typeof userMessage === 'string' && userMessage.trim()

package/src/channels/shared/message-mode.mjs

@@ -0,0 +1,19 @@
+export const SET_MESSAGE_MODE_ENDPOINT = 'bot.message-mode.set';
+
+export function normalizeBusyMessageMode(value) {
+  return value === 'steer' ? 'steer' : 'queue';
+}
+
+export function validateBusyMessageMode(value) {
+  if (value !== 'queue' && value !== 'steer') {
+    throw new TypeError('Message mode must be queue or steer');
+  }
+  return value;
+}
+
+export function validMessageModePayload(payload) {
+  return payload !== null && typeof payload === 'object' && !Array.isArray(payload)
+    && Object.keys(payload).length === 2
+    && typeof payload.botId === 'string' && /^[A-Za-z0-9_-]{1,128}$/.test(payload.botId)
+    && (payload.busyMessageMode === 'queue' || payload.busyMessageMode === 'steer');
+}

package/src/channels/shared/text-harness-bridge.mjs

@@ -1,3 +1,4 @@
+import { BusyMessageDispatcher, canAutomaticallySteer } from './busy-message-dispatcher.mjs';
 import { randomUUID } from 'node:crypto';
 
 import { createDeferredDeliveryCoordinator, deferredOutcomeText } from './deferred-delivery-coordinator.mjs';
@@ -14,6 +15,7 @@ import {
 } from './context-enhancement.mjs';
 import { runWorkspaceCommand } from './workspace-command.mjs';
 import { runCompactCommand } from './compact-command.mjs';
+import { isClearCommand, runClearCommand } from './clear-command.mjs';
 import { isHistoryCommand, runHistoryCommand } from './history-command.mjs';
 import {
   isControlCommand,
@@ -178,6 +180,7 @@ export class TextHarnessBridge {
   #signal;
   #keepaliveIntervalMs;
   #queues = new Map();
+  #busyMessages = new BusyMessageDispatcher();
   #pendingInteractions = new Map();
   #interactionKeys = new Map();
   // Keep the accepted configuration through the existing queue/reply lifecycle.
@@ -236,7 +239,7 @@ export class TextHarnessBridge {
     return structuredClone(this.#status);
   }
 
-  accept(message, { contextSnapshot, accessDecision } = {}) {
+  accept(message, { contextSnapshot, accessDecision, busyMessageMode } = {}) {
     if (this.#signal?.aborted) return Promise.resolve();
     const conversationId = cleanText(message?.conversationId);
     const kind = message?.kind === 'group' ? 'group' : 'direct';
@@ -300,7 +303,7 @@ export class TextHarnessBridge {
     });
     normalized.statusReaction = statusReaction;
 
-    const processing = this.#acceptAcceptedMessage(normalized, messageId, senderId);
+    const processing = this.#acceptAcceptedMessage(normalized, messageId, senderId, busyMessageMode);
     void processing.then(
       () => statusReaction.success(),
       () => statusReaction.error(),
@@ -308,7 +311,7 @@ export class TextHarnessBridge {
     return processing;
   }
 
-  #acceptAcceptedMessage(normalized, messageId, senderId) {
+  #acceptAcceptedMessage(normalized, messageId, senderId, busyMessageMode) {
     if (normalized.kind === 'direct') {
       rememberConnectionTestTarget(
         this.#state,
@@ -319,6 +322,18 @@ export class TextHarnessBridge {
     const key = `${normalized.kind}:${normalized.conversationId}`;
     const pending = this.#pendingInteractions.get(key);
     const text = controlTextOf(normalized);
+    if (isClearCommand(text) && (
+      this.#queues.has(key)
+      || pending
+      || this.#approvals.hasPending(key)
+      || this.#batches.status(key).phase !== 'idle'
+    )) {
+      return this.#finishLocalMessage(
+        normalized,
+        messageId,
+        t('当前会话正在生成回复或等待交互，请先完成交互或发送 /stop，再执行 /clear。'),
+      );
+    }
     const batchCommand = isBatchInputCommand(text);
     if (batchCommand && normalized.kind === 'group' && normalized.addressed === true) {
       return this.#finishLocalMessage(
@@ -373,7 +388,8 @@ export class TextHarnessBridge {
     }
     const collectingBatch = normalized.kind === 'direct'
       && this.#batches.status(key).phase === 'collecting';
-    const commandRunner = collectingBatch ? null : isHistoryCommand(text) ? runHistoryCommand
+    const commandRunner = collectingBatch ? null : isClearCommand(text) ? runClearCommand
+      : isHistoryCommand(text) ? runHistoryCommand
       : hasInboundFiles(normalized) ? null : isControlCommand(text)
       ? runControlCommand
       : (isModelCommand(text)
@@ -458,7 +474,33 @@ export class TextHarnessBridge {
       pending.queue = current;
       return current;
     }
-    return this.#enqueueMessage(normalized, messageId, senderId, key);
+    return this.#busyMessages.dispatch({
+      key, messageId, text: normalized.content,
+      commandText: text, mode: busyMessageMode,
+      onFailure: (error) => this.#signal?.aborted || error?.code === 'turn-stopped'
+        ? normalized.statusReaction?.clear() : normalized.statusReaction?.error(),
+      eligible: () => normalized.plainText !== false
+        && !hasInboundImages(normalized) && !hasInboundFiles(normalized)
+        && !hasReplyReference(normalized)
+        && canAutomaticallySteer(this.#accessPolicy, normalized.kind,
+          [senderId, normalized.senderAlternateId].filter(Boolean)),
+      harness: this.#harness, state: this.#state, status: this.#status,
+      signal: this.#signal, control: { owner: this, key }, logger: this.#logger,
+      acceptedMessageIds: this.#acceptedMessageIds,
+      pendingInteraction: () => this.#pendingInteractions.has(key) || this.#approvals.hasPending(key),
+      enhancement: {
+        snapshot: this.#acceptedMessageIds.get(messageId),
+        source: () => {
+          const source = normalized.contextSource?.();
+          return { channel: this.#descriptor.key, senderId, senderName: source?.senderName,
+            conversationTitle: source?.conversationTitle,
+            chatId: source?.chatId ?? normalized.conversationId, threadId: source?.threadId };
+        },
+      },
+      isQueued: () => this.#queues.has(key),
+      enqueue: (options) => this.#enqueueMessage(normalized, messageId, senderId, key, options),
+      send: (reply) => this.#bot.sendText(normalized.replyTarget, reply),
+    });
   }
 
   #finishLocalMessage(message, messageId, reply, { recordReceived = true } = {}) {
@@ -522,6 +564,7 @@ export class TextHarnessBridge {
   }
 
   async waitForIdle() {
+    await this.#busyMessages.whenIdle();
     await Promise.allSettled([
       ...this.#queues.values(),
       ...[...this.#pendingInteractions.values()].flatMap((pending) => (

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

@@ -1,3 +1,4 @@
+import { BusyMessageDispatcher, canAutomaticallySteer } from '../shared/busy-message-dispatcher.mjs';
 import { imageInputLimits } from '../shared/image-input-policy.mjs';
 import { imageDownloadLimitMessage } from '../shared/image-prompt.mjs';
 import { createDeferredDeliveryCoordinator, deferredOutcomeText } from '../shared/deferred-delivery-coordinator.mjs';
@@ -20,6 +21,7 @@ import {
   isBatchInputCommand,
 } from '../shared/batch-input.mjs';
 import { runCompactCommand } from '../shared/compact-command.mjs';
+import { isClearCommand, runClearCommand } from '../shared/clear-command.mjs';
 import { isHistoryCommand, runHistoryCommand } from '../shared/history-command.mjs';
 import {
   isControlCommand,
@@ -82,6 +84,7 @@ function helpText() {
     t('/menu 或 /m  打开可点击的功能菜单'),
     t('/new  开启一个全新会话'),
     t('/compact  压缩当前会话的较早上下文'),
+    t('/clear  清空当前会话上下文（保留 Session 绑定和历史记录）'),
     t('/history [数量]  查看最近历史消息（默认 3 条，最多 5 条）'),
     t('/workspace 工作区序号或绝对路径  切换工作区'),
     t('/workspacelist  列出工作区绝对路径'),
@@ -565,6 +568,7 @@ export class WecomHarnessBridge {
   #signal;
   #fileUploadTimeoutMs;
   #queues = new Map();
+  #busyMessages = new BusyMessageDispatcher();
   #pendingInteractions = new Map();
   #interactionKeys = new Map();
   // Keep the accepted configuration through the existing queue/reply lifecycle.
@@ -870,6 +874,7 @@ export class WecomHarnessBridge {
       return { message: t('已开启新会话。请发送你的问题。') };
     }
     return await runWorkspaceCommand(text, this.#harness, key)
+      ?? await runClearCommand(text, this.#harness, this.#state, key, options)
       ?? await runCompactCommand(text, this.#harness, this.#state, key, options);
   }
 
@@ -951,7 +956,8 @@ export class WecomHarnessBridge {
     const menuCommand = !hasInboundImages(commandMessage) && !hasInboundFiles(commandMessage)
       && (parseWecomMenu(commandText) || ['/help', '/status', '/new'].includes(commandText.toLowerCase())
         || this.#cardFrames.has(frame));
-    const commandRunner = isHistoryCommand(commandText) ? runHistoryCommand
+    const commandRunner = isClearCommand(commandText) ? runClearCommand
+      : isHistoryCommand(commandText) ? runHistoryCommand
       : hasInboundFiles(commandMessage) ? null : isControlCommand(commandText)
       ? runControlCommand
       : (isModelCommand(commandText)
@@ -1048,7 +1054,23 @@ export class WecomHarnessBridge {
       pending.queue = current;
       return current;
     }
-    return this.#enqueueMessage(frame, messageId, key);
+    return this.#busyMessages.dispatch({
+      key, messageId, text: commandText,
+      eligible: () => isNativeWecomText(frame) && !hasReplyReference(commandMessage)
+        && !parseWecomMenu(commandText) && !this.#cardFrames.has(frame)
+        && canAutomaticallySteer(this.#accessPolicy, conversationType, senderId),
+      harness: this.#harness, state: this.#state, status: this.#status,
+      signal: this.#signal, control: { owner: this, key }, logger: this.#logger,
+      acceptedMessageIds: this.#acceptedMessageIds,
+      pendingInteraction: () => this.#pendingInteractions.has(key) || this.#approvals.hasPending(key),
+      enhancement: {
+        snapshot: this.#acceptedMessageIds.get(messageId),
+        source: () => ({ channel: 'wecom', senderId, chatId }),
+      },
+      isQueued: () => this.#queues.has(key),
+      enqueue: (options) => this.#enqueueMessage(frame, messageId, key, options),
+      send: (reply) => this.#sendImmediate(frame, chatId, reply),
+    });
   }
 
   #enqueueMessage(frame, messageId, key, {
@@ -1151,6 +1173,7 @@ export class WecomHarnessBridge {
   }
 
   async waitForIdle() {
+    await this.#busyMessages.whenIdle();
     await Promise.allSettled([
       ...this.#queues.values(),
       ...[...this.#pendingInteractions.values()].flatMap((pending) => (
@@ -1176,6 +1199,7 @@ export class WecomHarnessBridge {
       hasFiles: hasInboundFiles(message),
       pendingInteraction: this.#pendingInteractions.has(key)
         || this.#approvals.hasPending(key),
+      busy: this.#queues.has(key) || this.#batchInputs.status(key).phase !== 'idle',
       control: { owner: this, key },
       deferredDelivery: this.#deferred,
       enhancement: captureContextEnhancementSource(

package/src/channels/wecom/wecom-cards.mjs

@@ -48,7 +48,7 @@ export function wecomMenu({ workspace, workspaces = [] } = {}) {
     entries: [
       [t('切换工作区'), 'select:workspace'],
       [t('🆕 新会话'), '/new'],
-      [t('⏹ 停止'), '/stop'], [t('📐 压缩'), '/compact'],
+      [t('⏹ 停止'), '/stop'], [t('📐 压缩'), '/compact'], [t('🧹 清空上下文'), '/clear'],
       [t('📊 状态'), '/status'], [t('📖 帮助'), '/help'],
     ],
   };

package/src/channels/wecom-app/wecom-app-bridge.mjs

@@ -1,3 +1,4 @@
+import { BusyMessageDispatcher, canAutomaticallySteer } from '../shared/busy-message-dispatcher.mjs';
 import { createDeferredDeliveryCoordinator, deferredOutcomeText } from '../shared/deferred-delivery-coordinator.mjs';
 import {
   harnessAnswerForQuestion,
@@ -11,6 +12,7 @@ import {
   isBatchInputCommand,
 } from '../shared/batch-input.mjs';
 import { runCompactCommand } from '../shared/compact-command.mjs';
+import { isClearCommand, runClearCommand } from '../shared/clear-command.mjs';
 import { isHistoryCommand, runHistoryCommand } from '../shared/history-command.mjs';
 import {
   isControlCommand,
@@ -75,6 +77,7 @@ const HELP_TEXT = () => [
   t('直接发送文字或图片即可继续当前会话。'),
   t('/new  开启一个全新会话'),
   t('/compact  压缩当前会话的较早上下文'),
+  t('/clear  清空当前会话上下文（保留 Session 绑定和历史记录）'),
   t('/history [数量]  查看最近历史消息（默认 3 条，最多 5 条）'),
   t('/workspace 工作区序号或绝对路径  切换工作区'),
   t('/workspacelist  列出工作区绝对路径'),
@@ -202,6 +205,7 @@ export class WecomAppBridge {
   #streamRegistry;
   #maxChunkBytes;
   #queues = new Map();
+  #busyMessages = new BusyMessageDispatcher();
   #acceptedMessageIds = new Map();
   #commandTasks = new Set();
   #approvalTasks = new Set();
@@ -311,7 +315,8 @@ export class WecomAppBridge {
         return this.#finishBatchResult(messageId, key, sender, result);
       }
     }
-    const commandRunner = isHistoryCommand(commandText) ? runHistoryCommand
+    const commandRunner = isClearCommand(commandText) ? runClearCommand
+      : isHistoryCommand(commandText) ? runHistoryCommand
       : isControlCommand(commandText)
       ? runControlCommand
       : (isModelCommand(commandText)
@@ -385,7 +390,24 @@ export class WecomAppBridge {
       pending.queue = current;
       return current;
     }
-    return this.#enqueueMessage(message, messageId, key, { sink });
+    return this.#busyMessages.dispatch({
+      key, messageId, text: commandText,
+      eligible: () => message.msgtype === 'text' && !hasImages
+        && !hasReplyReference(wecomAppInboundMessage(message, this.#api))
+        && canAutomaticallySteer(this.#accessPolicy, 'direct', sender),
+      harness: this.#harness, state: this.#state, status: this.#status,
+      signal: this.#signal, control: { owner: this, key }, logger: this.#logger,
+      acceptedMessageIds: this.#acceptedMessageIds,
+      pendingInteraction: () => this.#pendingInteractions.has(key) || this.#approvals.hasPending(key),
+      enhancement: {
+        snapshot: this.#acceptedMessageIds.get(messageId),
+        source: () => ({ channel: 'wecom-app', senderId: sender, chatId: sender }),
+      },
+      isQueued: () => this.#queues.has(key),
+      enqueue: (options) => this.#enqueueMessage(message, messageId, key, { ...options, sink }),
+      send: (reply) => this.#send(sender, reply),
+      onError: (error) => this.#handleInteractionFailure(message, messageId, error),
+    });
   }
 
   #enqueueMessage(message, messageId, key, {
@@ -472,6 +494,7 @@ export class WecomAppBridge {
   }
 
   async waitForIdle() {
+    await this.#busyMessages.whenIdle();
     await Promise.allSettled([
       ...this.#queues.values(),
       ...[...this.#pendingInteractions.values()].flatMap((pending) => (
@@ -501,6 +524,7 @@ export class WecomAppBridge {
       hasFiles: false,
       pendingInteraction: this.#pendingInteractions.has(key)
         || this.#approvals.hasPending(key),
+      busy: this.#queues.has(key) || this.#batchInputs.status(key).phase !== 'idle',
       control: { owner: this, key },
       deferredDelivery: this.#deferred,
       enhancement: captureContextEnhancementSource(

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

@@ -1,3 +1,4 @@
+import { BusyMessageDispatcher, canAutomaticallySteer } from '../shared/busy-message-dispatcher.mjs';
 import { createDeferredDeliveryCoordinator, deferredOutcomeText } from '../shared/deferred-delivery-coordinator.mjs';
 import {
   DEFAULT_WEIXIN_MAX_MESSAGE_CHARS,
@@ -21,6 +22,7 @@ import {
   isBatchInputCommand,
 } from '../shared/batch-input.mjs';
 import { runCompactCommand } from '../shared/compact-command.mjs';
+import { isClearCommand, runClearCommand } from '../shared/clear-command.mjs';
 import { isHistoryCommand, runHistoryCommand } from '../shared/history-command.mjs';
 import {
   isControlCommand,
@@ -91,6 +93,7 @@ const HELP_TEXT = () => [
   t('直接发送文字、图片、文件或带文字识别结果的语音即可继续当前会话。'),
   t('/new  开启一个全新会话'),
   t('/compact  压缩当前会话的较早上下文'),
+  t('/clear  清空当前会话上下文（保留 Session 绑定和历史记录）'),
   t('/history [数量]  查看最近历史消息（默认 3 条，最多 5 条）'),
   t('/workspace 工作区序号或绝对路径  切换工作区'),
   t('/workspacelist  列出工作区绝对路径'),
@@ -313,6 +316,7 @@ export class WeixinHarnessBridge {
   #typingKeepaliveMs;
   #signal;
   #queues = new Map();
+  #busyMessages = new BusyMessageDispatcher();
   #pendingInteractions = new Map();
   #interactionKeys = new Map();
   // Keep the accepted configuration through the existing queue/reply lifecycle.
@@ -457,7 +461,8 @@ export class WeixinHarnessBridge {
         );
       }
     }
-    const commandRunner = isHistoryCommand(commandText) ? runHistoryCommand
+    const commandRunner = isClearCommand(commandText) ? runClearCommand
+      : isHistoryCommand(commandText) ? runHistoryCommand
       : hasWeixinFileItems(message) ? null : isControlCommand(commandText)
       ? runControlCommand
       : (isModelCommand(commandText)
@@ -542,7 +547,20 @@ export class WeixinHarnessBridge {
       pending.queue = current;
       return current;
     }
-    return this.#enqueueMessage(message, messageId, key);
+    return this.#busyMessages.dispatch({
+      key, messageId, text: commandText,
+      eligible: () => isNativeWeixinText(message) && !extractWeixinReplyReference(message)
+        && canAutomaticallySteer(this.#accessPolicy, 'direct', sender),
+      harness: this.#harness, state: this.#state, status: this.#status,
+      signal: this.#signal, control: { owner: this, key }, logger: this.#logger,
+      acceptedMessageIds: this.#acceptedMessageIds,
+      pendingInteraction: () => this.#pendingInteractions.has(key) || this.#approvals.hasPending(key),
+      enhancement: this.#acceptedMessageIds.get(messageId),
+      isQueued: () => this.#queues.has(key),
+      enqueue: (options) => this.#enqueueMessage(message, messageId, key, options),
+      send: (reply) => this.#sendOutOfBand(key, sender, reply, contextToken, runId),
+      onError: (error) => this.#handleInteractionFailure(message, messageId, error),
+    });
   }
 
   #enqueueMessage(message, messageId, key, {
@@ -684,6 +702,7 @@ export class WeixinHarnessBridge {
   }
 
   async waitForIdle() {
+    await this.#busyMessages.whenIdle();
     await Promise.allSettled([
       ...this.#queues.values(),
       ...[...this.#pendingInteractions.values()].flatMap((pending) => (
@@ -724,6 +743,7 @@ export class WeixinHarnessBridge {
       hasFiles: hasWeixinFileItems(message),
       pendingInteraction: this.#pendingInteractions.has(key)
         || this.#approvals.hasPending(key),
+      busy: this.#queues.has(key) || this.#batchInputs.status(key).phase !== 'idle',
       control: { owner: this, key },
       deferredDelivery: this.#deferred,
       enhancement: captureContextEnhancementSource(