@xmanrui/dsh-im 4.14.0 → 4.16.0

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

@@ -96,8 +96,16 @@ 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;
+    && typeof value.description === 'string' && value.description.trim().length >= 1
+    && [...value.description].length <= 256;
+}
+
+export function validateTelegramCommands(commands, { allowEmpty = false } = {}) {
+  if (!Array.isArray(commands) || (!allowEmpty && commands.length === 0)
+    || commands.length > 100 || commands.some((command) => !validBotCommand(command))
+    || new Set(commands.map((item) => item.command)).size !== commands.length) {
+    throw new TypeError('Telegram bot commands are invalid');
+  }
 }
 
 export const COMMANDS_MENU_BUTTON = Object.freeze({ type: 'commands' });
@@ -334,10 +342,7 @@ export class TelegramApi {
   }
 
   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');
-    }
+    validateTelegramCommands(commands);
     return this.#call('setMyCommands', {
       commands,
       ...(scope ? { scope } : {}),
@@ -345,6 +350,13 @@ export class TelegramApi {
     }, { signal });
   }
 
+  async deleteMyCommands({ scope, languageCode, signal } = {}) {
+    return this.#call('deleteMyCommands', {
+      ...(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');

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

@@ -5,7 +5,8 @@ import { createTextDeliveryBlock } from '../shared/semantic/delivery.mjs';
 import { t } from '../shared/i18n.mjs';
 import { captureContextEnhancement } from '../shared/context-enhancement.mjs';
 import { recoverAssistantTextByTimestamp } from '../shared/session-reply-recovery.mjs';
-import { COMMANDS_MENU_BUTTON, TelegramApi } from './telegram-api.mjs';
+import { SHARED_COMMAND_CATALOG, commandsForChannel } from '../shared/command-catalog.mjs';
+import { COMMANDS_MENU_BUTTON, TelegramApi, validateTelegramCommands } from './telegram-api.mjs';
 import { createTelegramHttpTransport } from './telegram-http.mjs';
 import { createTelegramBridgeStatus, TelegramHarnessBridge } from './telegram-bridge.mjs';
 import {
@@ -17,39 +18,30 @@ import {
   TELEGRAM_ACCESS_MODES,
 } from './config-store.mjs';
 
-export const TELEGRAM_COMMAND_MENU = Object.freeze([
-  { command: 'new', description: '开启一个全新会话' },
-  { command: 'compact', description: '压缩当前会话的较早上下文' },
-  { command: 'workspace', description: '切换工作区' },
-  { command: 'ws', description: '切换工作区' },
-  { command: 'workspacelist', description: '列出工作区绝对路径' },
-  { command: 'workspaces', description: '列出工作区绝对路径' },
-  { command: 'wsl', description: '列出工作区绝对路径' },
-  { command: 'sessionlist', description: '列出会话 ID 和标题' },
-  { command: 'sessions', description: '列出会话 ID 和标题' },
-  { command: 'session', description: '将当前聊天绑定到指定会话' },
-  { command: 'models', description: '按序号列出所有可用模型' },
-  { command: 'model', description: '查看或切换当前会话模型' },
-  { command: 'presetlist', description: '列出可用 Agent Preset' },
-  { command: 'presets', description: '列出可用 Agent Preset' },
-  { command: 'preset', description: '查看或设置新会话 Agent Preset' },
-  { command: 'stop', description: '停止当前任务' },
-  { command: 'steer', description: '纠偏当前任务' },
-  { command: 'batch', description: '开始批量输入（仅私聊）' },
-  { command: 'send', description: '提交当前批次' },
-  { command: 'cancel', description: '取消当前批次' },
-  { command: 'status', description: '检查连接状态' },
-  { command: 'version', description: '查看插件版本' },
-  { command: 'help', description: '显示帮助' },
-]);
+function commandMenuEntries(catalog, translate) {
+  return commandsForChannel('telegram', catalog)
+    .filter((item) => item.menuVisible !== false)
+    .flatMap((item) => [item, ...(item.aliases ?? [])]
+      .filter((entry) => entry.menuVisible !== false && entry.enabled !== false
+        && (!entry.channels || entry.channels.includes('telegram')))
+      .map((entry) => ({
+        command: entry.name,
+        description: translate(entry.description ?? item.description),
+      })));
+}
 
-export function telegramCommandMenu() {
-  return TELEGRAM_COMMAND_MENU.map((item) => ({
-    ...item,
-    description: t(item.description),
-  }));
+export function telegramCommandMenu(catalog = SHARED_COMMAND_CATALOG) {
+  const commands = commandMenuEntries(catalog, t);
+  validateTelegramCommands(commands, { allowEmpty: true });
+  return commands;
 }
 
+// Retain the source-language export for existing consumers, derived from the
+// catalog. Runtime synchronization always generates a fresh, localized list.
+export const TELEGRAM_COMMAND_MENU = Object.freeze(
+  commandMenuEntries(SHARED_COMMAND_CATALOG, (text) => text).map((item) => Object.freeze(item)),
+);
+
 function escaped(value) {
   return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 }
@@ -772,6 +764,7 @@ export class TelegramRuntime {
   #replyTimeoutMs;
   #createApi;
   #createHttpTransport;
+  #commandCatalog;
   #status = createTelegramRuntimeStatus();
   #httpTransport = null;
   #api = null;
@@ -791,6 +784,7 @@ export class TelegramRuntime {
     replyTimeoutMs = 600_000,
     createApi = (options) => new TelegramApi(options),
     createHttpTransport = createTelegramHttpTransport,
+    commandCatalog = SHARED_COMMAND_CATALOG,
   }) {
     if (!config || !token || !harness || !state) {
       throw new TypeError('TelegramRuntime requires config, token, Harness, and state');
@@ -805,6 +799,7 @@ export class TelegramRuntime {
     this.#replyTimeoutMs = replyTimeoutMs;
     this.#createApi = createApi;
     this.#createHttpTransport = createHttpTransport;
+    this.#commandCatalog = commandCatalog;
   }
 
   get status() {
@@ -883,7 +878,14 @@ export class TelegramRuntime {
         throw error;
       }
       try {
-        await api.setMyCommands({ commands: telegramCommandMenu(), signal: controller.signal });
+        const commands = telegramCommandMenu(this.#commandCatalog);
+        // Both operations use the existing default scope and language. Sending
+        // the full list replaces old entries; an empty catalog clears that list.
+        if (commands.length > 0) {
+          await api.setMyCommands({ commands, signal: controller.signal });
+        } else {
+          await api.deleteMyCommands({ signal: controller.signal });
+        }
         await api.setChatMenuButton({ menuButton: COMMANDS_MENU_BUTTON, signal: controller.signal });
       } catch (error) {
         this.#logger.warn?.(

package/src/channels/wecom/send-error.mjs

@@ -0,0 +1,31 @@
+import { channelDeliveryFailure } from '../shared/message-failure.mjs';
+
+// Normalize only errors from SDK send calls, never Harness or menu-building errors.
+export function wecomSendError(error, operation) {
+  if (error?.wecomOperation || error?.name === 'AbortError'
+    || error instanceof TypeError || error instanceof ReferenceError || error instanceof SyntaxError) return error;
+  const value = error?.errcode ?? error?.body?.errcode ?? error?.providerCode;
+  const providerCode = typeof value === 'number'
+    || (typeof value === 'string' && /^-?\d+$/u.test(value)) ? Number(value) : NaN;
+  const rejected = Number.isSafeInteger(providerCode) && providerCode !== 0;
+  const disconnected = error?.message === 'WebSocket not connected, unable to send data';
+  const wrapped = channelDeliveryFailure(error, { uncertain: !rejected && !disconnected });
+  // Keep the same provider mappings as wecomArtifactError.
+  if (providerCode === 48002) wrapped.code = 'channel-permission';
+  if (providerCode === 45009) wrapped.code = 'channel-rate-limit';
+  if (rejected) wrapped.providerCode = providerCode;
+  wrapped.wecomOperation = operation;
+  wrapped.message = `Enterprise WeChat ${operation} failed (${wrapped.code}, provider=${wrapped.providerCode ?? '-'})`;
+  return wrapped;
+}
+
+// The SDK rejection frame can contain private payloads. Log only diagnostic fields.
+export function wecomSendDiagnostic(error) {
+  if (!error?.wecomOperation) return undefined;
+  return {
+    operation: error.wecomOperation,
+    code: error.code,
+    providerCode: error.providerCode,
+    status: error.status,
+  };
+}

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

@@ -1,6 +1,7 @@
 import { createDeferredDeliveryCoordinator, deferredOutcomeText } from '../shared/deferred-delivery-coordinator.mjs';
 import { generateReqId } from '@wecom/aibot-node-sdk';
 import { randomUUID } from 'node:crypto';
+import { wecomSendDiagnostic, wecomSendError } from './send-error.mjs';
 import {
   parseWecomMenu, wecomList, wecomMenu, wecomMenuText, wecomSettings, wecomTemplateCard,
 } from './wecom-cards.mjs';
@@ -54,7 +55,6 @@ import {
   createDeliveryReceipt,
 } from '../shared/semantic/delivery.mjs';
 import {
-  channelDeliveryFailure,
   clearLastMessageFailure,
   messageFailureText,
   setLastMessageFailure,
@@ -616,6 +616,7 @@ export class WecomHarnessBridge {
   }
 
   async #showMain(frame, { welcome = false } = {}) {
+    const previousFailure = this.#status.lastMessageError;
     const key = conversationKey(frame);
     const workspace = this.#harness.currentWorkspace?.();
     const sessionId = this.#state.sessionFor(key);
@@ -650,10 +651,21 @@ export class WecomHarnessBridge {
       presetLabel: settings?.agentPresetCatalog?.items.find((item) => item.id === currentPreset)?.label,
     });
     await this.#sendMenu(frame, settingsMenu, { active: welcome });
-    if (welcome) return;
-    await this.#sendMenu(frame, wecomMenu({ workspace,
-      workspaces: (paths?.paths ?? (workspace ? [workspace] : [])).map((path) => [path, `/workspace ${path}`]),
-    }), { active: true });
+    if (!welcome) {
+      await this.#sendMenu(frame, wecomMenu({ workspace,
+        workspaces: (paths?.paths ?? (workspace ? [workspace] : [])).map((path) => [path, `/workspace ${path}`]),
+      }), { active: true });
+    }
+    this.#clearMenuFailure(previousFailure);
+  }
+
+  #clearMenuFailure(previousFailure) {
+    // Do not clear a model failure or one recorded by a concurrent request.
+    if (previousFailure?.reason === 'WECOM_MENU_DELIVERY'
+      && this.#status.lastMessageError === previousFailure) {
+      clearLastMessageFailure(this.#status);
+      this.#status.lastError = null;
+    }
   }
 
   #rememberMenu(frame, menu) {
@@ -675,6 +687,8 @@ export class WecomHarnessBridge {
     const body = bodyOf(frame);
     const chatId = body.chattype === 'group' ? body.chatid : body.from.userid;
     const card = this.#rememberMenu(frame, menu);
+    const operation = welcome ? 'replyWelcome'
+      : active || this.#cardFrames.has(frame) ? 'sendMessage' : 'replyTemplateCard';
     try {
       if (welcome) {
         await this.#client.replyWelcome(frame, { msgtype: 'template_card', template_card: card });
@@ -683,11 +697,20 @@ export class WecomHarnessBridge {
       } else {
         await this.#client.replyTemplateCard(frame, card);
       }
-    } catch (error) {
-      this.#menus.delete(card.task_id);
-      this.#logger.warn?.('[dsh-im:wecom] menu delivery failed; using text:', error);
+    } catch (cause) {
+      const error = wecomSendError(cause, operation);
+      // A timed-out card may already be visible and must remain usable.
+      if (error.code !== 'channel-delivery-uncertain') this.#menus.delete(card.task_id);
+      // Only a definite card rejection can safely fall back to text.
+      if (error.code !== 'channel-delivery-failed' || error.providerCode === undefined) throw error;
+      this.#logger.warn?.('[dsh-im:wecom] menu delivery failed; using text:', wecomSendDiagnostic(error));
       if (welcome) {
-        await this.#client.replyWelcome(frame, { msgtype: 'text', text: { content: wecomMenuText(menu) } });
+        const content = wecomMenuText(menu);
+        try {
+          await this.#client.replyWelcome(frame, { msgtype: 'text', text: { content } });
+        } catch (cause) {
+          throw wecomSendError(cause, 'replyWelcome');
+        }
       } else {
         await this.#sendImmediate(frame, chatId, wecomMenuText(menu));
       }
@@ -705,7 +728,10 @@ export class WecomHarnessBridge {
     task = this.#processEvent(frame).catch((error) => {
       if (this.#signal?.aborted) return;
       this.#status.lastError = error?.message ?? String(error);
-      this.#logger.warn?.('[dsh-im:wecom] menu event failed:', error);
+      const failure = setLastMessageFailure(this.#status, error, {
+        reason: error?.wecomOperation ? 'wecom-menu-delivery' : undefined,
+      });
+      this.#logger.warn?.(`[dsh-im:wecom] menu event failed [${failure.referenceId}]`, wecomSendDiagnostic(error));
     }).finally(() => {
       this.#eventIds.delete(id);
       this.#commandTasks.delete(task);
@@ -802,6 +828,7 @@ export class WecomHarnessBridge {
     const menu = parseWecomMenu(text);
     const options = { signal: this.#signal };
     if (menu) {
+      const previousFailure = this.#status.lastMessageError;
       let content;
       if (menu.section === 'main') {
         await this.#showMain(frame);
@@ -846,6 +873,7 @@ export class WecomHarnessBridge {
         content = wecomList({ title, entries, description, ...menu });
       }
       await this.#sendMenu(frame, content);
+      this.#clearMenuFailure(previousFailure);
       return { messages: [] };
     }
     const command = text.toLowerCase();
@@ -960,10 +988,15 @@ export class WecomHarnessBridge {
       ).catch((error) => {
         if (error?.code === 'turn-stopped' || this.#signal?.aborted) return;
         this.#status.lastError = error?.message ?? String(error);
-        const failure = setLastMessageFailure(this.#status, error);
+        const failure = setLastMessageFailure(this.#status, error, {
+          reason: parseWecomMenu(commandText) && error?.wecomOperation ? 'wecom-menu-delivery' : undefined,
+        });
         this.#logger.error?.(
           `[dsh-im:wecom] failed to process a command [${failure.referenceId}]`,
+          wecomSendDiagnostic(error),
         );
+        if (this.#cardFrames.has(frame) && error?.wecomOperation
+          && error.code !== 'channel-delivery-failed') return;
         return this.#sendImmediate(frame, chatId, messageFailureText(failure))
           .catch(() => undefined);
       }).finally(() => {
@@ -1149,6 +1182,7 @@ export class WecomHarnessBridge {
   async #processFastCommand(frame, messageId, chatId, key, message, runner) {
     this.#signal?.throwIfAborted();
     if (this.#state.hasSeen(messageId)) return;
+    const previousFailure = this.#status.lastMessageError;
     await this.#state.markSeen(messageId);
     this.#status.messagesReceived += 1;
     this.#status.lastMessageAt = new Date().toISOString();
@@ -1171,17 +1205,24 @@ export class WecomHarnessBridge {
     for (const reply of result?.messages ?? [result?.message]) {
       if (reply) await this.#sendImmediate(frame, chatId, reply);
     }
-    this.#status.lastError = null;
+    if (!this.#status.lastMessageError || this.#status.lastMessageError === previousFailure) {
+      this.#status.lastError = null;
+    }
   }
 
   async #sendActive(chatId, text) {
     const providerMessageIds = [];
     for (const chunk of splitUtf8(text)) {
       this.#signal?.throwIfAborted();
-      const result = await this.#client.sendMessage(
-        chatId,
-        { msgtype: 'markdown', markdown: { content: chunk } },
-      );
+      let result;
+      try {
+        result = await this.#client.sendMessage(
+          chatId,
+          { msgtype: 'markdown', markdown: { content: chunk } },
+        );
+      } catch (error) {
+        throw wecomSendError(error, 'sendMessage');
+      }
       const messageId = providerMessageId(result);
       if (messageId) providerMessageIds.push(messageId);
     }
@@ -1434,7 +1475,7 @@ export class WecomHarnessBridge {
           });
         }
       } catch (error) {
-        textSendError = channelDeliveryFailure(error);
+        textSendError = wecomSendError(error, 'sendMessage');
         this.#logger.warn?.(
           '[dsh-im:wecom] final text delivery failed; continuing with result files:',
           error,
@@ -1491,6 +1532,7 @@ export class WecomHarnessBridge {
       });
       this.#logger.error?.(
         `[dsh-im:wecom] failed to process an inbound message [${failure.referenceId}]`,
+        wecomSendDiagnostic(error),
       );
       const errorText = messageFailureText(failure);
       const visibleError = batchFailureMessage