@xmanrui/dsh-im 4.36.1 → 4.38.0

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('回答问题、审批和批量输入时，数字优先用于当前交互。'),

package/src/channels/shared/bot-workspace-store.mjs

@@ -1,4 +1,5 @@
 import { t } from './i18n.mjs';
+import { normalizeBusyMessageMode, validateBusyMessageMode } from './message-mode.mjs';
 import { atConnectionStage, connectionStageError, extractConnectionEvidence } from './connection-error.mjs';
 import { validateBotAlias, withBotAlias } from './bot-alias.mjs';
 import { defaultImWorkspace, ensureImWorkspaceDirectory, sameWorkspacePath } from './default-workspace.mjs';
@@ -307,6 +308,13 @@ function normalizeDocument(value) {
       } catch { /* A damaged display name must not disable the bot. */ }
     }
   }
+  const busyMessageModes = Object.create(null);
+  if (value.busyMessageModes && typeof value.busyMessageModes === 'object'
+    && !Array.isArray(value.busyMessageModes)) {
+    for (const [id, mode] of Object.entries(value.busyMessageModes)) {
+      if (Object.hasOwn(workspaces, id) && mode === 'steer') busyMessageModes[id] = mode;
+    }
+  }
   const accessPolicies = normalizeAccessPolicies(value.accessPolicies, workspaces);
   const version = Math.max(
     value.version,
@@ -324,6 +332,7 @@ function normalizeDocument(value) {
     deliveryTargets,
     accessPolicies,
     aliases,
+    busyMessageModes,
   };
 }
 
@@ -337,8 +346,10 @@ function storedDocument({
   deliveryTargets,
   accessPolicies,
   aliases,
+  busyMessageModes,
 }) {
   const document = { version, workspaces };
+  if (Object.keys(busyMessageModes).length > 0) document.busyMessageModes = busyMessageModes;
   if (Object.keys(aliases).length > 0) document.aliases = aliases;
   if (Object.keys(conversationWorkspaces).length > 0) {
     document.conversationWorkspaces = conversationWorkspaces;
@@ -400,6 +411,7 @@ export class BotWorkspaceStore {
   #agentPresets = {};
   #models = {};
   #aliases = Object.create(null);
+  #busyMessageModes = Object.create(null);
   #contextEnhancement = {};
   #deliveryTargets = Object.create(null);
   #accessPolicies = Object.create(null);
@@ -431,6 +443,7 @@ export class BotWorkspaceStore {
       this.#agentPresets = normalized.agentPresets;
       this.#models = normalized.models;
       this.#aliases = normalized.aliases;
+      this.#busyMessageModes = normalized.busyMessageModes;
       this.#contextEnhancement = normalized.contextEnhancement;
       this.#deliveryTargets = normalized.deliveryTargets;
       this.#accessPolicies = normalized.accessPolicies;
@@ -442,6 +455,7 @@ export class BotWorkspaceStore {
       this.#agentPresets = {};
       this.#models = {};
       this.#aliases = Object.create(null);
+      this.#busyMessageModes = Object.create(null);
       this.#contextEnhancement = {};
       this.#deliveryTargets = Object.create(null);
       this.#accessPolicies = Object.create(null);
@@ -519,6 +533,11 @@ export class BotWorkspaceStore {
     return this.has(id) && Object.hasOwn(this.#aliases, id) ? this.#aliases[id] : '';
   }
 
+  busyMessageModeFor(botId) {
+    const id = botIdOf(botId);
+    return normalizeBusyMessageMode(this.has(id) ? this.#busyMessageModes[id] : undefined);
+  }
+
   contextEnhancementFor(botId) {
     const id = botIdOf(botId);
     return this.has(id) && Object.hasOwn(this.#contextEnhancement, id)
@@ -890,6 +909,27 @@ export class BotWorkspaceStore {
     });
   }
 
+  async setBusyMessageMode(botId, value, { incarnation } = {}) {
+    const id = botIdOf(botId);
+    const expectedIncarnation = incarnation === undefined ? this.incarnationFor(id) : incarnation;
+    const mode = validateBusyMessageMode(value);
+    return this.#enqueue(id, async () => {
+      if (!this.has(id) || expectedIncarnation !== this.incarnationFor(id)) {
+        const error = new Error('找不到要修改的机器人。');
+        error.code = 'workspace-bot-not-found';
+        throw error;
+      }
+      const next = { ...this.#busyMessageModes };
+      if (mode === 'steer') next[id] = mode;
+      else delete next[id];
+      // Publish only after the same atomic write used by the other bot settings.
+      await this.#persist(this.#contextEnhancement, this.#deliveryTargets,
+        this.#version, this.#accessPolicies, this.#aliases, this.#conversationWorkspaces, next);
+      this.#busyMessageModes = next;
+      return mode;
+    });
+  }
+
   async setContextEnhancement(botId, value, { incarnation } = {}) {
     const id = botIdOf(botId);
     const expectedIncarnation = incarnation === undefined ? this.incarnationFor(id) : incarnation;
@@ -1253,6 +1293,7 @@ export class BotWorkspaceStore {
       ...Object.keys(this.#agentPresets),
       ...Object.keys(this.#models),
       ...Object.keys(this.#aliases),
+      ...Object.keys(this.#busyMessageModes),
       ...Object.keys(this.#contextEnhancement),
       ...Object.keys(this.#deliveryTargets),
       ...Object.keys(this.#accessPolicies),
@@ -1276,6 +1317,7 @@ export class BotWorkspaceStore {
           agentPreset: this.agentPresetFor(bot.botId),
           model: this.modelFor(bot.botId),
           contextEnhancement: this.contextEnhancementFor(bot.botId),
+          busyMessageMode: this.busyMessageModeFor(bot.botId),
           accessPolicy: this.accessPolicyFor(bot.botId),
         }
         : bot),
@@ -1314,17 +1356,19 @@ export class BotWorkspaceStore {
     const hadPreset = Object.hasOwn(this.#agentPresets, id);
     const hadModel = Object.hasOwn(this.#models, id);
     const hadAlias = Object.hasOwn(this.#aliases, id);
+    const hadMessageMode = Object.hasOwn(this.#busyMessageModes, id);
     const hadContextEnhancement = Object.hasOwn(this.#contextEnhancement, id);
     const hadDeliveryTargets = Object.hasOwn(this.#deliveryTargets, id);
     const hadAccessPolicy = Object.hasOwn(this.#accessPolicies, id);
     const hadConversationWorkspaces = Object.hasOwn(this.#conversationWorkspaces, id);
     const needsCleanup = hadWorkspace || hadPreset || hadModel || hadAlias || hadContextEnhancement
-      || hadDeliveryTargets || hadAccessPolicy || hadConversationWorkspaces
+      || hadDeliveryTargets || hadAccessPolicy || hadConversationWorkspaces || hadMessageMode
       || this.#dirtyRemovals.has(id);
     delete this.#workspaces[id];
     delete this.#agentPresets[id];
     delete this.#models[id];
     delete this.#aliases[id];
+    delete this.#busyMessageModes[id];
     delete this.#contextEnhancement[id];
     delete this.#deliveryTargets[id];
     delete this.#accessPolicies[id];
@@ -1365,6 +1409,7 @@ export class BotWorkspaceStore {
     accessPolicies = this.#accessPolicies,
     aliases = this.#aliases,
     conversationWorkspaces = this.#conversationWorkspaces,
+    busyMessageModes = this.#busyMessageModes,
   ) {
     await writeStoredDocument(this.#path, storedDocument({
       version,
@@ -1376,6 +1421,7 @@ export class BotWorkspaceStore {
       deliveryTargets,
       accessPolicies,
       aliases,
+      busyMessageModes,
     }));
     this.#dirtyRemovals.clear();
   }
@@ -1385,6 +1431,7 @@ export class BotWorkspaceStore {
       || Object.keys(this.#agentPresets).length > 0
       || Object.keys(this.#models).length > 0
       || Object.keys(this.#aliases).length > 0
+      || Object.keys(this.#busyMessageModes).length > 0
       || Object.keys(this.#contextEnhancement).length > 0
       || Object.keys(this.#deliveryTargets).length > 0
       || Object.keys(this.#accessPolicies).length > 0
@@ -1689,6 +1736,9 @@ export function createBotWorkspaceScope(
           }
         };
       }
+      if (property === 'currentBusyMessageMode') {
+        return () => isCurrentScope() ? workspaces.busyMessageModeFor(botId) : 'queue';
+      }
       if (property === 'currentWorkspace') {
         return () => {
           if (!isCurrentScope()) {
@@ -2252,6 +2302,23 @@ export function createWorkspaceAwareController(controller, {
       return result;
     });
   };
+  const updateBusyMessageMode = (botId, value, projectStatus) => {
+    const incarnation = workspaces.incarnationFor(botId);
+    const busyMessageMode = validateBusyMessageMode(value);
+    return withBotTransition(botId, async () => {
+      const snapshot = await decorate(await controller.status());
+      if (!snapshot?.bots?.some((bot) => bot?.botId === botId)) {
+        const error = new Error('找不到要修改的机器人。');
+        error.code = 'workspace-bot-not-found';
+        throw error;
+      }
+      const updated = { ...snapshot, bots: snapshot.bots.map((bot) => bot.botId === botId
+        ? { ...bot, busyMessageMode } : bot) };
+      const result = projectStatus ? await projectStatus(updated) : updated;
+      await workspaces.setBusyMessageMode(botId, busyMessageMode, { incarnation });
+      return result;
+    });
+  };
   const updateContextEnhancement = (botId, value, projectStatus) => {
     const incarnation = workspaces.incarnationFor(botId);
     const config = validateContextEnhancementConfig(value);
@@ -2369,6 +2436,7 @@ export function createWorkspaceAwareController(controller, {
       if (property === 'updateAgentPreset') return updateAgentPreset;
       if (property === 'updateModel') return updateModel;
       if (property === 'updateAlias') return updateAlias;
+      if (property === 'updateBusyMessageMode') return updateBusyMessageMode;
       if (property === 'updateContextEnhancement') return updateContextEnhancement;
       if (property === 'updateAccessPolicy') return updateAccessPolicy;
       const value = Reflect.get(target, property, target);

package/src/channels/shared/busy-message-dispatcher.mjs

@@ -0,0 +1,94 @@
+import { steerMessage } from './control-command.mjs';
+import { isSharedLocalCommand } from './command-permission.mjs';
+import { evaluateInboundAccess } from './inbound-access.mjs';
+import { normalizeBusyMessageMode } from './message-mode.mjs';
+import { t } from './i18n.mjs';
+import {
+  messageFailureDiagnostic, messageFailureText, setLastMessageFailure,
+} from './message-failure.mjs';
+
+export function canAutomaticallySteer(policy, conversationType, senderIds) {
+  // Legacy bridges have already checked their owner/allowlist at acceptance.
+  return !policy || evaluateInboundAccess(policy, {
+    conversationType, senderIds, text: '/steer', isCommand: true,
+  }).allowed;
+}
+
+/** Serialize only routing/submission, leaving the existing task queues intact. */
+export class BusyMessageDispatcher {
+  #tails = new Map();
+  #tasks = new Set();
+
+  dispatch({
+    key, messageId, text, commandText = text, eligible, harness, state, status,
+    control, signal, enhancement, pendingInteraction, acceptedMessageIds,
+    mode = harness.currentBusyMessageMode?.(), onFailure,
+    enqueue, isQueued, send, logger = console, onSteered, onError,
+  }) {
+    // Read once, before any await: a settings change cannot reinterpret this input.
+    const steer = normalizeBusyMessageMode(mode) === 'steer'
+      && (typeof eligible === 'function' ? eligible() : eligible) && Boolean(text?.trim()) && !isSharedLocalCommand(commandText);
+    const report = async (error) => {
+      onFailure?.(error);
+      if (signal?.aborted || error?.code === 'turn-stopped') return;
+      if (onError) return onError(error);
+      status.lastError = error?.message ?? String(error);
+      const failure = setLastMessageFailure(status, error);
+      logger.error?.('[dsh-im] failed to route a message:', messageFailureDiagnostic(error, failure));
+      await Promise.resolve().then(() => send(messageFailureText(failure))).catch(() => undefined);
+    };
+    const queue = (alreadyRecorded = false) => {
+      const waiting = isQueued();
+      // Reserve FIFO position before sending the optional receipt.
+      const completion = enqueue({ alreadyRecorded });
+      const receipt = waiting
+        ? Promise.resolve().then(() => send(t('已排队，等待前序消息处理。'))).catch((error) => {
+            logger.warn?.('[dsh-im] failed to send queue receipt:', error);
+          })
+        : Promise.resolve();
+      return { completion: Promise.all([completion, receipt]).then(([result]) => result) };
+    };
+    const route = async () => {
+      signal?.throwIfAborted();
+      if (!steer || pendingInteraction()) return queue();
+      if (state.hasSeen(messageId)) return {};
+      await state.markSeen(messageId);
+      status.messagesReceived = (status.messagesReceived ?? 0) + 1;
+      status.lastMessageAt = new Date().toISOString();
+      signal?.throwIfAborted();
+      const submitted = await steerMessage(text, harness, state, key, {
+        signal, control, enhancement, pendingInteraction: pendingInteraction(),
+      });
+      if (!submitted) return queue(true);
+      // Submission is final even if its receipt fails.
+      await send(t('已提交补充指令，Agent 会在下一步读取。'));
+      await onSteered?.();
+      status.lastError = null;
+      return {};
+    };
+
+    const previous = this.#tails.get(key);
+    // Preserve synchronous queue reservation for the default/attachment path.
+    const routed = !previous && !steer
+      ? Promise.resolve(queue())
+      : (previous ?? Promise.resolve()).catch(() => undefined).then(route);
+    const tail = routed.then(() => undefined, () => undefined);
+    this.#tails.set(key, tail);
+    void tail.then(() => {
+      if (this.#tails.get(key) === tail) this.#tails.delete(key);
+    });
+    const task = routed.catch(async (error) => {
+      await report(error);
+      return {};
+    }).then(({ completion }) => completion).finally(() => {
+      acceptedMessageIds.delete(messageId);
+      this.#tasks.delete(task);
+    });
+    this.#tasks.add(task);
+    return task;
+  }
+
+  async whenIdle() {
+    await Promise.allSettled([...this.#tasks]);
+  }
+}

package/src/channels/shared/clear-command.mjs

@@ -0,0 +1,85 @@
+import { t } from './i18n.mjs';
+import { WORKSPACE_SESSION_STALE } from './workspace-session.mjs';
+
+const CLEAR_COMMAND = /^\/clear(?=$|\s)([\s\S]*)$/iu;
+const CLEAR_USAGE = '用法：/clear（不带参数且不可附带图片或文件）';
+
+function commandResult(message) {
+  return { handled: true, message, messages: [message] };
+}
+
+function clearErrorMessage(error) {
+  const code = error?.code ?? error?.failure?.code;
+  if (code === 'session-not-found') {
+    return t('当前聊天绑定的会话已不存在，未清空上下文；请先发送新消息开启会话。');
+  }
+  if (code === 'agent-busy' || code === 'pending-interaction') {
+    return t('当前会话正在生成回复或等待交互，请先完成交互或发送 /stop，再执行 /clear。');
+  }
+  if (code === 'cancelled' || error?.name === 'AbortError') {
+    return t('上下文清理已取消，当前会话未修改。');
+  }
+  if (code === WORKSPACE_SESSION_STALE || code === 'workspace-bot-not-found') {
+    return t('工作区或机器人状态已发生变化，未清空当前会话，请重试。');
+  }
+  if (code === 'commands-unavailable') {
+    return t('当前 Host 不支持 /clear，当前会话未修改。');
+  }
+  return t('清空当前会话上下文失败，当前会话未修改，请稍后重试。');
+}
+
+/**
+ * Execute Host's argument-free /clear command without changing the dsh-im
+ * Session binding. Hosts that do not register /clear return undefined and
+ * are reported explicitly; the command never falls back to /new.
+ */
+export async function runClearCommand(text, harness, state, conversationKey, options = {}) {
+  if (!isClearCommand(text)) return null;
+  const match = CLEAR_COMMAND.exec(text.trim());
+  if (match[1].trim() || options.hasImages || options.hasFiles) {
+    return commandResult(t(CLEAR_USAGE));
+  }
+  if (options.pendingInteraction || options.busy) {
+    return commandResult(t('当前会话正在生成回复或等待交互，请先完成交互或发送 /stop，再执行 /clear。'));
+  }
+  if (typeof state?.sessionFor !== 'function') {
+    return commandResult(t('当前机器人没有可用的会话状态，未清空当前会话。'));
+  }
+  const sessionId = state.sessionFor(conversationKey);
+  if (typeof sessionId !== 'string' || !sessionId) {
+    return commandResult(t('当前聊天还没有可清空的会话，请先发送一条消息。'));
+  }
+  try {
+    let execution;
+    if (typeof harness?.workspaceSession === 'function') {
+      const session = harness.workspaceSession(sessionId, conversationKey);
+      if (typeof session?.executeCommand !== 'function') {
+        return commandResult(t('当前 Host 不支持 /clear，当前会话未修改。'));
+      }
+      execution = await session.executeCommand('/clear', options);
+    } else {
+      if (typeof harness?.executeCommand !== 'function') {
+        return commandResult(t('当前 Host 不支持 /clear，当前会话未修改。'));
+      }
+      execution = await harness.executeCommand(sessionId, '/clear', options);
+    }
+    if (execution === undefined) {
+      return commandResult(t('当前 Host 不支持 /clear，当前会话未修改。'));
+    }
+    const result = execution?.result;
+    if (!result || !['success', 'error'].includes(result.kind)
+      || (result.text !== undefined && typeof result.text !== 'string')) {
+      return commandResult(t('清空当前会话上下文失败，当前会话未修改，请稍后重试。'));
+    }
+    if (result.kind === 'error') {
+      return commandResult(clearErrorMessage({ ...result, failure: result.failure ?? result }));
+    }
+    return commandResult(t('当前会话上下文已清空；Session 绑定和历史记录仍保留。'));
+  } catch (error) {
+    return commandResult(clearErrorMessage(error));
+  }
+}
+
+export function isClearCommand(text) {
+  return typeof text === 'string' && CLEAR_COMMAND.test(text.trim());
+}

package/src/channels/shared/command-catalog.mjs

@@ -29,6 +29,9 @@ export const SHARED_COMMAND_CATALOG = Object.freeze([
   defineCatalogCommand('compact', '压缩当前会话的较早上下文', [
     '/compact  压缩当前会话的较早上下文',
   ]),
+  defineCatalogCommand('clear', '清空当前会话上下文并保留会话绑定', [
+    '/clear  清空当前会话上下文（保留 Session 绑定和历史记录）',
+  ]),
   defineCatalogCommand('history', '查看最近历史消息（仅私聊）', [
     '/history [数量]  查看最近历史消息（默认 3 条，最多 5 条）',
   ], { privateOnly: true }),

package/src/channels/shared/command-permission.mjs

@@ -1,5 +1,6 @@
 import { isBatchInputCommand } from './batch-input.mjs';
 import { isCompactCommand } from './compact-command.mjs';
+import { isClearCommand } from './clear-command.mjs';
 import { isControlCommand } from './control-command.mjs';
 import { isHistoryCommand } from './history-command.mjs';
 import { isModelCommand } from './model-command.mjs';
@@ -20,6 +21,7 @@ export function isSharedLocalCommand(text, {
   const command = text.trim();
   if (!command) return false;
   if (isBatchInputCommand(command) || isHistoryCommand(command)) return true;
+  if (isClearCommand(command)) return true;
   if (!hasFiles && (
     isControlCommand(command)
     || isModelCommand(command)

package/src/channels/shared/control-command.mjs

@@ -36,6 +36,23 @@ export function isControlCommand(text) {
   return typeof text === 'string' && CONTROL_COMMAND.test(text.trim());
 }
 
+// Shared by explicit /steer and ordinary messages configured to steer. A false
+// result guarantees no submission; exceptions must never trigger a second ask.
+export async function steerMessage(text, harness, state, key, {
+  signal, control, enhancement, pendingInteraction = false,
+} = {}) {
+  if (pendingInteraction) return false;
+  const session = boundSession(harness, state, key);
+  if (!session) return false;
+  if (typeof session.steerActiveTurn !== 'function') {
+    throw new TypeError('Harness session does not support steering active turns');
+  }
+  const steering = enhancement
+    ? enhanceContextContent(text, enhancement.snapshot, enhancement.source)
+    : text;
+  return session.steerActiveTurn(steering, control, requestOptions(signal));
+}
+
 export async function runControlCommand(text, harness, state, key, {
   signal,
   hasImages = false,
@@ -92,19 +109,11 @@ export async function runControlCommand(text, harness, state, key, {
   if (!session) {
     return commandResult(t('当前聊天没有绑定会话，无法补充指令。请先绑定会话。'));
   }
-  if (typeof session.steerActiveTurn !== 'function') {
-    throw new TypeError('Harness session does not support steering active turns');
-  }
   // A mid-turn correction carries the same provenance as the message that
   // opened the turn, so a group member who steers is identified too.
-  const steering = enhancement
-    ? enhanceContextContent(instruction, enhancement.snapshot, enhancement.source)
-    : instruction;
-  const steered = await session.steerActiveTurn(
-    steering,
-    control,
-    requestOptions(signal),
-  );
+  const steered = await steerMessage(instruction, harness, state, key, {
+    signal, control, enhancement,
+  });
   return steered
     ? commandResult(t('已提交补充指令，Agent 会在下一步读取。'))
     : commandResult(t('任务已结束，没有正在运行的任务，无法补充指令。请直接发送消息开始新任务。'));