botmux 2.36.0 → 2.36.2

package/dist/adapters/cli/cursor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cursor.d.ts","sourceRoot":"","sources":["../../../src/adapters/cli/cursor.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAa,MAAM,YAAY,CAAC;AAMxD,wBAAgB,mBAAmB,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,UAAU,CAgDrE;AAED,eAAO,MAAM,MAAM,4BAAsB,CAAC"}
+{"version":3,"file":"cursor.d.ts","sourceRoot":"","sources":["../../../src/adapters/cli/cursor.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAa,MAAM,YAAY,CAAC;AAYxD,wBAAgB,mBAAmB,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,UAAU,CAuFrE;AAED,eAAO,MAAM,MAAM,4BAAsB,CAAC"}

package/dist/adapters/cli/cursor.js

@@ -3,6 +3,11 @@ import { BOTMUX_SHELL_HINTS } from './shared-hints.js';
 function delay(ms) {
     return new Promise(resolve => setTimeout(resolve, ms));
 }
+/** PTYs that have already received a writeInput. The first write lands while
+ *  cursor-agent's TUI is still doing its startup render, so it needs a longer
+ *  settle + throttle than later writes. Tracked by identity so the warmup state
+ *  is shared across adapter instances. Mirrors claude-code's first-write guard. */
+const cursorFirstWriteSeen = new WeakSet();
 export function createCursorAdapter(pathOverride) {
     const bin = resolveCommand(pathOverride ?? 'cursor-agent');
     return {
@@ -31,20 +36,57 @@ export function createCursorAdapter(pathOverride) {
             return `cursor-agent --resume ${cliSessionId}`;
         },
         async writeInput(pty, content) {
-            // No on-disk submit verification yet — cursor stores transcripts as
-            // JSONL but the path isn't documented. Treat like aiden: paste the
-            // text, brief settle, send Enter. Worker still gets quiescence-based
-            // idle and the bridge fallback timer if the model never replies.
-            if (pty.sendText && pty.sendSpecialKeys) {
-                pty.sendText(content);
+            // Emit line-by-line instead of writing the whole message at once.
+            // cursor-agent's paste detector folds a multi-line chunk that arrives in
+            // one burst into a `[Pasted text +N lines]` placeholder the model can't
+            // read; typing each line with a throttle between keeps it under that
+            // threshold so the text lands verbatim. Covers both backends — tmux
+            // (send-keys) and raw PTY (write only). Never use bracketed-paste markers
+            // (\x1b[200~ … \x1b[201~): they trigger the fold.
+            //
+            // Soft-newline differs per backend because the detector counts LF (0x0a)
+            // bytes arriving densely:
+            //   - tmux: Ctrl+J, cursor's native soft-newline — renders cleanly and
+            //     send-keys spaces the bytes out enough to never fold.
+            //   - raw PTY: a fast write('\n') folds, so send `\` + CR; cursor eats the
+            //     backslash-before-CR as a soft-newline (not part of the submitted
+            //     text) and no LF byte hits the stream, making it fold-immune. Costs a
+            //     cosmetic trailing `\` in the local TUI render only.
+            // Submit is always a bare Enter (\r). No on-disk submit verification —
+            // cursor's transcript path isn't documented, so the worker relies on
+            // idle detection + the bridge fallback timer.
+            const useKeys = !!(pty.sendText && pty.sendSpecialKeys);
+            const emitText = (s) => (useKeys ? pty.sendText(s) : pty.write(s));
+            const emitSoftNewline = () => {
+                if (useKeys) {
+                    pty.sendSpecialKeys('C-j');
+                }
+                else {
+                    pty.write('\\');
+                    pty.write('\r');
+                }
+            };
+            const emitEnter = () => (useKeys ? pty.sendSpecialKeys('Enter') : pty.write('\r'));
+            const isFirstWrite = !cursorFirstWriteSeen.has(pty);
+            if (isFirstWrite) {
+                cursorFirstWriteSeen.add(pty);
                 await delay(200);
-                pty.sendSpecialKeys('Enter');
             }
-            else {
-                pty.write(content);
-                await delay(1000);
-                pty.write('\r');
+            const throttleMs = isFirstWrite ? 80 : 30;
+            const tick = () => delay(throttleMs);
+            const lines = content.split('\n');
+            for (let i = 0; i < lines.length; i++) {
+                if (lines[i].length > 0) {
+                    emitText(lines[i]);
+                    await tick();
+                }
+                if (i < lines.length - 1) {
+                    emitSoftNewline();
+                    await tick();
+                }
             }
+            await delay(200);
+            emitEnter();
         },
         completionPattern: undefined,
         skillsDir: '~/.cursor/skills',

package/dist/adapters/cli/cursor.js.map

@@ -1 +1 @@
-{"version":3,"file":"cursor.js","sourceRoot":"","sources":["../../../src/adapters/cli/cursor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAGvD,SAAS,KAAK,CAAC,EAAU;IACvB,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AACzD,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,YAAqB;IACvD,MAAM,GAAG,GAAG,cAAc,CAAC,YAAY,IAAI,cAAc,CAAC,CAAC;IAC3D,OAAO;QACL,EAAE,EAAE,QAAQ;QACZ,WAAW,EAAE,GAAG;QAEhB,SAAS,CAAC,EAAE,MAAM,EAAE,eAAe,EAAE;YACnC,wEAAwE;YACxE,yEAAyE;YACzE,0EAA0E;YAC1E,kCAAkC;YAClC,MAAM,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC;YACzB,IAAI,CAAC,MAAM;gBAAE,OAAO,IAAI,CAAC;YACzB,IAAI,eAAe;gBAAE,OAAO,CAAC,GAAG,IAAI,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC;YACnE,qEAAqE;YACrE,wEAAwE;YACxE,OAAO,CAAC,GAAG,IAAI,EAAE,YAAY,CAAC,CAAC;QACjC,CAAC;QAED,kBAAkB,CAAC,EAAE,YAAY,EAAE;YACjC,wEAAwE;YACxE,4EAA4E;YAC5E,sCAAsC;YACtC,IAAI,CAAC,YAAY;gBAAE,OAAO,IAAI,CAAC;YAC/B,OAAO,yBAAyB,YAAY,EAAE,CAAC;QACjD,CAAC;QAED,KAAK,CAAC,UAAU,CAAC,GAAc,EAAE,OAAe;YAC9C,oEAAoE;YACpE,mEAAmE;YACnE,qEAAqE;YACrE,iEAAiE;YACjE,IAAI,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,eAAe,EAAE,CAAC;gBACxC,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;gBACtB,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;gBACjB,GAAG,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;YAC/B,CAAC;iBAAM,CAAC;gBACN,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;gBACnB,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC;gBAClB,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAClB,CAAC;QACH,CAAC;QAED,iBAAiB,EAAE,SAAS;QAC5B,SAAS,EAAE,kBAAkB;QAC7B,WAAW,EAAE,kBAAkB;QAC/B,SAAS,EAAE,IAAI;KAChB,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG,mBAAmB,CAAC"}
+{"version":3,"file":"cursor.js","sourceRoot":"","sources":["../../../src/adapters/cli/cursor.ts"],"names":[],"mappings":"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"}

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: '' }]);