@xmanrui/dsh-im 0.11.0 → 0.12.0

package/package.json

@@ -1,7 +1,36 @@
 {
   "name": "@xmanrui/dsh-im",
-  "version": "0.11.0",
-  "description": "通过扫码、App Manifest或机器人凭据把IM机器人接入DeepSeek Harness（支持飞书、微信、钉钉、企业微信、QQ、Slack、Telegram、Discord和WhatsApp）。",
+  "version": "0.12.0",
+  "description": "通过扫码或机器人凭据把IM机器人接入DeepSeek Harness（支持飞书、微信、钉钉、企业微信、QQ、Slack、Telegram、Discord和WhatsApp）。 Connect IM bots to DeepSeek Harness via QR code or credentials (9 channels).",
+  "keywords": [
+    "deepseek-harness",
+    "dsh",
+    "dsh-plugin",
+    "ai-agent",
+    "im",
+    "instant-messaging",
+    "chatbot",
+    "feishu",
+    "lark",
+    "wechat",
+    "wecom",
+    "dingtalk",
+    "qq",
+    "slack",
+    "telegram",
+    "discord",
+    "whatsapp"
+  ],
+  "author": {
+    "name": "xmanrui",
+    "url": "https://github.com/xmanrui"
+  },
+  "contributors": [
+    {
+      "name": "C3H3-AI",
+      "url": "https://github.com/C3H3-AI"
+    }
+  ],
   "license": "MIT",
   "type": "module",
   "repository": {

package/plugin-src/host/channels/dingtalk/production.mjs

@@ -16,6 +16,7 @@ import {
 } from '../../../../src/channels/shared/bot-workspace-store.mjs';
 import { createConnectionSupervisor } from './connection-supervisor.mjs';
 import { createHarnessCommandExecutor } from '../../harness-command-executor.mjs';
+import { createHarnessSessionExecutors } from '../../harness-session-coordinator.mjs';
 
 function harnessOrigin(webServer, configured) {
   if (configured !== undefined) return new URL(configured);
@@ -81,6 +82,10 @@ export async function createProductionController(ctx, config = {}, internals = {
     return state;
   };
   const commandExecutor = createHarnessCommandExecutor(ctx, internals.commandExecutor);
+  const { controlExecutor, sessionMaintenanceExecutor } = createHarnessSessionExecutors(ctx, {
+    controlExecutor: internals.controlExecutor,
+    sessionMaintenanceExecutor: internals.sessionMaintenanceExecutor,
+  });
   const harness = new Harness({
     baseUrl: harnessOrigin(ctx.webServer, config.harnessBaseUrl),
     workspace: defaultWorkspace,
@@ -88,6 +93,8 @@ export async function createProductionController(ctx, config = {}, internals = {
     autostart: false,
     dshBin: config.dshBin ?? 'dsh',
     ...(commandExecutor ? { commandExecutor } : {}),
+    ...(controlExecutor ? { controlExecutor } : {}),
+    ...(sessionMaintenanceExecutor ? { sessionMaintenanceExecutor } : {}),
   });
   const coreController = new Controller({
     deviceAuth,

package/plugin-src/host/channels/feishu/production.mjs

@@ -4,6 +4,7 @@ import { unlink } from 'node:fs/promises';
 import * as Lark from '@larksuiteoapi/node-sdk';
 import { createConnectionSupervisor } from './connection-supervisor.mjs';
 import { createHarnessCommandExecutor } from '../../harness-command-executor.mjs';
+import { createHarnessSessionExecutors } from '../../harness-session-coordinator.mjs';
 import { verifyFeishuApp } from '../../../../src/channels/feishu/feishu-app.mjs';
 import { FeishuRuntime } from '../../../../src/channels/feishu/feishu-runtime.mjs';
 import { HarnessClient } from '../../../../src/channels/feishu/harness-client.mjs';
@@ -107,6 +108,10 @@ export async function createProductionController(ctx, config = {}, internals = {
     return stateFor(botConfig);
   };
   const commandExecutor = createHarnessCommandExecutor(ctx, internals.commandExecutor);
+  const { controlExecutor, sessionMaintenanceExecutor } = createHarnessSessionExecutors(ctx, {
+    controlExecutor: internals.controlExecutor,
+    sessionMaintenanceExecutor: internals.sessionMaintenanceExecutor,
+  });
   const harness = new Harness({
     baseUrl: harnessOrigin(ctx.webServer, config.harnessBaseUrl),
     workspace: defaultWorkspace,
@@ -116,6 +121,8 @@ export async function createProductionController(ctx, config = {}, internals = {
     autostart: false,
     dshBin: config.dshBin ?? 'dsh',
     ...(commandExecutor ? { commandExecutor } : {}),
+    ...(controlExecutor ? { controlExecutor } : {}),
+    ...(sessionMaintenanceExecutor ? { sessionMaintenanceExecutor } : {}),
   });
 
   const coreController = new Controller({

package/plugin-src/host/channels/qq/production.mjs

@@ -16,6 +16,7 @@ import {
 } from '../../../../src/channels/shared/bot-workspace-store.mjs';
 import { createConnectionSupervisor } from './connection-supervisor.mjs';
 import { createHarnessCommandExecutor } from '../../harness-command-executor.mjs';
+import { createHarnessSessionExecutors } from '../../harness-session-coordinator.mjs';
 
 function harnessOrigin(webServer, configured) {
   if (configured !== undefined) return new URL(configured);
@@ -72,6 +73,10 @@ export async function createProductionController(ctx, config = {}, internals = {
     return state;
   };
   const commandExecutor = createHarnessCommandExecutor(ctx, internals.commandExecutor);
+  const { controlExecutor, sessionMaintenanceExecutor } = createHarnessSessionExecutors(ctx, {
+    controlExecutor: internals.controlExecutor,
+    sessionMaintenanceExecutor: internals.sessionMaintenanceExecutor,
+  });
   const harness = new Harness({
     baseUrl: harnessOrigin(ctx.webServer, config.harnessBaseUrl),
     workspace: defaultWorkspace,
@@ -79,6 +84,8 @@ export async function createProductionController(ctx, config = {}, internals = {
     autostart: false,
     dshBin: config.dshBin ?? 'dsh',
     ...(commandExecutor ? { commandExecutor } : {}),
+    ...(controlExecutor ? { controlExecutor } : {}),
+    ...(sessionMaintenanceExecutor ? { sessionMaintenanceExecutor } : {}),
   });
   const coreController = new Controller({
     qrAuth,

package/plugin-src/host/channels/shared/production.mjs

@@ -4,6 +4,7 @@ import { join, resolve } from 'node:path';
 
 import { createTokenConnectionSupervisor } from './connection-supervisor.mjs';
 import { createHarnessCommandExecutor } from '../../harness-command-executor.mjs';
+import { createHarnessSessionExecutors } from '../../harness-session-coordinator.mjs';
 import {
   BotWorkspaceStore,
   createBotWorkspaceScope,
@@ -66,6 +67,10 @@ export async function createTokenProductionController(ctx, config, internals, de
     return state;
   };
   const commandExecutor = createHarnessCommandExecutor(ctx, internals.commandExecutor);
+  const { controlExecutor, sessionMaintenanceExecutor } = createHarnessSessionExecutors(ctx, {
+    controlExecutor: internals.controlExecutor,
+    sessionMaintenanceExecutor: internals.sessionMaintenanceExecutor,
+  });
   const harness = new ResolvedHarness({
     baseUrl: harnessOrigin(ctx.webServer, config.harnessBaseUrl),
     workspace: defaultWorkspace,
@@ -73,6 +78,8 @@ export async function createTokenProductionController(ctx, config, internals, de
     autostart: false,
     dshBin: config.dshBin ?? 'dsh',
     ...(commandExecutor ? { commandExecutor } : {}),
+    ...(controlExecutor ? { controlExecutor } : {}),
+    ...(sessionMaintenanceExecutor ? { sessionMaintenanceExecutor } : {}),
   });
   const coreController = new ResolvedController({
     credentials: ctx.credentials,

package/plugin-src/host/channels/slack/production.mjs

@@ -15,6 +15,7 @@ import {
 import { createTokenConnectionSupervisor } from '../shared/connection-supervisor.mjs';
 import { harnessOrigin, pluginPaths } from '../shared/production.mjs';
 import { createHarnessCommandExecutor } from '../../harness-command-executor.mjs';
+import { createHarnessSessionExecutors } from '../../harness-session-coordinator.mjs';
 
 export async function createProductionController(ctx, config = {}, internals = {}) {
   if (!ctx?.credentials) throw new TypeError('dsh-im slack requires ctx.credentials');
@@ -51,6 +52,10 @@ export async function createProductionController(ctx, config = {}, internals = {
     return state;
   };
   const commandExecutor = createHarnessCommandExecutor(ctx, internals.commandExecutor);
+  const { controlExecutor, sessionMaintenanceExecutor } = createHarnessSessionExecutors(ctx, {
+    controlExecutor: internals.controlExecutor,
+    sessionMaintenanceExecutor: internals.sessionMaintenanceExecutor,
+  });
   const harness = new ResolvedHarness({
     baseUrl: harnessOrigin(ctx.webServer, config.harnessBaseUrl),
     workspace: defaultWorkspace,
@@ -58,6 +63,8 @@ export async function createProductionController(ctx, config = {}, internals = {
     autostart: false,
     dshBin: config.dshBin ?? 'dsh',
     ...(commandExecutor ? { commandExecutor } : {}),
+    ...(controlExecutor ? { controlExecutor } : {}),
+    ...(sessionMaintenanceExecutor ? { sessionMaintenanceExecutor } : {}),
   });
   const coreController = new ResolvedController({
     credentials: ctx.credentials,

package/plugin-src/host/channels/wecom/production.mjs

@@ -16,6 +16,7 @@ import {
 } from '../../../../src/channels/shared/bot-workspace-store.mjs';
 import { createConnectionSupervisor } from './connection-supervisor.mjs';
 import { createHarnessCommandExecutor } from '../../harness-command-executor.mjs';
+import { createHarnessSessionExecutors } from '../../harness-session-coordinator.mjs';
 
 function harnessOrigin(webServer, configured) {
   if (configured !== undefined) return new URL(configured);
@@ -75,6 +76,10 @@ export async function createProductionController(ctx, config = {}, internals = {
     return state;
   };
   const commandExecutor = createHarnessCommandExecutor(ctx, internals.commandExecutor);
+  const { controlExecutor, sessionMaintenanceExecutor } = createHarnessSessionExecutors(ctx, {
+    controlExecutor: internals.controlExecutor,
+    sessionMaintenanceExecutor: internals.sessionMaintenanceExecutor,
+  });
   const harness = new Harness({
     baseUrl: harnessOrigin(ctx.webServer, config.harnessBaseUrl),
     workspace: defaultWorkspace,
@@ -82,6 +87,8 @@ export async function createProductionController(ctx, config = {}, internals = {
     autostart: false,
     dshBin: config.dshBin ?? 'dsh',
     ...(commandExecutor ? { commandExecutor } : {}),
+    ...(controlExecutor ? { controlExecutor } : {}),
+    ...(sessionMaintenanceExecutor ? { sessionMaintenanceExecutor } : {}),
   });
   const coreController = new Controller({
     qrAuth,

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

@@ -16,6 +16,7 @@ import {
 } from '../../../../src/channels/shared/bot-workspace-store.mjs';
 import { createConnectionSupervisor } from './connection-supervisor.mjs';
 import { createHarnessCommandExecutor } from '../../harness-command-executor.mjs';
+import { createHarnessSessionExecutors } from '../../harness-session-coordinator.mjs';
 
 function harnessOrigin(webServer, configured) {
   if (configured !== undefined) return new URL(configured);
@@ -75,6 +76,10 @@ export async function createProductionController(ctx, config = {}, internals = {
     return state;
   };
   const commandExecutor = createHarnessCommandExecutor(ctx, internals.commandExecutor);
+  const { controlExecutor, sessionMaintenanceExecutor } = createHarnessSessionExecutors(ctx, {
+    controlExecutor: internals.controlExecutor,
+    sessionMaintenanceExecutor: internals.sessionMaintenanceExecutor,
+  });
   const harness = new Harness({
     baseUrl: harnessOrigin(ctx.webServer, config.harnessBaseUrl),
     workspace: defaultWorkspace,
@@ -82,6 +87,8 @@ export async function createProductionController(ctx, config = {}, internals = {
     autostart: false,
     dshBin: config.dshBin ?? 'dsh',
     ...(commandExecutor ? { commandExecutor } : {}),
+    ...(controlExecutor ? { controlExecutor } : {}),
+    ...(sessionMaintenanceExecutor ? { sessionMaintenanceExecutor } : {}),
   });
   const coreController = new Controller({
     api,

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

@@ -16,6 +16,7 @@ import {
 } from '../../../../src/channels/shared/bot-workspace-store.mjs';
 import { createTokenConnectionSupervisor } from '../shared/connection-supervisor.mjs';
 import { createHarnessCommandExecutor } from '../../harness-command-executor.mjs';
+import { createHarnessSessionExecutors } from '../../harness-session-coordinator.mjs';
 
 const AUTH_DIRECTORY_PATTERN = /^[a-f0-9-]{36}$/;
 
@@ -78,6 +79,10 @@ export async function createProductionController(ctx, config = {}, internals = {
     return state;
   };
   const commandExecutor = createHarnessCommandExecutor(ctx, internals.commandExecutor);
+  const { controlExecutor, sessionMaintenanceExecutor } = createHarnessSessionExecutors(ctx, {
+    controlExecutor: internals.controlExecutor,
+    sessionMaintenanceExecutor: internals.sessionMaintenanceExecutor,
+  });
   const harness = new Harness({
     baseUrl: harnessOrigin(ctx.webServer, config.harnessBaseUrl),
     workspace: defaultWorkspace,
@@ -85,6 +90,8 @@ export async function createProductionController(ctx, config = {}, internals = {
     autostart: false,
     dshBin: config.dshBin ?? 'dsh',
     ...(commandExecutor ? { commandExecutor } : {}),
+    ...(controlExecutor ? { controlExecutor } : {}),
+    ...(sessionMaintenanceExecutor ? { sessionMaintenanceExecutor } : {}),
   });
   const coreController = new Controller({
     configStore: observedConfigStore,

package/plugin-src/host/harness-session-coordinator.mjs

@@ -0,0 +1,134 @@
+import { randomUUID } from 'node:crypto';
+
+function agentsFromContext(ctx) {
+  if (typeof ctx?.get !== 'function') return undefined;
+  let agents;
+  try {
+    agents = ctx.get('agents');
+  } catch {
+    return undefined;
+  }
+  if (agents === undefined || agents === null) return undefined;
+  if (typeof agents.get !== 'function') {
+    throw new TypeError('dsh-im requires a callable AgentRegistry when ctx.get("agents") is present');
+  }
+  return agents;
+}
+
+function currentOwnedTurn(agent, expectedTurn, promptRpcId) {
+  if (agent?.status !== 'running') return false;
+  const events = agent?.session?.events;
+  if (!Array.isArray(events)) return false;
+
+  let openTurn = null;
+  let owned = false;
+  for (const event of events) {
+    if (event?.type === 'turn/start') {
+      openTurn = event.data?.turn ?? null;
+      owned = false;
+      continue;
+    }
+    if (event?.type === 'turn/end' && event.data?.turn === openTurn) {
+      openTurn = null;
+      owned = false;
+      continue;
+    }
+    if (openTurn === expectedTurn
+      && event?.type === 'user/message'
+      && event.data?.source?.rpcId === promptRpcId) {
+      owned = true;
+    }
+  }
+  return openTurn === expectedTurn && owned;
+}
+
+function deepFreeze(value) {
+  if (!value || typeof value !== 'object' || Object.isFrozen(value)) return value;
+  for (const child of Object.values(value)) deepFreeze(child);
+  return Object.freeze(value);
+}
+
+function steeringMessage(text) {
+  return deepFreeze({
+    id: randomUUID(),
+    role: 'user',
+    content: [{ type: 'text', text }],
+    source: { kind: 'user' },
+  });
+}
+
+function agentBusyError(cause) {
+  const error = new Error('Session is busy with an active turn or maintenance task', { cause });
+  error.code = 'agent-busy';
+  return error;
+}
+
+function createControlExecutor(agents) {
+  return ({ sessionId, expectedTurn, promptRpcId, action, text }) => {
+    const agent = agents.get(sessionId);
+    // An unattached Session cannot be coordinated in-process. Let the client
+    // retain its legacy HTTP path for deployments where attachment is lazy.
+    if (!agent) return undefined;
+    if (!currentOwnedTurn(agent, expectedTurn, promptRpcId)) return false;
+
+    if (action === 'stop') {
+      agent.cancel({ kind: 'user' }, { keepInbox: true });
+      return true;
+    }
+    if (action === 'steer') {
+      if (typeof text !== 'string' || !text.trim()) return false;
+      // inject() never wakes an idle driver. Because validation and injection
+      // share one JS tick, this context can only target this live turn's next step.
+      agent.inject(steeringMessage(text));
+      return true;
+    }
+    throw new TypeError(`Unsupported Harness control action: ${String(action)}`);
+  };
+}
+
+function createSessionMaintenanceExecutor(agents) {
+  return ({ sessionId, operation }) => {
+    if (typeof operation !== 'function') throw new TypeError('maintenance operation is required');
+    const agent = agents.get(sessionId);
+    if (!agent) return operation();
+    try {
+      // runMaintenance claims the true-idle phase synchronously. A prompt or a
+      // second maintenance operation therefore cannot interleave with the RPC.
+      return agent.runMaintenance((signal) => {
+        if (agents.get(sessionId) !== agent) {
+          const error = new Error('Session agent changed before maintenance started');
+          error.code = 'agent-unavailable';
+          throw error;
+        }
+        return operation(signal);
+      });
+    } catch (error) {
+      throw agentBusyError(error);
+    }
+  };
+}
+
+/**
+ * Build optional same-process Session executors without adding a hard Cordis
+ * service injection. Fixtures and deployments without AgentRegistry preserve
+ * the existing HTTP behavior.
+ */
+export function createHarnessSessionExecutors(ctx, provided = {}) {
+  const { controlExecutor, sessionMaintenanceExecutor } = provided;
+  if (controlExecutor !== undefined && typeof controlExecutor !== 'function') {
+    throw new TypeError('controlExecutor must be a function');
+  }
+  if (sessionMaintenanceExecutor !== undefined
+    && typeof sessionMaintenanceExecutor !== 'function') {
+    throw new TypeError('sessionMaintenanceExecutor must be a function');
+  }
+
+  const agents = controlExecutor && sessionMaintenanceExecutor
+    ? undefined
+    : agentsFromContext(ctx);
+  return {
+    controlExecutor: controlExecutor ?? (agents ? createControlExecutor(agents) : undefined),
+    sessionMaintenanceExecutor: sessionMaintenanceExecutor
+      ?? (agents ? createSessionMaintenanceExecutor(agents) : undefined),
+  };
+}

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

@@ -10,6 +10,14 @@ import {
 } from '../shared/harness-question.mjs';
 import { HarnessApprovalQueue } from '../shared/harness-approval.mjs';
 import { runCompactCommand } from '../shared/compact-command.mjs';
+import {
+  isControlCommand,
+  runControlCommand,
+} from '../shared/control-command.mjs';
+import {
+  isModelCommand,
+  runModelCommand,
+} from '../shared/model-command.mjs';
 import { runWorkspaceCommand } from '../shared/workspace-command.mjs';
 import { askInWorkspaceSession } from '../shared/workspace-session.mjs';
 import {
@@ -33,6 +41,10 @@ const HELP_TEXT = [
   '/workspacelist  列出工作区绝对路径',
   '/sessionlist [工作区序号或绝对路径]  列出会话 ID 和标题',
   '/session Session ID 或当前工作区序号  将当前聊天绑定到指定会话',
+  '/models  列出所有可用模型',
+  '/model [模型ID]  查看或切换当前会话模型',
+  '/stop  停止当前任务',
+  '/steer 补充指令  纠偏当前任务',
   '/status  检查连接状态',
   '/help  显示本帮助',
 ].join('\n');
@@ -246,6 +258,7 @@ export class DingtalkHarnessBridge {
   #pendingInteractions = new Map();
   #interactionKeys = new Map();
   #interactionTasks = new Set();
+  #commandTasks = new Set();
   #acceptedMessageIds = new Set();
   #approvals;
 
@@ -314,6 +327,37 @@ export class DingtalkHarnessBridge {
       rememberConnectionTestTarget(this.#state, { sessionWebhook });
     }
     const pending = this.#pendingInteractions.get(key);
+    const promptMessage = dingtalkInboundMessage(message, {
+      api: this.#api,
+      clientId: this.#clientId,
+      clientSecret: this.#clientSecret,
+    });
+    const commandText = nonEmptyString(promptMessage.content) ?? '';
+    const commandRunner = isControlCommand(commandText)
+      ? runControlCommand
+      : (isModelCommand(commandText) ? runModelCommand : null);
+    const addressed = String(message.conversationType) !== '2' || message?.isInAtList === true;
+    if (commandRunner && sessionWebhook && addressed) {
+      let task;
+      task = this.#processFastCommand(
+        message,
+        messageId,
+        key,
+        sessionWebhook,
+        promptMessage,
+        commandRunner,
+      ).catch((error) => {
+        if (error?.code === 'turn-stopped' || this.#signal?.aborted) return;
+        this.#status.lastError = '钉钉命令处理失败。';
+        this.#logger.error?.('[dsh-dingtalk] failed to process a command', safeErrorDiagnostic(error));
+        return this.#send(sessionWebhook, CARD_ERROR_TEXT).catch(() => undefined);
+      }).finally(() => {
+        this.#acceptedMessageIds.delete(messageId);
+        this.#commandTasks.delete(task);
+      });
+      this.#commandTasks.add(task);
+      return task;
+    }
     const approvalReply = this.#approvals.claimReply({
       key,
       actor: sender,
@@ -412,9 +456,41 @@ export class DingtalkHarnessBridge {
         pending.queue ? [pending.queue] : []
       )),
       ...this.#interactionTasks,
+      ...this.#commandTasks,
     ]);
   }
 
+  async #processFastCommand(message, messageId, key, sessionWebhook, prompt, runner) {
+    this.#signal?.throwIfAborted();
+    if (this.#state.hasSeen(messageId)) return;
+    await this.#state.markSeen(messageId);
+    increment(this.#status, 'messagesReceived');
+    this.#status.lastMessageAt = new Date().toISOString();
+    const result = await runner(
+      nonEmptyString(prompt.content) ?? '',
+      this.#harness,
+      this.#state,
+      key,
+      {
+        signal: this.#signal,
+        hasImages: hasInboundImages(prompt),
+        pendingInteraction: this.#pendingInteractions.has(key)
+          || this.#approvals.hasPending(key),
+        control: { owner: this, key },
+      },
+    );
+    if (result?.stopped) {
+      await Promise.allSettled([
+        this.#cancelPendingInteraction(key),
+        this.#approvals.closeRoute(key),
+      ]);
+    }
+    for (const reply of result?.messages ?? [result?.message]) {
+      if (reply) await this.#send(sessionWebhook, reply);
+    }
+    this.#status.lastError = null;
+  }
+
   async #process(message, messageId, sender, key, { alreadyRecorded = false } = {}) {
     this.#signal?.throwIfAborted();
     if (!alreadyRecorded) {
@@ -519,6 +595,7 @@ export class DingtalkHarnessBridge {
         askOptions: {
           timeoutMs: this.#replyTimeoutMs,
           signal: this.#signal,
+          control: { owner: this, key },
           onUpdate: cardStarted
             ? (update) => cardStream.push(progressText(update))
             : undefined,
@@ -537,6 +614,10 @@ export class DingtalkHarnessBridge {
       this.#status.lastReplyAt = new Date().toISOString();
       this.#status.lastError = null;
     } catch (error) {
+      if (error?.code === 'turn-stopped') {
+        if (cardStarted) await cardStream.finish('已停止。').catch(() => undefined);
+        return;
+      }
       if (this.#signal?.aborted) return;
       this.#status.lastError = '钉钉消息处理失败。';
       this.#logger.error?.(

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

@@ -108,7 +108,7 @@ export class DiscordApi {
         headers: {
           authorization: `Bot ${this.#token}`,
           'content-type': 'application/json',
-          'user-agent': 'DeepSeek-Harness-dsh-im (https://github.com/xmanrui/dsh-im, 0.11.0)',
+          'user-agent': 'DeepSeek-Harness-dsh-im (https://github.com/xmanrui/dsh-im, 0.12.0)',
         },
         ...(body === undefined ? {} : { body: JSON.stringify(body) }),
         signal: requestSignal(signal, timeoutMs),

package/src/channels/feishu/bridge.mjs

@@ -18,7 +18,15 @@ import {
 } from '../shared/harness-question.mjs';
 import { HarnessApprovalQueue } from '../shared/harness-approval.mjs';
 import { runCompactCommand } from '../shared/compact-command.mjs';
+import {
+  isControlCommand,
+  runControlCommand,
+} from '../shared/control-command.mjs';
 import { rememberConnectionTestTarget } from '../shared/connection-test.mjs';
+import {
+  isModelCommand,
+  runModelCommand,
+} from '../shared/model-command.mjs';
 import { runWorkspaceCommand } from '../shared/workspace-command.mjs';
 import { askInWorkspaceSession } from '../shared/workspace-session.mjs';
 
@@ -35,6 +43,10 @@ const HELP_TEXT = [
   '/workspacelist  列出工作区绝对路径',
   '/sessionlist [工作区序号或绝对路径]  列出会话 ID 和标题',
   '/session Session ID 或当前工作区序号  将当前聊天绑定到指定会话',
+  '/models  列出所有可用模型',
+  '/model [模型ID]  查看或切换当前会话模型',
+  '/stop  停止当前任务',
+  '/steer 补充指令  纠偏当前任务',
   '/status  检查连接状态',
   '/help  显示本帮助',
 ].join('\n');
@@ -77,6 +89,7 @@ export class FeishuHarnessBridge {
   #resolvedQuestionReplies = new Map();
   #acceptedMessageIds = new Set();
   #interactionTasks = new Set();
+  #commandTasks = new Set();
   #approvals;
   #status;
   #allowedSenderOpenIds;
@@ -141,6 +154,37 @@ export class FeishuHarnessBridge {
 
     this.#acceptedMessageIds.add(messageId);
     const processingReaction = this.#addReaction(messageId, 'OnIt');
+    const commandMessage = extractInboundMessage(event, this.#client);
+    const commandText = nonEmptyString(commandMessage.content) ?? '';
+    const commandRunner = isControlCommand(commandText)
+      ? runControlCommand
+      : (isModelCommand(commandText) ? runModelCommand : null);
+    const addressed = event?.message?.chat_type === 'p2p'
+      || (Array.isArray(event?.message?.mentions) && event.message.mentions.length > 0);
+    if (commandRunner && addressed) {
+      const processing = this.#processFastCommand(
+        event,
+        messageId,
+        key,
+        commandMessage,
+        commandRunner,
+      );
+      let current;
+      current = processing
+        .then(() => this.#finishReaction(messageId, processingReaction, 'DONE'))
+        .catch((error) => this.#handleMessageFailure(
+          event,
+          messageId,
+          processingReaction,
+          error,
+        ))
+        .finally(() => {
+          this.#acceptedMessageIds.delete(messageId);
+          this.#commandTasks.delete(current);
+        });
+      this.#commandTasks.add(current);
+      return current;
+    }
     if (this.#isResolvedQuestionReply(event, key)) {
       const current = Promise.resolve()
         .then(() => this.#discardResolvedInteractionReply(event, messageId))
@@ -276,6 +320,10 @@ export class FeishuHarnessBridge {
   }
 
   async #handleMessageFailure(event, messageId, processingReaction, error) {
+    if (error?.code === 'turn-stopped') {
+      await this.#removeProcessingReaction(messageId, processingReaction);
+      return;
+    }
     if (this.#signal?.aborted) {
       await this.#removeProcessingReaction(messageId, processingReaction);
       return;
@@ -297,9 +345,41 @@ export class FeishuHarnessBridge {
         pending.queue ? [pending.queue] : []
       )),
       ...this.#interactionTasks,
+      ...this.#commandTasks,
     ]);
   }
 
+  async #processFastCommand(event, messageId, key, message, runner) {
+    this.#signal?.throwIfAborted();
+    if (this.#state.hasSeen(messageId)) return;
+    await this.#state.markSeen(messageId);
+    this.#status.lastMessageAt = new Date().toISOString();
+    this.#status.messagesReceived += 1;
+    const result = await runner(
+      nonEmptyString(message.content) ?? '',
+      this.#harness,
+      this.#state,
+      key,
+      {
+        signal: this.#signal,
+        hasImages: hasInboundImages(message),
+        pendingInteraction: this.#pendingInteractions.has(key)
+          || this.#approvals.hasPending(key),
+        control: { owner: this, key },
+      },
+    );
+    if (result?.stopped) {
+      await Promise.allSettled([
+        this.#cancelPendingInteraction(key),
+        this.#approvals.closeRoute(key),
+      ]);
+    }
+    for (const reply of result?.messages ?? [result?.message]) {
+      if (reply) await this.#send(event.message.chat_id, reply);
+    }
+    this.#status.lastError = null;
+  }
+
   async #handle(event, key, { alreadyRecorded = false } = {}) {
     this.#signal?.throwIfAborted();
     const messageId = event.message.message_id;
@@ -372,6 +452,7 @@ export class FeishuHarnessBridge {
     return {
       timeoutMs: this.#replyTimeoutMs,
       signal: this.#signal,
+      control: { owner: this, key },
       onInteraction: (interaction) => this.#handleInteraction(interaction, {
         key,
         actor: senderOpenId(event),