@xmanrui/dsh-im 4.36.1 → 4.37.0

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

@@ -1,3 +1,4 @@
+import { SET_MESSAGE_MODE_ENDPOINT, validMessageModePayload } from '../../../../src/channels/shared/message-mode.mjs';
 import { SET_ALIAS_ENDPOINT, validAliasPayload } from '../shared/bot-alias-rpc.mjs';
 import { registerManagementRpc } from '../../../management-rpc.mjs';
 import QRCode from 'qrcode';
@@ -32,6 +33,7 @@ export const WEIXIN_ENDPOINTS = Object.freeze({
   setModel: SET_MODEL_ENDPOINT,
   setAgentPreset: SET_AGENT_PRESET_ENDPOINT,
   setContextEnhancement: SET_CONTEXT_ENHANCEMENT_ENDPOINT,
+  setBusyMessageMode: SET_MESSAGE_MODE_ENDPOINT,
   setAccessPolicy: SET_ACCESS_POLICY_ENDPOINT,
   setAlias: SET_ALIAS_ENDPOINT,
 });
@@ -95,6 +97,10 @@ function payloadFailure(endpoint, payload) {
     return validAgentPresetPayload(payload)
       ? null : '请选择 Agent Preset。';
   }
+  if (endpoint === WEIXIN_ENDPOINTS.setBusyMessageMode) {
+    return validMessageModePayload(payload)
+      ? null : '请提交有效的消息处理方式。';
+  }
   if (endpoint === WEIXIN_ENDPOINTS.setContextEnhancement) {
     return validContextEnhancementPayload(payload)
       ? null : '请提交有效的上下文增强设置。';
@@ -235,6 +241,11 @@ export function createWeixinRpcHandler(controller, { encodeQr = qrDataUrl, logge
           await controller.updateModel(payload.botId, payload.model),
           cachedEncode,
         );
+      } else if (endpoint === WEIXIN_ENDPOINTS.setBusyMessageMode) {
+        if (typeof controller.updateBusyMessageMode !== 'function') throw new Error('Message mode update is unavailable');
+        value = await controller.updateBusyMessageMode(
+          payload.botId, payload.busyMessageMode, (status) => publicStatus(status, cachedEncode),
+        );
       } else if (endpoint === WEIXIN_ENDPOINTS.setContextEnhancement) {
         if (typeof controller.updateContextEnhancement !== 'function') throw new Error('Context enhancement update is unavailable');
         value = await controller.updateContextEnhancement(

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

@@ -1,3 +1,4 @@
+import { SET_MESSAGE_MODE_ENDPOINT, validMessageModePayload } from '../../../../src/channels/shared/message-mode.mjs';
 import { createConnectionDiagnostics, diagnosticRpcResult } from '../../../../src/channels/shared/connection-error.mjs';
 import { SET_ALIAS_ENDPOINT, validAliasPayload } from '../shared/bot-alias-rpc.mjs';
 import { registerManagementRpc } from '../../../management-rpc.mjs';
@@ -25,6 +26,7 @@ export const WHATSAPP_ENDPOINTS = Object.freeze({
   setModel: SET_MODEL_ENDPOINT,
   setAgentPreset: SET_AGENT_PRESET_ENDPOINT,
   setContextEnhancement: SET_CONTEXT_ENHANCEMENT_ENDPOINT,
+  setBusyMessageMode: SET_MESSAGE_MODE_ENDPOINT,
 });
 export const WHATSAPP_RPC_ENDPOINTS = Object.freeze(Object.values(WHATSAPP_ENDPOINTS));
 
@@ -79,6 +81,10 @@ function payloadFailure(endpoint, payload) {
     return validAgentPresetPayload(payload)
       ? null : '请选择 Agent Preset。';
   }
+  if (endpoint === WHATSAPP_ENDPOINTS.setBusyMessageMode) {
+    return validMessageModePayload(payload)
+      ? null : '请提交有效的消息处理方式。';
+  }
   if (endpoint === WHATSAPP_ENDPOINTS.setContextEnhancement) {
     return validContextEnhancementPayload(payload)
       ? null : '请提交有效的上下文增强设置。';
@@ -192,6 +198,11 @@ export function createWhatsappRpcHandler(controller, { encodeQr = qrDataUrl } =
           await controller.updateModel(payload.botId, payload.model),
           cachedEncode,
         );
+      } else if (endpoint === WHATSAPP_ENDPOINTS.setBusyMessageMode) {
+        if (typeof controller.updateBusyMessageMode !== 'function') throw new Error('Message mode update is unavailable');
+        value = await controller.updateBusyMessageMode(
+          payload.botId, payload.busyMessageMode, (status) => publicStatus(status, cachedEncode),
+        );
       } else if (endpoint === WHATSAPP_ENDPOINTS.setContextEnhancement) {
         if (typeof controller.updateContextEnhancement !== 'function') throw new Error('Context enhancement update is unavailable');
         value = await controller.updateContextEnhancement(

package/src/channels/dingtalk/dingtalk-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 {
   DINGTALK_DONE_REACTION_NAME,
@@ -15,6 +16,7 @@ import {
 } from '../shared/harness-question.mjs';
 import { HarnessApprovalQueue } from '../shared/harness-approval.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,
@@ -87,6 +89,7 @@ const HELP_TEXT_LINES = [
   '/m 或 /menu  打开下拉操作菜单',
   '/new  开启一个全新会话',
   '/compact  压缩当前会话的较早上下文',
+  '/clear  清空当前会话上下文（保留 Session 绑定和历史记录）',
   '/history [数量]  查看最近历史消息（默认 3 条，最多 5 条）',
   '/workspace 工作区序号或绝对路径  切换工作区',
   '/workspacelist  列出工作区绝对路径',
@@ -539,6 +542,7 @@ export class DingtalkHarnessBridge {
   #maxMessageChars;
   #signal;
   #queues = new Map();
+  #busyMessages = new BusyMessageDispatcher();
   #pendingInteractions = new Map();
   #interactionKeys = new Map();
   #interactionTasks = new Set();
@@ -597,7 +601,7 @@ export class DingtalkHarnessBridge {
     return structuredClone(this.#status);
   }
 
-  accept(message, { contextSnapshot } = {}) {
+  accept(message, { contextSnapshot, busyMessageMode } = {}) {
     if (this.#signal?.aborted) return Promise.resolve();
     const messageId = nonEmptyString(message?.msgId);
     const sender = senderStaffId(message);
@@ -716,6 +720,7 @@ export class DingtalkHarnessBridge {
     const commandRunner = isDingtalkMenuCommand(commandText)
       && !hasInboundFiles(promptMessage) && !hasInboundImages(promptMessage)
       ? async () => { await this.#showMenu(message, key); }
+      : isClearCommand(commandText) ? runClearCommand
       : isHistoryCommand(commandText) ? runHistoryCommand
       : hasInboundFiles(promptMessage) ? null : isControlCommand(commandText)
       ? runControlCommand
@@ -834,7 +839,28 @@ export class DingtalkHarnessBridge {
       pending.queue = current;
       return finish(current);
     }
-    return finish(this.#enqueueMessage(message, messageId, sender, key, { statusReaction }));
+    return finish(this.#busyMessages.dispatch({
+      key, messageId, text: commandText, mode: busyMessageMode,
+      onFailure: (error) => this.#finishStatusReaction(statusReaction,
+        this.#signal?.aborted || error?.code === 'turn-stopped' ? 'clear' : 'error'),
+      eligible: () => Boolean(sessionWebhook) && addressed && String(message.msgtype).toLowerCase() === 'text'
+        && !hasInboundImages(promptMessage) && !hasInboundFiles(promptMessage)
+        && !hasReplyReference(promptMessage) && !isDingtalkMenuCommand(commandText)
+        && canAutomaticallySteer(this.#accessPolicy, conversationType, 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: 'dingtalk', senderId: sender, senderName: message.senderNick,
+          conversationTitle: message.conversationTitle, chatId: message.conversationId }),
+      },
+      isQueued: () => this.#queues.has(key),
+      enqueue: (options) => this.#enqueueMessage(message, messageId, sender, key, { ...options, statusReaction }),
+      send: (reply) => sessionWebhook && addressed
+        ? this.#send(sessionWebhook, reply, this.#atUsersFor(message)) : Promise.resolve(),
+    }));
   }
 
   async #showMenu(message, key) {
@@ -933,6 +959,7 @@ export class DingtalkHarnessBridge {
       result = { message: helpText() };
     } else {
       result = await runWorkspaceCommand(command, this.#harness, key)
+        ?? await runClearCommand(command, this.#harness, this.#state, key, options)
         ?? await runCompactCommand(command, this.#harness, this.#state, key, options)
         ?? await runControlCommand(command, this.#harness, this.#state, key, options)
         ?? await runHistoryCommand(command, this.#harness, this.#state, key, options)
@@ -1133,6 +1160,7 @@ export class DingtalkHarnessBridge {
   }
 
   async waitForIdle() {
+    await this.#busyMessages.whenIdle();
     await Promise.allSettled([
       ...this.#queues.values(),
       ...[...this.#pendingInteractions.values()].flatMap((pending) => (
@@ -1162,6 +1190,7 @@ export class DingtalkHarnessBridge {
         hasFiles: hasInboundFiles(prompt),
         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/dingtalk/dingtalk-menu.mjs

@@ -5,7 +5,7 @@ import { t } from '../shared/i18n.mjs';
 export const DINGTALK_MENU_TEMPLATE_ID = '9ca31362-e5b3-409c-a694-6993706a6004.schema';
 export const DINGTALK_CARD_TOPIC = '/v1.0/card/instances/callback';
 export const DINGTALK_MENU_BUTTONS = Object.freeze({
-  new: '/new', history: '/history', stop: '/stop', compact: '/compact',
+  new: '/new', history: '/history', stop: '/stop', compact: '/compact', clear: '/clear',
   status: '/status', help: '/help',
 });
 

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

@@ -311,6 +311,7 @@ export class DingtalkRuntime {
         } catch {
           // Optional settings failures leave the original message path active.
         }
+        const busyMessageMode = this.#harness.currentBusyMessageMode?.() ?? 'queue';
         const task = Promise.resolve().then(async () => {
           if (this.#bridge !== bridge) return;
           let message;
@@ -330,7 +331,7 @@ export class DingtalkRuntime {
             get botId() { return contextEnhancement?.botId; },
           }, message.conversationType === '1' || message.conversationType === 1 ? 'direct'
             : message.conversationType === '2' || message.conversationType === 2 ? 'group' : null);
-          await bridge.accept(message, { contextSnapshot });
+          await bridge.accept(message, { contextSnapshot, busyMessageMode });
         }).catch(() => {
           if (signal.aborted || this.#bridge !== bridge) return;
           this.#status.lastError = t('钉钉消息处理失败。');

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

@@ -876,13 +876,14 @@ export class DiscordRuntime {
         this.#contextEnhancement,
         message.guild_id ? 'group' : 'direct',
       );
+      const busyMessageMode = this.#harness.currentBusyMessageMode?.() ?? 'queue';
       const pendingRoute = resolveDiscordMessageRoute(message, this.#config.platformId, {
         api: this.#api,
         channel: this.#channels.get(String(message.channel_id)),
         signal: this.#abortController?.signal,
         onChannel: (resolved) => this.#rememberChannel(resolved),
       });
-      route = { pendingRoute, contextSnapshot };
+      route = { pendingRoute, contextSnapshot, busyMessageMode };
       this.#routing.set(messageId, route);
       void pendingRoute.finally(() => {
         if (this.#routing.get(messageId) === route) this.#routing.delete(messageId);
@@ -893,6 +894,7 @@ export class DiscordRuntime {
       if (normalized) {
         await bridge.accept(normalized, {
           contextSnapshot: route.contextSnapshot,
+          busyMessageMode: route.busyMessageMode,
           ...(accessDecision ? { accessDecision } : {}),
         });
       }

package/src/channels/feishu/bridge.mjs

@@ -1,3 +1,4 @@
+import { BusyMessageDispatcher, canAutomaticallySteer } from '../shared/busy-message-dispatcher.mjs';
 import { isPermissionCommand, runPermissionCommand } from '../shared/permission-command.mjs';
 import { randomUUID } from 'node:crypto';
 import QRCode from 'qrcode';
@@ -43,6 +44,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,
@@ -178,7 +180,7 @@ const REPAIR_URL_HOSTS = new Set([
 
 const ARCHIVED_COMMAND = /^\/archived(?:\s+(on|off))?$/i;
 /** Matches fast card commands that should not be queued behind a running task. */
-const CARD_COMMAND = /^\/(?:m(?:enu)?|new|help|status|compact|(?:sessionlist|sessions)(?:\s|$)|workspacelist|workspaces|wsl|watchlist|archived(?:\s+(on|off))?)$/i;
+const CARD_COMMAND = /^\/(?:m(?:enu)?|new|help|status|compact|clear|(?:sessionlist|sessions)(?:\s|$)|workspacelist|workspaces|wsl|watchlist|archived(?:\s+(on|off))?)$/i;
 
 // ── Step push (分步直推) limits ──────────────────────────────────────────────
 /** Feishu allows 5 msg/s per chat; step push stays well below that. */
@@ -617,6 +619,7 @@ export class FeishuHarnessBridge {
   #contextEnhancement;
   #accessPolicy;
   #queues = new Map();
+  #busyMessages = new BusyMessageDispatcher();
   #batchInputs = new BatchInputManager();
   #pendingInteractions = new Map();
   #interactionKeys = new Map();
@@ -1388,7 +1391,27 @@ export class FeishuHarnessBridge {
       this.#interactionTasks.add(current);
       return current;
     }
-    return this.#enqueueMessage(event, messageId, key, processingReaction);
+    return this.#busyMessages.dispatch({
+      key, messageId, text: commandText,
+      eligible: () => event.message.message_type === 'text' && !hasImages && !hasFiles
+        && !hasReplyReference(commandMessage) && !isFeishuLocalCommand(commandText)
+        && !(NUMBER_REPLY.test(commandText) && this.#menus.has(key))
+        && canAutomaticallySteer(this.#accessPolicy, conversationType, senderOpenId(event)),
+      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: 'feishu', senderId: senderOpenId(event),
+          chatId: event.message.chat_id, threadId: event.message.thread_id }),
+      },
+      isQueued: () => this.#queues.has(key),
+      enqueue: (options) => this.#enqueueMessage(event, messageId, key, processingReaction, options),
+      send: (reply) => this.#send(event.message.chat_id, reply, { replyTo: messageId }),
+      onSteered: () => this.#finishReaction(messageId, processingReaction, 'DONE'),
+      onError: (error) => this.#handleMessageFailure(event, messageId, processingReaction, error),
+    });
   }
 
   #finishBatchResult(event, messageId, processingReaction, result) {
@@ -1545,6 +1568,7 @@ export class FeishuHarnessBridge {
   }
 
   async waitForIdle() {
+    await this.#busyMessages.whenIdle();
     // Drain to a fixed point: awaited work can register compensation or
     // another serialized tail before it settles.
     for (;;) {
@@ -1600,6 +1624,7 @@ export class FeishuHarnessBridge {
         deferredDelivery: this.#deferred,
         hasFiles: hasInboundFiles(message),
         pendingInteraction: this.#hasPendingInteraction(key),
+        busy: this.#queues.has(key),
         control: { owner: this, key },
         enhancement: captureContextEnhancementSource(
           this.#contextEnhancement,
@@ -1691,7 +1716,8 @@ export class FeishuHarnessBridge {
     // 命令识别对 text 与纯文本 post 一视同仁：post 富文本若仅含单个
     // 文本段落（如复制粘贴的 /new），同样按命令处理；带图片/文件不认。
     // accept() 侧已用 nonEmptyString(content) 判定，两侧保持一致。
-    const commandText = !hasImages && !hasFiles && text ? text.trim() : null;
+    const rawCommandText = text ? text.trim() : '';
+    const commandText = !hasImages && !hasFiles && text ? rawCommandText : null;
     if (!text && !hasImages && !hasFiles && !hasReply) {
       // An "@bot" with nothing else carries no instruction to parse, and the
       // menu card is what the reader is reaching for — answer it the way `/m`
@@ -1751,6 +1777,19 @@ export class FeishuHarnessBridge {
       }
       return;
     }
+    if (isClearCommand(rawCommandText)) {
+      const clearCommand = await runClearCommand(rawCommandText, this.#harness, this.#state, key, {
+        signal: this.#signal,
+        hasImages,
+        hasFiles,
+        pendingInteraction: this.#hasPendingInteraction(key),
+        busy: this.#queues.has(key),
+      });
+      if (clearCommand) {
+        await this.#send(event.message.chat_id, clearCommand.message, { replyTo: event.message.message_id });
+      }
+      return;
+    }
     if (SESSION_LIST_PREFIX.test(commandText)) {
       const argument = commandText.replace(/^\/(?:sessionlist|sessions)/i, '').trim();
       const request = parseSessionListArgument(argument);
@@ -2551,6 +2590,7 @@ export class FeishuHarnessBridge {
     actor = null,
     menuContext = null,
     newSessionActionId = null,
+    fromMessageQueue = false,
   }) {
     // Confirmations triggered by a card interaction stay anchored to the
     // card's message so they land inside the same Feishu topic.
@@ -2704,7 +2744,9 @@ export class FeishuHarnessBridge {
         await this.#handleNewSessionMenu({ key, chatId, messageId, menuContext, newSessionActionId });
         return;
       }
-      if (this.#queues.has(key) || this.#hasPendingInteraction(key)) {
+      // A queued menu pick runs after earlier messages; its own unfinished
+      // queue (including later messages) must not prevent the reset.
+      if ((!fromMessageQueue && this.#queues.has(key)) || this.#hasPendingInteraction(key)) {
         await reply(t('当前任务仍在运行，请先停止任务或等待任务完成后再开启新会话。'));
         return;
       }
@@ -2739,6 +2781,10 @@ export class FeishuHarnessBridge {
       await this.#handleCompact(key, chatId, messageId);
       return;
     }
+    if (action === 'clear') {
+      await this.#handleClear(key, chatId, messageId);
+      return;
+    }
     if (action === 'stop') {
       await this.#handleStop(key, chatId, messageId);
       return;
@@ -2927,7 +2973,9 @@ export class FeishuHarnessBridge {
         await this.#handleRepairCommand(event, '/repair');
         return;
       }
-      await this.#handleCardAction(action, { chatId, key, messageId: replyTo });
+      await this.#handleCardAction(action, {
+        chatId, key, messageId: replyTo, fromMessageQueue: action === 'new',
+      });
       return;
     }
     if (menu.kind === 'sessions') {
@@ -3509,6 +3557,22 @@ export class FeishuHarnessBridge {
     }
   }
 
+  /** Run /clear while retaining the current Session binding. */
+  async #handleClear(key, chatId, replyTo = null) {
+    try {
+      const result = await runClearCommand(
+        '/clear', this.#harness, this.#state, key, {
+          signal: this.#signal,
+          pendingInteraction: this.#hasPendingInteraction(key),
+          busy: this.#queues.has(key),
+        },
+      );
+      await this.#send(chatId, result?.message || t('清空当前会话上下文失败，当前会话未修改，请稍后重试。'), { replyTo });
+    } catch (error) {
+      await this.#sendFailure(chatId, error, { logLabel: 'clear', replyTo });
+    }
+  }
+
   /**
    * Stop the running task in the bound session (mirrors `/stop`).
    */

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

@@ -353,6 +353,7 @@ export function menuCard(ctx) {
   // ── 任务控制（对运行中任务的操作）────────────────────────
   elements.push({ tag: 'div', text: markdown(t('**任务控制**')) });
   elements.push(buttonPair(t('⏹ 停止'), 'stop', t('📐 压缩'), 'compact'));
+  elements.push(button(t('🧹 清空上下文'), 'clear'));
   elements.push({ tag: 'hr' });
 
   // ── 补充指令 + 归档切换（并列）────────────────────────────
@@ -573,6 +574,7 @@ export function menuHelpText() {
     '/status  连接状态',
     '/version  查看插件版本',
     '/compact  压缩当前会话上下文',
+    '/clear  清空当前会话上下文（保留 Session 绑定和历史记录）',
     '/history [数量]  查看最近历史消息（默认 3 条，最多 5 条）',
     '/archived on/off  会话列表显示/隐藏归档',
     '',
@@ -620,10 +622,11 @@ const HELP_CARD_FEATURES = [
   '6. 📋 会话/关注 — 查看/绑定会话，管理关注',
   '7. ⏹ 停止 — 停止当前任务',
   '8. 📐 压缩 — 压缩当前会话上下文',
-  '9. 补充指令 — 给 Agent 发送指令',
-  '10. 🗄 归档切换 — 显示/隐藏归档会话',
-  '11. 📊 状态 — 查看系统连接状态',
-  '12. 📖 帮助 — 查看本帮助',
+  '9. 🧹 清空上下文 — 清空上下文并保留绑定和历史记录',
+  '10. 补充指令 — 给 Agent 发送指令',
+  '11. 🗄 归档切换 — 显示/隐藏归档会话',
+  '12. 📊 状态 — 查看系统连接状态',
+  '13. 📖 帮助 — 查看本帮助',
 ].join('\n');
 
 const HELP_TEXT_COMMANDS = [
@@ -638,6 +641,7 @@ const HELP_TEXT_COMMANDS = [
   '`/workspacelist` — 列出工作区',
   '`/status` — 查看连接状态',
   '`/compact` — 压缩上下文',
+  '`/clear` — 清空上下文并保留 Session 绑定和历史记录',
   '`/stop` — 停止当前任务',
   '`/steer 指令` — 补充指令',
   '`/watch ID` — 关注会话',

package/src/channels/feishu/slash-command-panel.mjs

@@ -30,6 +30,7 @@ export const SLASH_COMMAND_MANIFEST = Object.freeze([
   { command: 'help', icon: 'promptword_outlined', default: '查看帮助', en_us: 'Show help' },
   { command: 'status', icon: 'ai-functions_outlined', default: '查看机器人状态', en_us: 'Show bot status' },
   { command: 'compact', icon: 'ai-block_outlined', default: '压缩当前会话上下文', en_us: 'Compact the current session' },
+  { command: 'clear', icon: 'clear_outlined', default: '清空当前会话上下文', en_us: 'Clear the current session context' },
   { command: 'sessionlist', icon: 'chat-ai_outlined', default: '列出会话', en_us: 'List sessions' },
   { command: 'workspacelist', icon: 'folder_outlined', default: '列出工作区', en_us: 'List workspaces' },
   { command: 'workspaces', icon: 'folder_outlined', default: '列出工作区', en_us: 'List workspaces' },

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

@@ -1,7 +1,9 @@
+import { BusyMessageDispatcher, canAutomaticallySteer } from '../shared/busy-message-dispatcher.mjs';
 import { isPermissionCommand, runPermissionCommand } from '../shared/permission-command.mjs';
 import { createDeferredDeliveryCoordinator, deferredOutcomeText } from '../shared/deferred-delivery-coordinator.mjs';
 import { runWorkspaceCommand } from '../shared/workspace-command.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,
@@ -101,6 +103,7 @@ function helpText() {
     t('/menu 或 /m  打开可点击的功能菜单'),
     t('/new  开启一个全新会话'),
     t('/compact  压缩当前会话的较早上下文'),
+    t('/clear  清空当前会话上下文（保留 Session 绑定和历史记录）'),
     t('/history [数量]  查看最近历史消息（默认 3 条，最多 5 条）'),
     t('/workspace 工作区序号或绝对路径  切换工作区'),
     t('/workspacelist  列出工作区绝对路径'),
@@ -445,6 +448,7 @@ export class QqHarnessBridge {
   #fetchImpl;
   #fileUploadTimeoutMs;
   #queues = new Map();
+  #busyMessages = new BusyMessageDispatcher();
   #pendingInteractions = new Map();
   #interactionKeys = new Map();
   // Keep the accepted configuration through the existing queue/reply lifecycle.
@@ -599,6 +603,7 @@ export class QqHarnessBridge {
     }
     const commandRunner = explicitMenu || numericMenu
       ? () => this.#runMenuCommand(message, menuInput, key)
+      : isClearCommand(commandText) ? runClearCommand
       : isHistoryCommand(commandText) ? runHistoryCommand
       : isPermissionCommand(commandText) ? runPermissionCommand
       : hasQqFileAttachments(message) ? null : isControlCommand(commandText)
@@ -683,7 +688,25 @@ export class QqHarnessBridge {
       pending.queue = current;
       return current;
     }
-    return this.#enqueueMessage(message, messageId, key);
+    return this.#busyMessages.dispatch({
+      key, messageId, text: commandText,
+      eligible: () => addressed && menuTextOnly && !explicitMenu && !numericMenu
+        && canAutomaticallySteer(this.#accessPolicy, message.kind === 'c2c' ? 'direct' : 'group', 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: 'qq', senderId: sender,
+          senderName: message.kind === 'group' ? message.senderName : undefined,
+          chatId: message.kind === 'group' ? message.groupOpenid : sender }),
+      },
+      isQueued: () => this.#queues.has(key),
+      enqueue: (options) => this.#enqueueMessage(message, messageId, key, options),
+      send: (reply) => addressed ? this.#bot.sendText(message.replyTarget, reply) : Promise.resolve(),
+      onError: (error) => this.#handleInteractionFailure(message, messageId, error),
+    });
   }
 
   #enqueueMessage(message, messageId, key, {
@@ -765,7 +788,7 @@ export class QqHarnessBridge {
     const pendingInteraction = this.#pendingInteractions.has(key) || this.#approvals.hasPending(key);
     const isBusy = () => this.#queues.has(key) || this.#pendingInteractions.has(key)
       || this.#approvals.hasPending(key) || this.#batchInputs.status(key).phase !== 'idle';
-    const needsIdle = /^\/(?:new|session|workspace|compact)(?:\s|$)/u.test(command);
+    const needsIdle = /^\/(?:new|session|workspace|compact|clear)(?:\s|$)/u.test(command);
     if (isBusy() && needsIdle) {
       return { message: t('当前任务仍在运行，请先停止任务或等待任务完成后再执行此操作。') };
     }
@@ -806,6 +829,7 @@ export class QqHarnessBridge {
         await this.#state.clearSession(key);
         return { message: t('已开启新会话。请发送你的问题。') };
       });
+      if (isClearCommand(command)) return runClearCommand(command, this.#harness, this.#state, key, options);
       if (command === '/compact') return runCompactCommand(command, this.#harness, this.#state, key, options);
       return runWorkspaceCommand(command, this.#harness, key);
     };
@@ -819,6 +843,7 @@ export class QqHarnessBridge {
   }
 
   async waitForIdle() {
+    await this.#busyMessages.whenIdle();
     await Promise.allSettled([
       ...this.#queues.values(),
       ...[...this.#pendingInteractions.values()].flatMap((pending) => (
@@ -843,6 +868,7 @@ export class QqHarnessBridge {
       hasFiles: hasQqFileAttachments(message),
       pendingInteraction: this.#pendingInteractions.has(key)
         || this.#approvals.hasPending(key),
+      busy: this.#queues.has(key),
       control: { owner: this, key },
       deferredDelivery: this.#deferred,
       enhancement: captureContextEnhancementSource(
@@ -1020,6 +1046,18 @@ export class QqHarnessBridge {
         await markMessageSeen();
         return;
       }
+      const clearCommand = await runClearCommand(text, this.#harness, this.#state, key, {
+        signal: this.#signal,
+        hasImages,
+        hasFiles,
+        pendingInteraction: this.#pendingInteractions.has(key) || this.#approvals.hasPending(key),
+        busy: this.#queues.has(key),
+      });
+      if (clearCommand) {
+        await this.#bot.sendText(target, clearCommand.message);
+        await markMessageSeen();
+        return;
+      }
       const workspaceCommand = hasImages || hasFiles
         ? null
         : await runWorkspaceCommand(text, this.#harness, key);

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

@@ -122,7 +122,7 @@ export async function qqMenuView(name, harness, state, key, { signal, busy = fal
       columns: 3, entries: name === 'status' ? [back()] : [
         section(t('💬 会话选择'), 'sessions'), section(t('📁 工作区'), 'workspaces'), section(t('🤖 模式／预设'), 'presets'),
         section(t('🧠 模型'), 'models'), command(t('🆕 新会话'), '/new'), section(t('📋 会话列表'), 'sessions'),
-        command(t('⏹ 停止'), '/stop'), command(t('📐 压缩'), '/compact'), section(t('💬 补充指令'), 'steer'),
+        command(t('⏹ 停止'), '/stop'), command(t('📐 压缩'), '/compact'), command(t('🧹 清空上下文'), '/clear'), section(t('💬 补充指令'), 'steer'),
         { label: t('切换归档显示'), action: { kind: 'archive', include: !archived } },
         section(t('📊 状态'), 'status'), section(t('📖 帮助'), 'help'),
       ] };
@@ -163,7 +163,7 @@ export async function qqMenuView(name, harness, state, key, { signal, busy = fal
     t('发送 /m 打开助手中心，点击按钮或回复当前列表的数字选择。'),
     t('设置：会话、工作区、模式／预设、模型。'),
     t('会话：新会话、会话列表、归档显示切换。'),
-    t('任务：停止、压缩、快捷或自定义补充指令。'),
+    t('任务：停止、压缩、清空上下文、快捷或自定义补充指令。'),
     t('信息：状态、帮助。'),
     t('菜单有效期为 15 分钟；发送普通消息会退出数字选择。'),
     t('回答问题、审批和批量输入时，数字优先用于当前交互。'),