botmux 2.110.0 → 2.111.0

package/dist/daemon.js

@@ -36,6 +36,7 @@ import { delay } from './utils/timing.js';
 import { BoundedMap } from './utils/bounded-map.js';
 import { checkAllowedChatGroupsConfig } from './services/allowed-chat-groups.js';
 import { ensureCjkFontsInstalled } from './utils/font-installer.js';
+import { scrubTmuxServerGlobalEnv } from './setup/ensure-tmux.js';
 import { invalidWorkingDirs } from './utils/working-dir.js';
 import { validateWorkingDir } from './core/working-dir.js';
 import { sessionKey, sessionAnchorId } from './core/types.js';
@@ -48,18 +49,19 @@ import { isLocalCliOpenReady } from './services/local-cli-opener.js';
 import { RECEIVED_REACTION_EMOJI_TYPE, SUBSTITUTE_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, getCurrentCliVersion, CARD_POSTING_SENTINEL, parkStreamCard, closeSession as closeSessionHelper, ensureCliEnv, sweepGlobalBotmuxSkills, writableTerminalLinkFor, } from './core/worker-pool.js';
+import { initWorkerPool, setActiveSessionsRegistry, forkWorker, sendWorkerInput, killWorker, reapOrphanWorkers, scheduleCardPatch, setCurrentCliVersion, getCurrentCliVersion, CARD_POSTING_SENTINEL, parkStreamCard, closeSession as closeSessionHelper, ensureCliEnv, sweepGlobalBotmuxSkills, writableTerminalLinkFor, } from './core/worker-pool.js';
 import { ipcRoute, jsonRes, readJsonBody, setBotName, setLarkAppId, startIpcServer, setWorkflowRunner, setBotRenamer } from './core/dashboard-ipc-server.js';
 import { saveFrozenCards } from './services/frozen-card-store.js';
-import { DAEMON_COMMANDS, SESSIONLESS_DAEMON_COMMANDS, resolvePassthroughCommands, resolveAdapterDefaultPassthroughCommands, handleCommand, handleCardCommand, handleTermLinkCommand, parseSlashCommandInvocation, parseForceTopicInvocation } from './core/command-handler.js';
+import { DAEMON_COMMANDS, SESSIONLESS_DAEMON_COMMANDS, EXISTING_SESSION_ONLY_DAEMON_COMMANDS, resolvePassthroughCommands, resolveAdapterDefaultPassthroughCommands, handleCommand, handleCardCommand, handleTermLinkCommand, parseSlashCommandInvocation, parseForceTopicInvocation } from './core/command-handler.js';
 import { docWatchCommandNeedsSession } from './core/doc-watch-command.js';
 import { SLASH_COMMAND_SHAPE } from './core/passthrough-commands.js';
 import { findInheritablePeer } from './core/inherit-peer.js';
 import { isCallbackUrl, handleCallbackUrl } from './utils/user-token.js';
 import { consumeQuota, removeChatGrant, removeGlobalGrant } from './services/grant-store.js';
 import { abortCharge, commitCharge, beginCharge } from './services/quota-dedup.js';
-import { getSessionWorkingDir, getProjectScanDirs, expandHome, downloadResources, formatAttachmentsHint, buildNewTopicPrompt, buildFollowUpContent, buildBridgeInputContent, buildReforkPrompt, getAvailableBots, restoreActiveSessions, executeScheduledTask, persistStreamCardState, rememberLastCliInput, ensureTerminalWorkerPort, ensureSessionWhiteboard, } from './core/session-manager.js';
+import { getSessionWorkingDir, getProjectScanDirs, expandHome, downloadResources, formatAttachmentsHint, buildNewTopicCliInput, buildFollowUpCliInput, buildBridgeInputContent, buildReforkCliInput, getAvailableBots, restoreActiveSessions, executeScheduledTask, persistStreamCardState, rememberLastCliInput, ensureTerminalWorkerPort, ensureSessionWhiteboard, } from './core/session-manager.js';
 import { triggerSessionTurn } from './core/trigger-session.js';
+import { applyQueuedCodexAppLegacyFallback, mergeQueuedCodexAppTurn } from './core/session-create.js';
 import { findOnlineDaemon, listOnlineDaemons } from './utils/daemon-discovery.js';
 import { beginReplyTargetTurn, fallbackTurnId, resolveSessionReplyTarget, syncReplyTargetState } from './core/reply-target.js';
 import { sweepOrphanSandboxes } from './adapters/backend/sandbox.js';
@@ -85,7 +87,7 @@ import { getDocSubscription, listAllDocSubscriptions, removeDocSubscription, set
 import { BOT_REPLY_SENTINEL, subscribeDocFile, unsubscribeDocFile, addCommentReaction, hasBotSentinel, isBotAuthoredReply, listDocComments } from './im/lark/doc-comment.js';
 import { learnFromMentions, resolveSender, flushIdentityCacheSync } from './im/lark/identity-cache.js';
 import { normalizeBrand } from './im/lark/lark-hosts.js';
-import { buildDocCommentPrompt, buildDocWatchWarmupPrompt } from './core/doc-comment-prompt.js';
+import { buildDocCommentTurnInput, buildDocWatchWarmupTurnInput } from './core/doc-comment-prompt.js';
 import { advanceDocCommentCursor, docCommentRepliesAfterCursor, latestDocCommentPollCursor } from './core/doc-comment-poller.js';
 import { renderBufferedSenderBlock } from './core/session-manager.js';
 import { shutdownBackendDisposition } from './core/persistent-backend.js';
@@ -1764,12 +1766,12 @@ async function prewarmDocCommentSession(ds, sub) {
     const bot = getBot(ds.larkAppId);
     const botCfg = bot.config;
     const loc = localeForBot(ds.larkAppId);
-    const promptContent = buildDocWatchWarmupPrompt({
+    const warmupInput = {
         fileToken: sub.fileToken,
         fileType: sub.fileType,
         brand: normalizeBrand(botCfg.brand),
         locale: loc,
-    });
+    };
     const title = `[Doc Watch] ${sub.fileToken.slice(0, 12)}`;
     const turnId = `doc-watch-${Date.now()}-${sub.fileToken.slice(0, 8)}`;
     const sender = sub.ownerOpenId ? await resolveSender(ds.larkAppId, sub.ownerOpenId, 'user') : undefined;
@@ -1779,34 +1781,39 @@ async function prewarmDocCommentSession(ds, sub) {
     if (sub.workingDir && (!ds.worker || ds.worker.killed)) {
         ds.workingDir = sub.workingDir;
         ds.session.workingDir = sub.workingDir;
+        // An explicit doc-watch cwd replaces the previous repo selection. Keeping
+        // a multi-Riff stamp would make the cold refork ignore this new directory.
+        ds.session.riffRepoDirs = undefined;
     }
     if (ds.worker && !ds.worker.killed) {
         ensureSessionWhiteboard(ds);
-        const msgContent = buildFollowUpContent(promptContent, ds.session.sessionId, {
-            isAdoptMode: false,
-            cliId: botCfg.cliId,
-            cliPathOverride: botCfg.cliPathOverride,
+        const { promptContent, cliInput } = buildDocWatchWarmupTurnInput({
+            ds,
+            promptInput: warmupInput,
+            botCliId: botCfg.cliId,
+            botCliPathOverride: botCfg.cliPathOverride,
             sender,
-            larkAppId: ds.larkAppId,
-            chatId: ds.session.chatId,
-            whiteboardId: ds.session.whiteboardId,
+            mode: 'live',
         });
-        rememberLastCliInput(ds, promptContent, msgContent);
+        rememberLastCliInput(ds, promptContent, cliInput);
         sessionStore.updateSession(ds.session);
-        ds.worker.send({ type: 'message', content: msgContent, turnId });
+        sendWorkerInput(ds, cliInput, turnId);
         markSessionActivity(ds);
     }
     else {
         ensureSessionWhiteboard(ds);
-        const wrappedPrompt = buildReforkPrompt(ds, promptContent, {
-            cliId: botCfg.cliId,
-            cliPathOverride: botCfg.cliPathOverride,
-            selfMention: { name: bot.botName, openId: bot.botOpenId },
+        const { promptContent, cliInput: wrappedInput } = buildDocWatchWarmupTurnInput({
+            ds,
+            promptInput: warmupInput,
+            botCliId: botCfg.cliId,
+            botCliPathOverride: botCfg.cliPathOverride,
+            botIdentity: { name: bot.botName, openId: bot.botOpenId },
             sender,
+            mode: 'refork',
         });
-        rememberLastCliInput(ds, promptContent, wrappedPrompt);
+        rememberLastCliInput(ds, promptContent, wrappedInput);
         sessionStore.updateSession(ds.session);
-        forkWorker(ds, wrappedPrompt, ds.hasHistory);
+        forkWorker(ds, wrappedInput, ds.hasHistory);
     }
     logger.info(`[${tag(ds)}] doc-comment watch prewarm injected file=${sub.fileToken.slice(0, 12)}`);
 }
@@ -5342,6 +5349,12 @@ async function resolvePinnedWorkingDir(ctx) {
     return { pinnedWorkingDir, oncallEntry, inheritedFrom, pinnedFromBotDefault };
 }
 export const __testOnly_resolvePinnedWorkingDir = resolvePinnedWorkingDir;
+// Production message routes (function declarations hoist, so the references
+// are valid here). Exposed for route-level regression tests — e.g. asserting
+// that `/rename` in a fresh topic/thread does NOT pre-create a phantom session,
+// which unit tests calling handleCommand directly can never catch.
+export const __testOnly_handleNewTopic = (data, ctx) => handleNewTopic(data, ctx);
+export const __testOnly_handleThreadReply = (data, ctx) => handleThreadReply(data, ctx);
 /**
  * 该新会话是否要走「仅默认目录 + 自动建 worktree」：pinned dir 来自本 bot 自己的
  * defaultWorkingDir (layer 3) 且开关打开。为真时，spawn 路径不再同步 fork，而是把会话登记
@@ -5663,6 +5676,17 @@ async function handleNewTopic(data, ctx) {
                 fireSessionlessCommandDetached(cmd, anchor, { ...parsed, content: commandContent, chatId }, larkAppId);
                 return;
             }
+            // `/rename` renames an EXISTING session; a brand-new topic has none. Route
+            // straight to handleCommand (its `!ds` branch replies no_active_session)
+            // so the pre-create block below doesn't spawn a worker:null phantom
+            // session just to rename it. Same phantom-session concern as the /card
+            // and /term special cases, but UNLIKE those (which carry their own
+            // permission gates inside their handlers) this branch MUST stay after
+            // the canOperate gate above — the /rename handler itself has no gate.
+            if (EXISTING_SESSION_ONLY_DAEMON_COMMANDS.has(cmd)) {
+                await handleCommand(cmd, anchor, { ...parsed, content: commandContent }, commandDeps, larkAppId);
+                return;
+            }
             // Same rootMessageId reasoning as below in the main spawn path:
             // thread-scope MUST anchor on the thread root or sessionAnchorId() will
             // disagree with activeSessions's key and downstream card buttons silently
@@ -5735,7 +5759,8 @@ async function handleNewTopic(data, ctx) {
     // weight on first turns. `content` (post force-topic-strip) is what the
     // worker will see; promptContent wraps it for prompt-building paths but
     // leaves `content` untouched for title / log substring uses.
-    const promptContent = buildQuoteHint(parsed, scope, anchor, localeForBot(larkAppId)) + content;
+    const codexAppMessageContext = buildQuoteHint(parsed, scope, anchor, localeForBot(larkAppId));
+    const promptContent = codexAppMessageContext + content;
     // Resolve sender identity for <sender> tag injection. The first call to
     // resolveSender for an unseen open_id may await contact.v3.user.get with a
     // short budget; subsequent calls hit the cache and are sync-fast.
@@ -5792,6 +5817,8 @@ async function handleNewTopic(data, ctx) {
         hasHistory: false,
         pendingRepo: !pinnedWorkingDir || autoWt,
         pendingPrompt: promptContent,
+        pendingCodexAppText: content,
+        pendingCodexAppMessageContext: codexAppMessageContext,
         pendingAttachments: attachments.length > 0 ? attachments : undefined,
         pendingMentions: parsed.mentions,
         pendingSubstituteTrigger: substituteTrigger,
@@ -5822,9 +5849,9 @@ async function handleNewTopic(data, ctx) {
             return;
         const selfBot = getBot(larkAppId);
         ensureSessionWhiteboard(ds);
-        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, whiteboardId: ds.session.whiteboardId, substituteTrigger });
-        rememberLastCliInput(ds, promptContent, prompt);
+        const prompt = buildNewTopicCliInput(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, whiteboardId: ds.session.whiteboardId, substituteTrigger, codexAppText: content, codexAppMessageContext });
         await noteTurnReceived(ds, messageId, content, newTopicSender, messageId, substituteTrigger ? SUBSTITUTE_RECEIVED_REACTION_EMOJI_TYPE : undefined);
+        rememberLastCliInput(ds, promptContent, prompt);
         forkWorker(ds, prompt);
         const reason = oncallEntry
             ? `oncall-bound chat ${chatId}`
@@ -5855,9 +5882,9 @@ async function handleNewTopic(data, ctx) {
         ds.pendingRepo = false;
         const selfBot = getBot(larkAppId);
         ensureSessionWhiteboard(ds);
-        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, whiteboardId: ds.session.whiteboardId, substituteTrigger });
-        rememberLastCliInput(ds, promptContent, prompt);
+        const prompt = buildNewTopicCliInput(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, whiteboardId: ds.session.whiteboardId, substituteTrigger, codexAppText: content, codexAppMessageContext });
         await noteTurnReceived(ds, messageId, content, newTopicSender, messageId, substituteTrigger ? SUBSTITUTE_RECEIVED_REACTION_EMOJI_TYPE : undefined);
+        rememberLastCliInput(ds, promptContent, prompt);
         forkWorker(ds, prompt);
         logger.info(`Session ${session.sessionId} ready (no projects to select), total active: ${getActiveCount()}`);
     }
@@ -5963,6 +5990,11 @@ async function handleBotAdded(chatId, operatorOpenId, larkAppId) {
         const mode = await getChatMode(larkAppId, chatId, { forceRefresh: true });
         const promptBody = resolveGroupJoinPrompt(botCfg.autoStartOnGroupJoinPrompt);
         const title = (promptBody || tr('daemon.auto_start_join_title', undefined, localeForBot(larkAppId))).substring(0, 50);
+        // D8 deliberately keeps the legacy prompt empty when no join prompt is
+        // configured, so the agent can inspect group context without receiving a
+        // synthetic instruction. Codex App still needs a non-blank visible
+        // UserMessage; reuse the localized session title only in its clean sidecar.
+        const codexAppText = promptBody || title;
         // Pick scope + anchor. 话题群 → seed a topic and anchor thread-scope there;
         // 普通群 → chat-scope anchored at chatId.
         let scope;
@@ -6010,6 +6042,7 @@ async function handleBotAdded(chatId, operatorOpenId, larkAppId) {
             hasHistory: false,
             pendingRepo: !pinnedWorkingDir || autoWt,
             pendingPrompt: promptBody,
+            pendingCodexAppText: botCfg.cliId === 'codex-app' ? codexAppText : undefined,
             ownerOpenId: operatorOpenId,
             currentTurnTitle: title,
             workingDir: pinnedWorkingDir,
@@ -6019,7 +6052,7 @@ async function handleBotAdded(chatId, operatorOpenId, larkAppId) {
         // even in 话题群 (where dsKey is the seed id, not chatId).
         groupJoinAnchorByChat.set(chatLiveKey, dsKey);
         const selfBot = getBot(larkAppId);
-        const buildPrompt = async () => buildNewTopicPrompt(promptBody, session.sessionId, botCfg.cliId, botCfg.cliPathOverride, undefined, undefined, await getAvailableBots(larkAppId, chatId), undefined, { name: selfBot.botName, openId: selfBot.botOpenId }, localeForBot(larkAppId), undefined, { larkAppId, chatId, whiteboardId: ds.session.whiteboardId });
+        const buildPrompt = async () => buildNewTopicCliInput(promptBody, session.sessionId, botCfg.cliId, botCfg.cliPathOverride, undefined, undefined, await getAvailableBots(larkAppId, chatId), undefined, { name: selfBot.botName, openId: selfBot.botOpenId }, localeForBot(larkAppId), undefined, { larkAppId, chatId, whiteboardId: ds.session.whiteboardId, codexAppText });
         // Auto-worktree: register PENDING, build worktree off-path, commit+fork later.
         if (pinnedWorkingDir && autoWt) {
             if (await replyInvalidWorkingDirs(anchor, larkAppId, ds))
@@ -6033,8 +6066,8 @@ async function handleBotAdded(chatId, operatorOpenId, larkAppId) {
                 return;
             ensureSessionWhiteboard(ds);
             const prompt = await buildPrompt();
-            rememberLastCliInput(ds, promptBody, prompt);
             await noteTurnReceived(ds, anchor, promptBody);
+            rememberLastCliInput(ds, promptBody, prompt);
             forkWorker(ds, prompt);
             logger.info(`[auto-start:入群] ${chatId.substring(0, 12)} 自动开工（${mode}/${scope}），workingDir=${pinnedWorkingDir}`);
             return;
@@ -6055,8 +6088,8 @@ async function handleBotAdded(chatId, operatorOpenId, larkAppId) {
             ds.pendingRepo = false;
             ensureSessionWhiteboard(ds);
             const prompt = await buildPrompt();
-            rememberLastCliInput(ds, promptBody, prompt);
             await noteTurnReceived(ds, anchor, promptBody);
+            rememberLastCliInput(ds, promptBody, prompt);
             forkWorker(ds, prompt);
             logger.info(`[auto-start:入群] ${chatId.substring(0, 12)} 无默认目录且无可选项目，直接开工`);
         }
@@ -6136,7 +6169,9 @@ async function handleThreadReply(data, ctx) {
         : '';
     // `let` (not const): the v3 grill gate below may replace this with a
     // skill-trigger prompt when the user sends `/workflow [new] <目标>` mid-thread.
-    let promptContent = buildQuoteHint(parsed, scope, anchor, localeForBot(larkAppId)) + botSenderPrefix + parsed.content;
+    const initialCodexAppMessageContext = buildQuoteHint(parsed, scope, anchor, localeForBot(larkAppId)) + botSenderPrefix;
+    const initialPromptContent = initialCodexAppMessageContext + parsed.content;
+    let promptContent = initialPromptContent;
     const existingHookSession = activeSessions.get(sessionKey(anchor, larkAppId));
     emitHookEvent('thread.reply', {
         larkAppId,
@@ -6340,8 +6375,12 @@ async function handleThreadReply(data, ctx) {
             // Without a session, handleCommand gets ds=undefined and `/repo` (and other
             // session commands) fall through to the repo-select card. Create the session
             // first, mirroring handleNewTopic's first-message `/repo` pendingRepo setup.
-            // Session-less commands (/group /g) don't need one.
-            if (!existingDs && threadChatId && !isSessionlessCommandInvocation(cmd, commandContent)) {
+            // Session-less commands (/group /g) don't need one; existing-session-only
+            // commands (/rename) must NOT get one — a pre-created worker:null session
+            // would be a phantom conversation that only exists to be renamed. Let
+            // handleCommand's `!ds` branch reply no_active_session instead.
+            if (!existingDs && threadChatId && !isSessionlessCommandInvocation(cmd, commandContent)
+                && !EXISTING_SESSION_ONLY_DAEMON_COMMANDS.has(cmd)) {
                 const session = sessionStore.createSession(threadChatId, anchor, cmdContent.substring(0, 50), ctxChatType);
                 const now = Date.now();
                 if (ctxChatType === 'p2p') {
@@ -6442,6 +6481,13 @@ async function handleThreadReply(data, ctx) {
     if (!await enforceMessageQuotaForCliInput(larkAppId, ctxChatId ?? data?.message?.chat_id, quotaSenderOpenId, parsed.messageId, anchor, threadTeamTrustUnionId, threadSenderUnionId)) {
         return;
     }
+    // When a command path rewrites the model prompt (for example /workflow),
+    // keep the Lark-authored bytes visible and move the rewritten instruction
+    // into hidden untrusted context. Simple quote/bot prefixes use only the
+    // prefix as context, avoiding a duplicate copy of the user text.
+    const codexAppMessageContext = promptContent === initialPromptContent
+        ? initialCodexAppMessageContext
+        : promptContent;
     // Download attachments
     const effectiveAppId = ds?.larkAppId ?? larkAppId;
     const { attachments, needLogin } = await downloadResources(effectiveAppId, parsed.messageId, resources);
@@ -6472,15 +6518,23 @@ async function handleThreadReply(data, ctx) {
     // If waiting for repo selection, buffer the message and remind user
     if (ds?.pendingRepo) {
         // Enrich content with attachment hints and mention metadata (same as normal send)
-        let enriched = attachments.length > 0
-            ? `${promptContent}${formatAttachmentsHint(attachments)}`
+        const codexAppFollowUpContextParts = [];
+        if (codexAppMessageContext)
+            codexAppFollowUpContextParts.push(codexAppMessageContext);
+        const attachmentHint = attachments.length > 0 ? formatAttachmentsHint(attachments) : '';
+        let enriched = attachmentHint
+            ? `${promptContent}${attachmentHint}`
             : promptContent;
+        if (attachmentHint)
+            codexAppFollowUpContextParts.push(attachmentHint);
         if (parsed.mentions && parsed.mentions.length > 0) {
             const mentionLines = parsed.mentions.map(m => {
                 const idPart = m.openId ? ` → open_id: ${m.openId}` : '';
                 return `- @${m.name}${idPart}`;
             });
-            enriched += `\n\n${tr('daemon.enriched_mentions_label', undefined, localeForBot(larkAppId))}\n${mentionLines.join('\n')}`;
+            const mentionContext = `${tr('daemon.enriched_mentions_label', undefined, localeForBot(larkAppId))}\n${mentionLines.join('\n')}`;
+            enriched += `\n\n${mentionContext}`;
+            codexAppFollowUpContextParts.push(mentionContext);
         }
         // Stamp a buffered follow-up with its own <sender> tag ONLY when it comes
         // from a different user than the first message (ds.pendingSender) — the
@@ -6496,12 +6550,20 @@ async function handleThreadReply(data, ctx) {
             // guard (the builder's own note only covers ds.pendingSender's top-level
             // tag, and is absent entirely when pendingSender is undefined).
             const followUpSenderBlock = renderBufferedSenderBlock(followUpSender, getBot(larkAppId).config.cliId, localeForBot(larkAppId));
-            if (followUpSenderBlock)
+            if (followUpSenderBlock) {
                 enriched = `${followUpSenderBlock}\n${enriched}`;
+                codexAppFollowUpContextParts.unshift(followUpSenderBlock);
+            }
         }
         if (!ds.pendingFollowUps)
             ds.pendingFollowUps = [];
         ds.pendingFollowUps.push(enriched);
+        if (!ds.pendingCodexAppFollowUps)
+            ds.pendingCodexAppFollowUps = [];
+        ds.pendingCodexAppFollowUps.push(parsed.content);
+        if (!ds.pendingCodexAppFollowUpContexts)
+            ds.pendingCodexAppFollowUpContexts = [];
+        ds.pendingCodexAppFollowUpContexts.push(codexAppFollowUpContextParts.join('\n\n'));
         // Auto-worktree pending (worktreeCreating) has no repo card to point at — the
         // message IS buffered (folded on commit), so just say "hold on, building worktree"
         // instead of the misleading "pick a repo from the card above".
@@ -6583,6 +6645,8 @@ async function handleThreadReply(data, ctx) {
             hasHistory: false,
             pendingRepo: !pinnedWorkingDir || autoWt,
             pendingPrompt: promptContent,
+            pendingCodexAppText: parsed.content,
+            pendingCodexAppMessageContext: codexAppMessageContext,
             pendingAttachments: attachments.length > 0 ? attachments : undefined,
             pendingMentions: parsed.mentions,
             pendingSubstituteTrigger: substituteTrigger,
@@ -6612,9 +6676,9 @@ async function handleThreadReply(data, ctx) {
                 return;
             const selfBot = getBot(larkAppId);
             ensureSessionWhiteboard(newDs);
-            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, whiteboardId: newDs.session.whiteboardId, substituteTrigger });
-            rememberLastCliInput(newDs, promptContent, prompt);
+            const prompt = buildNewTopicCliInput(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, whiteboardId: newDs.session.whiteboardId, substituteTrigger, codexAppText: parsed.content, codexAppMessageContext });
             await noteTurnReceived(newDs, parsed.messageId, parsed.content, autoCreateSender, parsed.messageId, substituteTrigger ? SUBSTITUTE_RECEIVED_REACTION_EMOJI_TYPE : undefined);
+            rememberLastCliInput(newDs, promptContent, prompt);
             forkWorker(newDs, prompt);
             const reason = oncallEntry
                 ? `oncall-bound chat ${autoCreateChatId}`
@@ -6645,9 +6709,9 @@ async function handleThreadReply(data, ctx) {
             newDs.pendingRepo = false;
             const selfBot = getBot(larkAppId);
             ensureSessionWhiteboard(newDs);
-            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, whiteboardId: newDs.session.whiteboardId, substituteTrigger });
-            rememberLastCliInput(newDs, promptContent, prompt);
+            const prompt = buildNewTopicCliInput(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, whiteboardId: newDs.session.whiteboardId, substituteTrigger, codexAppText: parsed.content, codexAppMessageContext });
             await noteTurnReceived(newDs, parsed.messageId, parsed.content, autoCreateSender, parsed.messageId, substituteTrigger ? SUBSTITUTE_RECEIVED_REACTION_EMOJI_TYPE : undefined);
+            rememberLastCliInput(newDs, promptContent, prompt);
             forkWorker(newDs, prompt);
         }
         return;
@@ -6667,28 +6731,31 @@ async function handleThreadReply(data, ctx) {
         const selfBot = getBot(ds.larkAppId);
         if (!isBridge)
             ensureSessionWhiteboard(ds);
-        const msgContent = isBridge
-            ? buildBridgeInputContent(promptContent, {
-                attachments,
-                mentions: parsed.mentions,
-                selfMention: { name: selfBot.botName, openId: selfBot.botOpenId },
-            })
-            : buildFollowUpContent(promptContent, ds.session.sessionId, {
+        const effectiveCliId = ds.session.cliId ?? dsBotCfgForMsg.cliId;
+        const cliInput = isBridge
+            ? { content: buildBridgeInputContent(promptContent, {
+                    attachments,
+                    mentions: parsed.mentions,
+                    selfMention: { name: selfBot.botName, openId: selfBot.botOpenId },
+                }) }
+            : buildFollowUpCliInput(promptContent, ds.session.sessionId, {
                 attachments,
                 mentions: parsed.mentions,
                 isAdoptMode: false,
-                cliId: dsBotCfgForMsg.cliId,
-                cliPathOverride: dsBotCfgForMsg.cliPathOverride,
+                cliId: effectiveCliId,
+                cliPathOverride: ds.session.cliPathOverride ?? dsBotCfgForMsg.cliPathOverride,
                 sender: await getThreadSender(),
                 larkAppId,
                 chatId: ds.session.chatId,
                 whiteboardId: ds.session.whiteboardId,
                 substituteTrigger,
+                codexAppText: parsed.content,
+                codexAppMessageContext,
             });
         beginNewTurn(ds, parsed.content);
-        rememberLastCliInput(ds, promptContent, msgContent);
         await noteTurnReceived(ds, parsed.messageId, parsed.content, await getThreadSender(), parsed.messageId, substituteTrigger ? SUBSTITUTE_RECEIVED_REACTION_EMOJI_TYPE : undefined);
-        ds.worker.send({ type: 'message', content: msgContent, turnId: parsed.messageId });
+        rememberLastCliInput(ds, promptContent, cliInput);
+        sendWorkerInput(ds, cliInput, parsed.messageId);
     }
     else {
         // Worker not running — re-fork with resume. This is a NEW turn, so drop
@@ -6739,21 +6806,44 @@ async function handleThreadReply(data, ctx) {
         // 待办池(queued)会话：CLI 从没起过，暂存的任务内容(queuedPrompt，已按角色包装好)
         // 必须当首轮发出去——否则群里来的这第一条消息会顶替掉它、把用户分配的任务丢掉。
         // 把暂存任务前置、用户这条消息拼在后面，一并作为首轮。forkWorker 随后清 queued。
-        const reforkContent = ds.session.queued && ds.session.queuedPrompt
+        const queuedDashboardTurn = !!(ds.session.queued && ds.session.queuedPrompt);
+        const reforkContent = queuedDashboardTurn
             ? `${ds.session.queuedPrompt}\n\n${promptContent}`
             : promptContent;
-        const wrappedPrompt = buildReforkPrompt(ds, reforkContent, {
+        const queuedCodexAppText = ds.session.queuedCodexAppText ?? ds.pendingCodexAppText;
+        const reforkCodexApp = mergeQueuedCodexAppTurn({
+            queued: queuedDashboardTurn,
+            queuedText: queuedCodexAppText,
+            queuedMessageContext: ds.session.queuedCodexAppMessageContext ?? ds.pendingCodexAppMessageContext,
+            currentText: parsed.content,
+            currentMessageContext: codexAppMessageContext,
+        });
+        const builtReforkInput = buildReforkCliInput(ds, reforkContent, {
             attachments,
             mentions: parsed.mentions,
-            cliId: dsBotCfgForFork.cliId,
-            cliPathOverride: dsBotCfgForFork.cliPathOverride,
+            cliId: ds.session.cliId ?? dsBotCfgForFork.cliId,
+            cliPathOverride: ds.session.cliPathOverride ?? dsBotCfgForFork.cliPathOverride,
             selfMention: { name: selfBot.botName, openId: selfBot.botOpenId },
             sender: await getThreadSender(),
+            substituteTrigger,
+            codexAppText: reforkCodexApp.text,
+            codexAppMessageContext: reforkCodexApp.messageContext,
         });
-        rememberLastCliInput(ds, promptContent, wrappedPrompt);
-        await noteTurnReceived(ds, parsed.messageId, parsed.content, await getThreadSender(), parsed.messageId);
+        const wrappedInput = applyQueuedCodexAppLegacyFallback(builtReforkInput, {
+            queued: queuedDashboardTurn,
+            queuedText: queuedCodexAppText,
+        });
+        if (wrappedInput !== builtReforkInput && dsBotCfgForFork.codexAppCleanInput === true) {
+            // Backlog sessions persisted before clean-input have no raw queued text.
+            // Keep this activation entirely legacy: reforkContent already contains
+            // queuedPrompt + the current reply, whereas a structured turn could only
+            // contain the reply and would silently discard the original task.
+            logger.warn(`[${tag(ds)}] Legacy queued dashboard task has no clean-input text; using the full legacy activation prompt`);
+        }
+        await noteTurnReceived(ds, parsed.messageId, parsed.content, await getThreadSender(), parsed.messageId, substituteTrigger ? SUBSTITUTE_RECEIVED_REACTION_EMOJI_TYPE : undefined);
+        rememberLastCliInput(ds, promptContent, wrappedInput);
         sessionStore.updateSession(ds.session);
-        forkWorker(ds, wrappedPrompt, ds.hasHistory);
+        forkWorker(ds, wrappedInput, ds.hasHistory);
     }
 }
 /**
@@ -6878,7 +6968,7 @@ async function handleDocComment(ctx) {
         const sender = ctx.authorOpenId ? await resolveSender(larkAppId, ctx.authorOpenId, 'user') : undefined;
         const authorName = sender?.name || ctx.authorOpenId?.slice(0, 8) || '?';
         const dsBotCfg = getBot(ds.larkAppId).config;
-        const promptContent = buildDocCommentPrompt({
+        const promptInput = {
             fileToken: sub.fileToken,
             fileType: sub.fileType,
             question: text,
@@ -6890,7 +6980,7 @@ async function handleDocComment(ctx) {
             })),
             brand: normalizeBrand(dsBotCfg.brand),
             locale: loc,
-        });
+        };
         // 记录本轮回评论的落点。两条路都要覆盖：
         //   • ds.docCommentTurns（内存，按 turnId）→ deliverFinalOutput「兜底」分流用
         //   • session.docCommentTargets（磁盘，per-turn map）→ `botmux send`「主回复」分流用
@@ -6910,25 +7000,21 @@ async function handleDocComment(ctx) {
             const isBridge = !!ds.adoptedFrom;
             if (!isBridge)
                 ensureSessionWhiteboard(ds);
-            const msgContent = isBridge
-                ? buildBridgeInputContent(promptContent, {
-                    selfMention: { name: selfBot.botName, openId: selfBot.botOpenId },
-                })
-                : buildFollowUpContent(promptContent, ds.session.sessionId, {
-                    isAdoptMode: false,
-                    cliId: dsBotCfg.cliId,
-                    cliPathOverride: dsBotCfg.cliPathOverride,
-                    sender,
-                    larkAppId,
-                    chatId: ds.session.chatId,
-                    whiteboardId: ds.session.whiteboardId,
-                });
+            const { promptContent, cliInput } = buildDocCommentTurnInput({
+                ds,
+                promptInput,
+                botCliId: dsBotCfg.cliId,
+                botCliPathOverride: dsBotCfg.cliPathOverride,
+                botIdentity: { name: selfBot.botName, openId: selfBot.botOpenId },
+                sender,
+                mode: 'live',
+            });
             beginNewTurn(ds, text);
             (ds.session.docCommentTargets ??= {})[turnId] = docTarget; // per-turn map，不覆盖其他并发轮
-            rememberLastCliInput(ds, promptContent, msgContent);
             sessionStore.updateSession(ds.session); // 先落盘，botmux send 子进程才读得到落点
             await noteTurnReceived(ds, commentId, text, sender, turnId);
-            ds.worker.send({ type: 'message', content: msgContent, turnId });
+            rememberLastCliInput(ds, promptContent, cliInput);
+            sendWorkerInput(ds, cliInput, turnId);
             logger.info(`[${tag(ds)}] doc-comment turn injected (turn ${turnId.slice(0, 8)})`);
         }
         else {
@@ -6950,17 +7036,20 @@ async function handleDocComment(ctx) {
             // the live-worker branch above (if (!isBridge) ensure…).
             if (!ds.adoptedFrom)
                 ensureSessionWhiteboard(ds);
-            const wrappedPrompt = buildReforkPrompt(ds, promptContent, {
-                cliId: dsBotCfg.cliId,
-                cliPathOverride: dsBotCfg.cliPathOverride,
-                selfMention: { name: selfBot.botName, openId: selfBot.botOpenId },
+            const { promptContent, cliInput: wrappedInput } = buildDocCommentTurnInput({
+                ds,
+                promptInput,
+                botCliId: dsBotCfg.cliId,
+                botCliPathOverride: dsBotCfg.cliPathOverride,
+                botIdentity: { name: selfBot.botName, openId: selfBot.botOpenId },
                 sender,
+                mode: 'refork',
             });
             (ds.session.docCommentTargets ??= {})[turnId] = docTarget; // per-turn map，不覆盖其他并发轮
-            rememberLastCliInput(ds, promptContent, wrappedPrompt);
             await noteTurnReceived(ds, commentId, text, sender, turnId);
+            rememberLastCliInput(ds, promptContent, wrappedInput);
             sessionStore.updateSession(ds.session);
-            forkWorker(ds, wrappedPrompt, { resume: ds.hasHistory, turnId });
+            forkWorker(ds, wrappedInput, { resume: ds.hasHistory, turnId });
         }
         return true;
     }
@@ -7133,6 +7222,17 @@ function dashboardUrlForReport() {
     }
 }
 export async function startDaemon(botIndex) {
+    // Repair a shared tmux server polluted by an older botmux immediately on
+    // daemon startup. This must not depend on restoring/spawning a bmx-* session:
+    // a user-held tmux server can outlive every botmux pane and still leak stale
+    // routing/profile env into newly-created user panes.
+    const tmuxEnvScrub = scrubTmuxServerGlobalEnv();
+    if (tmuxEnvScrub.removed.length > 0) {
+        logger.info(`[tmux] scrubbed ${tmuxEnvScrub.removed.length} server-global env key(s): ${tmuxEnvScrub.removed.join(', ')}`);
+    }
+    if (tmuxEnvScrub.failed.length > 0) {
+        logger.warn(`[tmux] failed to scrub server-global env key(s): ${tmuxEnvScrub.failed.join(', ')}`);
+    }
     // 首次启动时后台尝试安装 CJK 字体（Debian/Ubuntu），避免截图中文显示豆腐块。
     // 不阻塞：首张截图可能仍是豆腐块，装完重启 daemon 即可正常。
     ensureCjkFontsInstalled();