botmux 2.55.0 → 2.56.0

package/dist/cli.js

@@ -31,13 +31,14 @@ import { enableAutostart, disableAutostart, autostartStatus, refreshAutostart }
 import { tmuxEnv } from './setup/ensure-tmux.js';
 import { writeBotsJsonAtomic as writeBotsAtomic } from './setup/bots-store.js';
 import { applyBotConfigEdits, assertUniqueBotProcessNames, botProcessName, normalizeBotConfig, parseBotConfigsJson, parseBotSelection, removeBotConfig, resolveCliId, assertOwnerWhenChatGroups, findInvalidAllowedUserEntries, hasOwnerEntry, } from './setup/bot-config-editor.js';
+import { buildPreset, serializePreset, presetFilename } from './setup/agent-preset.js';
 import { createCliAdapterSync } from './adapters/cli/registry.js';
 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, orderedFooterRecipients, } from './utils/bot-routing.js';
-import { isLocale, setDefaultLocale, SUPPORTED_LOCALES } from './i18n/index.js';
+import { isLocale, localeForBot, 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
 // CLI output (and any t() callers that don't pass an explicit locale) honour
@@ -748,8 +749,8 @@ async function promptEditBotConfig(rl, bot) {
         input.model = cliChanged && result === undefined ? null : result;
     }
     printInputHelp('会话后端 backendType', [
-        '可选。pty 更轻量；tmux 支持 adopt 和 Web Terminal 附着；zellij 为实验后端（pty-under-zellij，需 zellij >= 0.44）。',
-        '留空保留当前值；输入 - 回到自动检测；接受 pty / tmux / zellij。',
+        '可选。pty 更轻量；tmux 支持 adopt 和 Web Terminal 附着；herdr 支持托管持久会话；zellij 为实验后端（需 zellij >= 0.44）。',
+        '留空保留当前值；输入 - 回到自动检测；接受 pty / tmux / herdr / zellij。',
     ]);
     input.backendType = await ask(rl, `会话后端 backendType [${formatOptionalValue(bot.backendType)}]: `);
     printInputHelp('默认工作目录', [
@@ -2210,6 +2211,12 @@ botmux v${getVersion()} — IM ↔ AI 编程 CLI 桥接
   create-group --bot <name> [--bot ...] [--name "群名"]
                                        用指定 bot 起新群；详见 \`botmux create-group --help\`
 
+预设分享（导出某 bot 的可分享配置给同事，绝不含密钥）:
+  preset export <bot> [--from-chat <chatId>] [--out <file>] [--yes]
+                                       导出 cliId/model/角色/能力标签 + 接入指引；
+                                       默认 team 级角色，--from-chat 取某群角色内容；
+                                       缺省写 ./<name或appid>.botmux-preset.json，--out - 走 stdout
+
 配置目录: ~/.botmux/
 文档: https://github.com/deepcoldy/botmux
 `);
@@ -2285,6 +2292,26 @@ function argValue(args, ...flags) {
 function argFlag(args, flag) {
     return args.includes(flag);
 }
+/**
+ * True when `flag` is present but lacks a usable value — i.e. it's the last
+ * token, is followed by another flag, or was given as `--flag=` (empty). Lets
+ * callers surface a friendly error instead of silently falling back to a
+ * default (e.g. treating a value-less `--from-chat` as "no chat"). `allowDash`
+ * permits a bare `-` value (used by `--out -` to mean stdout).
+ */
+function flagPresentButValueMissing(args, flag, allowDash = false) {
+    const i = args.findIndex(a => a === flag || a.startsWith(flag + '='));
+    if (i < 0)
+        return false; // absent entirely — not "missing a value"
+    if (args[i].startsWith(flag + '='))
+        return args[i].slice(flag.length + 1) === '';
+    const next = args[i + 1];
+    if (next === undefined)
+        return true;
+    if (next.startsWith('-'))
+        return !(allowDash && next === '-');
+    return false;
+}
 /** Extract positional args, skipping --flag and the value that follows it
  *  (for --flag <value> style).  --flag=value style is self-contained.
  *  `booleanFlags` lists flags that take no value — without this hint the
@@ -2643,9 +2670,10 @@ 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 `buildCardBodyElements` and `hasMarkdown` from there.
+// keeps using `buildCardBodyElements` from there.
+import { buildMentionedPendingResponseCard } from './im/lark/card-builder.js';
 import { buildCardBodyElements, brandFooterSegment } from './im/lark/md-card.js';
-import { claimPendingResponseCard, markPendingResponseCardPatchedIfCurrent, mergePendingResponseState } from './core/pending-response.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 } from './services/send-policy.js';
@@ -2843,7 +2871,7 @@ async function cmdSend(rest) {
             registerBot(cfg);
     }
     catch { /* */ }
-    const { sendMessage, replyMessage, uploadImage, uploadFile, deleteMessage, MessageWithdrawnError } = await import('./im/lark/client.js');
+    const { sendMessage, replyMessage, uploadImage, uploadFile, updateMessage, addReaction, 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;
@@ -2914,16 +2942,50 @@ 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 = 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;
+        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
@@ -3066,6 +3128,7 @@ 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 语义和"未@任何人"输出自相矛盾
@@ -4190,6 +4253,168 @@ function cmdLang(args) {
     console.log(`✅ Set global lang → ${target}.`);
     console.log(`Run \`botmux restart\` for changes to take effect.`);
 }
+// ─── botmux preset ────────────────────────────────────────────────────────────
+/**
+ * `botmux preset <sub>` dispatcher. Currently only `export`.
+ */
+async function cmdPreset(sub, rest) {
+    switch (sub) {
+        case 'export':
+            await cmdPresetExport(rest);
+            break;
+        default:
+            console.error('用法: botmux preset export <bot> [--from-chat <chatId>] [--out <file>] [--yes]');
+            process.exit(1);
+    }
+}
+/**
+ * `botmux preset export <bot> [--from-chat <chatId>] [--out <file>] [--yes]`
+ *
+ * Export a bot's **shareable, secret-free** preset (cliId / model / team role /
+ * capability + an embedded guide) so a teammate's agent can self-configure a
+ * matching bot. Never emits credentials or deployment fields — see
+ * agent-preset.ts:buildPreset for the allow-list guarantee.
+ *
+ * Role source: team-level by default; `--from-chat <chatId>` exports that
+ * group's role content instead (the chatId itself is dropped). Both role and
+ * capability resolve under the effective data dir: this fn sets
+ * `SESSION_DATA_DIR ??= resolveDataDir()` (SESSION_DATA_DIR → ~/.botmux
+ * breadcrumb → default), and reads it via config.session.dataDir's lazy getter —
+ * correct in agent sessions and bare-shell runs alike.
+ */
+async function cmdPresetExport(rest) {
+    process.env.SESSION_DATA_DIR ??= resolveDataDir();
+    const USAGE = '用法: botmux preset export <bot> [--from-chat <chatId>] [--out <file>] [--yes]';
+    const selection = firstPositional(rest, ['--from-chat', '--out']);
+    if (!selection) {
+        console.error(USAGE);
+        console.error('  <bot>  进程名 (botmux-xxx) 或 larkAppId');
+        process.exit(1);
+        return;
+    }
+    const bots = loadBotsJson();
+    if (bots.length === 0) {
+        console.error('❌ 没有可用的 bot：未找到 bots.json 或其中为空。先跑 `botmux setup`。');
+        process.exit(1);
+        return;
+    }
+    const idx = parseBotSelection(selection, bots);
+    if (idx === undefined) {
+        console.error(`❌ 找不到 bot "${selection}"。可选：`);
+        bots.forEach((b, i) => {
+            const appId = typeof b.larkAppId === 'string' ? b.larkAppId : '(无 larkAppId)';
+            console.error(`   - ${botProcessName(b, i)}  (${appId})`);
+        });
+        process.exit(1);
+        return;
+    }
+    const bot = bots[idx];
+    const appId = typeof bot.larkAppId === 'string' ? bot.larkAppId : '';
+    if (!appId) {
+        console.error(`❌ bot "${selection}" 缺少 larkAppId，无法解析角色/能力。`);
+        process.exit(1);
+        return;
+    }
+    if (!bot.cliId || typeof bot.cliId !== 'string') {
+        console.error(`❌ bot "${selection}" 缺少 cliId，无法导出预设。`);
+        process.exit(1);
+        return;
+    }
+    // Fail loudly when a flag was given without a value, instead of silently
+    // exporting as if it weren't passed (e.g. a value-less `--from-chat` would
+    // otherwise quietly fall back to the team role).
+    if (flagPresentButValueMissing(rest, '--from-chat')) {
+        console.error('❌ --from-chat 需要一个 chatId（如 oc_xxx）。');
+        console.error(USAGE);
+        process.exit(1);
+        return;
+    }
+    if (flagPresentButValueMissing(rest, '--out', true)) {
+        console.error('❌ --out 需要一个文件路径，或用 `--out -` 输出到 stdout。');
+        console.error(USAGE);
+        process.exit(1);
+        return;
+    }
+    const fromChat = argValue(rest, '--from-chat');
+    const out = argValue(rest, '--out');
+    const skipConfirm = argFlag(rest, '--yes') || argFlag(rest, '-y');
+    // capability + role read the SAME data dir. config.session.dataDir is a lazy
+    // getter, so the SESSION_DATA_DIR set at the top of this fn (= resolveDataDir())
+    // is honored — correct for both agent sessions AND bare-shell runs (no longer
+    // the frozen packaged default).
+    const dataDir = config.session.dataDir;
+    const { resolveTeamRoleFile, resolveRoleFile } = await import('./core/role-resolver.js');
+    const { getBotCapability } = await import('./services/bot-profile-store.js');
+    let teamRole;
+    if (fromChat) {
+        teamRole = resolveRoleFile(appId, fromChat);
+        if (teamRole === null) {
+            console.error(`⚠️  群 ${fromChat} 下没有为该 bot 配置角色；导出将不含 teamRole（仍含 cliId/model/capability）。`);
+        }
+    }
+    else {
+        teamRole = resolveTeamRoleFile(appId);
+        if (teamRole === null) {
+            console.error('⚠️  该 bot 没有 team 级角色；导出将不含 teamRole。可加 `--from-chat <chatId>` 导出某群的角色内容。');
+        }
+    }
+    const capability = getBotCapability(dataDir, appId);
+    const sourceName = typeof bot.name === 'string' && bot.name.trim() ? bot.name.trim() : undefined;
+    const preset = buildPreset({
+        cliId: bot.cliId,
+        model: typeof bot.model === 'string' ? bot.model : undefined,
+        teamRole,
+        capability,
+        sourceName,
+    });
+    const json = serializePreset(preset);
+    // Confirm before writing — the role may carry internal info. --yes skips.
+    if (!skipConfirm) {
+        if (!process.stdin.isTTY) {
+            console.error('❌ 角色内容可能含内部信息，导出前需确认；非交互环境（如 agent 调用）请加 `--yes` 跳过确认。');
+            process.exit(1);
+            return;
+        }
+        if (teamRole || capability) {
+            console.error('\n即将导出以下内容，请确认不含敏感/内部信息：');
+            console.error('────────────────────────────────────────');
+            if (teamRole)
+                console.error(`[角色 teamRole]\n${teamRole}`);
+            if (capability)
+                console.error(`[能力标签 capability] ${capability}`);
+            console.error('────────────────────────────────────────');
+        }
+        else {
+            console.error('\n（无角色 / 能力标签内容，仅导出 cliId/model）');
+        }
+        // Prompt on stderr so a piped stdout (--out -) stays clean.
+        const rl = createInterface({ input: process.stdin, output: process.stderr });
+        const answer = (await ask(rl, '确认导出？输入 y 继续，其它取消: ')).trim().toLowerCase();
+        rl.close();
+        if (answer !== 'y' && answer !== 'yes') {
+            console.error('已取消，未写入任何文件。');
+            process.exit(1);
+            return;
+        }
+    }
+    // stdout mode: the JSON must own stdout; all chatter goes to stderr.
+    if (out === '-') {
+        process.stdout.write(json);
+        console.error('✅ 已输出到 stdout。本文件不含任何密钥（larkAppId/secret/allowedUsers 等均未包含）。');
+        return;
+    }
+    const outPath = out ?? `./${presetFilename(sourceName, appId)}`;
+    try {
+        writeFileSync(outPath, json, 'utf-8');
+    }
+    catch (err) {
+        console.error(`❌ 写入 ${outPath} 失败: ${err?.message ?? String(err)}`);
+        process.exit(1);
+        return;
+    }
+    console.error(`✅ 已导出预设到 ${outPath}`);
+    console.error('   本文件不含任何密钥（larkAppId/secret/allowedUsers/workingDir 等均未包含），可安全分享。');
+}
 // ─── Main ────────────────────────────────────────────────────────────────────
 function getVersion() {
     const pkgPath = join(PKG_ROOT, 'package.json');
@@ -4318,6 +4543,25 @@ async function cmdVoiceSetup(args) {
         mergeGlobalConfig({ voice: voice });
         console.log('\n✅ 已写入 voice 配置。`botmux restart` 后，配了语音的机器人回复卡片底部会出现「🔊 语音总结」按钮。');
         console.log('   查看：`botmux voice status`  关闭：`botmux voice disable`');
+        // 语音合成产物要编码成飞书语音气泡用的 opus，依赖系统的 opusenc(opus-tools)。
+        // 缺了就当场帮用户装（沿用 ensure-tmux 的包管理器/sudo 机制）。
+        const { ensureOpusTools, probeOpusenc } = await import('./setup/ensure-opus.js');
+        if (!probeOpusenc()) {
+            console.log('\n⚠️  未检测到 opus 编码器（opus-tools）——语音合成需要它把音频转成飞书语音格式。');
+            const yes = (await ask(rl, '现在自动安装 opus-tools？(Y/n): ')).trim().toLowerCase();
+            if (yes === '' || yes === 'y' || yes === 'yes') {
+                const r = await ensureOpusTools();
+                if (r.installed)
+                    console.log(`✅ opus-tools 就绪${r.version ? `（${r.version}）` : ''}`);
+                else {
+                    console.log(`未能自动安装：${r.reason ?? ''}`);
+                    console.log(`请手动安装后再用语音：${r.manualCommand ?? 'apt-get install -y opus-tools / brew install opus-tools'}`);
+                }
+            }
+            else {
+                console.log('已跳过。记得手动安装：Debian/Ubuntu `sudo apt-get install -y opus-tools`，macOS `brew install opus-tools`。');
+            }
+        }
     }
     finally {
         rl.close();
@@ -4401,6 +4645,9 @@ switch (command) {
     case 'bots':
         await cmdBots(process.argv[3] ?? 'list', process.argv.slice(4));
         break;
+    case 'preset':
+        await cmdPreset(process.argv[3] ?? '', process.argv.slice(4));
+        break;
     case 'history':
         await cmdHistory(process.argv.slice(3));
         break;