@xmanrui/dsh-im 4.18.0 → 4.19.0

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

@@ -1,3 +1,4 @@
+import { validateBotAlias, withBotAlias } from './bot-alias.mjs';
 import {
   mkdir,
   readFile,
@@ -264,6 +265,16 @@ function normalizeDocument(value) {
   if (value.version === 1 && value.deliveryTargets !== undefined) return null;
   const deliveryTargets = normalizeDeliveryTargets(value.deliveryTargets, { version: value.version });
   if (!deliveryTargets) return null;
+  const aliases = Object.create(null);
+  if (value.aliases && typeof value.aliases === 'object' && !Array.isArray(value.aliases)) {
+    for (const [botId, alias] of Object.entries(value.aliases)) {
+      try {
+        botIdOf(botId);
+        const normalized = validateBotAlias(alias);
+        if (normalized) aliases[botId] = normalized;
+      } catch { /* A damaged display name must not disable the bot. */ }
+    }
+  }
   const accessPolicies = normalizeAccessPolicies(value.accessPolicies, workspaces);
   const version = Math.max(
     value.version,
@@ -279,6 +290,7 @@ function normalizeDocument(value) {
     contextEnhancement,
     deliveryTargets,
     accessPolicies,
+    aliases,
   };
 }
 
@@ -290,8 +302,10 @@ function storedDocument({
   contextEnhancement,
   deliveryTargets,
   accessPolicies,
+  aliases,
 }) {
   const document = { version, workspaces };
+  if (Object.keys(aliases).length > 0) document.aliases = aliases;
   if (Object.keys(agentPresets).length > 0) document.agentPresets = agentPresets;
   if (Object.keys(models).length > 0) document.models = models;
   if (Object.keys(contextEnhancement).length > 0) {
@@ -346,6 +360,7 @@ export class BotWorkspaceStore {
   #workspaces = {};
   #agentPresets = {};
   #models = {};
+  #aliases = Object.create(null);
   #contextEnhancement = {};
   #deliveryTargets = Object.create(null);
   #accessPolicies = Object.create(null);
@@ -373,6 +388,7 @@ export class BotWorkspaceStore {
       this.#workspaces = normalized.workspaces;
       this.#agentPresets = normalized.agentPresets;
       this.#models = normalized.models;
+      this.#aliases = normalized.aliases;
       this.#contextEnhancement = normalized.contextEnhancement;
       this.#deliveryTargets = normalized.deliveryTargets;
       this.#accessPolicies = normalized.accessPolicies;
@@ -382,6 +398,7 @@ export class BotWorkspaceStore {
       this.#workspaces = {};
       this.#agentPresets = {};
       this.#models = {};
+      this.#aliases = Object.create(null);
       this.#contextEnhancement = {};
       this.#deliveryTargets = Object.create(null);
       this.#accessPolicies = Object.create(null);
@@ -427,6 +444,11 @@ export class BotWorkspaceStore {
     return selection ? { ...selection } : null;
   }
 
+  aliasFor(botId) {
+    const id = botIdOf(botId);
+    return this.has(id) && Object.hasOwn(this.#aliases, id) ? this.#aliases[id] : '';
+  }
+
   contextEnhancementFor(botId) {
     const id = botIdOf(botId);
     return this.has(id) && Object.hasOwn(this.#contextEnhancement, id)
@@ -745,6 +767,26 @@ export class BotWorkspaceStore {
     });
   }
 
+  async setAlias(botId, value, { incarnation } = {}) {
+    const id = botIdOf(botId);
+    const expectedIncarnation = incarnation === undefined ? this.incarnationFor(id) : incarnation;
+    const alias = validateBotAlias(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.#aliases };
+      if (alias) next[id] = alias;
+      else delete next[id];
+      await this.#persist(this.#contextEnhancement, this.#deliveryTargets,
+        this.#version, this.#accessPolicies, next);
+      this.#aliases = next;
+      return alias;
+    });
+  }
+
   async setContextEnhancement(botId, value, { incarnation } = {}) {
     const id = botIdOf(botId);
     const expectedIncarnation = incarnation === undefined ? this.incarnationFor(id) : incarnation;
@@ -945,6 +987,7 @@ export class BotWorkspaceStore {
       ...Object.keys(this.#workspaces),
       ...Object.keys(this.#agentPresets),
       ...Object.keys(this.#models),
+      ...Object.keys(this.#aliases),
       ...Object.keys(this.#contextEnhancement),
       ...Object.keys(this.#deliveryTargets),
       ...Object.keys(this.#accessPolicies),
@@ -962,6 +1005,7 @@ export class BotWorkspaceStore {
       bots: status.bots.map((bot) => bot?.botId
         ? {
           ...bot,
+          ...(this.aliasFor(bot.botId) ? { bot: withBotAlias(bot.bot, this.aliasFor(bot.botId)) } : {}),
           workspace: this.workspaceFor(bot.botId),
           agentPreset: this.agentPresetFor(bot.botId),
           model: this.modelFor(bot.botId),
@@ -997,14 +1041,16 @@ export class BotWorkspaceStore {
     const hadWorkspace = Object.hasOwn(this.#workspaces, id);
     const hadPreset = Object.hasOwn(this.#agentPresets, id);
     const hadModel = Object.hasOwn(this.#models, id);
+    const hadAlias = Object.hasOwn(this.#aliases, id);
     const hadContextEnhancement = Object.hasOwn(this.#contextEnhancement, id);
     const hadDeliveryTargets = Object.hasOwn(this.#deliveryTargets, id);
     const hadAccessPolicy = Object.hasOwn(this.#accessPolicies, id);
-    const needsCleanup = hadWorkspace || hadPreset || hadModel || hadContextEnhancement
+    const needsCleanup = hadWorkspace || hadPreset || hadModel || hadAlias || hadContextEnhancement
       || hadDeliveryTargets || hadAccessPolicy || this.#dirtyRemovals.has(id);
     delete this.#workspaces[id];
     delete this.#agentPresets[id];
     delete this.#models[id];
+    delete this.#aliases[id];
     delete this.#contextEnhancement[id];
     delete this.#deliveryTargets[id];
     delete this.#accessPolicies[id];
@@ -1042,6 +1088,7 @@ export class BotWorkspaceStore {
     deliveryTargets = this.#deliveryTargets,
     version = this.#version,
     accessPolicies = this.#accessPolicies,
+    aliases = this.#aliases,
   ) {
     await writeStoredDocument(this.#path, storedDocument({
       version,
@@ -1051,6 +1098,7 @@ export class BotWorkspaceStore {
       contextEnhancement,
       deliveryTargets,
       accessPolicies,
+      aliases,
     }));
     this.#dirtyRemovals.clear();
   }
@@ -1059,6 +1107,7 @@ export class BotWorkspaceStore {
     if (Object.keys(this.#workspaces).length > 0
       || Object.keys(this.#agentPresets).length > 0
       || Object.keys(this.#models).length > 0
+      || Object.keys(this.#aliases).length > 0
       || Object.keys(this.#contextEnhancement).length > 0
       || Object.keys(this.#deliveryTargets).length > 0
       || Object.keys(this.#accessPolicies).length > 0) {
@@ -1350,6 +1399,7 @@ export function createBotWorkspaceScope(
       }
       if (property === 'createSession') {
         return async (options = {}) => {
+          const { inheritBotModel = true, ...createOptions } = options;
           await workspaces.whenBotIdle(botId);
           if (!isCurrentScope()) {
             const error = new Error('找不到要修改的机器人。');
@@ -1358,9 +1408,9 @@ export function createBotWorkspaceScope(
           }
           const generation = workspaces.generationFor(botId);
           const agentPreset = workspaces.agentPresetFor(botId);
-          const model = workspaces.modelFor(botId);
+          const model = inheritBotModel === false ? null : workspaces.modelFor(botId);
           const sessionId = await target.createSession({
-            ...options,
+            ...createOptions,
             workspace: workspaces.workspaceFor(botId),
             ...(agentPreset == null ? {} : { agentPreset }),
           });
@@ -1645,6 +1695,23 @@ export function createWorkspaceAwareController(controller, {
       );
     });
   };
+  const updateAlias = (botId, value, projectStatus) => {
+    const incarnation = workspaces.incarnationFor(botId);
+    const alias = validateBotAlias(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, bot: withBotAlias(bot.bot, alias) } : bot) };
+      const result = projectStatus ? await projectStatus(updated) : updated;
+      await workspaces.setAlias(botId, alias, { incarnation });
+      return result;
+    });
+  };
   const updateContextEnhancement = (botId, value, projectStatus) => {
     const incarnation = workspaces.incarnationFor(botId);
     const config = validateContextEnhancementConfig(value);
@@ -1743,6 +1810,7 @@ export function createWorkspaceAwareController(controller, {
       if (property === 'updateWorkspace') return updateWorkspace;
       if (property === 'updateAgentPreset') return updateAgentPreset;
       if (property === 'updateModel') return updateModel;
+      if (property === 'updateAlias') return updateAlias;
       if (property === 'updateContextEnhancement') return updateContextEnhancement;
       if (property === 'updateAccessPolicy') return updateAccessPolicy;
       const value = Reflect.get(target, property, target);

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

@@ -57,8 +57,8 @@ export default {
     'This conversation exceeds the model context limit. Send /compact or /new, then try again.',
   '当前模型不存在或暂不可用。请发送 /models 查看并使用 /model 切换模型。':
     'The current model does not exist or is unavailable. Send /models and use /model to switch models.',
-  '当前模型不存在或不支持所选配置。请发送 /models，并使用 /model 重新选择。':
-    'The current model does not exist or does not support the selected settings. Send /models and use /model to choose again.',
+  '当前模型不存在或不支持所选配置。请发送 /models，再用 /model <序号> 为当前聊天重新选择。若要修改后续新会话的默认模型，请到 DSH 设置 → IM机器人 → 对应机器人卡片修改。':
+    'The current model does not exist or does not support the selected settings. Send /models, then use /model <index> to choose a model for the current conversation. To change the default model for new conversations, open DSH Settings → IM Bots → the corresponding bot card.',
   '当前模型不支持这类内容或所选配置。请调整内容、模型或推理等级后重试。':
     'The current model does not support this content or the selected settings. Adjust the content, model, or reasoning effort and try again.',
   '当前模型不支持所选配置。请切换模型或推理等级后重试。':

package/src/channels/shared/message-failure.mjs

@@ -47,7 +47,7 @@ const FAILURE_MESSAGES = Object.freeze({
   MODEL_CONTEXT_LIMIT:
     '当前会话内容超过模型上下文上限。请发送 /compact 或 /new 后重试。',
   MODEL_UNAVAILABLE:
-    '当前模型不存在或不支持所选配置。请发送 /models，并使用 /model 重新选择。',
+    '当前模型不存在或不支持所选配置。请发送 /models，再用 /model <序号> 为当前聊天重新选择。若要修改后续新会话的默认模型，请到 DSH 设置 → IM机器人 → 对应机器人卡片修改。',
   MODEL_CONFIG:
     '当前模型不支持这类内容或所选配置。请调整内容、模型或推理等级后重试。',
   MODEL_TIMEOUT:
@@ -125,6 +125,7 @@ function failureCode(error) {
   }
   if (code === 'harness-turn-failed') return 'INTERNAL_UNKNOWN';
   if (['harness-http-failed', 'harness-rpc-rejected'].includes(code)) return 'HARNESS_SERVICE';
+  if (code === 'model-unavailable' || code === 'session/model-unavailable') return 'MODEL_UNAVAILABLE';
   if (code === 'model-empty-response') return 'MODEL_EMPTY_REPLY';
   if (code === 'model-max-tokens') return 'MODEL_OUTPUT_LIMIT';
   if (code === 'turn-blocked') return 'TURN_BLOCKED';

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

@@ -393,7 +393,7 @@ function modelErrorMessage(error, action) {
   if (code === 'session-not-found') {
     return t('当前聊天绑定的会话已不存在，请重试。');
   }
-  if (code === 'model-unavailable') {
+  if (code === 'model-unavailable' || code === 'session/model-unavailable') {
     if (action === 'reasoning-select') {
       return t('无法切换推理等级。当前模型或推理等级不可用。');
     }
@@ -704,7 +704,8 @@ export async function runModelCommand(text, harness, state, key, options = {}) {
           || typeof state?.setSession !== 'function') {
           throw new TypeError('Harness cannot create a conversation session');
         }
-        const sessionId = await harness.createSession(requestOptions);
+        // An explicit choice must remain usable even when the saved bot model expires.
+        const sessionId = await harness.createSession({ ...requestOptions, inheritBotModel: false });
         if (typeof sessionId !== 'string' || !sessionId) {
           throw new TypeError('Harness returned an invalid session id');
         }

package/src/channels/shared/session-sync-registry.mjs

@@ -0,0 +1,34 @@
+/**
+ * Session-sync ownership registry: records which delivery targets of a
+ * session are being mirrored as process cards by their owning bridge.
+ *
+ * The plain-text session-sync coordinator and the per-bridge card mirror
+ * observe the same global session events. When a bridge mirrors a turn to a
+ * specific target, the coordinator must suppress the plain-text delivery for
+ * THAT target only — other targets (same or other channels) still receive
+ * their normal text. Both sides live in the same Host process, so a
+ * module-level registry is the whole contract: the mirror claims a target
+ * when it opens the mirror card and releases it when the turn ends.
+ */
+const claimed = new Map();
+
+function keyOf(sessionId, targetId) {
+  return `${sessionId}\0${targetId ?? ''}`;
+}
+
+export function claimSessionSyncMirror(sessionId, targetId = '', turn = null) {
+  if (typeof sessionId !== 'string' || !sessionId) return;
+  claimed.set(keyOf(sessionId, targetId), { turn, claimedAt: Date.now() });
+}
+
+export function releaseSessionSyncMirror(sessionId, targetId = '') {
+  claimed.delete(keyOf(sessionId, targetId));
+}
+
+/** True when a live mirror claim covers this session and target. */
+export function isSessionSyncMirrored(sessionId, targetId = '', turn = null) {
+  const claim = claimed.get(keyOf(sessionId, targetId));
+  if (!claim) return false;
+  if (turn !== null && claim.turn !== null && claim.turn !== turn) return false;
+  return true;
+}

package/src/channels/shared/text-harness-bridge.mjs

@@ -144,6 +144,7 @@ export class TextHarnessBridge {
   #logger;
   #replyTimeoutMs;
   #signal;
+  #keepaliveIntervalMs;
   #queues = new Map();
   #pendingInteractions = new Map();
   #interactionKeys = new Map();
@@ -165,6 +166,7 @@ export class TextHarnessBridge {
     logger = console,
     replyTimeoutMs = 600_000,
     signal,
+    keepaliveIntervalMs = 4_000,
   }) {
     if (!descriptor?.key || !descriptor?.label) throw new TypeError('A channel descriptor is required');
     if (!bot || typeof bot.sendText !== 'function') throw new TypeError('A bot client is required');
@@ -179,6 +181,7 @@ export class TextHarnessBridge {
     this.#logger = logger;
     this.#replyTimeoutMs = replyTimeoutMs;
     this.#signal = signal;
+    this.#keepaliveIntervalMs = keepaliveIntervalMs;
     this.#deferred = createDeferredDeliveryCoordinator({ harness, state, signal, logger,
       deliver: (entry, outcome) => this.#deliverDeferredOutcome(entry, outcome),
     });
@@ -586,6 +589,15 @@ export class TextHarnessBridge {
     const batchSubmission = message.batchSubmission;
     let stream = null;
     let semanticStream = false;
+    // A keepalive heartbeat keeps short-lived carriers (e.g. Telegram's
+    // private-chat Rich Draft) visible during long silent stretches such as a
+    // running tool call. Declared outside the try so every exit path (including
+    // pre-prompt failures like image parsing) clears the timer.
+    let keepaliveTimer = null;
+    const stopKeepalive = () => {
+      if (keepaliveTimer !== null) clearInterval(keepaliveTimer);
+      keepaliveTimer = null;
+    };
     try {
       this.#signal?.throwIfAborted();
       if (message.kind === 'group' && message.addressed !== true) {
@@ -685,6 +697,29 @@ export class TextHarnessBridge {
         }));
         contextEnhanced = content !== originalContent;
       }
+      // Start the keepalive only after the inbound payload is ready, so a
+      // pre-prompt failure (image parsing, context building) cannot leave the
+      // timer running; the outermost finally below clears it on every path.
+      if (stream && stream.keepalive === true && typeof stream.refresh === 'function') {
+        let refreshing = false;
+        keepaliveTimer = setInterval(async () => {
+          // Skip ticks while the previous heartbeat is pending so redundant
+          // refreshes cannot queue ahead of the final answer on a slow network.
+          if (refreshing) return;
+          refreshing = true;
+          try {
+            await Promise.allSettled([
+              this.#bot.sendTyping?.(target),
+              stream.refresh(),
+            ]);
+          } catch {
+            // Keepalive is best-effort, including synchronous adapter failures.
+          } finally {
+            refreshing = false;
+          }
+        }, this.#keepaliveIntervalMs);
+        keepaliveTimer.unref?.();
+      }
       const { answer, artifacts = [] } = await askInWorkspaceSession({
         deferredDelivery: () => ({ coordinator: this.#deferred, target: this.#descriptor.key === 'whatsapp' ? { jid: target.jid, selfChat: target.selfChat } : target }),
         harness: this.#harness,
@@ -719,6 +754,7 @@ export class TextHarnessBridge {
           files: message.files,
         },
       });
+      stopKeepalive();
       if (batchSubmission) {
         this.#batches.complete(conversationKey, batchSubmission.token);
       }
@@ -805,6 +841,7 @@ export class TextHarnessBridge {
       }
       return delivery.receipt;
     } catch (error) {
+      stopKeepalive();
       const turnStopped = error?.code === 'turn-stopped';
       if (batchSubmission && turnStopped) {
         this.#batches.complete(conversationKey, batchSubmission.token);
@@ -875,6 +912,7 @@ export class TextHarnessBridge {
       }
       return error.deliveryReceipt;
     } finally {
+      stopKeepalive();
       await Promise.allSettled([
         this.#cancelPendingInteraction(conversationKey),
         this.#approvals.closeRoute(conversationKey),

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

@@ -325,48 +325,99 @@ class TelegramDeliveryStream {
   #providerMessageIds;
   #closed = false;
   #lastUpdate = null;
+  #lastBlock = null;
+  #keepalive = false;
+  #chain = Promise.resolve();
 
-  constructor({ update, finish, fail, providerMessageIds = [], presentation, logger }) {
+  constructor({
+    update,
+    finish,
+    fail,
+    providerMessageIds = [],
+    presentation,
+    logger,
+    keepalive = false,
+  }) {
     this.#update = update;
     this.#finish = finish;
     this.#fail = fail;
     this.#providerMessageIds = providerMessageIds;
     this.presentation = presentation;
     this.#logger = logger;
+    // Only short-lived carriers (e.g. the private-chat Rich Draft) need a
+    // keepalive refresh; editing a real placeholder message with identical
+    // content would be rejected by the platform.
+    this.#keepalive = keepalive === true;
   }
 
   get providerMessageIds() {
     return [...this.#providerMessageIds];
   }
 
-  async update(value) {
-    if (this.#closed) return undefined;
-    const block = createTextDeliveryBlock(value);
-    const key = `${block.format}:${block.text}`;
-    if (key === this.#lastUpdate) return undefined;
-    this.#lastUpdate = key;
-    try {
-      return await this.#update(block);
-    } catch (error) {
-      this.#logger.warn?.('[dsh-im:telegram] rich stream update failed:', error);
-      return undefined;
-    }
+  /** Whether this carrier is short-lived and wants a keepalive heartbeat. */
+  get keepalive() {
+    return this.#keepalive;
   }
 
-  async finish(value) {
-    if (this.#closed) throw new Error('Message stream is already closed');
-    this.#closed = true;
-    const result = await this.#finish(createTextDeliveryBlock(value));
-    this.#providerMessageIds.push(...(result?.providerMessageIds ?? []));
-    return result;
+  /** Serialize every write so an in-flight keepalive refresh can never land
+   *  after the final frame: finish()/fail() queue behind refresh()/update(). */
+  #enqueue(task) {
+    const run = this.#chain.then(task);
+    this.#chain = run.catch(() => undefined);
+    return run;
   }
 
-  async fail(text) {
-    if (this.#closed) return undefined;
-    this.#closed = true;
-    const result = await this.#fail(createTextDeliveryBlock(text, 'plain'));
-    this.#providerMessageIds.push(...(result?.providerMessageIds ?? []));
-    return result;
+  update(value) {
+    return this.#enqueue(async () => {
+      if (this.#closed) return undefined;
+      const block = createTextDeliveryBlock(value);
+      this.#lastBlock = block;
+      const key = `${block.format}:${block.text}`;
+      if (key === this.#lastUpdate) return undefined;
+      this.#lastUpdate = key;
+      try {
+        return await this.#update(block);
+      } catch (error) {
+        this.#logger.warn?.('[dsh-im:telegram] rich stream update failed:', error);
+        return undefined;
+      }
+    });
+  }
+
+  /** Re-send the most recent frame even when unchanged, to keep a short-lived
+   *  carrier (the private-chat Rich Draft) visible during long silent
+   *  stretches such as a running tool call. Serialized like update() so it
+   *  never overtakes a later finish(). No-op for carriers without keepalive. */
+  refresh() {
+    return this.#enqueue(async () => {
+      if (this.#closed || !this.#keepalive || !this.#lastBlock) return undefined;
+      try {
+        return await this.#update(this.#lastBlock);
+      } catch (error) {
+        this.#logger.warn?.('[dsh-im:telegram] rich stream refresh failed:', error);
+        return undefined;
+      }
+    });
+  }
+
+  finish(value) {
+    return this.#enqueue(async () => {
+      if (this.#closed) throw new Error('Message stream is already closed');
+      this.#closed = true;
+      const result = await this.#finish(createTextDeliveryBlock(value));
+      this.#providerMessageIds.push(...(result?.providerMessageIds ?? []));
+      return result;
+    });
+  }
+
+  fail(text) {
+    return this.#enqueue(async () => {
+      if (this.#closed) return undefined;
+      this.#closed = true;
+      const result = await this.#fail(createTextDeliveryBlock(text, 'plain'));
+      this.#providerMessageIds.push(...(result?.providerMessageIds ?? []));
+      return result;
+    });
   }
 
   cancel() {
@@ -663,6 +714,7 @@ export class TelegramBotClient {
         finish: (block) => this.#sendRich(target, block),
         fail: (block) => this.#sendPlain(target, block.text),
         presentation: 'telegram-rich-draft',
+        keepalive: true,
         logger: this.#logger,
       });
       await stream.update(createTextDeliveryBlock('正在处理…', 'plain'));