@xmanrui/dsh-im 2.0.1 → 2.1.0

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

@@ -14,6 +14,7 @@ const CALLBACK_PROBE_SUCCESS_NOTICE = '✅ 修复完成：已实测收到 card.a
 const CALLBACK_PROBE_TIMEOUT_NOTICE = '⚠️ 修复验证超时：未收到测试卡按钮的 card.action.trigger，不能确认按钮已修复。请不要重复授权；先检查飞书开放平台的卡片回调配置，确认后再发送 /repair。';
 const CALLBACK_PROBE_SEND_FAILURE_NOTICE = '⚠️ 修复验证失败：无法发送专用测试卡，不能确认 card.action.trigger 已恢复。请不要重复授权；先检查机器人消息权限和连接状态。';
 const CALLBACK_PROBE_ABORT_NOTICE = '⚠️ 修复验证中断：Runtime 已停止，未完成 card.action.trigger 实测，不能确认修复成功。请不要重复授权；先等待机器人恢复连接。';
+const REUSABLE_WS_STATES = new Set(['connected', 'connecting', 'reconnecting']);
 
 function nonEmptyString(value) {
   return typeof value === 'string' && value.trim() ? value.trim() : null;
@@ -24,6 +25,15 @@ function strictCardOperatorOpenId(event) {
     ?? nonEmptyString(event?.operator?.operator_id?.open_id);
 }
 
+function websocketState(wsClient, fallback) {
+  try {
+    const state = wsClient?.getConnectionStatus?.()?.state;
+    return typeof state === 'string' && state ? state : fallback;
+  } catch {
+    return fallback;
+  }
+}
+
 function probeError(code, message) {
   const error = new Error(message);
   error.code = code;
@@ -104,6 +114,7 @@ export class FeishuRuntime {
   #bridge = null;
   #wsClient = null;
   #starting = null;
+  #stopping = null;
   #abortController = null;
   #pendingCardActionProbes = new Map();
   #status;
@@ -170,25 +181,59 @@ export class FeishuRuntime {
   }
 
   async start() {
-    if (this.#wsClient && this.#status.ready) return this.status;
-    if (this.#starting) return this.#starting;
+    while (true) {
+      while (this.#stopping) await this.#stopping;
+      if (this.#starting) return this.#starting;
+
+      const wsClient = this.#wsClient;
+      if (wsClient) {
+        const state = websocketState(wsClient, this.#status.feishuLongConnectionState);
+        if (REUSABLE_WS_STATES.has(state)) return this.status;
+
+        await this.stop({ preserveError: state === 'failed' });
+        continue;
+      }
+
+      // A partial/failed attempt may have created resources before its
+      // WSClient became observable. Drain them before assigning a new attempt.
+      if (this.#client || this.#bridge || this.#abortController) {
+        await this.stop({
+          preserveError: this.#status.feishuLongConnectionState === 'failed',
+        });
+        continue;
+      }
+
+      break;
+    }
 
-    this.#starting = this.#start().finally(() => {
-      this.#starting = null;
+    let starting;
+    starting = this.#start().finally(() => {
+      if (this.#starting === starting) this.#starting = null;
     });
-    return this.#starting;
+    this.#starting = starting;
+    return starting;
   }
 
   async #start() {
     const abortController = new AbortController();
     this.#abortController = abortController;
     const { signal } = abortController;
+    const abortError = () => (
+      signal.reason ?? new DOMException('Feishu runtime stopped', 'AbortError')
+    );
+    const isCurrentStart = () => (
+      !signal.aborted && this.#abortController === abortController
+    );
+    const assertCurrentStart = () => {
+      if (!isCurrentStart()) throw abortError();
+    };
     this.#status.startedAt = new Date().toISOString();
     this.#status.feishuLongConnectionState = 'connecting';
     this.#status.lastError = null;
 
     try {
       await this.#harness.ensureRunning({ signal });
+      assertCurrentStart();
       this.#status.harnessReachable = true;
 
       const sdkDomain = this.#domain === 'lark'
@@ -204,13 +249,14 @@ export class FeishuRuntime {
         this.#requestTimeoutMs,
       );
       if (httpInstance) larkConfig.httpInstance = httpInstance;
-      this.#client = new this.#lark.Client(larkConfig);
+      const client = new this.#lark.Client(larkConfig);
+      this.#client = client;
       const channel = new VerifiedFeishuChannel({
-        client: this.#client,
+        client,
         initialText: t('已连接 DeepSeek Harness，正在思考…'),
       });
-      this.#bridge = new FeishuHarnessBridge({
-        client: this.#client,
+      const bridge = new FeishuHarnessBridge({
+        client,
         channel,
         harness: this.#harness,
         state: this.#state,
@@ -226,22 +272,22 @@ export class FeishuRuntime {
         signal,
         logger: this.#logger,
       });
+      this.#bridge = bridge;
 
       const dispatcher = new this.#lark.EventDispatcher({}).register({
         'im.message.receive_v1': (event) => {
-          this.#bridge.accept(event);
-          return {};
+          if (isCurrentStart()) void bridge.accept(event);
         },
-        'im.message.reaction.created_v1': () => ({}),
-        'im.message.reaction.deleted_v1': () => ({}),
+        'im.message.reaction.created_v1': () => undefined,
+        'im.message.reaction.deleted_v1': () => undefined,
         // Interactive-card button callbacks (only delivered when the app
         // subscribes card.action.trigger; the number-reply fallback covers
         // apps that do not).
         'card.action.trigger': (event) => {
+          if (!isCurrentStart()) return;
           this.#status.cardActionsReceived += 1;
           this.#status.lastCardActionAt = new Date().toISOString();
-          if (!this.#consumeCardActionProbe(event)) this.#bridge.onCardAction(event);
-          return {};
+          if (!this.#consumeCardActionProbe(event)) void bridge.onCardAction(event);
         },
       });
 
@@ -249,37 +295,49 @@ export class FeishuRuntime {
       let settleError;
       const ready = new Promise((resolve, reject) => {
         let settled = false;
-        const timer = setTimeout(() => {
+        const onAbort = () => {
+          settleError(abortError());
+        };
+        const settle = (callback, value) => {
           if (settled) return;
           settled = true;
-          reject(new Error(`Feishu WebSocket handshake timed out after ${this.#connectTimeoutMs}ms`));
+          clearTimeout(timer);
+          signal.removeEventListener('abort', onAbort);
+          callback(value);
+        };
+        const timer = setTimeout(() => {
+          settle(
+            reject,
+            new Error(`Feishu WebSocket handshake timed out after ${this.#connectTimeoutMs}ms`),
+          );
         }, this.#connectTimeoutMs);
         settleReady = () => {
-          if (settled) return;
-          settled = true;
-          clearTimeout(timer);
-          resolve();
+          settle(resolve);
         };
         settleError = (error) => {
-          if (settled) return;
-          settled = true;
-          clearTimeout(timer);
-          reject(error);
+          settle(reject, error);
         };
+        signal.addEventListener('abort', onAbort, { once: true });
+        if (signal.aborted) onAbort();
       });
+      // The SDK constructor can throw before Promise.all attaches below.
+      // Keep the abort-driven rejection observed in that path as well.
+      void ready.catch(() => undefined);
 
-      this.#wsClient = new this.#lark.WSClient({
+      const wsClient = new this.#lark.WSClient({
         ...larkConfig,
         ...(this.#wsAgent ? { agent: this.#wsAgent } : {}),
         loggerLevel: this.#lark.LoggerLevel.info,
-        handshakeTimeoutMs: 15000,
+        handshakeTimeoutMs: this.#connectTimeoutMs,
         onReady: () => {
+          if (!isCurrentStart()) return;
           this.#status.feishuLongConnectionState = 'connected';
           this.#status.ready = true;
           this.#status.lastError = null;
           settleReady();
         },
         onError: (error) => {
+          if (!isCurrentStart()) return;
           this.#status.feishuLongConnectionState = 'failed';
           this.#status.ready = false;
           this.#status.lastError = error?.message ?? String(error);
@@ -287,25 +345,35 @@ export class FeishuRuntime {
           settleError(error);
         },
         onReconnecting: () => {
+          if (!isCurrentStart()) return;
           this.#status.feishuLongConnectionState = 'reconnecting';
           this.#status.ready = false;
         },
         onReconnected: () => {
+          if (!isCurrentStart()) return;
           this.#status.feishuLongConnectionState = 'connected';
           this.#status.ready = true;
           this.#status.lastError = null;
         },
       });
-      await this.#wsClient.start({ eventDispatcher: dispatcher }).catch((error) => {
-        settleError(error);
-      });
-      await ready;
+      this.#wsClient = wsClient;
+      const wsStarted = Promise.resolve()
+        .then(() => wsClient.start({ eventDispatcher: dispatcher }))
+        .catch((error) => {
+          settleError(error);
+          throw error;
+        });
+      await Promise.all([wsStarted, ready]);
+      assertCurrentStart();
       return this.status;
     } catch (error) {
+      // stop() owns the terminal idle state for an explicitly aborted start.
+      // In particular, do not let the rejected handshake waiter overwrite it.
+      if (signal.aborted) throw error;
       this.#status.ready = false;
       this.#status.feishuLongConnectionState = 'failed';
       this.#status.lastError = error?.message ?? String(error);
-      await this.stop({ preserveError: true });
+      await this.#cleanup({ preserveError: true, abortController });
       throw error;
     }
   }
@@ -492,10 +560,30 @@ export class FeishuRuntime {
     });
   }
 
-  async stop({ preserveError = false } = {}) {
-    const error = preserveError ? this.#status.lastError : null;
+  stop(options = {}) {
+    if (this.#stopping) return this.#stopping;
+
+    let stopping;
+    stopping = this.#stop(options).finally(() => {
+      if (this.#stopping === stopping) this.#stopping = null;
+    });
+    this.#stopping = stopping;
+    return stopping;
+  }
+
+  async #stop({ preserveError = false } = {}) {
     const abortController = this.#abortController;
-    this.#abortController = null;
+    if (this.#abortController === abortController) this.#abortController = null;
+    abortController?.abort(new DOMException('Feishu runtime stopped', 'AbortError'));
+
+    const starting = this.#starting;
+    if (starting) await starting.catch(() => undefined);
+    return this.#cleanup({ preserveError, abortController });
+  }
+
+  async #cleanup({ preserveError = false, abortController } = {}) {
+    const error = preserveError ? this.#status.lastError : null;
+    if (this.#abortController === abortController) this.#abortController = null;
     abortController?.abort(new DOMException('Feishu runtime stopped', 'AbortError'));
     for (const probe of this.#pendingCardActionProbes.values()) {
       clearTimeout(probe.timeout);
@@ -508,14 +596,12 @@ export class FeishuRuntime {
     }
     this.#pendingCardActionProbes.clear();
     this.#status.ready = false;
-    if (this.#wsClient) {
-      this.#wsClient.close({ force: true });
-      this.#wsClient = null;
-    }
-    if (this.#bridge) {
-      await this.#bridge.waitForIdle();
-      this.#bridge = null;
-    }
+    const wsClient = this.#wsClient;
+    this.#wsClient = null;
+    wsClient?.close({ force: true });
+    const bridge = this.#bridge;
+    this.#bridge = null;
+    if (bridge) await bridge.waitForIdle();
     this.#client = null;
     this.#status.feishuLongConnectionState = preserveError ? 'failed' : 'idle';
     this.#status.lastError = error;

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

@@ -70,7 +70,7 @@ export async function runControlCommand(text, harness, state, key, {
 
   const session = boundSession(harness, state, key);
   if (!session) {
-    return commandResult(t('当前聊天没有正在运行的任务，请直接发送普通消息。'));
+    return commandResult(t('当前聊天没有绑定会话，无法补充指令。请先绑定会话。'));
   }
   if (typeof session.steerActiveTurn !== 'function') {
     throw new TypeError('Harness session does not support steering active turns');
@@ -82,5 +82,5 @@ export async function runControlCommand(text, harness, state, key, {
   );
   return steered
     ? commandResult(t('已提交补充指令，Agent 会在下一步读取。'))
-    : commandResult(t('当前聊天没有正在运行的任务，请直接发送普通消息。'));
+    : commandResult(t('任务已结束，没有正在运行的任务，无法补充指令。请直接发送消息开始新任务。'));
 }

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

@@ -223,6 +223,11 @@ function workspaceSessions(workspace, archivedSessionIds, sessionList) {
         origin: summary?.origin === 'subagent' ? 'subagent' : null,
         summaryAvailable: summary !== undefined,
       };
+      const lastSeq = summary?.projections?.asOfSeq;
+      // This is the projection's durable lower bound, not necessarily the live
+      // log tail for a cold session. Harness uses -1 as the legitimate bound
+      // for a session with no projected events yet.
+      if (Number.isSafeInteger(lastSeq) && lastSeq >= -1) session.lastSeq = lastSeq;
       const time = sessionTimeMs(summary);
       if (time !== null) session.time = time;
       return session;

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

@@ -131,8 +131,130 @@ export default {
   '已取消关注「{title}」。': 'Unwatched "{title}".',
   '取消失败：{message}': 'Could not unwatch: {message}',
   '飞书交互问题发送失败。': 'Failed to send the Feishu interaction question.',
+  '当前任务仍在运行，请先停止任务或等待任务完成后再开启新会话。':
+    'The current task is still running. Stop it or wait for it to finish before starting a new session.',
+  '请输入补充指令后再提交。': 'Enter an instruction before submitting.',
+  '操作过于频繁，请稍后再试。': 'Too many card actions are pending. Please try again shortly.',
+  '卡片操作失败，请稍后重试。': 'The card action failed. Please try again later.',
+  '请先选择至少一个会话。': 'Select at least one session first.',
+  '已批量关注 {count} 个会话。': 'Now watching {count} sessions.',
+  '已批量关注 {count} 个会话，另有 {failed} 个未成功。':
+    'Now watching {count} sessions; {failed} could not be processed.',
+  '已关注（或已达关注上限）。': 'Sessions are already watched, or the watch limit has been reached.',
+  '已取消关注 {count} 个会话。': 'Stopped watching {count} sessions.',
+  '已取消关注 {count} 个会话，另有 {failed} 个未成功。':
+    'Stopped watching {count} sessions; {failed} could not be processed.',
+  '所选会话均未处理成功，请稍后重试。':
+    'None of the selected sessions could be processed. Please try again later.',
+  '所选会话已在关注列表中。': 'The selected sessions are already being watched.',
+  '所选会话已不在关注列表中。': 'The selected sessions are no longer in the watch list.',
+  '未取消任何关注。': 'No watches were removed.',
+  '当前没有绑定的会话，请先从会话列表选择。':
+    'No session is currently bound. Select one from the session list first.',
+  '已就绪，直接发消息即可继续当前会话。':
+    'Ready. Send a message to continue the current session.',
+  '修复需在私聊中验证接入者身份，请直接发送 /repair 开始。':
+    'Repair must verify the owner in a direct chat. Send /repair there to begin.',
+  '暂时无法获取预设列表，请稍后重试。':
+    'Could not load the preset list. Please try again later.',
+  '暂时无法获取系统状态，请稍后重试。':
+    'Could not load system status. Please try again later.',
+  '连接正常': 'Connected',
+  '预设：{preset}': 'Preset: {preset}',
+  '未知': 'Unknown',
+  '/stop 执行完成。': '/stop completed.',
+  '停止任务失败，请稍后重试。': 'Could not stop the task. Please try again later.',
+  '已提交补充指令。': 'Instruction submitted.',
+  '预设重置失败，请稍后重试。': 'Could not reset the preset. Please try again later.',
+  '预设切换失败，请稍后重试。': 'Could not switch the preset. Please try again later.',
 
   // feishu/feishu-cards.mjs — interactive cards
+  '🤖 助手中心': '🤖 Assistant center',
+  '**设置**': '**Settings**',
+  '切换会话': 'Switch session',
+  '选择会话（当前未绑定）': 'Select a session (none currently bound)',
+  '跟随默认': 'Follow default',
+  '切换预设': 'Switch preset',
+  '切换模型': 'Switch model',
+  '当前工作区暂无可用会话。': 'There are no available sessions in the current workspace.',
+  '🤖 切换预设': '🤖 Switch preset',
+  '🧠 切换模型': '🧠 Switch model',
+  '🆕 新会话': '🆕 New session',
+  '📋 会话/关注': '📋 Sessions / watches',
+  '🗂 工作区列表': '🗂 Workspace list',
+  '**任务控制**': '**Task controls**',
+  '⏹ 停止': '⏹ Stop',
+  '📐 压缩': '📐 Compact',
+  '**补充指令**': '**Steer task**',
+  '选择补充指令': 'Choose an instruction',
+  '继续': 'Continue',
+  '加速运行': 'Move faster',
+  '总结当前进展': 'Summarize current progress',
+  '更简洁些': 'Be more concise',
+  '更详细些': 'Be more detailed',
+  '✏️ 更多 / 自定义…': '✏️ More / custom…',
+  '🗄 归档：{state}': '🗄 Archived: {state}',
+  '已显示': 'shown',
+  '已隐藏': 'hidden',
+  '切换归档显示': 'Toggle archived sessions',
+  '📊 状态': '📊 Status',
+  '📖 帮助': '📖 Help',
+  '**数字兜底**\n**1**工作区列表 · **2**新会话 · **3**会话列表 · **4**状态\n**5**🔧修复 · **6**帮助':
+    '**Number fallback**\n**1** Workspace list · **2** New session · **3** Session list · **4** Status\n**5** 🔧 Repair · **6** Help',
+  '跟随 Host 默认{default}': 'Follow Host default{default}',
+  '**当前**：{value}': '**Current**: {value}',
+  '**Host 默认**：{value}': '**Host default**: {value}',
+  '未设置': 'Not set',
+  '选择预设': 'Select a preset',
+  '🔄 跟随默认': '🔄 Follow default',
+  '当前没有可选择的预设。': 'There are no presets to choose from.',
+  '🤖 预设列表': '🤖 Preset list',
+  '**当前模型**：{model}': '**Current model**: {model}',
+  '选择模型': 'Select a model',
+  '🧠 模型列表': '🧠 Model list',
+  '{icon} 飞书机器人{state}': '{icon} Feishu bot {state}',
+  '已连接': 'connected',
+  '未连接': 'disconnected',
+  '📂 工作区：`{workspace}`': '📂 Workspace: `{workspace}`',
+  '🤖 预设：{preset}': '🤖 Preset: {preset}',
+  '🧠 模型：{model}': '🧠 Model: {model}',
+  '💬 会话：{count} 个': '💬 Sessions: {count}',
+  '📊 系统状态': '📊 System status',
+  '📋 会话 / 工作区': '📋 Sessions / workspace',
+  '/sessionlist  列出工作区会话': '/sessionlist  List workspace sessions',
+  '/session ID  绑定已有会话': '/session ID  Bind an existing session',
+  '/workspacelist  列出工作区': '/workspacelist  List workspaces',
+  '/workspace 路径  切换工作区': '/workspace PATH  Switch workspace',
+  '/new  开启全新会话': '/new  Start a new session',
+  '📊 状态 / 压缩': '📊 Status / compact',
+  '/status  连接状态': '/status  Connection status',
+  '/compact  压缩当前会话上下文': '/compact  Compact the current session context',
+  '/archived on/off  会话列表显示/隐藏归档': '/archived on/off  Show/hide archived sessions',
+  '👁 关注': '👁 Watches',
+  '/watch ID  关注会话（完成后推送）': '/watch ID  Watch a session (push on completion)',
+  '/watchlist  关注列表': '/watchlist  List watched sessions',
+  '/unwatch ID  取消关注': '/unwatch ID  Stop watching a session',
+  '🤖 预设 / 模型': '🤖 Presets / models',
+  '/models  列出模型': '/models  List models',
+  '/model 2  按序号切换模型': '/model 2  Switch model by index',
+  '🎮 任务控制': '🎮 Task controls',
+  '/steer 指令  给 Agent 补充指令': '/steer INSTRUCTION  Steer the Agent',
+  '**📋 卡片功能**\n\n1. 会话下拉 — 切换当前绑定会话\n2. 工作区下拉 — 切换工作区\n3. 🤖 预设下拉 — 切换 Agent 预设\n4. 🧠 模型下拉 — 切换模型\n5. 🆕 新会话 — 开启全新会话\n6. 📋 会话/关注 — 查看/绑定会话，管理关注\n7. ⏹ 停止 — 停止当前任务\n8. 📐 压缩 — 压缩当前会话上下文\n9. 补充指令 — 给 Agent 发送指令\n10. 🗄 归档切换 — 显示/隐藏归档会话\n11. 📊 状态 — 查看系统连接状态\n12. 📖 帮助 — 查看本帮助':
+    '**📋 Card features**\n\n1. Session dropdown — switch the bound session\n2. Workspace dropdown — switch workspace\n3. 🤖 Preset dropdown — switch Agent Preset\n4. 🧠 Model dropdown — switch model\n5. 🆕 New session — start fresh\n6. 📋 Sessions/watches — view or bind sessions and manage watches\n7. ⏹ Stop — stop the current task\n8. 📐 Compact — compact the current session context\n9. Steer task — send an instruction to the Agent\n10. 🗄 Archived toggle — show or hide archived sessions\n11. 📊 Status — view connection status\n12. 📖 Help — view this help',
+  '**⌨️ 文本命令**\n\n`/m` — 打开菜单卡片\n`/new` — 开启全新会话\n`/session ID` — 绑定已有会话\n`/sessionlist [工作区]` — 列出会话\n`/workspace 路径` — 切换工作区\n`/workspacelist` — 列出工作区\n`/status` — 查看连接状态\n`/compact` — 压缩上下文\n`/stop` — 停止当前任务\n`/steer 指令` — 补充指令\n`/watch ID` — 关注会话\n`/watchlist` — 关注列表\n`/unwatch ID` — 取消关注\n`/archived on/off` — 归档显隐\n`/presetlist` — 列出预设\n`/preset [序号/ID]` — 切换预设\n`/preset --default` — 跟随默认\n`/models` — 列出模型\n`/model 2` — 切换模型\n`/repair` — 修复卡片按钮':
+    '**⌨️ Text commands**\n\n`/m` — open the menu card\n`/new` — start a new session\n`/session ID` — bind an existing session\n`/sessionlist [workspace]` — list sessions\n`/workspace PATH` — switch workspace\n`/workspacelist` — list workspaces\n`/status` — view connection status\n`/compact` — compact context\n`/stop` — stop the current task\n`/steer INSTRUCTION` — steer the task\n`/watch ID` — watch a session\n`/watchlist` — list watched sessions\n`/unwatch ID` — stop watching\n`/archived on/off` — show or hide archived sessions\n`/presetlist` — list presets\n`/preset [index/ID]` — switch preset\n`/preset --default` — follow default\n`/models` — list models\n`/model 2` — switch model\n`/repair` — repair card buttons',
+  '**💡 数字兜底**\n回复数字快速操作：\n**1**工作区列表 · **2**新会话 · **3**会话/关注\n**4**状态 · **5**修复 · **6**帮助':
+    '**💡 Number fallback**\nReply with a number for a quick action:\n**1** Workspace list · **2** New session · **3** Sessions/watches\n**4** Status · **5** Repair · **6** Help',
+  '从下方下拉选择补充指令；最后一项可自定义输入。':
+    'Choose an instruction below; the last option lets you enter a custom one.',
+  '当前没有绑定会话，请先绑定会话再补充指令。':
+    'No session is bound. Bind one before steering the task.',
+  '➕ 补充指令': '➕ Steer task',
+  '输入补充指令后点「提交」，发送给当前运行的任务。':
+    'Enter an instruction and press Submit to send it to the running task.',
+  '输入你的补充指令': 'Enter your instruction',
+  '提交': 'Submit',
+  '➕ 自定义指令': '➕ Custom instruction',
   '🤖 助手菜单': '🤖 Assistant menu',
   '**点击按钮或直接回复数字**': '**Tap a button or reply with a number**',
   '1 · 会话列表': '1 · Sessions',
@@ -182,6 +304,18 @@ export default {
   '任务完成会自动推送，回复数字或点按钮取消关注：':
     'Completion is pushed automatically. Reply with a number or tap a button to unwatch:',
   '👁 关注列表': '👁 Watch list',
+  '⭐ 取消关注': '⭐ Unwatch',
+  '☆ 关注': '☆ Watch',
+  '🔍 关注列表': '🔍 Watch list',
+  '勾选要关注的会话': 'Select sessions to watch',
+  '勾选要取消关注的会话': 'Select sessions to unwatch',
+  '当前没有关注的会话。任务完成会自动推送结果。':
+    'No sessions are being watched. Results are pushed automatically when tasks complete.',
+  '当前关注 **{count}** 个会话：': 'Currently watching **{count}** sessions:',
+  '**➕ 添加关注**（多选下拉勾选）': '**➕ Add watch** (select from the multi-select dropdown)',
+  '**➖ 取消关注**（多选下拉勾选）': '**➖ Remove watch** (select from the multi-select dropdown)',
+  '📋 会话列表': '📋 Session list',
+  '🔙 返回菜单': '🔙 Back to menu',
   '已完成': 'Completed',
   '已停止': 'Stopped',
   '已中止': 'Aborted',

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

@@ -210,6 +210,10 @@ export default {
   '已请求停止当前任务。': 'Stop requested for the current task.',
   '当前聊天没有正在运行的任务，请直接发送普通消息。':
     'This chat has no running task; just send a regular message.',
+  '当前聊天没有绑定会话，无法补充指令。请先绑定会话。':
+    'No session is bound to this chat, so an additional instruction cannot be given. Bind a session first.',
+  '任务已结束，没有正在运行的任务，无法补充指令。请直接发送消息开始新任务。':
+    'The task has ended and there is no running task to steer. Send a message to start a new task.',
   '已提交补充指令，Agent 会在下一步读取。':
     'Additional instruction submitted; the Agent will read it at the next step.',
 };

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

@@ -8,6 +8,7 @@ const MODELS_COMMAND = /^\/models(?=$|\s)/i;
 const MODEL_USAGE = '用法：/model <序号> 或 /model <provider>/<model>';
 const MODELS_USAGE = '用法：/models（不带参数）';
 const SESSION_BINDING_CHANGED = 'session-binding-changed';
+const MODEL_SELECTION_MISMATCH = 'model-selection-mismatch';
 const UNSAFE_DISPLAY_TEXT_GLOBAL = /[\p{Cc}\p{Cf}\p{Zl}\p{Zp}]+/gu;
 
 function commandResult(message) {
@@ -78,6 +79,32 @@ function modelId(provider, model) {
   return `${provider}/${model}`;
 }
 
+function sameModel(left, right) {
+  return left?.provider === right?.provider && left?.model === right?.model;
+}
+
+function selectionMismatch(expected, actual, source) {
+  const error = new Error(`Harness ${source} did not confirm the selected model`);
+  error.code = MODEL_SELECTION_MISMATCH;
+  error.expected = expected;
+  error.actual = actual;
+  error.source = source;
+  return error;
+}
+
+function sessionBindingChanged() {
+  const error = new Error('Conversation binding changed during model selection');
+  error.code = SESSION_BINDING_CHANGED;
+  return error;
+}
+
+function assertSessionBinding(state, key, expectedSessionId) {
+  const currentSessionId = typeof state?.sessionFor === 'function'
+    ? state.sessionFor(key)
+    : null;
+  if (currentSessionId !== expectedSessionId) throw sessionBindingChanged();
+}
+
 function matchingModel(catalog, requested) {
   for (const group of catalog.groups) {
     for (const model of group.models) {
@@ -181,6 +208,23 @@ function modelErrorMessage(error, action) {
   if (code === SESSION_BINDING_CHANGED) {
     return t('当前聊天绑定的会话已发生变化，请重试。');
   }
+  if (code === MODEL_SELECTION_MISMATCH) {
+    const expected = error?.expected;
+    const actual = error?.actual;
+    const lines = [t('模型切换失败，请稍后重试。')];
+    if (expected?.provider && expected?.model) {
+      lines.push('', `requested: ${safeDisplayText(modelId(expected.provider, expected.model))}`);
+    }
+    if (actual?.provider && actual?.model) {
+      const label = error?.source === 'models.current'
+        ? t('当前模型：')
+        : 'selectModel.selected:';
+      lines.push(`${label} ${safeDisplayText(modelId(actual.provider, actual.model))}`);
+    } else {
+      lines.push(`${error?.source ?? 'Harness'}: unconfirmed`);
+    }
+    return lines.join('\n');
+  }
   if (code === 'cancelled' || error?.name === 'AbortError') {
     return action === 'list' ? t('获取模型列表已取消。') : t('模型切换已取消。');
   }
@@ -230,6 +274,21 @@ async function sessionCatalog(session, options) {
   return normalizeCatalog(await session.models(options), { requireCurrent: true });
 }
 
+async function selectAndVerifyModel(session, selection, options) {
+  if (typeof session?.selectModel !== 'function') {
+    throw new TypeError('Harness session does not support model selection');
+  }
+  const selected = (await session.selectModel(selection, options))?.selected;
+  if (!sameModel(selected, selection)) {
+    throw selectionMismatch(selection, selected, 'selectModel.selected');
+  }
+  const current = (await sessionCatalog(session, options)).current;
+  if (!sameModel(current, selection)) {
+    throw selectionMismatch(selection, current, 'models.current');
+  }
+  return current;
+}
+
 function isModelsCommand(command) {
   return MODELS_COMMAND.test(command);
 }
@@ -312,11 +371,10 @@ export async function runModelCommand(text, harness, state, key, options = {}) {
         ].join('\n'));
       }
 
+      let applied;
       if (bound) {
-        if (typeof bound.session.selectModel !== 'function') {
-          throw new TypeError('Harness session does not support model selection');
-        }
-        await bound.session.selectModel(selection, requestOptions);
+        applied = await selectAndVerifyModel(bound.session, selection, requestOptions);
+        assertSessionBinding(state, key, bound.sessionId);
       } else {
         if (typeof harness?.createSession !== 'function'
           || typeof harness?.workspaceSession !== 'function'
@@ -329,15 +387,10 @@ export async function runModelCommand(text, harness, state, key, options = {}) {
           throw new TypeError('Harness returned an invalid session id');
         }
         const session = harness.workspaceSession(sessionId);
-        if (!session || typeof session.selectModel !== 'function') {
-          throw new TypeError('Harness session does not support model selection');
-        }
-        await session.selectModel(selection, requestOptions);
+        applied = await selectAndVerifyModel(session, selection, requestOptions);
         const currentSessionId = state.sessionFor(key);
         if (typeof currentSessionId === 'string' && currentSessionId) {
-          const changed = new Error('Conversation binding changed during model selection');
-          changed.code = SESSION_BINDING_CHANGED;
-          throw changed;
+          throw sessionBindingChanged();
         }
         if (await state.setSession(key, sessionId) === false) {
           const stale = new Error('Workspace changed while binding the new session');
@@ -348,7 +401,7 @@ export async function runModelCommand(text, harness, state, key, options = {}) {
       return commandResult(t(`模型已切换为：
 {model}
 
-后续消息将使用该模型。`, { model: modelId(selection.provider, selection.model) }));
+后续消息将使用该模型。`, { model: modelId(applied.provider, applied.model) }));
     });
   } catch (error) {
     return commandResult(modelErrorMessage(error, 'select'));

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

@@ -92,8 +92,8 @@ async function selectedWorkspacePath(value) {
   }
 }
 
-export async function workspacePathSnapshot(harness) {
-  const listed = await harness.listWorkspaces();
+export async function workspacePathSnapshot(harness, options = {}) {
+  const listed = await harness.listWorkspaces(options);
   const currentValue = typeof harness?.currentWorkspace === 'function'
     ? harness.currentWorkspace()
     : null;
@@ -155,7 +155,7 @@ async function runWorkspaceListCommand(match, harness) {
   }
 }
 
-export async function resolveSessionListWorkspace(selector, harness) {
+export async function resolveSessionListWorkspace(selector, harness, options = {}) {
   if (!selector) {
     if (typeof harness?.currentWorkspace !== 'function') {
       return { error: t('当前机器人没有可用的工作区。') };
@@ -169,7 +169,7 @@ export async function resolveSessionListWorkspace(selector, harness) {
     if (typeof harness?.listWorkspaces !== 'function') {
       return { error: t('当前机器人暂不支持按序号选择工作区。') };
     }
-    const { paths } = await workspacePathSnapshot(harness);
+    const { paths } = await workspacePathSnapshot(harness, options);
     const position = Number(selector);
     if (!Number.isSafeInteger(position) || position < 1 || position > paths.length) {
       return { error: t('工作区序号不存在，请先执行 /workspacelist。') };