botmux 2.84.0 → 2.85.0

package/dist/daemon.js

@@ -13,7 +13,7 @@ import { botmuxWrapperFiles } from './core/botmux-wrapper.js';
 import { startMaintenance, stopMaintenance } from './core/maintenance.js';
 import { sendRestartReportIfPending } from './core/restart-report.js';
 import { statSync } from 'node:fs';
-import { getChatMode, listChatMemberOpenIds, replyMessage, resolveAllowedUsersWithMap, sendMessage, sendUserMessage, updateMessage } from './im/lark/client.js';
+import { addReaction, getChatMode, listChatMemberOpenIds, replyMessage, resolveAllowedUsersWithMap, sendMessage, sendUserMessage, updateMessage } from './im/lark/client.js';
 import { resolveGroupJoinPrompt, waitForAllowedUserInChat } from './core/auto-start.js';
 import { loadBotConfigs, registerBot, getBot, getAllBots, findOncallChatForAnyBot } from './bot-registry.js';
 import * as sessionStore from './services/session-store.js';
@@ -36,9 +36,8 @@ import { buildTerminalUrl, setTerminalProxyPort, setTerminalExternalPort } from
 import { startTerminalProxy } from './core/terminal-proxy.js';
 import * as scheduler from './core/scheduler.js';
 import { scanMultipleProjects } from './services/project-scanner.js';
-import { buildPendingResponseCard, buildQuotaExhaustedCard, buildRepoSelectCard, buildStreamingCard, getCliDisplayName } from './im/lark/card-builder.js';
-import { createPendingResponseQueue, markPendingResponseCardPatched, shouldTreatPendingCardAsPatchedByMarker, startPendingResponseTurn, syncPendingResponseState } from './core/pending-response.js';
-import { readPendingResponsePatchMarker } from './services/pending-response-transaction-store.js';
+import { buildQuotaExhaustedCard, buildRepoSelectCard, buildStreamingCard, getCliDisplayName } from './im/lark/card-builder.js';
+import { RECEIVED_REACTION_EMOJI_TYPE } from './core/pending-response.js';
 import { t as tr, botLocale, localeForBot } from './i18n/index.js';
 import { createCliAdapterSync } from './adapters/cli/registry.js';
 import { initWorkerPool, setActiveSessionsRegistry, forkWorker, killWorker, reapOrphanWorkers, scheduleCardPatch, setCurrentCliVersion, CARD_POSTING_SENTINEL, parkStreamCard, closeSession as closeSessionHelper, ensureCliEnv, writableTerminalLinkFor, } from './core/worker-pool.js';
@@ -226,7 +225,6 @@ function startMemoryDiagnostics() {
  * Lark message ids start with `om_` and chat ids with `oc_`, so the two
  * address spaces never collide; the lookup just tries both.
  */
-const pendingResponseQueue = createPendingResponseQueue();
 function streamingCardDisabledFor(ds) {
     if (ds.streamingCardForced)
         return false;
@@ -256,43 +254,44 @@ function readSessionFreshFromDisk(sessionId, larkAppId) {
     }
     return undefined;
 }
-export async function postPendingResponseCard(ds, replyToMessageId, prompt, sender, turnId) {
-    // Card-off path (streaming card disabled for this session): post a lightweight
-    // 「处理中」 placeholder. The final reply / `botmux send` patches this card in
-    // place — and that patch is also what lets the 完成 emoji land on the user's
-    // original message. When streaming cards are ON the streaming card itself is
-    // the placeholder, so this is a no-op for those sessions.
+export async function noteTurnReceived(ds, triggerMessageId, _prompt, _sender, _turnId) {
+    // Replaces the old 「处理中」 placeholder card. That card existed only to be
+    // PATCHed with the final answer, and `im.v1.message.patch` is silent (no Feishu
+    // notification / unread) — so card-off answers could land unseen. The
+    // placeholder + patch-delivery was removed; answers now always go out as a
+    // fresh message (deliverFinalOutput / `botmux send`).
+    //
+    // This call site is the per-message acceptance point, so it also drives the
+    // two-phase turn reaction. It's auto-enabled exactly for card-off sessions
+    // (streaming card disabled): those have no live status card, so the ✋→✅ on
+    // the user's message is the only lightweight progress signal. When the
+    // streaming card is on it already shows status, so we stay silent.
+    // React 冲! on the triggering message the instant it's accepted. Binding to the
+    // message — not a worker status edge — means type-ahead / busy-batched messages
+    // each get their own ✋. `finishTurnReactions` flips every pending ✋ to ✅ when
+    // the worker next goes idle.
     if (!streamingCardDisabledFor(ds))
         return;
-    await pendingResponseQueue.run(ds.session.sessionId, async () => {
-        const fresh = readSessionFreshFromDisk(ds.session.sessionId, ds.larkAppId);
-        syncPendingResponseState(ds, fresh);
-        if (fresh)
-            syncReplyTargetState(ds, fresh);
-        // Reconcile a PATCH that committed at Feishu but whose session save lost the
-        // race, so a stale prior card isn't left dangling as "open".
-        const marker = readPendingResponsePatchMarker(ds.session.sessionId);
-        if (shouldTreatPendingCardAsPatchedByMarker(ds.pendingResponseCardId, marker)) {
-            markPendingResponseCardPatched(ds);
-        }
-        syncPendingResponseState(ds.session, ds);
-        const card = buildPendingResponseCard(localeForBot(ds.larkAppId));
-        try {
-            // Route the placeholder to the same target the final reply will use: a
-            // topic-alias turn (chat-scope + matching turnId) lands in the topic
-            // thread; otherwise it's a plain chat message / thread-scope reply.
-            const target = resolveSessionReplyTarget(ds, turnId);
-            const messageId = target.mode === 'thread'
-                ? await replyMessage(ds.larkAppId, target.rootMessageId, card, 'interactive', true)
-                : await sendMessage(ds.larkAppId, target.chatId, card, 'interactive');
-            startPendingResponseTurn(ds, messageId);
-            startPendingResponseTurn(ds.session, messageId);
-            sessionStore.updateSession(ds.session);
-        }
-        catch (err) {
-            logger.warn(`[${tag(ds)}] failed to post pending response card: ${err instanceof Error ? err.message : String(err)}`);
-        }
-    });
+    // Only Lark messages carry reactions — doc-comment ids / chat anchors can't.
+    if (!triggerMessageId.startsWith('om_'))
+        return;
+    if ((ds.pendingAckReactions ??= []).some(a => a.messageId === triggerMessageId))
+        return;
+    // Add the ✋ FIRST, register the entry only after it lands. If we pushed the
+    // entry before awaiting addReaction, a previous turn's idle edge
+    // (finishTurnReactions) could detach this half-formed entry mid-flight —
+    // DONE-ing a message that hasn't even reached the worker yet and orphaning its
+    // reactionId. Callers await this before dispatching the message to the worker,
+    // so a registered entry is always in place before its own turn can go idle.
+    let reactionId;
+    try {
+        reactionId = await addReaction(ds.larkAppId, triggerMessageId, RECEIVED_REACTION_EMOJI_TYPE);
+    }
+    catch (err) {
+        logger.debug(`[reaction] received add failed for ${triggerMessageId}: ${err instanceof Error ? err.message : String(err)}`);
+        return;
+    }
+    (ds.pendingAckReactions ??= []).push({ messageId: triggerMessageId, reactionId });
 }
 async function sessionReply(anchor, content, msgType = 'text', larkAppId, turnId) {
     let ds;
@@ -2060,7 +2059,7 @@ async function handleNewTopic(data, ctx) {
         const selfBot = getBot(larkAppId);
         const prompt = buildNewTopicPrompt(promptContent, session.sessionId, botCfg.cliId, botCfg.cliPathOverride, attachments, parsed.mentions, await getAvailableBots(larkAppId, chatId), undefined, { name: selfBot.botName, openId: selfBot.botOpenId }, localeForBot(larkAppId), newTopicSender, { larkAppId, chatId });
         rememberLastCliInput(ds, promptContent, prompt);
-        await postPendingResponseCard(ds, messageId, content, newTopicSender, messageId);
+        await noteTurnReceived(ds, messageId, content, newTopicSender, messageId);
         forkWorker(ds, prompt);
         const reason = oncallEntry
             ? `oncall-bound chat ${chatId}`
@@ -2092,7 +2091,7 @@ async function handleNewTopic(data, ctx) {
         const selfBot = getBot(larkAppId);
         const prompt = buildNewTopicPrompt(promptContent, session.sessionId, botCfg.cliId, botCfg.cliPathOverride, attachments, parsed.mentions, await getAvailableBots(larkAppId, chatId), undefined, { name: selfBot.botName, openId: selfBot.botOpenId }, localeForBot(larkAppId), newTopicSender, { larkAppId, chatId });
         rememberLastCliInput(ds, promptContent, prompt);
-        await postPendingResponseCard(ds, messageId, content, newTopicSender, messageId);
+        await noteTurnReceived(ds, messageId, content, newTopicSender, messageId);
         forkWorker(ds, prompt);
         logger.info(`Session ${session.sessionId} ready (no projects to select), total active: ${getActiveCount()}`);
     }
@@ -2260,7 +2259,7 @@ async function handleBotAdded(chatId, operatorOpenId, larkAppId) {
                 return;
             const prompt = await buildPrompt();
             rememberLastCliInput(ds, promptBody, prompt);
-            await postPendingResponseCard(ds, anchor, promptBody);
+            await noteTurnReceived(ds, anchor, promptBody);
             forkWorker(ds, prompt);
             logger.info(`[auto-start:入群] ${chatId.substring(0, 12)} 自动开工（${mode}/${scope}），workingDir=${pinnedWorkingDir}`);
             return;
@@ -2281,7 +2280,7 @@ async function handleBotAdded(chatId, operatorOpenId, larkAppId) {
             ds.pendingRepo = false;
             const prompt = await buildPrompt();
             rememberLastCliInput(ds, promptBody, prompt);
-            await postPendingResponseCard(ds, anchor, promptBody);
+            await noteTurnReceived(ds, anchor, promptBody);
             forkWorker(ds, prompt);
             logger.info(`[auto-start:入群] ${chatId.substring(0, 12)} 无默认目录且无可选项目，直接开工`);
         }
@@ -2620,8 +2619,6 @@ async function handleThreadReply(data, ctx) {
     // reply cards to whoever triggered this turn — matters in oncall groups
     // where the caller is often not the session owner).
     if (ds) {
-        syncPendingResponseState(ds, readSessionFreshFromDisk(ds.session.sessionId, ds.larkAppId));
-        syncPendingResponseState(ds.session, ds);
         markSessionActivity(ds);
         const callerOpenId = parsed.senderId || data?.sender?.sender_id?.open_id;
         // quoteTargetId changes every inbound message (always a new message_id), so
@@ -2766,7 +2763,7 @@ async function handleThreadReply(data, ctx) {
             const selfBot = getBot(larkAppId);
             const prompt = buildNewTopicPrompt(promptContent, session.sessionId, botCfg.cliId, botCfg.cliPathOverride, attachments, parsed.mentions, await getAvailableBots(larkAppId, autoCreateChatId), undefined, { name: selfBot.botName, openId: selfBot.botOpenId }, localeForBot(larkAppId), autoCreateSender, { larkAppId, chatId: autoCreateChatId });
             rememberLastCliInput(newDs, promptContent, prompt);
-            await postPendingResponseCard(newDs, parsed.messageId, parsed.content, autoCreateSender, parsed.messageId);
+            await noteTurnReceived(newDs, parsed.messageId, parsed.content, autoCreateSender, parsed.messageId);
             forkWorker(newDs, prompt);
             const reason = oncallEntry
                 ? `oncall-bound chat ${autoCreateChatId}`
@@ -2798,7 +2795,7 @@ async function handleThreadReply(data, ctx) {
             const selfBot = getBot(larkAppId);
             const prompt = buildNewTopicPrompt(promptContent, session.sessionId, botCfg.cliId, botCfg.cliPathOverride, attachments, parsed.mentions, await getAvailableBots(larkAppId, autoCreateChatId), undefined, { name: selfBot.botName, openId: selfBot.botOpenId }, localeForBot(larkAppId), autoCreateSender, { larkAppId, chatId: autoCreateChatId });
             rememberLastCliInput(newDs, promptContent, prompt);
-            await postPendingResponseCard(newDs, parsed.messageId, parsed.content, autoCreateSender, parsed.messageId);
+            await noteTurnReceived(newDs, parsed.messageId, parsed.content, autoCreateSender, parsed.messageId);
             forkWorker(newDs, prompt);
         }
         return;
@@ -2834,7 +2831,7 @@ async function handleThreadReply(data, ctx) {
             });
         beginNewTurn(ds, parsed.content);
         rememberLastCliInput(ds, promptContent, msgContent);
-        await postPendingResponseCard(ds, parsed.messageId, parsed.content, await getThreadSender(), parsed.messageId);
+        await noteTurnReceived(ds, parsed.messageId, parsed.content, await getThreadSender(), parsed.messageId);
         ds.worker.send({ type: 'message', content: msgContent, turnId: parsed.messageId });
     }
     else {
@@ -2886,7 +2883,7 @@ async function handleThreadReply(data, ctx) {
             sender: await getThreadSender(),
         });
         rememberLastCliInput(ds, promptContent, wrappedPrompt);
-        await postPendingResponseCard(ds, parsed.messageId, parsed.content, await getThreadSender(), parsed.messageId);
+        await noteTurnReceived(ds, parsed.messageId, parsed.content, await getThreadSender(), parsed.messageId);
         sessionStore.updateSession(ds.session);
         forkWorker(ds, wrappedPrompt, ds.hasHistory);
     }
@@ -2946,7 +2943,7 @@ async function handleDocComment(ctx) {
         ds.session.currentDocCommentTarget = docTarget; // beginNewTurn 刚清空，这里设本轮落点
         rememberLastCliInput(ds, promptContent, msgContent);
         sessionStore.updateSession(ds.session); // 先落盘，botmux send 子进程才读得到落点
-        await postPendingResponseCard(ds, commentId, text, sender, turnId);
+        await noteTurnReceived(ds, commentId, text, sender, turnId);
         ds.worker.send({ type: 'message', content: msgContent, turnId });
         logger.info(`[${tag(ds)}] doc-comment turn injected (turn ${turnId.slice(0, 8)})`);
     }
@@ -2973,7 +2970,7 @@ async function handleDocComment(ctx) {
         });
         ds.session.currentDocCommentTarget = docTarget;
         rememberLastCliInput(ds, promptContent, wrappedPrompt);
-        await postPendingResponseCard(ds, commentId, text, sender, turnId);
+        await noteTurnReceived(ds, commentId, text, sender, turnId);
         sessionStore.updateSession(ds.session);
         forkWorker(ds, wrappedPrompt, ds.hasHistory);
     }