botmux 2.110.0 → 2.111.0

package/dist/core/session-manager.js

@@ -11,7 +11,7 @@ import * as sessionStore from '../services/session-store.js';
 import * as messageQueue from '../services/message-queue.js';
 import { downloadMessageResource, listChatBotMembers, UserTokenMissingError } from '../im/lark/client.js';
 import { logger } from '../utils/logger.js';
-import { forkWorker, forkAdoptWorker, killStalePids, getCurrentCliVersion, restoreUsageLimitRuntimeState, setActiveSessionSafe, isRelayableRealSession, closeSession, getActiveSessionsRegistry, suspendWorker } from './worker-pool.js';
+import { forkWorker, sendWorkerInput, forkAdoptWorker, killStalePids, getCurrentCliVersion, restoreUsageLimitRuntimeState, setActiveSessionSafe, isRelayableRealSession, closeSession, getActiveSessionsRegistry, suspendWorker } from './worker-pool.js';
 import { createCliAdapterSync } from '../adapters/cli/registry.js';
 import { buildBotmuxShellHints } from '../adapters/cli/shared-hints.js';
 import { assertSafeAppId } from '../adapters/cli/read-isolation.js';
@@ -21,8 +21,9 @@ import { adoptTargetLabel, validateAdoptTargetState } from './session-discovery.
 import { getBot, getAllBots, getOwnerOpenId, findOncallChat, effectiveDefaultWorkingDir } from '../bot-registry.js';
 import { dashboardEventBus } from './dashboard-events.js';
 import { composeRowFromActive } from './dashboard-rows.js';
-import { composeSpawnUserContent, deriveSessionTitleFromContent, } from './session-create.js';
+import { composeSpawnCodexAppContext, composeSpawnUserContent, deriveSessionTitleFromContent, } from './session-create.js';
 import { validateZellijAdoptTarget } from './zellij-adopt-discovery.js';
+import { addCodexAppContext } from '../utils/codex-app-context.js';
 import { sessionKey, sessionAnchorId } from './types.js';
 import { announceSessionRow, markSessionActivity, announcePendingRepoSession } from './session-activity.js';
 import { scanMultipleProjects } from '../services/project-scanner.js';
@@ -352,30 +353,89 @@ export function renderBufferedSenderBlock(sender, cliId, locale) {
     const note = renderCursorSenderNote(cliId, true, locale);
     return note ? `${tag}\n${note}` : tag;
 }
+function substituteInstruction(disclosure) {
+    return disclosure === 'none'
+        ? 'This turn was triggered by a configured substitute target mention. Answer on behalf of that target when appropriate.'
+        : 'This turn was triggered by a configured substitute target mention. Answer on behalf of that target and clearly disclose that you are answering for them.';
+}
+function renderSubstituteIdentity(tag, identity) {
+    if (!identity)
+        return '';
+    const attrs = [];
+    if (identity.name)
+        attrs.push(`name="${xmlEscape(identity.name)}"`);
+    if (identity.openId)
+        attrs.push(`open_id="${xmlEscape(identity.openId)}"`);
+    if (identity.userId)
+        attrs.push(`user_id="${xmlEscape(identity.userId)}"`);
+    if (identity.unionId)
+        attrs.push(`union_id="${xmlEscape(identity.unionId)}"`);
+    return attrs.length > 0 ? `<${tag} ${attrs.join(' ')} />` : `<${tag} />`;
+}
+/** Preserve the pre-clean-input legacy schema exactly: one effective target,
+ * with configured fields taking precedence and event fields only filling
+ * missing values. The structured Codex App sidecar keeps both sources below. */
+function renderLegacySubstituteTarget(trigger) {
+    const observed = trigger.observedMention;
+    const target = {
+        name: trigger.target.name ?? observed?.name,
+        openId: trigger.target.openId ?? observed?.openId,
+        userId: trigger.target.userId ?? observed?.userId,
+        unionId: trigger.target.unionId ?? observed?.unionId,
+    };
+    const attrs = [];
+    if (target.name)
+        attrs.push(`name="${xmlEscape(target.name)}"`);
+    if (target.openId)
+        attrs.push(`open_id="${xmlEscape(target.openId)}"`);
+    if (target.userId)
+        attrs.push(`user_id="${xmlEscape(target.userId)}"`);
+    if (target.unionId)
+        attrs.push(`union_id="${xmlEscape(target.unionId)}"`);
+    return `<target ${attrs.join(' ')} />`;
+}
+/** Legacy prompt envelope. This whole string remains user-role input for the
+ * terminal CLIs; Codex App uses the two trust-separated renderers below. */
 function renderSubstituteTrigger(trigger) {
     if (!trigger)
         return '';
-    const attrs = [];
-    if (trigger.target.name)
-        attrs.push(`name="${xmlEscape(trigger.target.name)}"`);
-    if (trigger.target.openId)
-        attrs.push(`open_id="${xmlEscape(trigger.target.openId)}"`);
-    if (trigger.target.userId)
-        attrs.push(`user_id="${xmlEscape(trigger.target.userId)}"`);
-    if (trigger.target.unionId)
-        attrs.push(`union_id="${xmlEscape(trigger.target.unionId)}"`);
     const disclosure = trigger.disclosure ?? 'prefix';
-    const instruction = disclosure === 'none'
-        ? 'This turn was triggered by a configured substitute target mention. Answer on behalf of that target when appropriate.'
-        : 'This turn was triggered by a configured substitute target mention. Answer on behalf of that target and clearly disclose that you are answering for them.';
     return [
         '<substitute_trigger>',
-        `  <target ${attrs.join(' ')} />`,
+        `  ${renderLegacySubstituteTarget(trigger)}`,
         `  <disclosure>${xmlEscape(disclosure)}</disclosure>`,
-        `  <instruction>${xmlEscape(instruction)}</instruction>`,
+        `  <instruction>${xmlEscape(substituteInstruction(disclosure))}</instruction>`,
         '</substitute_trigger>',
     ].join('\n');
 }
+/** Botmux-owned policy only. No configured profile or event field may enter
+ * this block because Codex App promotes it to developer-role context. */
+function renderSubstitutePolicy(trigger) {
+    if (!trigger)
+        return '';
+    const disclosure = trigger.disclosure ?? 'prefix';
+    return [
+        '<substitute_policy>',
+        '  <match>configured_target_mention</match>',
+        `  <disclosure>${disclosure}</disclosure>`,
+        `  <instruction>${substituteInstruction(disclosure)}</instruction>`,
+        '</substitute_policy>',
+    ].join('\n');
+}
+/** All identity metadata is untrusted, regardless of whether it came from a
+ * saved Lark profile or the current event. Keep the two sources distinct so a
+ * matching user_id cannot make conflicting observed IDs look canonical. */
+function renderSubstituteTarget(trigger) {
+    if (!trigger)
+        return '';
+    const observedMention = renderSubstituteIdentity('observed_mention', trigger.observedMention);
+    return [
+        '<substitute_target>',
+        `  ${renderSubstituteIdentity('configured_target', trigger.target)}`,
+        ...(observedMention ? [`  ${observedMention}`] : []),
+        '</substitute_target>',
+    ].join('\n');
+}
 export function formatAttachmentsHint(attachments, locale) {
     if (!attachments || attachments.length === 0)
         return '';
@@ -471,6 +531,52 @@ function hermesFollowupReminder(locale) {
  * topic that never collaborates.
  */
 const AVAILABLE_BOTS_INLINE_MAX = 3;
+function renderMentionBlock(mentions) {
+    if (!mentions || mentions.length === 0)
+        return '';
+    const items = mentions.map(m => {
+        const oid = m.openId ? ` open_id="${xmlEscape(m.openId)}"` : '';
+        return `  <mention name="${xmlEscape(m.name)}"${oid} />`;
+    });
+    return `<mentions>\n${items.join('\n')}\n</mentions>`;
+}
+function renderAvailableBotsBlock(availableBots, mentions, locale) {
+    if (!availableBots || availableBots.length === 0)
+        return '';
+    const mentionedOpenIds = new Set(mentions?.map(m => m.openId).filter(Boolean));
+    const unmentionedBots = availableBots.filter(b => !mentionedOpenIds.has(b.openId));
+    if (unmentionedBots.length === 0)
+        return '';
+    if (unmentionedBots.length <= AVAILABLE_BOTS_INLINE_MAX) {
+        const items = unmentionedBots.map(b => `  <bot name="${xmlEscape(b.displayName)}" open_id="${xmlEscape(b.openId)}" />`);
+        return `<available_bots hint="${xmlEscape(t('ai.available_bots.hint', undefined, locale))}">\n${items.join('\n')}\n</available_bots>`;
+    }
+    const sep = (locale ?? getDefaultLocale()) === 'en' ? ', ' : '、';
+    const names = unmentionedBots.map(b => b.displayName).join(sep);
+    const line = t('ai.available_bots.collapsed_line', { count: unmentionedBots.length, names }, locale);
+    return `<available_bots hint="${xmlEscape(t('ai.available_bots.hint_collapsed', undefined, locale))}" count="${unmentionedBots.length}">\n${xmlEscape(line)}\n</available_bots>`;
+}
+function buildCodexAppTurnInput(opts) {
+    const additionalContext = {};
+    addCodexAppContext(additionalContext, 'botmux_role', opts.roleBlock ?? '', 'application');
+    addCodexAppContext(additionalContext, 'botmux_whiteboard', opts.whiteboardBlock ?? '', 'application');
+    addCodexAppContext(additionalContext, 'botmux_sender', opts.senderBlock ?? '', 'untrusted');
+    addCodexAppContext(additionalContext, 'botmux_substitute_policy', opts.substitutePolicyBlock ?? '', 'application');
+    addCodexAppContext(additionalContext, 'botmux_substitute_target', opts.substituteTargetBlock ?? '', 'untrusted');
+    addCodexAppContext(additionalContext, 'botmux_attachments', opts.attachmentBlock ?? '', 'untrusted');
+    addCodexAppContext(additionalContext, 'botmux_mentions', opts.mentionBlock ?? '', 'untrusted');
+    addCodexAppContext(additionalContext, 'botmux_available_bots', opts.availableBotsBlock ?? '', 'untrusted');
+    addCodexAppContext(additionalContext, 'botmux_application_context', opts.applicationContextBlock ?? '', 'application');
+    addCodexAppContext(additionalContext, 'botmux_message_context', opts.messageContextBlock ?? '', 'untrusted');
+    addCodexAppContext(additionalContext, 'botmux_buffered_followups', opts.bufferedFollowUpsBlock ?? '', 'untrusted');
+    return {
+        text: opts.text,
+        ...(Object.keys(additionalContext).length > 0 ? { additionalContext } : {}),
+        ...(opts.attachments?.some(a => a.type === 'image')
+            ? { localImages: opts.attachments.filter(a => a.type === 'image').map(a => ({ path: a.path, detail: 'original' })) }
+            : {}),
+    };
+}
 export function buildNewTopicPrompt(userMessage, sessionId, cliId, cliPathOverride, attachments, mentions, availableBots, followUps, botIdentity, locale, sender, opts) {
     const adapter = createCliAdapterSync(cliId, cliPathOverride);
     // Non-Claude CLIs receive the botmux routing hints inline via the prompt
@@ -514,41 +620,8 @@ export function buildNewTopicPrompt(userMessage, sessionId, cliId, cliPathOverri
     }
     const roleBlock = renderRoleContextBlock(opts?.larkAppId, opts?.chatId);
     const whiteboardBlock = renderWhiteboardBlock({ whiteboardId: opts?.whiteboardId });
-    let mentionBlock = '';
-    if (mentions && mentions.length > 0) {
-        const items = mentions.map(m => {
-            const oid = m.openId ? ` open_id="${xmlEscape(m.openId)}"` : '';
-            return `  <mention name="${xmlEscape(m.name)}"${oid} />`;
-        });
-        mentionBlock = `<mentions>\n${items.join('\n')}\n</mentions>`;
-    }
-    let botBlock = '';
-    if (availableBots && availableBots.length > 0) {
-        const mentionedOpenIds = new Set(mentions?.map(m => m.openId).filter(Boolean));
-        const unmentionedBots = availableBots.filter(b => !mentionedOpenIds.has(b.openId));
-        if (unmentionedBots.length > 0) {
-            // ≤ threshold peers: inline the full roster with open_ids so any
-            // cross-bot message (a question, collaboration, or full handoff) needs
-            // zero round-trip. Above it: collapse to a one-line pointer — names only
-            // for awareness, open_ids deferred to an on-demand `botmux bots list` —
-            // so a many-bot group doesn't pay a long open_id list on every solo
-            // topic. Either way this block is emitted once, on the first message.
-            if (unmentionedBots.length <= AVAILABLE_BOTS_INLINE_MAX) {
-                const items = unmentionedBots.map(b => `  <bot name="${xmlEscape(b.displayName)}" open_id="${xmlEscape(b.openId)}" />`);
-                botBlock = `<available_bots hint="${xmlEscape(t('ai.available_bots.hint', undefined, locale))}">\n${items.join('\n')}\n</available_bots>`;
-            }
-            else {
-                // Resolve the locale the same way t() does (explicit arg → process
-                // default) so the separator matches the rendered sentence's language —
-                // otherwise an undefined `locale` under an 'en' default would produce an
-                // English sentence joined with the Chinese enumeration comma.
-                const sep = (locale ?? getDefaultLocale()) === 'en' ? ', ' : '、';
-                const names = unmentionedBots.map(b => b.displayName).join(sep);
-                const line = t('ai.available_bots.collapsed_line', { count: unmentionedBots.length, names }, locale);
-                botBlock = `<available_bots hint="${xmlEscape(t('ai.available_bots.hint_collapsed', undefined, locale))}" count="${unmentionedBots.length}">\n${xmlEscape(line)}\n</available_bots>`;
-            }
-        }
-    }
+    const mentionBlock = renderMentionBlock(mentions);
+    const botBlock = renderAvailableBotsBlock(availableBots, mentions, locale);
     // Messages the user sent while the repo-selection card was still pending are
     // buffered as followUps. Fold them into the single <user_message> body
     // (blank-line separated) rather than emitting a separate <follow_up_message>
@@ -603,6 +676,44 @@ export function buildNewTopicPrompt(userMessage, sessionId, cliId, cliPathOverri
     // resolves delivery — keeping a single injection site avoids double-rendering.
     return parts.join('\n\n');
 }
+/** Build the legacy opening prompt plus a Codex App structured sidecar. The
+ * sibling string API above stays unchanged for every existing caller. Pending-
+ * repo follow-ups currently arrive as already-enriched strings (and may contain
+ * sender tags), so that rare merged path deliberately falls back to legacy
+ * rather than guessing which bytes are user text. */
+export function buildNewTopicCliInput(userMessage, sessionId, cliId, cliPathOverride, attachments, mentions, availableBots, followUps, botIdentity, locale, sender, opts) {
+    const content = buildNewTopicPrompt(userMessage, sessionId, cliId, cliPathOverride, attachments, mentions, availableBots, followUps, botIdentity, locale, sender, opts);
+    // Legacy pending buffers contain enriched strings. Only materialize those as
+    // clean input when the caller also preserved their matching raw texts.
+    if (cliId !== 'codex-app' || (followUps && followUps.length > 0 && !opts?.codexAppFollowUps))
+        return { content };
+    const roleBlock = renderRoleContextBlock(opts?.larkAppId, opts?.chatId);
+    const whiteboardBlock = renderWhiteboardBlock({ whiteboardId: opts?.whiteboardId });
+    const senderBlock = renderSenderTag(sender);
+    const substitutePolicyBlock = renderSubstitutePolicy(opts?.substituteTrigger);
+    const substituteTargetBlock = renderSubstituteTarget(opts?.substituteTrigger);
+    const attachmentBlock = formatAttachmentsHint(attachments, locale);
+    const mentionBlock = renderMentionBlock(mentions);
+    const availableBotsBlock = renderAvailableBotsBlock(availableBots, mentions, locale);
+    return {
+        content,
+        codexAppInput: buildCodexAppTurnInput({
+            text: [opts?.codexAppText ?? userMessage, ...(opts?.codexAppFollowUps ?? [])].join('\n\n'),
+            roleBlock,
+            whiteboardBlock,
+            senderBlock,
+            substitutePolicyBlock,
+            substituteTargetBlock,
+            attachmentBlock,
+            mentionBlock,
+            availableBotsBlock,
+            applicationContextBlock: opts?.codexAppApplicationContext,
+            messageContextBlock: opts?.codexAppMessageContext,
+            bufferedFollowUpsBlock: opts?.codexAppFollowUpContexts?.filter(Boolean).join('\n\n'),
+            attachments,
+        }),
+    };
+}
 /**
  * Build the content for a follow-up message (thread reply to an active session).
  * Mirrors buildNewTopicPrompt structure but for subsequent messages.
@@ -647,15 +758,40 @@ export function buildFollowUpContent(content, sessionId, opts) {
         : '';
     if (attachHint)
         parts.push(attachHint);
-    if (opts?.mentions && opts.mentions.length > 0) {
-        const items = opts.mentions.map(m => {
-            const oid = m.openId ? ` open_id="${xmlEscape(m.openId)}"` : '';
-            return `  <mention name="${xmlEscape(m.name)}"${oid} />`;
-        });
-        parts.push(`<mentions>\n${items.join('\n')}\n</mentions>`);
-    }
+    const mentionBlock = renderMentionBlock(opts?.mentions);
+    if (mentionBlock)
+        parts.push(mentionBlock);
     return parts.join('\n\n');
 }
+/** Follow-up counterpart of buildNewTopicCliInput. */
+export function buildFollowUpCliInput(content, sessionId, opts) {
+    const legacyContent = buildFollowUpContent(content, sessionId, opts);
+    if (opts?.cliId !== 'codex-app' || opts.isAdoptMode)
+        return { content: legacyContent };
+    const roleBlock = renderRoleContextBlock(opts.larkAppId, opts.chatId, { followUp: true });
+    const whiteboardBlock = renderWhiteboardBlock({ whiteboardId: opts.whiteboardId });
+    const senderBlock = renderSenderTag(opts.sender);
+    const substitutePolicyBlock = renderSubstitutePolicy(opts.substituteTrigger);
+    const substituteTargetBlock = renderSubstituteTarget(opts.substituteTrigger);
+    const attachmentBlock = formatAttachmentsHint(opts.attachments, opts.locale);
+    const mentionBlock = renderMentionBlock(opts.mentions);
+    return {
+        content: legacyContent,
+        codexAppInput: buildCodexAppTurnInput({
+            text: opts.codexAppText ?? content,
+            roleBlock,
+            whiteboardBlock,
+            senderBlock,
+            substitutePolicyBlock,
+            substituteTargetBlock,
+            attachmentBlock,
+            mentionBlock,
+            applicationContextBlock: opts.codexAppApplicationContext,
+            messageContextBlock: opts.codexAppMessageContext,
+            attachments: opts.attachments,
+        }),
+    };
+}
 /**
  * Build raw input content for adopt-bridge mode.
  *
@@ -770,6 +906,37 @@ export function buildReforkPrompt(ds, content, opts) {
         whiteboardId: ds.session.whiteboardId,
     });
 }
+/** Structured refork variant. Adopted external CLIs intentionally remain on
+ * their existing raw bridge path and never receive a Codex App sidecar. */
+export function buildReforkCliInput(ds, content, opts) {
+    const locale = opts?.locale ?? localeForBot(ds.larkAppId);
+    if (ds.adoptedFrom) {
+        return {
+            content: buildBridgeInputContent(content, {
+                attachments: opts?.attachments,
+                mentions: opts?.mentions,
+                selfMention: opts?.selfMention,
+                locale,
+            }),
+        };
+    }
+    return buildFollowUpCliInput(content, ds.session.sessionId, {
+        attachments: opts?.attachments,
+        mentions: opts?.mentions,
+        isAdoptMode: false,
+        cliId: opts?.cliId,
+        cliPathOverride: opts?.cliPathOverride,
+        locale,
+        sender: opts?.sender,
+        larkAppId: ds.larkAppId,
+        chatId: ds.session.chatId,
+        whiteboardId: ds.session.whiteboardId,
+        substituteTrigger: opts?.substituteTrigger,
+        codexAppText: opts?.codexAppText,
+        codexAppApplicationContext: opts?.codexAppApplicationContext,
+        codexAppMessageContext: opts?.codexAppMessageContext,
+    });
+}
 /**
  * Copy current streaming-card fields from `ds` into the persisted Session and save.
  * Lets the existing card be PATCHed on next screen_update after a daemon restart,
@@ -787,6 +954,7 @@ export function persistStreamCardState(ds) {
         sameUsageLimit(s.usageLimit, ds.usageLimit) &&
         s.lastUserPrompt === ds.lastUserPrompt &&
         s.lastCliInput === ds.lastCliInput &&
+        JSON.stringify(s.lastCodexAppInput ?? null) === JSON.stringify(ds.lastCodexAppInput ?? null) &&
         JSON.stringify(s.replyThreadAliases ?? {}) === JSON.stringify(ds.replyThreadAliases ?? {}) &&
         JSON.stringify(s.currentReplyTarget ?? null) === JSON.stringify(ds.currentReplyTarget ?? null))
         return;
@@ -798,20 +966,38 @@ export function persistStreamCardState(ds) {
     s.usageLimit = ds.usageLimit;
     s.lastUserPrompt = ds.lastUserPrompt;
     s.lastCliInput = ds.lastCliInput;
+    if (ds.lastCodexAppInput)
+        s.lastCodexAppInput = ds.lastCodexAppInput;
+    else
+        delete s.lastCodexAppInput;
     s.replyThreadAliases = ds.replyThreadAliases;
     s.currentReplyTarget = ds.currentReplyTarget;
     // Clear legacy field so it doesn't drift
     s.streamExpanded = undefined;
     sessionStore.updateSession(s);
 }
-export function rememberLastCliInput(ds, userPrompt, cliInput) {
+export function rememberLastCliInput(ds, userPrompt, cliInput, opts) {
     // A real CLI input means the post-restart silence is over — let the normal
     // card flow resume for this and subsequent turns.
     ds.suppressRecoveryCard = undefined;
     ds.lastUserPrompt = userPrompt;
-    ds.lastCliInput = cliInput;
+    const normalized = typeof cliInput === 'string' ? { content: cliInput } : cliInput;
+    ds.lastCliInput = normalized.content;
+    const botCfg = getBot(ds.larkAppId).config;
+    const effectiveCliId = ds.session.cliId ?? botCfg.cliId;
+    const keepCodexAppInput = opts?.codexAppInputAccepted ?? (effectiveCliId === 'codex-app' &&
+        botCfg.codexAppCleanInput === true &&
+        !ds.adoptedFrom);
+    if (keepCodexAppInput && normalized.codexAppInput)
+        ds.lastCodexAppInput = normalized.codexAppInput;
+    else
+        delete ds.lastCodexAppInput;
     ds.session.lastUserPrompt = userPrompt;
-    ds.session.lastCliInput = cliInput;
+    ds.session.lastCliInput = normalized.content;
+    if (keepCodexAppInput && normalized.codexAppInput)
+        ds.session.lastCodexAppInput = normalized.codexAppInput;
+    else
+        delete ds.session.lastCodexAppInput;
     ds.session.replyThreadAliases = ds.replyThreadAliases;
     ds.session.currentReplyTarget = ds.currentReplyTarget;
     sessionStore.updateSession(ds.session);
@@ -903,6 +1089,7 @@ export async function restoreActiveSessions(activeSessions) {
                 lastMessageAt: sessionLastMessageAtMs(session),
                 hasHistory: false,
                 workingDir: adopted.cwd,
+                ownerOpenId: session.ownerOpenId,
                 adoptedFrom: adopted,
                 streamCardId: session.streamCardId,
                 streamCardNonce: session.streamCardNonce,
@@ -914,6 +1101,7 @@ export async function restoreActiveSessions(activeSessions) {
                 usageLimit: session.usageLimit,
                 lastUserPrompt: session.lastUserPrompt,
                 lastCliInput: session.lastCliInput,
+                lastCodexAppInput: session.lastCodexAppInput,
                 replyThreadAliases: session.replyThreadAliases,
                 currentReplyTarget: session.currentReplyTarget,
                 // Restart stays silent for adopt sessions too: forkAdoptWorker shares
@@ -963,6 +1151,8 @@ export async function restoreActiveSessions(activeSessions) {
                 workingDir: session.workingDir,
                 ownerOpenId: session.ownerOpenId,
                 pendingPrompt: session.queuedPrompt,
+                pendingCodexAppText: session.queuedCodexAppText,
+                pendingCodexAppMessageContext: session.queuedCodexAppMessageContext,
                 currentTurnTitle: session.currentTurnTitle ?? session.title,
             };
             const anchor = sessionAnchorId(ds);
@@ -989,6 +1179,7 @@ export async function restoreActiveSessions(activeSessions) {
             lastMessageAt: sessionLastMessageAtMs(session),
             hasHistory: true, // restored sessions have prior CLI history
             workingDir: session.workingDir,
+            ownerOpenId: session.ownerOpenId,
             // Restore persisted streaming-card state — next screen_update will PATCH
             // the existing card instead of POSTing a fresh one. If the card was
             // withdrawn while we were down, the PATCH fails with MessageWithdrawnError
@@ -1002,6 +1193,7 @@ export async function restoreActiveSessions(activeSessions) {
             usageLimit: session.usageLimit,
             lastUserPrompt: session.lastUserPrompt,
             lastCliInput: session.lastCliInput,
+            lastCodexAppInput: session.lastCodexAppInput,
             replyThreadAliases: session.replyThreadAliases,
             currentReplyTarget: session.currentReplyTarget,
             // Restart stays silent in the group: the recovery re-fork won't post or
@@ -1276,6 +1468,7 @@ export async function resumeSession(sessionId, activeSessions) {
         usageLimit: session.usageLimit,
         lastUserPrompt: session.lastUserPrompt,
         lastCliInput: session.lastCliInput,
+        lastCodexAppInput: session.lastCodexAppInput,
         replyThreadAliases: session.replyThreadAliases,
         currentReplyTarget: session.currentReplyTarget,
     };
@@ -1403,17 +1596,17 @@ export async function executeScheduledTask(task, activeSessions, refreshCliVersi
         markSessionActivity(existing);
         try {
             ensureSessionWhiteboard(existing);
-            const content = buildFollowUpContent(task.prompt, existing.session.sessionId, {
+            const input = buildFollowUpCliInput(task.prompt, existing.session.sessionId, {
                 isAdoptMode: false,
-                cliId: bot.config.cliId,
-                cliPathOverride: bot.config.cliPathOverride,
+                cliId: existing.session.cliId ?? bot.config.cliId,
+                cliPathOverride: existing.session.cliPathOverride ?? bot.config.cliPathOverride,
                 locale: localeForBot(larkAppId),
                 larkAppId,
                 chatId: task.chatId,
                 whiteboardId: existing.session.whiteboardId,
             });
-            rememberLastCliInput(existing, task.prompt, content);
-            existing.worker.send({ type: 'message', content });
+            rememberLastCliInput(existing, task.prompt, input);
+            sendWorkerInput(existing, input);
             logger.info(`[scheduler] Task "${task.name}" injected into live session ${existing.session.sessionId}`);
             return;
         }
@@ -1452,7 +1645,7 @@ export async function executeScheduledTask(task, activeSessions, refreshCliVersi
         workingDir: task.workingDir,
     };
     ensureSessionWhiteboard(ds);
-    const prompt = buildNewTopicPrompt(task.prompt, session.sessionId, bot.config.cliId, bot.config.cliPathOverride, undefined, undefined, undefined, undefined, { name: bot.botName, openId: bot.botOpenId }, localeForBot(larkAppId), undefined, { larkAppId, chatId: task.chatId, whiteboardId: ds.session.whiteboardId });
+    const prompt = buildNewTopicCliInput(task.prompt, session.sessionId, bot.config.cliId, bot.config.cliPathOverride, undefined, undefined, undefined, undefined, { name: bot.botName, openId: bot.botOpenId }, localeForBot(larkAppId), undefined, { larkAppId, chatId: task.chatId, whiteboardId: ds.session.whiteboardId });
     activeSessions.set(sessionKey(anchor, larkAppId), ds);
     rememberLastCliInput(ds, task.prompt, prompt);
     forkWorker(ds, prompt);
@@ -1516,7 +1709,14 @@ async function forkOrShowRepoCard(ds, userContent) {
             return;
         }
     }
-    const buildPrompt = () => buildNewTopicPrompt(userContent, ds.session.sessionId, bot.config.cliId, bot.config.cliPathOverride, undefined, undefined, undefined, undefined, { name: bot.botName, openId: bot.botOpenId }, locale, undefined, { larkAppId, chatId: ds.chatId, whiteboardId: ds.session.whiteboardId });
+    const buildPrompt = () => buildNewTopicCliInput(userContent, ds.session.sessionId, bot.config.cliId, bot.config.cliPathOverride, undefined, undefined, undefined, undefined, { name: bot.botName, openId: bot.botOpenId }, locale, undefined, {
+        larkAppId,
+        chatId: ds.chatId,
+        whiteboardId: ds.session.whiteboardId,
+        codexAppText: ds.pendingCodexAppText,
+        codexAppApplicationContext: ds.pendingCodexAppApplicationContext,
+        codexAppMessageContext: ds.pendingCodexAppMessageContext,
+    });
     if (!ds.workingDir) {
         // 没钉目录 → 复用 /repo 选择卡片让用户在群里选仓库。
         const scanDirs = getProjectScanDirs(ds).filter(d => existsSync(d));
@@ -1548,6 +1748,9 @@ async function forkOrShowRepoCard(ds, userContent) {
     const prompt = buildPrompt();
     rememberLastCliInput(ds, userContent, prompt);
     forkWorker(ds, prompt);
+    ds.pendingCodexAppText = undefined;
+    ds.pendingCodexAppApplicationContext = undefined;
+    ds.pendingCodexAppMessageContext = undefined;
 }
 /** 在新建的飞书群里为某个 bot 拉起一条 chat-scope 会话（dashboard「创建会话」用）。
  *  column='in_progress' → 立即 forkWorker 把内容当首轮发给 CLI；
@@ -1591,6 +1794,7 @@ export async function spawnDashboardSession(activeSessions, refreshCliVersion, a
     // 这份已包装内容，激活时直接喂给 buildNewTopicPrompt，保证待办池里起来的 lead
     // 也带编排上下文（coworkers 只有此刻可靠，激活时已无从重算）。
     const userContent = composeSpawnUserContent({ content, role, coworkers: args.coworkers, locale });
+    const codexAppMessageContext = composeSpawnCodexAppContext({ role, coworkers: args.coworkers, locale });
     const resolvedTitle = args.title || deriveSessionTitleFromContent(content);
     const session = sessionStore.createSession(chatId, bannerMessageId ?? chatId, resolvedTitle, 'group');
     const now = Date.now();
@@ -1604,6 +1808,8 @@ export async function spawnDashboardSession(activeSessions, refreshCliVersion, a
     if (column === 'backlog') {
         session.queued = true;
         session.queuedPrompt = userContent;
+        session.queuedCodexAppText = content;
+        session.queuedCodexAppMessageContext = codexAppMessageContext;
         session.kanbanColumn = 'backlog';
     }
     // 钉 workingDir：oncall 绑定（弹框填了目录）/ bot 默认。都没有 → undefined，激活/开跑时
@@ -1629,6 +1835,8 @@ export async function spawnDashboardSession(activeSessions, refreshCliVersion, a
         workingDir,
         ownerOpenId: session.ownerOpenId,
         currentTurnTitle: resolvedTitle,
+        pendingCodexAppText: content,
+        pendingCodexAppMessageContext: codexAppMessageContext,
     };
     activeSessions.set(sessionKey(anchor, larkAppId), ds);
     if (column === 'backlog') {
@@ -1655,12 +1863,21 @@ export async function activateQueuedSession(ds) {
         // 不该发生（queued 一定 worker:null），但保险：清标记即可。
         ds.session.queued = false;
         ds.session.queuedPrompt = undefined;
+        ds.session.queuedCodexAppText = undefined;
+        ds.session.queuedCodexAppMessageContext = undefined;
         sessionStore.updateSession(ds.session);
         return { ok: true };
     }
     const content = ds.session.queuedPrompt ?? ds.pendingPrompt ?? '';
+    // A parked dashboard task may have crossed a daemon restart. Restore the
+    // persisted clean-input sidecar before clearing the durable backlog fields;
+    // forkOrShowRepoCard will carry it through either immediate fork or /repo.
+    ds.pendingCodexAppText ??= ds.session.queuedCodexAppText;
+    ds.pendingCodexAppMessageContext ??= ds.session.queuedCodexAppMessageContext;
     ds.session.queued = false;
     ds.session.queuedPrompt = undefined;
+    ds.session.queuedCodexAppText = undefined;
+    ds.session.queuedCodexAppMessageContext = undefined;
     ds.pendingPrompt = undefined;
     // 激活即视为开始：从待办池挪到进行中，让卡片归位。
     if (ds.session.kanbanColumn === 'backlog')