botmux 2.107.0 → 2.108.0

package/dist/cli.js

@@ -43,10 +43,12 @@ import { logger } from './utils/logger.js';
 import { scheduleTimeZone } from './utils/timezone.js';
 import { expandHomePath, invalidWorkingDirs } from './utils/working-dir.js';
 import { firstPositional } from './cli/arg-utils.js';
-import { dispatchPrimaryMessage, findStdinAliasAttachment, sendFileAttachments, sendVideoAttachments, shouldSendAsPureVideo, validateVideoAttachments } from './cli/send-dispatch.js';
+import { isColdResumeDormant, sessionListDisposition } from './cli/session-list-liveness.js';
+import { dispatchPrimaryMessage, findStdinAliasAttachment, normalizeInteractiveCardInput, sendFileAttachments, sendVideoAttachments, shouldSendAsPureVideo, validateVideoAttachments } from './cli/send-dispatch.js';
 import { buildPm2SpawnCommand } from './cli/pm2-command.js';
 import { callDashboard } from './cli/dashboard-endpoint.js';
-import { npmGlobalUpdateCwd } from './core/maintenance.js';
+import { installLatestBotmuxSync } from './core/maintenance.js';
+import { formatGlobalInstallCommand, resolveGlobalInstallPlan, UnsupportedGlobalInstallError, } from './utils/global-install.js';
 import { loadDashboardSecret } from './dashboard/auth.js';
 import { rejectLikelyWindowsStdinMojibake, decodeStdinBytes } from './cli/stdin-encoding.js';
 import { formatBotInfoEntriesForCli, formatChatBotsForCli, } from './cli/bots-list-output.js';
@@ -2124,13 +2126,19 @@ function cmdStatus() {
     runPm2(['status']);
 }
 function cmdUpgrade() {
-    console.log('🔄 升级中...');
     try {
-        execSync('npm install -g botmux@latest', { cwd: npmGlobalUpdateCwd(), stdio: 'inherit' });
+        const plan = resolveGlobalInstallPlan();
+        console.log(`🔄 升级中：${formatGlobalInstallCommand(plan)}`);
+        installLatestBotmuxSync(plan);
         console.log('\n✅ 升级完成。运行 botmux restart 以应用更新。');
     }
-    catch {
-        console.error('❌ 升级失败，请手动运行: npm install -g botmux@latest');
+    catch (error) {
+        if (error instanceof UnsupportedGlobalInstallError) {
+            console.error(`❌ 无法安全识别当前安装方式（${error.manager}），请使用原包管理器手动更新 botmux。`);
+        }
+        else {
+            console.error(`❌ 升级失败：${error instanceof Error ? error.message : error}`);
+        }
         process.exit(1);
     }
 }
@@ -2568,6 +2576,8 @@ function sessionStatusLabel(s) {
             return isProcessAlive(pid) ? 'adopt' : 'stopped';
         return s.pid && isProcessAlive(s.pid) ? 'adopt' : 'idle';
     }
+    if (isColdResumeDormant(s) && !(s.pid && isProcessAlive(s.pid)))
+        return 'dormant';
     return s.pid && isProcessAlive(s.pid) ? 'online' : s.pid ? 'stopped' : 'idle';
 }
 function sessionTargetLabel(s, tmuxName, hasTmux) {
@@ -2842,13 +2852,13 @@ async function cmdList() {
         }
         const hasPid = !!(s.pid && isProcessAlive(s.pid));
         const hasTmux = tmuxSessionExists(`bmx-${s.sessionId.substring(0, 8)}`);
-        if (!hasPid && !hasTmux) {
-            const everReal = !!(s.cliId || s.lastCliInput || s.adoptedFrom);
-            (everReal ? pruned : prunedScratch).push(s);
-        }
-        else {
+        const disposition = sessionListDisposition(s, { hasPid, hasBackingSession: hasTmux });
+        if (disposition === 'prune_real')
+            pruned.push(s);
+        else if (disposition === 'prune_scratch')
+            prunedScratch.push(s);
+        else
             live.push(s);
-        }
     }
     const closeNow = (arr) => {
         for (const s of arr) {
@@ -3479,6 +3489,8 @@ botmux v${getVersion()} — IM ↔ AI 编程 CLI 桥接
        --files <path>                  附件（可重复）
        --videos <path>                 视频预览 MP4（可重复，需配套 --video-covers）
        --video-covers <path>           视频封面图片（可重复，按顺序对应 --videos）
+       --card-file <path>              直接发送飞书/Lark interactive 卡片 JSON
+       --card-json <json>              直接发送飞书/Lark interactive 卡片 JSON 字符串
        --mention <open_id:name>        @提及（可重复）
        --mention-back                  @回本轮触发消息的发送者（open_id 自动取自会话）
        --no-mention                    明确声明本条不@任何人
@@ -4257,6 +4269,25 @@ function argValues(args, ...flags) {
     }
     return out;
 }
+function withCustomCardMentionFooter(card, mentionOpenIds, sentToLabel) {
+    if (mentionOpenIds.length === 0)
+        return { ok: true, card };
+    const cloned = JSON.parse(JSON.stringify(card));
+    const body = cloned.body;
+    if (!body || !Array.isArray(body.elements)) {
+        return {
+            ok: false,
+            error: '自定义卡片带 --mention/--mention-back 时必须是 schema 2.0 且包含 body.elements；或改用 --no-mention 并在卡片 JSON 内自行处理展示',
+        };
+    }
+    const deduped = [...new Set(mentionOpenIds.filter(Boolean))];
+    body.elements.push({ tag: 'hr' }, {
+        tag: 'markdown',
+        text_size: 'notation_small_v2',
+        content: `<font color='grey'>${sentToLabel}${deduped.map(id => `<at id=${id}></at>`).join(' ')}</font>`,
+    });
+    return { ok: true, card: cloned };
+}
 // 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.
@@ -4279,13 +4310,38 @@ async function relaySend(rest, relayDir) {
         console.error('relay: 无法确定 session-id');
         process.exit(1);
     }
+    const cardJsonArg = argValue(rest, '--card-json');
+    const cardFile = argValue(rest, '--card-file');
+    let cardContent = '';
+    if (cardJsonArg !== undefined && cardFile !== undefined) {
+        console.error('relay: --card-json 与 --card-file 不能同时使用');
+        process.exit(2);
+    }
+    if (cardJsonArg !== undefined) {
+        cardContent = cardJsonArg;
+    }
+    else if (cardFile !== undefined) {
+        if (!existsSync(cardFile)) {
+            console.error(`relay: 文件不存在: ${cardFile}`);
+            process.exit(1);
+        }
+        cardContent = readFileSync(cardFile, 'utf-8');
+    }
     // Resolve content with the same precedence as cmdSend (content-file > positional > stdin)
     const contentFile = argValue(rest, '--content-file');
     let content = '';
-    if (contentFile) {
+    if (cardJsonArg !== undefined || cardFile !== undefined) {
+        content = '';
+    }
+    else if (contentFile) {
         content = existsSync(contentFile) ? readFileSync(contentFile, 'utf-8') : '';
     }
     else {
+        // NOTE: `--attention` is deliberately NOT excluded here. The relay flag
+        // allowlist (below) doesn't forward it, so sandbox `--attention` can't raise
+        // the dashboard hand anyway; excluding it would silently send the reason as a
+        // bare message instead of the original loud "no content" failure. Plumbing
+        // `--attention` through the relay is a separate change, out of this scope.
         const pos = positionals(rest, ['--card', '--text', '--top-level', '--no-quote', '--mention-back', '--no-mention', '--anyway', '--voice']);
         content = pos.length > 0 ? pos.join(' ') : await readStdin();
     }
@@ -4299,6 +4355,13 @@ async function relaySend(rest, relayDir) {
     const contentBase = `${id}.content`;
     const cfile = join(relayDir, contentBase);
     writeFileSync(cfile, content);
+    let cardBase;
+    let cardOutfile;
+    if (cardJsonArg !== undefined || cardFile !== undefined) {
+        cardBase = `${id}.card.json`;
+        cardOutfile = join(relayDir, cardBase);
+        writeFileSync(cardOutfile, cardContent);
+    }
     // Copy attachments into the outbox; carry only basenames.
     const copyOutboxAttachment = (p, out) => {
         if (!p || !existsSync(p))
@@ -4338,7 +4401,7 @@ async function relaySend(rest, relayDir) {
     }
     // 原子写：req.json 是 host watcher 的触发文件，rename 让它「完整出现」，
     // watcher 永远不会读到半截 JSON（tmp 后缀不匹配 .req.json 过滤）。
-    atomicWriteFileSync(join(relayDir, `${id}.req.json`), JSON.stringify({ contentFile: contentBase, attachments, videos, videoCovers, flags }));
+    atomicWriteFileSync(join(relayDir, `${id}.req.json`), JSON.stringify({ contentFile: contentBase, cardFile: cardBase, attachments, videos, videoCovers, flags }));
     const resPath = join(relayDir, `${id}.res.json`);
     const deadlineMs = Date.now() + 120_000;
     while (Date.now() < deadlineMs) {
@@ -4353,6 +4416,12 @@ async function relaySend(rest, relayDir) {
                     unlinkSync(cfile);
                 }
                 catch { /* */ }
+                if (cardOutfile) {
+                    try {
+                        unlinkSync(cardOutfile);
+                    }
+                    catch { /* */ }
+                }
                 if (res.stdout)
                     process.stdout.write(res.stdout);
                 if (res.stderr)
@@ -4429,10 +4498,29 @@ async function cmdSend(rest) {
             process.exit(2);
         }
     }
+    if (flagPresentButValueMissing(rest, '--card-file', true)) {
+        console.error('botmux send: --card-file 需要路径参数');
+        process.exit(2);
+    }
+    if (flagPresentButValueMissing(rest, '--card-json', true)) {
+        console.error('botmux send: --card-json 需要 JSON 字符串参数');
+        process.exit(2);
+    }
+    const cardJsonArg = argValue(rest, '--card-json');
+    const cardFile = argValue(rest, '--card-file');
+    const customCardRequested = cardJsonArg !== undefined || cardFile !== undefined;
+    if (cardJsonArg !== undefined && cardFile !== undefined) {
+        console.error('botmux send: --card-json 与 --card-file 不能同时使用');
+        process.exit(2);
+    }
     const images = argValues(rest, '--image', '--images');
     const files = argValues(rest, '--file', '--files');
     const videos = argValues(rest, '--video', '--videos');
     const videoCovers = argValues(rest, '--video-cover', '--video-covers');
+    if (customCardRequested && (images.length > 0 || files.length > 0 || videos.length > 0 || videoCovers.length > 0)) {
+        console.error('botmux send: --card-file/--card-json 暂不与 --images/--files/--videos 混用；请把素材先上传为飞书资源并写入卡片 JSON');
+        process.exit(2);
+    }
     const videoValidation = validateVideoAttachments(videos, videoCovers);
     if (!videoValidation.ok) {
         console.error(`botmux send: ${videoValidation.error}`);
@@ -4452,6 +4540,10 @@ async function cmdSend(rest) {
     }
     const mentionArgs = argValues(rest, '--mention'); // "open_id:Display Name"
     const contentFile = argValue(rest, '--content-file');
+    if (customCardRequested && contentFile) {
+        console.error('botmux send: --card-file/--card-json 不能与 --content-file 混用');
+        process.exit(2);
+    }
     // 回复一律走交互卡片。`--card` / `--text` 是隐藏的旧脚本兼容 no-op：纯文本
     // post 路径已删除，只有卡片能承载「🔊 语音总结」按钮，且守护进程兜底也一直只发卡片。
     // Publish-mode flags: post a fresh top-level message in a chat instead of
@@ -4479,6 +4571,10 @@ async function cmdSend(rest) {
     // needs-you column for this session. Parsed specially (not argValue) so a bare
     // `--attention "我卡住了"` doesn't eat the message as the flag value.
     const attention = parseAttentionFlag(rest);
+    if (customCardRequested && asVoice) {
+        console.error('botmux send: --card-file/--card-json 不能与 --voice 混用');
+        process.exit(2);
+    }
     const ancestorCtx = findAncestorSessionContext();
     const sid = sessionIdArg ?? ancestorCtx?.sessionId ?? null;
     if (!sid) {
@@ -4498,7 +4594,29 @@ async function cmdSend(rest) {
     }
     // Read content from: --content-file > positional arg > stdin
     let content = '';
-    if (contentFile) {
+    let customCard;
+    if (customCardRequested) {
+        const unexpectedText = positionals(rest, ['--card', '--text', '--top-level', '--no-quote', '--mention-back', '--no-mention', '--anyway', '--voice', '--attention']);
+        if (unexpectedText.length > 0) {
+            console.error('botmux send: --card-file/--card-json 发送自定义卡片时不接受正文参数；卡片内容请写入 JSON');
+            process.exit(2);
+        }
+        let rawCard = cardJsonArg ?? '';
+        if (cardFile !== undefined) {
+            if (!existsSync(cardFile)) {
+                console.error(`文件不存在: ${cardFile}`);
+                process.exit(1);
+            }
+            rawCard = readFileSync(cardFile, 'utf-8');
+        }
+        const normalizedCard = normalizeInteractiveCardInput(rawCard);
+        if (!normalizedCard.ok) {
+            console.error(`botmux send: ${normalizedCard.error}`);
+            process.exit(2);
+        }
+        customCard = normalizedCard.card;
+    }
+    else if (contentFile) {
         if (!existsSync(contentFile)) {
             console.error(`文件不存在: ${contentFile}`);
             process.exit(1);
@@ -4514,9 +4632,9 @@ async function cmdSend(rest) {
             content = await readStdin();
         }
     }
-    if (!contentFile)
+    if (!contentFile && !customCardRequested)
         rejectLikelyWindowsStdinMojibake(content);
-    if (!content.trim() && images.length === 0 && files.length === 0 && videoAttachments.length === 0) {
+    if (!customCard && !content.trim() && images.length === 0 && files.length === 0 && videoAttachments.length === 0) {
         console.error('没有内容可发送。用法:\n  echo "消息" | botmux send\n  botmux send "消息"\n  botmux send --content-file /tmp/msg.md --images /tmp/chart.png\n  botmux send --videos /tmp/replay.mp4 --video-covers /tmp/cover.png --no-mention "视频预览"');
         process.exit(1);
     }
@@ -4607,6 +4725,10 @@ async function cmdSend(rest) {
     // （之前 currentTurnId 取自 cliPidMarker，文档轮里取值不稳导致误判落到 @ 硬门）。
     const docTarget = s.currentDocCommentTarget;
     if (docTarget && !sendTopLevel && !overrideChatId && !sendInto) {
+        if (customCardRequested) {
+            console.error('botmux send: 文档评论回复不支持 --card-file/--card-json；请改用普通文本，或显式 --top-level/--chat-id 发到飞书群');
+            process.exit(2);
+        }
         const { registerBot, loadBotConfigs } = await import('./bot-registry.js');
         try {
             for (const cfg of loadBotConfigs())
@@ -4942,6 +5064,20 @@ async function cmdSend(rest) {
                 hasExplicitBotMention: explicitKnownBotMention,
                 knownBotOpenIds,
             });
+        if (customCard) {
+            const mentionFooter = orderedFooterRecipients({
+                sendTo: footerAddressing.sendTo,
+                mentionIds: mentions.map(m => m.open_id),
+                cc: footerAddressing.cc,
+                inlinedIds: [],
+            });
+            const withFooter = withCustomCardMentionFooter(customCard, mentionFooter, t('card.sent_to', undefined, localeForBot(appId)));
+            if (!withFooter.ok) {
+                console.error(`botmux send: ${withFooter.error}`);
+                process.exit(2);
+            }
+            customCard = withFooter.card;
+        }
         // Capture sentAtMs BEFORE dispatch — the worker's bridge fallback gates
         // on `sentAtMs ∈ [turn.markTimeMs, nextTurn.markTimeMs)`. If we recorded
         // it after dispatch (which can take seconds), a slow Lark RTT could push
@@ -4952,20 +5088,25 @@ async function cmdSend(rest) {
         let messageId;
         let failedAttachments = [];
         let failedVideoAttachments = [];
-        // Pure-video fast path: send the preview as a standalone media message.
-        // A send that also carries mentions is deliberately excluded (media messages
-        // can't embed `<at>`), so it falls through to the card branch which renders
-        // the @ on the footer and sends the video as a follow-up attachment — same
-        // shape as an attachment-only `--files … --mention …` send, whose card body
-        // is likewise empty. See shouldSendAsPureVideo.
-        const pureVideoSend = shouldSendAsPureVideo({
-            hasBodyText: !!text.trim(),
-            imageCount: imageKeys.length,
-            fileCount: files.length,
-            videoCount: videoAttachments.length,
-            mentionCount: mentions.length,
-        });
-        if (pureVideoSend) {
+        const pureVideoSend = customCard
+            ? false
+            : shouldSendAsPureVideo({
+                hasBodyText: !!text.trim(),
+                imageCount: imageKeys.length,
+                fileCount: files.length,
+                videoCount: videoAttachments.length,
+                mentionCount: mentions.length,
+            });
+        if (customCard) {
+            messageId = await dispatchPrimary(JSON.stringify(customCard), 'interactive');
+        }
+        else if (pureVideoSend) {
+            // Pure-video fast path: send the preview as a standalone media message.
+            // A send that also carries mentions is deliberately excluded (media messages
+            // can't embed `<at>`), so it falls through to the card branch which renders
+            // the @ on the footer and sends the video as a follow-up attachment — same
+            // shape as an attachment-only `--files … --mention …` send, whose card body
+            // is likewise empty. See shouldSendAsPureVideo.
             // No card/text primary here, so the FIRST media message must carry the
             // quote chain itself (dispatchPrimary applies the chat-scope quoteTargetId
             // and updates primaryQuotedId). Otherwise a bare `--videos … --no-mention`
@@ -5734,7 +5875,7 @@ async function cmdAsk(sub, rest) {
         process.exit(2);
     }
     const { findMissingAskEnv, parseAskOptions, parseAskTimeoutSeconds, AskArgsError } = await import('./core/ask-args.js');
-    const { toLegacySelected } = await import('./core/ask-types.js');
+    const { toLegacySelected, isCustomReply } = await import('./core/ask-types.js');
     const missing = findMissingAskEnv(process.env);
     if (missing) {
         console.error(`botmux ask: 缺少必需环境变量 ${missing}。` +
@@ -5795,7 +5936,15 @@ async function cmdAsk(sub, rest) {
         process.stdout.write(JSON.stringify(out) + '\n');
     }
     else if (result.kind === 'answered') {
-        // 非 JSON 模式：输出 selected key（单问单选），多选/多问输出空字符串
+        // 非 JSON 模式：输出 selected key（单问单选），多选/多问输出空字符串。
+        //
+        // 用户以文字作答时同样落到空字符串，与多选/多问的降级值无法区分，且 exit 0
+        // ——调用方会静默走进空分支。comment 可能含换行，塞进「一行一个 key」的
+        // stdout 契约并不安全，因此 stdout 保持不变，改由 stderr 指明答案去向。
+        if (isCustomReply(result)) {
+            console.error('botmux ask: 用户以文字作答，未点选任何选项；stdout 留空（stdout 只承载 option key）。' +
+                ' 用 `--json` 读 comment 字段取回原文。');
+        }
         process.stdout.write((selected ?? '') + '\n');
     }
     switch (result.kind) {