botmux 2.53.0 → 2.54.0

package/dist/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAo3HA;;;;;;;;;;;GAWG;AACH,wBAAsB,OAAO,CAC3B,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,EACvC,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC,OAAO,qBAAqB,EAAE,SAAS,CAAC,EAC9F,KAAK,EAAE,MAAM,EACb,mBAAmB,CAAC,EAAE,MAAM,OAAO,CAAC,OAAO,2BAA2B,EAAE,UAAU,GAAG,IAAI,CAAC,GACzF,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CA+F7B"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AA64HA;;;;;;;;;;;GAWG;AACH,wBAAsB,OAAO,CAC3B,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,EACvC,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC,OAAO,qBAAqB,EAAE,SAAS,CAAC,EAC9F,KAAK,EAAE,MAAM,EACb,mBAAmB,CAAC,EAAE,MAAM,OAAO,CAAC,OAAO,2BAA2B,EAAE,UAAU,GAAG,IAAI,CAAC,GACzF,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CA+F7B"}

package/dist/cli.js

@@ -1510,6 +1510,9 @@ function loadSessions() {
     return sessions;
 }
 /** Save a single session back to its appropriate file based on larkAppId. */
+function loadSessionFresh(session) {
+    return loadSessions().get(session.sessionId);
+}
 function saveSession(session) {
     const dataDir = resolveDataDir();
     const fileName = session.larkAppId ? `sessions-${session.larkAppId}.json` : 'sessions.json';
@@ -1522,7 +1525,7 @@ function saveSession(session) {
         }
         catch { /* start fresh */ }
     }
-    data[session.sessionId] = session;
+    data[session.sessionId] = mergePendingResponseState(session, data[session.sessionId]);
     // Clean up entries where file key doesn't match the entry's sessionId (data corruption)
     for (const [key, val] of Object.entries(data)) {
         if (val && typeof val === 'object' && 'sessionId' in val && val.sessionId !== key) {
@@ -2638,6 +2641,7 @@ function argValues(args, ...flags) {
 // daemon's bridge fallback path can produce identical cards. cmdSend
 // keeps using `buildCardBodyElements` and `hasMarkdown` from there.
 import { buildCardBodyElements, hasMarkdown, brandFooterSegment } from './im/lark/md-card.js';
+import { claimPendingResponseCard, isPendingResponseCardOpen, markPendingResponseCardPatchedIfCurrent, mergePendingResponseState, shouldUseCardForSend } from './core/pending-response.js';
 import { resolveBrandLabel } from './bot-registry.js';
 import { config } from './config.js';
 import { resolveQuoteTarget, validateMentionDecision } from './services/send-policy.js';
@@ -2763,7 +2767,7 @@ async function cmdSend(rest) {
             registerBot(cfg);
     }
     catch { /* */ }
-    const { sendMessage, replyMessage, uploadImage, uploadFile, MessageWithdrawnError } = await import('./im/lark/client.js');
+    const { sendMessage, replyMessage, uploadImage, uploadFile, deleteMessage, MessageWithdrawnError } = await import('./im/lark/client.js');
     const appId = s.larkAppId;
     // Effective target chat for top-level mode (defaults to session's chat)
     const targetChatId = overrideChatId ?? s.chatId;
@@ -2824,6 +2828,28 @@ async function cmdSend(rest) {
     const dispatch = (content, msgType) => (sendTopLevel || isChatScope)
         ? sendMessage(appId, targetChatId, content, msgType)
         : replyMessage(appId, s.rootMessageId, content, msgType, true);
+    const recordBridgeSendMarker = (sentAtMs, messageId) => {
+        try {
+            const markerDir = join(resolveDataDir(), 'turn-sends');
+            if (!existsSync(markerDir))
+                mkdirSync(markerDir, { recursive: true });
+            const line = JSON.stringify({ sentAtMs, messageId }) + '\n';
+            appendFileSync(join(markerDir, `${sid}.jsonl`), line);
+        }
+        catch { /* best-effort: marker miss only causes a redundant fallback message */ }
+    };
+    const shouldRecordBridgeMarker = !sendTopLevel && !overrideChatId;
+    const dispatchOrPatchPending = async (content, msgType) => {
+        const pendingCardId = msgType === 'interactive' ? claimPendingResponseCard(s) : undefined;
+        const sentId = await dispatchPrimary(content, msgType);
+        const latest = pendingCardId ? loadSessionFresh(s) : undefined;
+        if (pendingCardId && latest?.pendingResponseCardId === pendingCardId) {
+            deleteMessage(appId, pendingCardId)
+                .then(() => { markPendingResponseCardPatchedIfCurrent(latest, pendingCardId); saveSession(latest); })
+                .catch((err) => logger.warn(`[send:${sid.substring(0, 8)}] failed to withdraw pending card after explicit send: ${err?.message ?? err}`));
+        }
+        return sentId;
+    };
     // Quote chain (普通群): the primary message replies to the turn's target so
     // Lark renders a 引用 chain. --quote overrides, --no-quote opts out. Thread
     // scope and --top-level never quote. Withdrawn target → fall back to plain.
@@ -2984,8 +3010,14 @@ async function cmdSend(rest) {
                 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));
+        // An open pending response card takes precedence over --text so the
+        // placeholder can close cleanly; otherwise explicit --card / --text wins.
+        const useCard = shouldUseCardForSend({
+            forceCard,
+            forceText,
+            hasMarkdown: hasMarkdown(text),
+            hasOpenPendingResponseCard: isPendingResponseCardOpen(s),
+        });
         const mentionMap = new Map();
         for (const m of mentions)
             if (m.name)
@@ -3079,7 +3111,7 @@ async function cmdSend(rest) {
                 config: { update_multi: true },
                 body: { direction: 'vertical', elements },
             });
-            messageId = await dispatchPrimary(cardJson, 'interactive');
+            messageId = await dispatchOrPatchPending(cardJson, 'interactive');
         }
         else {
             // Plain-text path: build post content, paragraph per line.
@@ -3129,23 +3161,11 @@ async function cmdSend(rest) {
             const postJson = JSON.stringify({ zh_cn: { title: '', content: postContent } });
             messageId = await dispatchPrimary(postJson, 'post');
         }
-        // Bridge fallback marker — append-only jsonl per session. The worker
-        // gates its non-adopt transcript-driven fallback on whether any send
-        // happened within the current Lark turn's window. Only when this send
-        // landed in the session's own thread (not --top-level, not --chat-id
-        // override) does it cancel that turn's fallback.
-        if (!sendTopLevel && !overrideChatId) {
-            try {
-                const markerDir = join(resolveDataDir(), 'turn-sends');
-                if (!existsSync(markerDir))
-                    mkdirSync(markerDir, { recursive: true });
-                // sentAtMs was captured pre-dispatch (see above). messageId is the
-                // confirmed Lark message id from the now-successful dispatch.
-                const line = JSON.stringify({ sentAtMs, messageId }) + '\n';
-                appendFileSync(join(markerDir, `${sid}.jsonl`), line);
-            }
-            catch { /* best-effort: marker miss only causes a redundant fallback message */ }
-        }
+        // Bridge fallback marker — append-only jsonl per session. Same-thread
+        // sends always suppress transcript fallback; detoured sends suppress only
+        // when they closed a pending response card for this turn.
+        if (shouldRecordBridgeMarker)
+            recordBridgeSendMarker(sentAtMs, messageId);
         // Send file attachments as separate messages
         const fileIds = [];
         for (const fp of files) {