@xmanrui/dsh-im 0.17.1 → 0.19.0

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

@@ -9,6 +9,10 @@ import {
 } from 'node:fs/promises';
 import { dirname, isAbsolute, resolve } from 'node:path';
 
+import {
+  normalizeAgentPresetCatalog,
+  validateAgentPresetId,
+} from './agent-preset.mjs';
 import { CONNECTION_TEST_STATE_IDENTITY } from './connection-test.mjs';
 import { WORKSPACE_SESSION_STALE } from './workspace-session.mjs';
 
@@ -49,7 +53,22 @@ function normalizeDocument(value) {
       || typeof workspace !== 'string' || !isAbsolute(workspace)) return null;
     workspaces[botId] = resolve(workspace);
   }
-  return { version: 1, workspaces };
+  let agentPresets = {};
+  if (value.agentPresets !== undefined) {
+    if (!value.agentPresets || typeof value.agentPresets !== 'object'
+      || Array.isArray(value.agentPresets)) return null;
+    for (const [botId, agentPreset] of Object.entries(value.agentPresets)) {
+      if (!/^[A-Za-z0-9_-]{1,128}$/.test(botId)) return null;
+      try {
+        const normalized = validateAgentPresetId(agentPreset);
+        if (!normalized) return null;
+        agentPresets[botId] = normalized;
+      } catch {
+        return null;
+      }
+    }
+  }
+  return { version: 1, workspaces, agentPresets };
 }
 
 export async function validateWorkspacePath(value) {
@@ -79,6 +98,7 @@ export class BotWorkspaceStore {
   #path;
   #defaultWorkspace;
   #workspaces = {};
+  #agentPresets = {};
   #generations = new Map();
   #nextGeneration = 1;
   #incarnations = new Map();
@@ -100,9 +120,11 @@ export class BotWorkspaceStore {
       const normalized = normalizeDocument(JSON.parse(await readFile(this.#path, 'utf8')));
       if (!normalized) throw new Error('dsh-im workspace config is invalid');
       this.#workspaces = normalized.workspaces;
+      this.#agentPresets = normalized.agentPresets;
     } catch (error) {
       if (error?.code !== 'ENOENT') throw error;
       this.#workspaces = {};
+      this.#agentPresets = {};
     }
     this.#generations.clear();
     this.#nextGeneration = 1;
@@ -130,6 +152,10 @@ export class BotWorkspaceStore {
     return this.#workspaces[botIdOf(botId)] ?? this.#defaultWorkspace;
   }
 
+  agentPresetFor(botId) {
+    return this.#agentPresets[botIdOf(botId)] ?? null;
+  }
+
   generationFor(botId) {
     return this.#generations.get(botIdOf(botId)) ?? null;
   }
@@ -148,18 +174,24 @@ export class BotWorkspaceStore {
     }
   }
 
-  async ensure(botId, { workspace = this.#defaultWorkspace } = {}) {
+  async ensure(botId, { workspace = this.#defaultWorkspace, defaultAgentPreset } = {}) {
     const id = botIdOf(botId);
     const initialWorkspace = resolve(workspace);
     return this.#enqueue(id, async () => {
       if (!this.#workspaces[id]) {
+        const agentPreset = validateAgentPresetId(defaultAgentPreset);
+        const hadAgentPreset = Object.hasOwn(this.#agentPresets, id);
+        const previousAgentPreset = this.#agentPresets[id];
         this.#workspaces[id] = initialWorkspace;
+        if (agentPreset) this.#agentPresets[id] = agentPreset;
         this.#generations.set(id, this.#freshGeneration());
         this.#incarnations.set(id, this.#freshIncarnation());
         try {
           await this.#persist();
         } catch (error) {
           delete this.#workspaces[id];
+          if (hadAgentPreset) this.#agentPresets[id] = previousAgentPreset;
+          else delete this.#agentPresets[id];
           this.#generations.delete(id);
           this.#incarnations.delete(id);
           throw error;
@@ -207,6 +239,37 @@ export class BotWorkspaceStore {
     });
   }
 
+  async setAgentPreset(botId, value, { incarnation } = {}) {
+    const id = botIdOf(botId);
+    if (!this.has(id)
+      || (incarnation !== undefined && incarnation !== this.incarnationFor(id))) {
+      const error = new Error('找不到要修改的机器人。');
+      error.code = 'workspace-bot-not-found';
+      throw error;
+    }
+    const agentPreset = validateAgentPresetId(value);
+    return this.#enqueue(id, async () => {
+      if (!this.has(id)
+        || (incarnation !== undefined && incarnation !== this.incarnationFor(id))) {
+        const error = new Error('找不到要修改的机器人。');
+        error.code = 'workspace-bot-not-found';
+        throw error;
+      }
+      const previous = this.#agentPresets[id] ?? null;
+      if (previous === agentPreset) return agentPreset;
+      if (agentPreset) this.#agentPresets[id] = agentPreset;
+      else delete this.#agentPresets[id];
+      try {
+        await this.#persist();
+      } catch (error) {
+        if (previous) this.#agentPresets[id] = previous;
+        else delete this.#agentPresets[id];
+        throw error;
+      }
+      return agentPreset;
+    });
+  }
+
   async bindWorkspaceSession(botId, value, {
     conversationKey,
     sessionId,
@@ -353,7 +416,11 @@ export class BotWorkspaceStore {
 
   async reconcile(activeBotIds) {
     const active = new Set([...activeBotIds].map(botIdOf));
-    const candidates = new Set([...Object.keys(this.#workspaces), ...this.#dirtyRemovals]);
+    const candidates = new Set([
+      ...Object.keys(this.#workspaces),
+      ...Object.keys(this.#agentPresets),
+      ...this.#dirtyRemovals,
+    ]);
     for (const botId of candidates) {
       if (!active.has(botId)) await this.remove(botId);
     }
@@ -364,7 +431,11 @@ export class BotWorkspaceStore {
     return {
       ...status,
       bots: status.bots.map((bot) => bot?.botId
-        ? { ...bot, workspace: this.workspaceFor(bot.botId) }
+        ? {
+          ...bot,
+          workspace: this.workspaceFor(bot.botId),
+          agentPreset: this.agentPresetFor(bot.botId),
+        }
         : bot),
     };
   }
@@ -392,8 +463,10 @@ export class BotWorkspaceStore {
 
   async #retireCurrentIncarnation(id) {
     const hadWorkspace = Object.hasOwn(this.#workspaces, id);
-    const needsCleanup = hadWorkspace || this.#dirtyRemovals.has(id);
+    const hadPreset = Object.hasOwn(this.#agentPresets, id);
+    const needsCleanup = hadWorkspace || hadPreset || this.#dirtyRemovals.has(id);
     delete this.#workspaces[id];
+    delete this.#agentPresets[id];
     this.#generations.delete(id);
     this.#incarnations.delete(id);
     if (!needsCleanup) return {
@@ -425,6 +498,9 @@ export class BotWorkspaceStore {
 
   async #persist() {
     const document = { version: 1, workspaces: this.#workspaces };
+    if (Object.keys(this.#agentPresets).length > 0) {
+      document.agentPresets = this.#agentPresets;
+    }
     await mkdir(dirname(this.#path), { recursive: true, mode: 0o700 });
     const temporary = `${this.#path}.tmp`;
     await writeFile(temporary, `${JSON.stringify(document, null, 2)}\n`, {
@@ -436,7 +512,8 @@ export class BotWorkspaceStore {
   }
 
   async #persistCurrentDocument() {
-    if (Object.keys(this.#workspaces).length > 0) {
+    if (Object.keys(this.#workspaces).length > 0
+      || Object.keys(this.#agentPresets).length > 0) {
       await this.#persist();
       return;
     }
@@ -450,10 +527,29 @@ export class BotWorkspaceStore {
   }
 }
 
-function decorateResult(workspaces, result) {
+function resolveAgentPresetCatalog(catalog) {
+  if (!catalog) return null;
+  const value = typeof catalog === 'function' ? catalog() : catalog;
+  return value && typeof value.then === 'function'
+    ? value.then(normalizeAgentPresetCatalog)
+    : normalizeAgentPresetCatalog(value);
+}
+
+function decorateResult(workspaces, result, catalog) {
+  const decorate = (value) => {
+    const decorated = workspaces.decorateStatus(value);
+    if (!catalog || !decorated || typeof decorated !== 'object') return decorated;
+    const attachCatalog = (agentPresetCatalog) => (
+      agentPresetCatalog ? { ...decorated, agentPresetCatalog } : decorated
+    );
+    const agentPresetCatalog = resolveAgentPresetCatalog(catalog);
+    return agentPresetCatalog && typeof agentPresetCatalog.then === 'function'
+      ? agentPresetCatalog.then(attachCatalog)
+      : attachCatalog(agentPresetCatalog);
+  };
   return result && typeof result.then === 'function'
-    ? result.then((value) => workspaces.decorateStatus(value))
-    : workspaces.decorateStatus(result);
+    ? result.then(decorate)
+    : decorate(result);
 }
 
 function targetStatus(controller) {
@@ -608,9 +704,11 @@ export function createBotWorkspaceScope(harness, { botId, workspaces, state }) {
             throw error;
           }
           const generation = workspaces.generationFor(botId);
+          const agentPreset = workspaces.agentPresetFor(botId);
           const sessionId = await target.createSession({
             ...options,
             workspace: workspaces.workspaceFor(botId),
+            ...(agentPreset == null ? {} : { agentPreset }),
           });
           sessionGenerations.set(sessionId, generation);
           return sessionId;
@@ -765,7 +863,7 @@ export function createBotScopedHarness(harness, options) {
   return createBotWorkspaceScope(harness, options).harness;
 }
 
-export function createWorkspaceAwareController(controller, { workspaces, stateFor }) {
+export function createWorkspaceAwareController(controller, { workspaces, stateFor, agentPresetCatalog } = {}) {
   if (!controller || !workspaces || typeof stateFor !== 'function') {
     throw new TypeError('controller, workspaces, and stateFor are required');
   }
@@ -778,6 +876,7 @@ export function createWorkspaceAwareController(controller, { workspaces, stateFo
       if (transitions.get(botId) === current) transitions.delete(botId);
     });
   };
+  const decorate = (value) => decorateResult(workspaces, value, agentPresetCatalog);
   const updateWorkspace = (botId, workspace) => {
     // Capture at API invocation, before even waiting for an older outer
     // transition. A queued request still belongs to the incarnation that the
@@ -795,7 +894,34 @@ export function createWorkspaceAwareController(controller, { workspaces, stateFo
         clearSessions: () => state.clearSessions(),
         incarnation,
       });
-      return workspaces.decorateStatus(await controller.status());
+      return decorate(await controller.status());
+    });
+  };
+  const updateAgentPreset = (botId, agentPreset) => {
+    const incarnation = workspaces.incarnationFor(botId);
+    const normalizedAgentPreset = validateAgentPresetId(agentPreset);
+    return withBotTransition(botId, async () => {
+      const snapshot = await controller.status();
+      if (!snapshot?.bots?.some((bot) => bot?.botId === botId)) {
+        const error = new Error('找不到要修改的机器人。');
+        error.code = 'workspace-bot-not-found';
+        throw error;
+      }
+      const catalog = normalizedAgentPreset && agentPresetCatalog
+        ? await resolveAgentPresetCatalog(agentPresetCatalog)
+        : null;
+      if (normalizedAgentPreset && agentPresetCatalog
+        && !catalog?.items.some((item) => item.id === normalizedAgentPreset)) {
+        const error = new Error('Agent Preset 不存在或不可用。');
+        error.code = 'agent-preset-unavailable';
+        throw error;
+      }
+      await workspaces.setAgentPreset(botId, normalizedAgentPreset, { incarnation });
+      return decorateResult(
+        workspaces,
+        await controller.status(),
+        catalog ?? agentPresetCatalog,
+      );
     });
   };
   const deleteWithWorkspace = (botId, invokeDelete) => withBotTransition(botId, async () => {
@@ -822,7 +948,7 @@ export function createWorkspaceAwareController(controller, { workspaces, stateFo
     try {
       const result = await invokeDelete();
       await workspaces.finishRemoval(removal);
-      return workspaces.decorateStatus(result);
+      return decorate(result);
     } catch (error) {
       const after = await targetStatus(controller).catch(() => null);
       const knownAbsent = Array.isArray(after?.bots)
@@ -836,6 +962,7 @@ export function createWorkspaceAwareController(controller, { workspaces, stateFo
   return new Proxy(controller, {
     get(target, property) {
       if (property === 'updateWorkspace') return updateWorkspace;
+      if (property === 'updateAgentPreset') return updateAgentPreset;
       const value = Reflect.get(target, property, target);
       if (typeof value !== 'function') return value;
       if (property === 'deleteBot') {
@@ -848,11 +975,11 @@ export function createWorkspaceAwareController(controller, { workspaces, stateFo
         return async (...args) => {
           const before = await target.status();
           const botId = before?.bots?.[0]?.botId;
-          if (!botId) return decorateResult(workspaces, value.apply(target, args));
+          if (!botId) return decorate(value.apply(target, args));
           return deleteWithWorkspace(botId, () => value.apply(target, args));
         };
       }
-      return (...args) => decorateResult(workspaces, value.apply(target, args));
+      return (...args) => decorate(value.apply(target, args));
     },
   });
 }

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

@@ -592,11 +592,13 @@ export class HarnessClient {
   }
 
   async createSession(options = {}) {
-    await this.ensureRunning(options);
-    const workspaceId = await this.workspaceId(options);
+    const { agentPreset: requestedPreset, ...rpcOptions } = options;
+    await this.ensureRunning(rpcOptions);
+    const workspaceId = await this.workspaceId(rpcOptions);
     const payload = { workspaceId };
-    if (this.#agentPreset !== undefined) payload.agentPreset = this.#agentPreset;
-    const created = await this.rpc('session.create', payload, 30_000, options);
+    const agentPreset = requestedPreset !== undefined ? requestedPreset : this.#agentPreset;
+    if (agentPreset != null) payload.agentPreset = agentPreset;
+    const created = await this.rpc('session.create', payload, 30_000, rpcOptions);
     return created.sessionId;
   }
 

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

@@ -16,6 +16,18 @@ export function validTelegramToken(value) {
   return typeof value === 'string' && /^\d{5,20}:[A-Za-z0-9_-]{20,}$/.test(value.trim());
 }
 
+const TELEGRAM_COMMAND_NAME = /^[a-z0-9_]{1,32}$/;
+
+function validBotCommand(value) {
+  return Boolean(value)
+    && typeof value === 'object' && !Array.isArray(value)
+    && typeof value.command === 'string' && TELEGRAM_COMMAND_NAME.test(value.command)
+    && typeof value.description === 'string' && value.description.length >= 1
+    && value.description.length <= 256;
+}
+
+export const COMMANDS_MENU_BUTTON = Object.freeze({ type: 'commands' });
+
 export class TelegramApi {
   #token;
   #fetch;
@@ -113,6 +125,25 @@ export class TelegramApi {
     }, { signal });
   }
 
+  async setMyCommands({ commands, scope, languageCode, signal } = {}) {
+    if (!Array.isArray(commands) || commands.length === 0
+      || commands.some((command) => !validBotCommand(command))) {
+      throw new TypeError('Telegram bot commands are invalid');
+    }
+    return this.#call('setMyCommands', {
+      commands,
+      ...(scope ? { scope } : {}),
+      ...(cleanString(languageCode) ? { language_code: cleanString(languageCode) } : {}),
+    }, { signal });
+  }
+
+  async setChatMenuButton({ menuButton = COMMANDS_MENU_BUTTON, signal } = {}) {
+    if (!menuButton || typeof menuButton !== 'object' || Array.isArray(menuButton)) {
+      throw new TypeError('Telegram menu button is invalid');
+    }
+    return this.#call('setChatMenuButton', { menu_button: menuButton }, { signal });
+  }
+
   async #call(method, payload, { signal, timeoutMs = 15_000 } = {}) {
     const url = new URL(this.#baseUrl);
     url.pathname = `${url.pathname.replace(/\/$/, '')}/bot${this.#token}/${method}`;

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

@@ -1,11 +1,26 @@
 import { createEditableMessageStream, splitMessageText } from '../shared/editable-message-stream.mjs';
-import { TelegramApi } from './telegram-api.mjs';
+import { COMMANDS_MENU_BUTTON, TelegramApi } from './telegram-api.mjs';
 import { createTelegramBridgeStatus, TelegramHarnessBridge } from './telegram-bridge.mjs';
 import {
   TELEGRAM_ACCESS_MODES,
   normalizeTelegramAccessPolicy,
 } from './config-store.mjs';
 
+export const TELEGRAM_COMMAND_MENU = Object.freeze([
+  { command: 'new', description: '开启一个全新会话' },
+  { command: 'compact', description: '压缩当前会话的较早上下文' },
+  { command: 'workspace', description: '切换工作区' },
+  { command: 'workspacelist', description: '列出工作区绝对路径' },
+  { command: 'sessionlist', description: '列出会话 ID 和标题' },
+  { command: 'session', description: '将当前聊天绑定到指定会话' },
+  { command: 'models', description: '按序号列出所有可用模型' },
+  { command: 'model', description: '查看或切换当前会话模型' },
+  { command: 'stop', description: '停止当前任务' },
+  { command: 'steer', description: '纠偏当前任务' },
+  { command: 'status', description: '检查连接状态' },
+  { command: 'help', description: '显示帮助' },
+]);
+
 function escaped(value) {
   return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 }
@@ -290,6 +305,15 @@ export class TelegramRuntime {
         error.code = 'webhook-configured';
         throw error;
       }
+      try {
+        await api.setMyCommands({ commands: TELEGRAM_COMMAND_MENU, signal: controller.signal });
+        await api.setChatMenuButton({ menuButton: COMMANDS_MENU_BUTTON, signal: controller.signal });
+      } catch (error) {
+        this.#logger.warn?.(
+          `[dsh-im:telegram] bot ${this.#config.botId} command menu setup failed:`,
+          error,
+        );
+      }
       const client = new TelegramBotClient({ api, signal: controller.signal });
       this.#bridge = new TelegramHarnessBridge({
         bot: client,

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

@@ -184,7 +184,7 @@ function authenticatedHeaders(token) {
 function baseInfo() {
   return {
     channel_version: WEIXIN_PROTOCOL_VERSION,
-    bot_agent: 'DeepSeekHarness/0.17.1',
+    bot_agent: 'DeepSeekHarness/0.19.0',
   };
 }