@xmanrui/dsh-im 4.14.0 → 4.15.0

package/src/channels/feishu/bridge.mjs

@@ -816,14 +816,21 @@ export class FeishuHarnessBridge {
   accept(event) {
     if (this.#signal?.aborted) return Promise.resolve();
     const messageId = nonEmptyString(event?.message?.message_id);
-    if (!messageId || isBotSender(event)) return Promise.resolve();
+    if (!messageId) return Promise.resolve();
+    const addressed = this.#isAddressed(event);
+    // Bot messages require a known, explicit group mention even in all-message mode.
+    if (isBotSender(event) && (
+      event?.message?.chat_type !== 'group'
+      || !this.#botOpenId
+      || !addressed
+      || senderOpenId(event) === this.#botOpenId
+    )) return Promise.resolve();
     if (!this.#accessPolicy && !isAllowedSender(event, this.#allowedSenderOpenIds)) {
       this.#status.messagesRejected += 1;
       this.#status.lastRejectedAt = new Date().toISOString();
       this.#logger.warn?.('[dsh-feishu] ignored a message from a sender outside the legacy allowlist');
       return Promise.resolve();
     }
-    const addressed = this.#isAddressed(event);
     if (event?.message?.chat_type !== 'p2p'
       && this.#groupResponseMode === FEISHU_GROUP_RESPONSE_MODES.MENTION
       && !addressed) {
@@ -1771,7 +1778,7 @@ export class FeishuHarnessBridge {
       : t('链接约 {minutes} 分钟后过期', { minutes: Math.max(1, Math.ceil(remaining / 60)) });
     await this.#send(chatId, [
       restarted ? t('旧授权链接已作废，已生成新的修复链接。') : t('🔧 准备补全权限与回调。'),
-      t('本次会增量添加当前缺少项：卡片回调 card.action.trigger；飞书显示为“获取单聊、群组消息”的租户权限 im:message:readonly（用于读取用户消息中的图片或文件）；im:resource（用于上传机器人发送的图片或文件）；以及原生命令面板所需的 application:app_slash_command:read / write。确认页只会显示当前缺少的项；若出现上述范围之外的配置，请取消。'),
+      t('本次会增量添加当前缺少项：卡片回调 card.action.trigger；飞书显示为“获取单聊、群组消息”的租户权限 im:message:readonly（用于读取用户消息中的图片或文件）；im:resource（用于上传机器人发送的图片或文件）；im:message.group_at_msg.include_bot:readonly（用于接收群内其他机器人 @ 当前机器人的消息）；以及原生命令面板所需的 application:app_slash_command:read / write。确认页只会显示当前缺少的项；若出现上述范围之外的配置，请取消。'),
       '',
       t('当前设备直接打开：'),
       url,

package/src/channels/feishu/plugin-controller.mjs

@@ -6,6 +6,7 @@ export const FEISHU_SECRET_REF = 'DSH_FEISHU_APP_SECRET';
 export const REQUIRED_TENANT_SCOPES = Object.freeze([
   'im:message.p2p_msg:readonly',
   'im:message.group_at_msg:readonly',
+  'im:message.group_at_msg.include_bot:readonly',
   'im:message:readonly',
   'im:message:send_as_bot',
   'im:message.reactions:write_only',

package/src/channels/feishu/repair-manager.mjs

@@ -76,8 +76,8 @@ export function assertCallbackRepairUrl(value, expectedAppId, domain = 'feishu')
  * shares RegistrationManager's polling/state implementation while fixing the
  * update manifest in one place so callers can add only the card callback, the
  * message-read scope needed to download user-sent media, the resource scope
- * needed to upload bot-sent images/files, and the Slash Command scopes needed
- * for the native command panel, without adding unrelated scopes, events,
+ * needed to upload bot-sent images/files, the group bot-mention scope, and the
+ * Slash Command scopes for the native command panel, without adding unrelated scopes, events,
  * presets, or createOnly.
  */
 export class CallbackRepairManager {
@@ -116,6 +116,7 @@ export class CallbackRepairManager {
           tenant: [
             FEISHU_MESSAGE_READ_SCOPE,
             FEISHU_RESOURCE_SCOPE,
+            'im:message.group_at_msg.include_bot:readonly',
             ...SLASH_COMMAND_TENANT_SCOPES,
           ],
         },

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

@@ -72,8 +72,8 @@ export default {
   '旧授权链接已作废，已生成新的修复链接。':
     'The previous authorization link was invalidated and a new repair link was generated.',
   '🔧 准备补全权限与回调。': '🔧 Preparing to complete permissions and the callback.',
-  '本次会增量添加当前缺少项：卡片回调 card.action.trigger；飞书显示为“获取单聊、群组消息”的租户权限 im:message:readonly（用于读取用户消息中的图片或文件）；im:resource（用于上传机器人发送的图片或文件）；以及原生命令面板所需的 application:app_slash_command:read / write。确认页只会显示当前缺少的项；若出现上述范围之外的配置，请取消。':
-    'This incrementally adds the currently missing items: the card callback card.action.trigger; the tenant scope im:message:readonly, shown by Feishu as “Read direct and group messages” and used to read images or files in user messages; im:resource, used to upload images or files sent by the bot; and application:app_slash_command:read / write for the native command panel. The confirmation page shows only items the app is currently missing; cancel if anything outside this scope appears.',
+  '本次会增量添加当前缺少项：卡片回调 card.action.trigger；飞书显示为“获取单聊、群组消息”的租户权限 im:message:readonly（用于读取用户消息中的图片或文件）；im:resource（用于上传机器人发送的图片或文件）；im:message.group_at_msg.include_bot:readonly（用于接收群内其他机器人 @ 当前机器人的消息）；以及原生命令面板所需的 application:app_slash_command:read / write。确认页只会显示当前缺少的项；若出现上述范围之外的配置，请取消。':
+    'This incrementally adds the currently missing items: the card callback card.action.trigger; the tenant scope im:message:readonly, shown by Feishu as “Read direct and group messages” and used to read images or files in user messages; im:resource, used to upload images or files sent by the bot; im:message.group_at_msg.include_bot:readonly, used to receive group messages from other bots that mention this bot; and application:app_slash_command:read / write for the native command panel. The confirmation page shows only items the app is currently missing; cancel if anything outside this scope appears.',
   '当前设备直接打开：': 'Open directly on this device:',
   '若要用另一台设备扫码，发送 /repair qr。{expiry}。':
     'To scan with another device, send /repair qr. {expiry}.',

package/src/channels/shared/session-channel-labels.mjs

@@ -0,0 +1,26 @@
+export const SESSION_CHANNEL_LABELS = Object.freeze(Object.fromEntries(Object.entries({
+  weixin: ['微信', 'WeChat'],
+  feishu: ['飞书', 'Feishu'],
+  dingtalk: ['钉钉', 'DingTalk'],
+  wecom: ['企业微信', 'WeCom'],
+  qq: ['QQ', 'QQ'],
+  slack: ['Slack', 'Slack'],
+  telegram: ['Telegram', 'Telegram'],
+  discord: ['Discord', 'Discord'],
+  whatsapp: ['WhatsApp', 'WhatsApp'],
+  office: ['AI Office', 'AI Office'],
+}).map(([channel, labels]) => [channel, Object.freeze(labels)])));
+
+/** Read only the exact, leading title prefix emitted by dsh-im. */
+export function parseSessionChannelTitle(title) {
+  if (typeof title !== 'string') return null;
+  for (const [channel, labels] of Object.entries(SESSION_CHANNEL_LABELS)) {
+    for (const label of labels) {
+      const prefix = `${label} · `;
+      if (title.startsWith(prefix) && title.slice(prefix.length).trim()) {
+        return { channel, title: title.slice(prefix.length) };
+      }
+    }
+  }
+  return null;
+}