botmux 2.84.0 → 2.84.1

package/dist/cli.js

@@ -50,6 +50,7 @@ import { chatAppLink, larkHosts, normalizeBrand, sdkDomain } from './im/lark/lar
 import { readGlobalConfig, setGlobalLocale, globalConfigPath } from './global-config.js';
 import { buildBridgeSendMarkerContent } from './services/bridge-fallback-gate.js';
 import { writeManualIntentIfAbsentTo } from './services/restart-intent-store.js';
+import { stripLegacyPendingCardFields } from './services/session-store.js';
 // Resolve the CLI's UI locale once from the global config file, so subsequent
 // CLI output (and any t() callers that don't pass an explicit locale) honour
 // the user's chosen language. Daemon entrypoint sets this separately for the
@@ -1585,12 +1586,17 @@ function saveSession(session) {
         }
         catch { /* start fresh */ }
     }
-    data[session.sessionId] = mergePendingResponseState(session, data[session.sessionId]);
-    // Clean up entries where file key doesn't match the entry's sessionId (data corruption)
+    data[session.sessionId] = session;
+    // Clean up entries where file key doesn't match the entry's sessionId (data
+    // corruption), and strip legacy placeholder-card fields so the file converges
+    // to clean (see stripLegacyPendingCardFields in services/session-store).
     for (const [key, val] of Object.entries(data)) {
         if (val && typeof val === 'object' && 'sessionId' in val && val.sessionId !== key) {
             delete data[key];
+            continue;
         }
+        if (val && typeof val === 'object')
+            stripLegacyPendingCardFields(val);
     }
     const tmpFp = fp + '.tmp';
     writeFileSync(tmpFp, JSON.stringify(data, null, 2), 'utf-8');
@@ -2949,9 +2955,7 @@ function argValues(args, ...flags) {
 // Card v2 body builder helpers — extracted to im/lark/md-card.ts so the
 // daemon's bridge fallback path can produce identical cards. cmdSend
 // keeps using `buildImageCardElements` from there.
-import { buildMentionedPendingResponseCard } from './im/lark/card-builder.js';
 import { buildImageCardElements, brandFooterSegment } from './im/lark/md-card.js';
-import { COMPLETED_REACTION_EMOJI_TYPE, claimPendingResponseCard, markPendingResponseCardPatchedIfCurrent, mergePendingResponseState, shouldMarkPendingAsMentionedSend, shouldPatchPendingOnExplicitSend } from './core/pending-response.js';
 import { resolveBrandLabel } from './bot-registry.js';
 import { config } from './config.js';
 import { resolveQuoteTarget, validateMentionDecision, parseAttentionFlag, attentionUsageError } from './services/send-policy.js';
@@ -3271,19 +3275,6 @@ async function cmdSend(rest) {
                 appendFileSync(join(markerDir, `${sid}.jsonl`), JSON.stringify({ sentAtMs: Date.now(), messageId: `doc:${docTarget.commentId}`, contentLength: content.length }) + '\n');
             }
             catch { /* best-effort：漏记只多一条兜底 */ }
-            // 收尾飞书侧占位卡（streaming-disabled 会话）避免停在「处理中」。
-            try {
-                const pendingCardId = claimPendingResponseCard(s);
-                const latest = pendingCardId ? loadSessionFresh(s) : undefined;
-                if (pendingCardId && latest?.pendingResponseCardId === pendingCardId) {
-                    const { updateMessage } = await import('./im/lark/client.js');
-                    const { buildMarkdownCard } = await import('./im/lark/md-card.js');
-                    await updateMessage(appId, pendingCardId, buildMarkdownCard(t('daemon.doc_comment_replied_card', undefined, loc), undefined, resolveBrandLabel(appId), loc));
-                    if (markPendingResponseCardPatchedIfCurrent(latest, pendingCardId))
-                        saveSession(latest);
-                }
-            }
-            catch { /* best-effort */ }
             console.error(`✓ 已回复文档评论 ${docTarget.commentId.slice(0, 12)}（${chunks.length} 条）`);
             console.log(JSON.stringify({ success: true, commentId: docTarget.commentId, sessionId: sid, kind: 'doc-comment', chunks: chunks.length }));
         }
@@ -3343,7 +3334,7 @@ async function cmdSend(rest) {
             registerBot(cfg);
     }
     catch { /* */ }
-    const { sendMessage, replyMessage, uploadImage, uploadFile, updateMessage, addReaction, MessageWithdrawnError } = await import('./im/lark/client.js');
+    const { sendMessage, replyMessage, uploadImage, uploadFile, 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;
@@ -3422,51 +3413,6 @@ async function cmdSend(rest) {
         catch { /* best-effort: marker miss only causes a redundant fallback message */ }
     };
     const shouldRecordBridgeMarker = !sendTopLevel && !overrideChatId && !sendInto;
-    let hasNotificationMentionsForPending = mentionArgs.length > 0;
-    const dispatchOrPatchPending = async (content, msgType) => {
-        const pendingCardId = shouldPatchPendingOnExplicitSend(s, { msgType, sendTopLevel, overrideChatId: !!overrideChatId, sendInto: !!sendInto, hasNotificationMentions: hasNotificationMentionsForPending })
-            ? claimPendingResponseCard(s)
-            : undefined;
-        if (!pendingCardId) {
-            const sentId = await dispatchPrimary(content, msgType);
-            if (shouldMarkPendingAsMentionedSend({ msgType, sendTopLevel, overrideChatId: !!overrideChatId, sendInto: !!sendInto, hasNotificationMentions: hasNotificationMentionsForPending })) {
-                const stalePendingCardId = claimPendingResponseCard(s);
-                const latest = stalePendingCardId ? loadSessionFresh(s) : undefined;
-                if (stalePendingCardId && latest?.pendingResponseCardId === stalePendingCardId) {
-                    updateMessage(appId, stalePendingCardId, buildMentionedPendingResponseCard(localeForBot(appId)))
-                        .then(() => {
-                        if (markPendingResponseCardPatchedIfCurrent(latest, stalePendingCardId))
-                            saveSession(latest);
-                    })
-                        .catch((err) => logger.warn(`[send:${sid.substring(0, 8)}] failed to mark pending card after mentioned send: ${err?.message ?? err}`));
-                }
-            }
-            return sentId;
-        }
-        const latest = loadSessionFresh(s);
-        if (latest?.pendingResponseCardId !== pendingCardId)
-            return dispatchPrimary(content, msgType);
-        try {
-            await updateMessage(appId, pendingCardId, content);
-            if (markPendingResponseCardPatchedIfCurrent(latest, pendingCardId)) {
-                saveSession(latest);
-                if (latest.quoteTargetId) {
-                    addReaction(appId, latest.quoteTargetId, COMPLETED_REACTION_EMOJI_TYPE)
-                        .catch((err) => logger.warn(`[send:${sid.substring(0, 8)}] failed to add completion reaction to ${latest.quoteTargetId}: ${err?.message ?? err}`));
-                }
-            }
-            return pendingCardId;
-        }
-        catch (err) {
-            if (err instanceof MessageWithdrawnError) {
-                logger.warn(`[send:${sid.substring(0, 8)}] pending card withdrawn before explicit send patch; sending a new reply`);
-                markPendingResponseCardPatchedIfCurrent(latest, pendingCardId);
-                saveSession(latest);
-                return dispatchPrimary(content, msgType);
-            }
-            throw err;
-        }
-    };
     // 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.
@@ -3608,7 +3554,6 @@ async function cmdSend(rest) {
         }
         catch { /* best-effort */ }
         const explicitKnownBotMention = hasKnownBotMention(text, mentions, botEntries, crossRef, appId);
-        hasNotificationMentionsForPending ||= explicitKnownBotMention;
         const knownBotOpenIds = knownBotOpenIdsFromCrossRef(crossRef, botEntries, appId);
         // --no-mention 显式不 @ 任何人 → 连 footer 的"发送给/cc"寻址 <at> 也清空，
         // 否则 footer 仍会 @ 人，与 --no-mention 语义和"未@任何人"输出自相矛盾
@@ -3742,7 +3687,7 @@ async function cmdSend(rest) {
                 config: { update_multi: true },
                 body: { direction: 'vertical', elements },
             });
-            messageId = await dispatchOrPatchPending(cardJson, 'interactive');
+            messageId = await dispatchPrimary(cardJson, 'interactive');
         }
         // Bridge fallback marker — append-only jsonl per session. Same-thread
         // sends can suppress transcript fallback when their content appears to
@@ -5198,6 +5143,26 @@ switch (command) {
         await cmdAsk(sub, rest);
         break;
     }
+    case 'skill': {
+        const { runSkillSessionCommand } = await import('./core/skills/cli-session-command.js');
+        const result = runSkillSessionCommand(process.argv.slice(3));
+        if (result.stdout)
+            process.stdout.write(result.stdout);
+        if (result.stderr)
+            process.stderr.write(result.stderr);
+        process.exitCode = result.code;
+        break;
+    }
+    case 'skills': {
+        const { runSkillsAdminCommand } = await import('./core/skills/cli-admin-command.js');
+        const result = runSkillsAdminCommand(process.argv.slice(3));
+        if (result.stdout)
+            process.stdout.write(result.stdout);
+        if (result.stderr)
+            process.stderr.write(result.stderr);
+        process.exitCode = result.code;
+        break;
+    }
     case 'hook': {
         // `botmux hook <cliId>` — hook 客户端，stdin 读 payload，stdout 写 directive
         const cliId = process.argv[3] ?? '';