botmux 3.2.1 → 3.4.0

package/dist/cli.js

@@ -12,6 +12,7 @@
  *   botmux logs [--lines] — view daemon logs
  *   botmux status         — show daemon status
  *   botmux upgrade|update — upgrade to latest version
+ *   botmux device enroll|status|logout — manage the host desktop device credential
  *   botmux list           — interactive session picker (TUI), attach to tmux
  *   botmux list --plain   — plain table output (for piping / scripts)
  *   botmux delete <id>    — close a session by ID prefix
@@ -46,11 +47,13 @@ import { buildBotFromAddFlags, editInputFromFlags, isScriptedSetupInvocation, ma
 import { interactiveSelect, pickChoice, pickCliSelection } from './setup/interactive-select.js';
 import { buildPreset, serializePreset, presetFilename } from './setup/agent-preset.js';
 import { logger } from './utils/logger.js';
+import { scrubSessionCliHomeEnv } from './utils/child-env.js';
 import { scheduleTimeZone } from './utils/timezone.js';
 import { expandHomePath, invalidWorkingDirs } from './utils/working-dir.js';
 import { firstPositional } from './cli/arg-utils.js';
 import { isColdResumeDormant, sessionListDisposition } from './cli/session-list-liveness.js';
 import { dispatchPrimaryMessage, findStdinAliasAttachment, normalizeInteractiveCardInput, sendFileAttachments, sendVideoAttachments, shouldSendAsPureVideo, validateVideoAttachments } from './cli/send-dispatch.js';
+import { dispatchDeferredTopicSend } from './cli/deferred-topic-send.js';
 import { resolveDaemonExternalHostEnv } from './cli/daemon-lifecycle-env.js';
 import { buildPm2SpawnCommand } from './cli/pm2-command.js';
 import { callDashboard } from './cli/dashboard-endpoint.js';
@@ -146,7 +149,18 @@ function pm2Bin() {
 }
 /** Env for pm2 invocations with an isolated PM2_HOME. */
 function pm2Env(home = PM2_HOME) {
-    return { ...process.env, PM2_HOME: home };
+    const env = { ...process.env, PM2_HOME: home };
+    // pm2 persists the caller's env into every managed app (and into dump.pm2
+    // for resurrect), so a `botmux start/restart` invoked from ANY process that
+    // carries a session-level CLI home pointer — most commonly a bot's own
+    // session during self-upgrade, whose env holds its injected
+    // CLAUDE_CONFIG_DIR — would poison ALL workers, making every non-isolated
+    // bot read/write a sibling bot's home. Strip at this boundary so the daemon
+    // stays session-agnostic; daemon/worker boot scrub the same keys against
+    // stale dumps (see SESSION_CLI_HOME_ENV_KEYS for the full story, including
+    // why GROK_HOME is exempt and why deleting beats pinning a default).
+    scrubSessionCliHomeEnv(env);
+    return env;
 }
 function listPm2GodDaemonPids(home = PM2_HOME) {
     if (process.platform !== 'linux')
@@ -325,6 +339,10 @@ function ecosystemConfig() {
     const externalHostEnv = resolveDaemonExternalHostEnv(process.env, existsSync(ENV_FILE) ? readFileSync(ENV_FILE, 'utf-8') : undefined);
     const baseApp = {
         script: daemonScript,
+        // Pin every managed core process to the Node that invoked this CLI. This
+        // keeps GUI/launchd starts independent from PATH and lets Desktop replace
+        // an external fleet without also killing unrelated plugin services.
+        interpreter: process.execPath,
         cwd: CONFIG_DIR,
         autorestart: true,
         max_restarts: 10,
@@ -370,6 +388,7 @@ function ecosystemConfig() {
     apps.push({
         name: 'botmux-dashboard',
         script: join(PKG_ROOT, 'dist', 'dashboard.js'),
+        interpreter: process.execPath,
         cwd: PKG_ROOT,
         autorestart: true,
         max_restarts: 10,
@@ -4057,6 +4076,9 @@ async function cmdResume() {
     else if (errCode === 'adopt_unsupported') {
         console.error('❌ adopt 接管会话不支持 resume。');
     }
+    else if (errCode === 'deferred_unmaterialized') {
+        console.error('❌ 该静默定时轮次未创建话题，隐藏会话只保留审计记录，不能 resume。');
+    }
     else {
         console.error(`❌ 恢复失败: ${errCode}`);
     }
@@ -4182,6 +4204,8 @@ botmux v${getVersion()} — IM ↔ AI 编程 CLI 桥接
   status      查看 daemon 状态
   upgrade     升级到最新版本（别名：update）
   dashboard   打印新的 Web Dashboard 一次性登录 URL（旧 token 同时失效）
+  device enroll|status|logout
+              在宿主终端注册、查看或清除 desktop device 凭证（AI CLI 会话内拒绝）
   list        列出活跃会话（交互式选择并连接 tmux）
               --plain  纯文本表格输出（管道/脚本场景）
   delete <id>      关闭指定会话（支持 ID 前缀匹配）
@@ -4231,8 +4255,10 @@ botmux v${getVersion()} — IM ↔ AI 编程 CLI 桥接
 定时任务（可在 CLI 会话内自动推断 chat）:
   schedule list                        列出所有任务
   schedule add <schedule> <prompt>     添加任务（ex: "30m" / "every 2h" / "每日9:00" / "0 9 * * *"）
-       --new-topic                     每次触发在同群开一个新话题、起独立会话（不续旧话题）
-       --silent                        静默执行：不发「执行中」提示，模型判断是否 botmux send 报警（与 --new-topic 互斥）
+       --top-level                     在群消息顶层执行（后续会话形态跟随普通群会话模式）
+       --topic --root-msg-id <om_...>  固定在指定话题下执行
+       --new-topic [--topic-title ...] 每次创建新话题和独立会话
+       --silent                        静默执行：不发「执行中」提示，模型判断是否 botmux send 报警
   schedule remove <id>                 删除任务
   schedule pause|resume <id>           暂停/恢复
   schedule run <id>                    标记立即执行
@@ -4711,9 +4737,9 @@ async function cmdSchedule(sub, rest) {
         return;
     }
     if (sub === 'add') {
-        const [rawSchedule, ...promptParts] = positionals(rest, ['--new-topic', '--silent']);
+        const [rawSchedule, ...promptParts] = positionals(rest, ['--new-topic', '--top-level', '--topic', '--silent']);
         if (!rawSchedule) {
-            console.error('用法: botmux schedule add <schedule> <prompt> [--name NAME] [--chat-id CHAT] [--root-msg-id ROOT] [--lark-app-id APP] [--workdir DIR] [--new-topic] [--silent]');
+            console.error('用法: botmux schedule add <schedule> <prompt> [--name NAME] [--chat-id CHAT] [--top-level | --topic --root-msg-id ROOT | --new-topic [--topic-title TITLE]] [--lark-app-id APP] [--workdir DIR] [--silent]');
             process.exit(1);
         }
         // prompt may come from positional or --prompt flag
@@ -4724,25 +4750,50 @@ async function cmdSchedule(sub, rest) {
         }
         const cur = detectCurrentSession();
         const chatId = argValue(rest, '--chat-id') ?? cur?.chatId;
-        const rootMessageId = argValue(rest, '--root-msg-id') ?? cur?.rootMessageId;
+        const explicitRootMessageId = argValue(rest, '--root-msg-id');
+        const rootMessageId = explicitRootMessageId
+            ?? (chatId && chatId === cur?.chatId ? cur.rootMessageId : undefined);
         const larkAppId = argValue(rest, '--lark-app-id') ?? cur?.larkAppId;
         const workingDir = argValue(rest, '--workdir') ?? cur?.workingDir ?? process.cwd();
         const name = argValue(rest, '--name') ?? (promptArg.length > 20 ? promptArg.slice(0, 20) + '…' : promptArg);
-        // --new-topic: every fire opens a brand-new topic in a fresh session.
-        const deliver = rest.includes('--new-topic')
-            ? 'new-topic'
-            : (argValue(rest, '--deliver') ?? 'origin');
+        const legacyDeliver = argValue(rest, '--deliver');
+        const wantsNewTopic = rest.includes('--new-topic') || legacyDeliver === 'new-topic';
+        const wantsTopLevel = rest.includes('--top-level');
+        const wantsTopic = rest.includes('--topic');
+        if ([wantsNewTopic, wantsTopLevel, wantsTopic].filter(Boolean).length > 1) {
+            console.error('--top-level、--topic 与 --new-topic 只能选择一个。');
+            process.exit(1);
+        }
+        const requestedDeliver = legacyDeliver;
+        const deliver = requestedDeliver === 'local' ? 'local' : 'origin';
         // --silent: fires post no "执行中" banner; the spawned turn stays quiet and
         // the model only `botmux send`s when the alert condition in the prompt is met.
         const silent = rest.includes('--silent');
-        if (silent && deliver === 'new-topic') {
-            console.error('--silent 与 --new-topic 不能同时使用：新话题必须由首条消息开启。要「有异常才开新话题」，请在 prompt 里指示模型报警时用 botmux send 顶层发送。');
-            process.exit(1);
-        }
         if (!chatId) {
             console.error('无法推断 chat-id。请加上 --chat-id <CHAT_ID>，或从 Lark 话题内的 CLI 会话中运行本命令。');
             process.exit(1);
         }
+        const executionPosition = wantsNewTopic
+            ? 'new-topic'
+            : wantsTopLevel
+                ? 'top-level'
+                : wantsTopic
+                    ? 'topic'
+                    : cur?.scope === 'chat' ? 'top-level' : rootMessageId ? 'topic' : 'top-level';
+        const scope = executionPosition === 'topic' ? 'thread' : 'chat';
+        if (scope === 'thread' && !rootMessageId) {
+            console.error('话题下执行需要 --root-msg-id <ROOT_MESSAGE_ID>，或从 Lark 话题会话中运行。');
+            process.exit(1);
+        }
+        const topicTitle = argValue(rest, '--topic-title');
+        if (topicTitle && executionPosition !== 'new-topic') {
+            console.error('--topic-title 仅可与 --new-topic 一起使用。');
+            process.exit(1);
+        }
+        if (topicTitle && Array.from(topicTitle.trim()).length > 200) {
+            console.error('--topic-title 最多 200 个字符。');
+            process.exit(1);
+        }
         let parsed;
         try {
             parsed = scheduler.parseSchedule(rawSchedule);
@@ -4764,7 +4815,9 @@ async function cmdSchedule(sub, rest) {
             creatorRootMessageId: cur?.rootMessageId,
             creatorLarkAppId: cur?.larkAppId,
             chatType: cur?.chatType === 'p2p' ? 'p2p' : 'topic_group',
-            scope: cur?.scope,
+            scope,
+            executionPosition,
+            topicTitle,
             deliver,
             silent,
         });
@@ -4773,7 +4826,9 @@ async function cmdSchedule(sub, rest) {
         console.log(`   规则: ${parsed.display}`);
         console.log(`   下次执行: ${next}`);
         console.log(`   工作目录: ${workingDir}`);
-        console.log(`   话题: ${deliver === 'new-topic' ? '(每次新开话题，独立会话)' : rootMessageId ?? '(将新开)'}`);
+        console.log(`   执行位置: ${executionPosition === 'new-topic' ? '每次新话题' : executionPosition === 'top-level' ? '群消息顶层' : '话题下'}`);
+        if (executionPosition === 'new-topic' && topicTitle?.trim())
+            console.log(`   新话题标题: ${topicTitle.trim()}`);
         if (silent)
             console.log('   静默: 触发时不发「执行中」提示，由模型判断是否需要 botmux send 报警');
         return;
@@ -5417,6 +5472,10 @@ function riffModeSession(opts = {}) {
     const scopeEnv = process.env.BOTMUX_SESSION_SCOPE;
     const scope = scopeEnv === 'chat' || scopeEnv === 'thread' ? scopeEnv : (rootMessageId ? 'thread' : 'chat');
     const ownerOpenId = process.env.BOTMUX_OWNER_OPEN_ID;
+    const deferredTaskId = process.env.BOTMUX_DEFERRED_SCHEDULE_TASK_ID;
+    const deferredTurnId = process.env.BOTMUX_DEFERRED_SCHEDULE_TURN_ID;
+    const deferredRoutingAnchor = process.env.BOTMUX_DEFERRED_SCHEDULE_ROUTING_ANCHOR;
+    const deferredCreatedAt = process.env.BOTMUX_DEFERRED_SCHEDULE_CREATED_AT;
     const botConfig = {
         larkAppId: appId,
         larkAppSecret: appSecret,
@@ -5434,6 +5493,19 @@ function riffModeSession(opts = {}) {
         larkAppId: appId,
         scope,
         ownerOpenId,
+        ...(deferredTaskId && deferredTurnId && deferredRoutingAnchor && deferredCreatedAt
+            ? {
+                deferredScheduleRun: {
+                    taskId: deferredTaskId,
+                    turnId: deferredTurnId,
+                    routingAnchor: deferredRoutingAnchor,
+                    ...(process.env.BOTMUX_DEFERRED_SCHEDULE_TOPIC_TITLE
+                        ? { topicTitle: process.env.BOTMUX_DEFERRED_SCHEDULE_TOPIC_TITLE }
+                        : {}),
+                    createdAt: deferredCreatedAt,
+                },
+            }
+            : {}),
         // 刻意不设 quoteTargetSenderOpenId：env 是任务创建时冻结的，follow-up 轮
         // 换了触发人后 --mention-back 会错误 @ 最初 owner。riff routing 明确禁用
         // mention-back（@ 硬门会拒绝并提示 agent 改用 --mention <本轮 sender>）。
@@ -5707,6 +5779,8 @@ async function cmdSend(rest) {
         console.error(`session ${sid} 缺少 larkAppId`);
         process.exit(1);
     }
+    let deferredMaterializedByThisCommand = false;
+    let deferredTopicRootMessageIdForOutput;
     // 本轮的回复锚点：优先按 turnId 精确取 per-turn 落点（排队/并发轮次不再被
     // 后到轮次覆盖 currentReplyTarget 而塌成群顶层 plain），无记录再退回单槽。
     const turnReplyTarget = pickTurnReplyTarget(s, currentTurnId);
@@ -5855,23 +5929,45 @@ async function cmdSend(rest) {
             }
             else {
                 revalidateVcMeetingManagedSend();
-                const canonicalTarget = resolveSendTarget({
-                    into: sendInto,
-                    topLevel: sendTopLevel,
-                    chatScope: s.scope === 'chat',
-                    chatId: canonicalOutput.targetChatId,
-                    rootMessageId: s.rootMessageId,
-                    replyTargetRootId: turnReplyTarget?.rootMessageId,
-                    replyTargetTurnId: turnReplyTarget?.turnId,
-                    replyTargetQuoteOnly: turnReplyTarget?.quoteOnly,
-                    currentTurnId,
-                });
                 const managedProviderOptions = prepared
                     ? { suppressHook: true }
                     : undefined;
-                messageId = canonicalTarget.mode === 'plain'
-                    ? await sendMessage(appId, canonicalTarget.chatId, canonicalOutput.content, canonicalOutput.msgType, prepared?.providerKey, undefined, managedProviderOptions)
-                    : await replyMessage(appId, canonicalTarget.rootMessageId, canonicalOutput.content, canonicalOutput.msgType, canonicalTarget.mode === 'thread', prepared?.providerKey, undefined, managedProviderOptions);
+                const deferred = !sendInto && (!overrideChatId || overrideChatId === s.chatId)
+                    ? await dispatchDeferredTopicSend({
+                        dataDir: resolveDataDir(),
+                        session: s,
+                        currentTurnId,
+                        explicitTopLevel: sendTopLevel,
+                        reuseBoundRootWhenTopLevel: deferredMaterializedByThisCommand,
+                        content: canonicalOutput.content,
+                        msgType: canonicalOutput.msgType,
+                        uuid: prepared?.providerKey,
+                        sendRoot: (body, type, uuid) => sendMessage(appId, targetChatId, body, type, uuid, undefined, managedProviderOptions),
+                        sendTitleSeed: (title, uuid) => sendMessage(appId, targetChatId, title, 'text', uuid),
+                        replyRoot: (root, body, type, uuid) => replyMessage(appId, root, body, type, true, uuid, undefined, managedProviderOptions),
+                    })
+                    : { handled: false };
+                if (deferred.handled && deferred.messageId) {
+                    deferredMaterializedByThisCommand ||= deferred.materializedNow === true;
+                    deferredTopicRootMessageIdForOutput = deferred.rootMessageId;
+                    messageId = deferred.messageId;
+                }
+                else {
+                    const canonicalTarget = resolveSendTarget({
+                        into: sendInto,
+                        topLevel: sendTopLevel,
+                        chatScope: s.scope === 'chat',
+                        chatId: canonicalOutput.targetChatId,
+                        rootMessageId: s.rootMessageId,
+                        replyTargetRootId: turnReplyTarget?.rootMessageId,
+                        replyTargetTurnId: turnReplyTarget?.turnId,
+                        replyTargetQuoteOnly: turnReplyTarget?.quoteOnly,
+                        currentTurnId,
+                    });
+                    messageId = canonicalTarget.mode === 'plain'
+                        ? await sendMessage(appId, canonicalTarget.chatId, canonicalOutput.content, canonicalOutput.msgType, prepared?.providerKey, undefined, managedProviderOptions)
+                        : await replyMessage(appId, canonicalTarget.rootMessageId, canonicalOutput.content, canonicalOutput.msgType, canonicalTarget.mode === 'thread', prepared?.providerKey, undefined, managedProviderOptions);
+                }
                 if (prepared?.kind === 'send' || prepared?.kind === 'succeeded') {
                     finishVcMeetingImReply(resolveDataDir(), prepared.ref, messageId);
                 }
@@ -5879,7 +5975,9 @@ async function cmdSend(rest) {
             recordVcMeetingPrimaryOutput(messageId, canonicalOutput.targetChatId);
             // 语音也是一次回复：写 bridge fallback marker，否则本轮会被判为"没发 botmux send"
             // 而触发兜底，多补一张文本卡。与文本/卡片路径同口径：仅同话题回复才记。
-            if (!sendTopLevel && !overrideChatId && !sendInto) {
+            if ((!sendTopLevel || !!deferredTopicRootMessageIdForOutput)
+                && (!overrideChatId || overrideChatId === s.chatId)
+                && !sendInto) {
                 try {
                     const markerDir = join(resolveDataDir(), 'turn-sends');
                     if (!existsSync(markerDir))
@@ -5889,7 +5987,16 @@ async function cmdSend(rest) {
                 catch { /* best-effort：漏记只多一条兜底，不致命 */ }
             }
             console.error(`✓ 已发送语音 ${messageId} ｜ ${Math.round(out.durationMs / 1000)}s`);
-            console.log(JSON.stringify({ success: true, messageId, sessionId: sid, kind: 'voice', durationMs: out.durationMs }));
+            console.log(JSON.stringify({
+                success: true,
+                messageId,
+                sessionId: sid,
+                kind: 'voice',
+                durationMs: out.durationMs,
+                ...(deferredTopicRootMessageIdForOutput
+                    ? { deferredTopicRootMessageId: deferredTopicRootMessageIdForOutput, turnId: currentTurnId }
+                    : {}),
+            }));
         }
         catch (e) {
             console.error(`语音发送失败：${e?.message ?? e}`);
@@ -6108,10 +6215,33 @@ async function cmdSend(rest) {
     // Dispatch helper: top-level / chat-scope send vs reply-in-thread, single
     // decision point. Used for file attachments (always plain in chat scope).
     const sendTarget = resolveSendTarget({ into: sendInto, topLevel: sendTopLevel, chatScope: isChatScope, chatId: targetChatId, rootMessageId: s.rootMessageId, replyTargetRootId: turnReplyTarget?.rootMessageId, replyTargetTurnId: turnReplyTarget?.turnId, replyTargetQuoteOnly: turnReplyTarget?.quoteOnly, currentTurnId });
-    const dispatch = (content, msgType, uuid, suppressHook) => {
+    const dispatch = async (content, msgType, uuid, suppressHook) => {
         // This closure also carries attachments, so every Lark call re-checks the
         // exact durable attempt/member instead of inheriting the early cmd gate.
         revalidateVcMeetingManagedSend();
+        if (!sendInto && (!overrideChatId || overrideChatId === s.chatId)) {
+            const deferred = await dispatchDeferredTopicSend({
+                dataDir: resolveDataDir(),
+                session: s,
+                currentTurnId,
+                explicitTopLevel: sendTopLevel,
+                reuseBoundRootWhenTopLevel: deferredMaterializedByThisCommand,
+                content,
+                msgType,
+                uuid,
+                sendRoot: (body, type, rootUuid) => sendMessage(appId, targetChatId, body, type, rootUuid, hookContext, suppressHook ? { suppressHook: true } : undefined),
+                // The optional title is the root seed and the actual alert follows as
+                // its first reply. Do not emit a user outbound hook for presentation-
+                // only seed text; the alert itself still goes through the hook path.
+                sendTitleSeed: (title, rootUuid) => sendMessage(appId, targetChatId, title, 'text', rootUuid),
+                replyRoot: (root, body, type, replyUuid) => replyMessage(appId, root, body, type, true, replyUuid, hookContext, suppressHook ? { suppressHook: true } : undefined),
+            });
+            if (deferred.handled && deferred.messageId) {
+                deferredMaterializedByThisCommand ||= deferred.materializedNow === true;
+                deferredTopicRootMessageIdForOutput = deferred.rootMessageId;
+                return deferred.messageId;
+            }
+        }
         return sendTarget.mode === 'plain'
             ? sendMessage(appId, sendTarget.chatId, content, msgType, uuid, hookContext, suppressHook ? { suppressHook: true } : undefined)
             : replyMessage(appId, sendTarget.rootMessageId, content, msgType, sendTarget.mode === 'thread', uuid, hookContext, suppressHook ? { suppressHook: true } : undefined);
@@ -6538,8 +6668,9 @@ async function cmdSend(rest) {
         // sends can suppress transcript fallback when their content appears to
         // cover the same final answer; detoured sends suppress only when they
         // closed a pending response card for this turn.
-        if (shouldRecordBridgeMarker)
+        if (shouldRecordBridgeMarker || deferredTopicRootMessageIdForOutput) {
             recordBridgeSendMarker(sentAtMs, messageId, text);
+        }
         // Send attachments as separate messages — best-effort. The primary message
         // is already delivered above; a failing attachment must not throw out to the
         // catch below (which would report total failure / exit 1 for an already-sent
@@ -6619,6 +6750,9 @@ async function cmdSend(rest) {
             sessionId: sid,
             quotedMessageId: primaryQuotedId,
             mentioned: mentions.map(m => ({ open_id: m.open_id, name: m.name })),
+            ...(deferredTopicRootMessageIdForOutput
+                ? { deferredTopicRootMessageId: deferredTopicRootMessageIdForOutput, turnId: currentTurnId }
+                : {}),
             ...(attention.requested ? { attentionRaised, attentionError } : {}),
             ...(failedAttachments.length > 0
                 ? { failedAttachments: failedAttachments.map(f => f.path) }
@@ -8615,6 +8749,11 @@ switch (command) {
         await cmdBind(process.argv.slice(3));
         break;
     }
+    case 'device': {
+        const { runDeviceCommand } = await import('./platform/device-command.js');
+        process.exitCode = await runDeviceCommand(process.argv.slice(3));
+        break;
+    }
     case 'list':
     case 'ls':
         await cmdList();