@xmanrui/dsh-im 0.10.0 → 0.12.0

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

@@ -9,6 +9,7 @@ import {
 } from 'node:fs/promises';
 import { dirname, isAbsolute, resolve } from 'node:path';
 
+import { CONNECTION_TEST_STATE_IDENTITY } from './connection-test.mjs';
 import { WORKSPACE_SESSION_STALE } from './workspace-session.mjs';
 
 const EMPTY_DOCUMENT = Object.freeze({ version: 1, workspaces: Object.freeze({}) });
@@ -510,7 +511,9 @@ export function createBotWorkspaceScope(harness, { botId, workspaces, state }) {
           }
         };
       }
-      if ((property === 'listWorkspaces' || property === 'listWorkspaceSessions')
+      if ((property === 'listWorkspaces'
+        || property === 'listWorkspaceSessions'
+        || property === 'listModels')
         && typeof target[property] === 'function') {
         return async (...args) => {
           if (!isCurrentScope()) {
@@ -626,6 +629,30 @@ export function createBotWorkspaceScope(harness, { botId, workspaces, state }) {
           sessionGenerations.delete(sessionId);
           const isCurrentSession = () => isCurrentScope()
             && generation === workspaces.generationFor(botId);
+          const invokeCurrentSession = async (method, args, action) => {
+            if (!isCurrentSession()) {
+              throw workspaceSessionStale(
+                `The bot workspace changed before this ${action} started.`,
+              );
+            }
+            const result = await target[method](sessionId, ...args);
+            if (!isCurrentSession()) {
+              throw workspaceSessionStale(
+                `The bot workspace changed while this ${action} was running.`,
+              );
+            }
+            return result;
+          };
+          const invokeStartedSessionMutation = async (method, args, action) => {
+            if (!isCurrentSession()) {
+              throw workspaceSessionStale(
+                `The bot workspace changed before this ${action} started.`,
+              );
+            }
+            // Once an irreversible control mutation has started, preserve its
+            // actual outcome even if a workspace switch commits concurrently.
+            return target[method](sessionId, ...args);
+          };
           return Object.freeze({
             sessionId,
             async sessionExists(...args) {
@@ -633,6 +660,24 @@ export function createBotWorkspaceScope(harness, { botId, workspaces, state }) {
               const exists = await target.sessionExists(sessionId, ...args);
               return isCurrentSession() && exists;
             },
+            models(...args) {
+              return invokeCurrentSession('getSessionModels', args, 'model listing');
+            },
+            selectModel(...args) {
+              return invokeCurrentSession('selectSessionModel', args, 'model selection');
+            },
+            isRunning(...args) {
+              return invokeCurrentSession('isSessionRunning', args, 'run-state check');
+            },
+            hasActiveTurn(...args) {
+              return invokeCurrentSession('hasActiveTurn', args, 'turn ownership check');
+            },
+            stopActiveTurn(...args) {
+              return invokeStartedSessionMutation('stopActiveTurn', args, 'turn stop');
+            },
+            steerActiveTurn(...args) {
+              return invokeStartedSessionMutation('steerActiveTurn', args, 'turn steering');
+            },
             ask(...args) {
               if (!isCurrentSession()) {
                 throw workspaceSessionStale(
@@ -687,6 +732,7 @@ export function createBotWorkspaceScope(harness, { botId, workspaces, state }) {
   });
   const scopedState = new Proxy(state, {
     get(target, property) {
+      if (property === CONNECTION_TEST_STATE_IDENTITY) return target;
       if (property === 'sessionFor') {
         return (key, ...args) => {
           if (!isCurrentScope()) return null;

package/src/channels/shared/connection-test.mjs

@@ -0,0 +1,54 @@
+const targets = new WeakMap();
+
+export const CONNECTION_TEST_STATE_IDENTITY = Symbol('dsh-im.connection-test-state-identity');
+
+function stateIdentity(state) {
+  return state?.[CONNECTION_TEST_STATE_IDENTITY] ?? state;
+}
+
+function cleanText(value) {
+  return typeof value === 'string' && value.trim() ? value.trim() : null;
+}
+
+export function rememberConnectionTestTarget(state, target) {
+  if (!state || !target || typeof target !== 'object') return false;
+  try {
+    targets.set(stateIdentity(state), structuredClone(target));
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+export function connectionTestTarget(state) {
+  const target = state ? targets.get(stateIdentity(state)) : null;
+  return target ? structuredClone(target) : null;
+}
+
+export function connectionTestMessage(botName, channelLabel = '机器人') {
+  const name = cleanText(botName) ?? channelLabel;
+  return `✅ DeepSeek Harness 连接测试成功\n这条消息由插件页面中的“${name}”机器人卡片发出。`;
+}
+
+export function connectionTestTargetUnavailable(channelLabel = '机器人') {
+  const error = new Error(`${channelLabel}尚未收到可用于测试的私聊消息。`);
+  error.code = 'test-target-unavailable';
+  return error;
+}
+
+export async function sendRememberedConnectionTest({ state, send, text, channelLabel }) {
+  const target = connectionTestTarget(state);
+  if (!target) throw connectionTestTargetUnavailable(channelLabel);
+  await send(target, text);
+  return { sent: true };
+}
+
+export function publicConnectionTestResult(error) {
+  if (!error) return Object.freeze({ sent: true });
+  return Object.freeze({
+    sent: false,
+    code: error?.code === 'test-target-unavailable'
+      ? 'test-target-unavailable'
+      : 'test-message-failed',
+  });
+}

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

@@ -0,0 +1,84 @@
+const CONTROL_COMMAND = /^\/(?:stop|steer)(?=$|\s)/iu;
+const STOP_COMMAND = /^\/stop(?=$|\s)/iu;
+const STOP_USAGE = '用法：/stop（不带参数）';
+const STEER_USAGE = '用法：/steer <补充指令>';
+const TEXT_ONLY = '控制命令仅支持纯文字，请移除图片后重试。';
+
+function commandResult(message, extra = {}) {
+  return { message, ...extra };
+}
+
+function requestOptions(signal) {
+  return signal ? { signal } : {};
+}
+
+function boundSession(harness, state, key) {
+  if (typeof state?.sessionFor !== 'function') return null;
+  const sessionId = state.sessionFor(key);
+  if (typeof sessionId !== 'string' || !sessionId) return null;
+  if (typeof harness?.workspaceSession !== 'function') {
+    throw new TypeError('Harness does not support workspace sessions');
+  }
+  const session = harness.workspaceSession(sessionId);
+  if (!session || typeof session !== 'object') {
+    throw new TypeError('Harness returned an invalid workspace session');
+  }
+  return session;
+}
+
+export function isControlCommand(text) {
+  return typeof text === 'string' && CONTROL_COMMAND.test(text.trim());
+}
+
+export async function runControlCommand(text, harness, state, key, {
+  signal,
+  hasImages = false,
+  pendingInteraction = false,
+  control,
+} = {}) {
+  if (!isControlCommand(text)) return null;
+  const command = text.trim();
+  const stop = STOP_COMMAND.test(command);
+
+  if (hasImages) return commandResult(TEXT_ONLY);
+
+  if (stop) {
+    if (!/^\/stop$/iu.test(command)) return commandResult(STOP_USAGE);
+    const session = boundSession(harness, state, key);
+    if (!session) return commandResult('当前聊天没有正在运行的任务。');
+    if (typeof session.stopActiveTurn !== 'function') {
+      throw new TypeError('Harness session does not support stopping active turns');
+    }
+    const stopped = await session.stopActiveTurn(control, requestOptions(signal));
+    return stopped
+      ? commandResult('已请求停止当前任务。', { stopped: true })
+      : commandResult('当前聊天没有正在运行的任务。');
+  }
+
+  const match = /^\/steer(?:\s+([\s\S]*))?$/iu.exec(command);
+  const instruction = match?.[1]?.trim() ?? '';
+  if (!instruction) return commandResult(STEER_USAGE);
+  if (pendingInteraction) {
+    return commandResult([
+      '当前任务正在等待你的回答或审批。',
+      '',
+      '请先处理当前请求，或者发送 /stop 停止任务。',
+    ].join('\n'));
+  }
+
+  const session = boundSession(harness, state, key);
+  if (!session) {
+    return commandResult('当前聊天没有正在运行的任务，请直接发送普通消息。');
+  }
+  if (typeof session.steerActiveTurn !== 'function') {
+    throw new TypeError('Harness session does not support steering active turns');
+  }
+  const steered = await session.steerActiveTurn(
+    instruction,
+    control,
+    requestOptions(signal),
+  );
+  return steered
+    ? commandResult('已提交补充指令，Agent 会在下一步读取。')
+    : commandResult('当前聊天没有正在运行的任务，请直接发送普通消息。');
+}

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

@@ -110,6 +110,10 @@ export class HarnessApprovalQueue {
     this.#logger = logger;
   }
 
+  hasPending(key) {
+    return this.#routes.get(key)?.items.some((pending) => !pending.inactive) === true;
+  }
+
   claimReply({
     key,
     actor,