botmux 2.36.1 → 2.36.2

package/dist/cli.js

@@ -33,6 +33,7 @@ import { logger } from './utils/logger.js';
 import { invalidWorkingDirs } from './utils/working-dir.js';
 import { firstPositional } from './cli/arg-utils.js';
 import { formatBotInfoEntriesForCli, formatChatBotsForCli, } from './cli/bots-list-output.js';
+import { buildFooterAddressing, hasKnownBotMention, knownBotOpenIdsFromCrossRef, } from './utils/bot-routing.js';
 import { isLocale, setDefaultLocale, SUPPORTED_LOCALES } from './i18n/index.js';
 import { readGlobalConfig, setGlobalLocale, globalConfigPath } from './global-config.js';
 // Resolve the CLI's UI locale once from the global config file, so subsequent
@@ -2456,20 +2457,6 @@ function argValues(args, ...flags) {
 // daemon's bridge fallback path can produce identical cards. cmdSend
 // keeps using `buildCardBodyElements` and `hasMarkdown` from there.
 import { buildCardBodyElements, hasMarkdown } from './im/lark/md-card.js';
-/**
- * Decide who the reply card should @ in its footer.
- *
- * Non-oncall chats: `发送给: @<owner>`.
- * Oncall chats: `发送给: @<last caller>` (falls back to owner if unknown) —
- *   permission is governed by allowedUsers, so there's no per-chat list to cc.
- */
-function buildFooterAddressing(s, oncall) {
-    const owner = s.ownerOpenId;
-    const caller = s.lastCallerOpenId ?? owner;
-    if (!oncall)
-        return { sendTo: owner, cc: [] };
-    return { sendTo: caller, cc: [] };
-}
 async function cmdSend(rest) {
     // Safety gate: a CLI agent running inside a workflow subagent (Slice F)
     // must not chat-post directly — chat-facing side effects are reserved
@@ -2616,12 +2603,14 @@ async function cmdSend(rest) {
         // "获取群组中其他机器人和用户@当前机器人的消息"权限），不再走任何本地
         // 转发——botmux 历史上为绕过 Lark 不投递跨 bot 事件搞过 signal-file，
         // 那套已经在该权限上线后整体下线。
+        let botEntries = [];
+        let crossRef = {};
         try {
             const dataDir = resolveDataDir();
             const botInfoPath = join(dataDir, 'bots-info.json');
-            const botEntries = existsSync(botInfoPath) ? JSON.parse(readFileSync(botInfoPath, 'utf-8')) : [];
+            botEntries = existsSync(botInfoPath) ? JSON.parse(readFileSync(botInfoPath, 'utf-8')) : [];
             const crossRefPath = join(dataDir, `bot-openids-${appId}.json`);
-            const crossRef = existsSync(crossRefPath)
+            crossRef = existsSync(crossRefPath)
                 ? JSON.parse(readFileSync(crossRefPath, 'utf-8'))
                 : {};
             const alreadyMentioned = new Set(mentions.map(m => m.open_id));
@@ -2629,10 +2618,16 @@ async function cmdSend(rest) {
             // prefix ("Claude") when both could match — break-on-first-hit otherwise
             // routes "@Claude分身" to Claude.
             const sortedEntries = [...botEntries].sort((a, b) => (b.botName?.length ?? 0) - (a.botName?.length ?? 0));
+            const selfAliases = new Set(botEntries
+                .filter(entry => entry.larkAppId === appId)
+                .flatMap(entry => [entry.botName, entry.cliId])
+                .filter((name) => !!name)
+                .map(name => name.toLowerCase()));
             for (const entry of sortedEntries) {
                 if (!entry.botName || entry.larkAppId === appId)
                     continue;
-                const names = [entry.botName, entry.cliId].filter(Boolean);
+                const names = [entry.botName, entry.cliId]
+                    .filter((name) => !!name && !selfAliases.has(name.toLowerCase()));
                 for (const name of names) {
                     const escName = name.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
                     // Boundary: lookbehind blocks only ASCII word chars (so `user@Claude`
@@ -2661,6 +2656,15 @@ async function cmdSend(rest) {
             }
         }
         catch { /* best-effort */ }
+        const explicitKnownBotMention = hasKnownBotMention(text, mentions, botEntries, crossRef, appId);
+        const knownBotOpenIds = knownBotOpenIdsFromCrossRef(crossRef, botEntries, appId);
+        const footerAddressing = sendTopLevel
+            ? { sendTo: undefined, cc: [] }
+            : buildFooterAddressing(s, {
+                isOncall: !!oncallEntry,
+                hasExplicitBotMention: explicitKnownBotMention,
+                knownBotOpenIds,
+            });
         // Decide: interactive card (renders markdown) vs. post (plain text).
         // Explicit --card / --text wins; otherwise auto-detect markdown syntax.
         const useCard = forceCard || (!forceText && hasMarkdown(text));
@@ -2724,14 +2728,13 @@ async function cmdSend(rest) {
             const elements = mdWithImages ? buildCardBodyElements(mdWithImages) : [];
             // Footer: de-emphasized markdown (v2 dropped the `note` tag). Use small
             // text size + grey font tag so it reads like a footnote below the hr.
-            // Oncall groups: `发送给` targets whoever triggered this turn (may not
-            // be the session owner). Non-oncall: keep owner-only behaviour.
+            // Oncall groups usually address whoever triggered this turn (may not be
+            // the session owner). Bot recipients are filtered out so footer chrome
+            // cannot accidentally wake a sibling bot.
             const footerParts = ['[botmux](https://github.com/deepcoldy/botmux)'];
             // Top-level publish has no specific recipient — drop "发送给/cc" addressing
             // so the message doesn't @ the session owner who isn't even in the target chat.
-            const addressing = sendTopLevel
-                ? { sendTo: undefined, cc: [] }
-                : buildFooterAddressing(s, oncallEntry);
+            const addressing = footerAddressing;
             if (addressing.sendTo)
                 footerParts.push(`发送给：<at id=${addressing.sendTo}></at>`);
             if (addressing.cc.length > 0) {
@@ -2787,11 +2790,9 @@ async function cmdSend(rest) {
                 }
             }
             // Footer: mirror the card layout — a blank paragraph separates the body
-            // from the addressing line(s). `发送给: @<caller>` always. Top-level
-            // publish has no specific recipient — skip addressing entirely.
-            const addressing = sendTopLevel
-                ? { sendTo: undefined, cc: [] }
-                : buildFooterAddressing(s, oncallEntry);
+            // from the addressing line(s). Top-level publish has no specific
+            // recipient; bot recipients are filtered out by footerAddressing.
+            const addressing = footerAddressing;
             if (addressing.sendTo || addressing.cc.length > 0) {
                 if (postContent.length > 0)
                     postContent.push([{ tag: 'text', text: '' }]);