funolio-agent 1.0.53 → 1.0.75

package/dist/local-server.js

@@ -39,6 +39,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.startLocalServer = startLocalServer;
 exports.stopLocalServer = stopLocalServer;
 exports.buildChatRuntimeForTest = buildChatRuntimeForTest;
+exports.resolveDirectCliSessionTransportForTest = resolveDirectCliSessionTransportForTest;
+exports.buildLocalDesktopDirectPromptForTest = buildLocalDesktopDirectPromptForTest;
 /**
  * Local HTTP server for desktop-first operation.
  *
@@ -47,6 +49,7 @@ exports.buildChatRuntimeForTest = buildChatRuntimeForTest;
  * Reuses existing LLM providers and tool execution from message-loop/providers.
  */
 const index_1 = require("./providers/index");
+const completion_marker_1 = require("./completion-marker");
 const index_2 = require("./index");
 const approval_1 = require("./approval");
 const config_1 = require("./config");
@@ -61,7 +64,6 @@ const config_cleanup_1 = require("./config-cleanup");
 const status_parser_1 = require("./orchestration/status-parser");
 const guided_actions_1 = require("./orchestration/guided-actions");
 const topic_normalizer_1 = require("./orchestration/topic-normalizer");
-const policy_prompt_1 = require("./orchestration/policy-prompt");
 const safeguards_1 = require("./orchestration/safeguards");
 const token_counter_1 = require("./token-counter");
 const response_guard_1 = require("./response-guard");
@@ -78,6 +80,7 @@ const policy_detection_1 = require("./policy-detection");
 const server_runtime_1 = require("./server-runtime");
 const storage_mode_1 = require("./storage-mode");
 const local_cli_pty_manager_1 = require("./local-cli-pty-manager");
+const codex_app_server_manager_1 = require("./codex-app-server-manager");
 const cli_session_epoch_1 = require("./cli-session-epoch");
 const server_adapter_1 = require("./server-adapter");
 const wizard_support_1 = require("./wizard-support");
@@ -611,7 +614,10 @@ function startLocalServer(opts) {
         if (isConnectedMode())
             return;
         while (runningChatJobControllers.size < MAX_LOCAL_CHAT_JOBS) {
-            const next = data.listQueuedChatJobs(1)[0];
+            const runningKeys = new Set(data.listRunningChatJobs(MAX_LOCAL_CHAT_JOBS + 20).map((job) => `${job.conversation_id}::${job.bot_id}`));
+            const next = data
+                .listQueuedChatJobs(50)
+                .find((job) => !runningKeys.has(`${job.conversation_id}::${job.bot_id}`));
             if (!next)
                 return;
             if (runningChatJobControllers.has(next.id))
@@ -1233,7 +1239,7 @@ function startLocalServer(opts) {
     app.post('/api/bots', (req, res) => {
         (async () => {
             try {
-                const { provider, model, name, soulMd, memoryMd, toolsMd, skillsMd, apiKeyEnc, permissionMode, isDefault, roleLabel, roleClass, isActive, priority, isOrchestrator, is_orchestrator } = req.body;
+                const { provider, model, name, soulMd, memoryMd, toolsMd, skillsMd, apiKeyEnc, permissionMode, isDefault, roleLabel, roleClass, isActive, priority, isOrchestrator, is_orchestrator, codexReasoningEffort, codex_reasoning_effort, codexReasoningSummary, codex_reasoning_summary, codexPersonality, codex_personality, codexServiceTier, codex_service_tier, codexSandboxPolicy, codex_sandbox_policy, codexApprovalPolicy, codex_approval_policy, } = req.body;
                 if (!provider || !model || !name) {
                     return res.status(400).json({ error: 'provider, model, and name are required' });
                 }
@@ -1263,6 +1269,12 @@ function startLocalServer(opts) {
                     isActive,
                     priority,
                     isOrchestrator: isOrchestrator ?? is_orchestrator,
+                    codexReasoningEffort: codexReasoningEffort ?? codex_reasoning_effort,
+                    codexReasoningSummary: codexReasoningSummary ?? codex_reasoning_summary,
+                    codexPersonality: codexPersonality ?? codex_personality,
+                    codexServiceTier: codexServiceTier ?? codex_service_tier,
+                    codexSandboxPolicy: codexSandboxPolicy ?? codex_sandbox_policy,
+                    codexApprovalPolicy: codexApprovalPolicy ?? codex_approval_policy,
                 });
                 res.status(201).json(profile);
             }
@@ -1309,6 +1321,18 @@ function startLocalServer(opts) {
                     fields.showThinking = b.showThinking ?? b.show_thinking;
                 if (b.isOrchestrator !== undefined || b.is_orchestrator !== undefined)
                     fields.isOrchestrator = b.isOrchestrator ?? b.is_orchestrator;
+                if (b.codexReasoningEffort !== undefined || b.codex_reasoning_effort !== undefined)
+                    fields.codexReasoningEffort = b.codexReasoningEffort ?? b.codex_reasoning_effort;
+                if (b.codexReasoningSummary !== undefined || b.codex_reasoning_summary !== undefined)
+                    fields.codexReasoningSummary = b.codexReasoningSummary ?? b.codex_reasoning_summary;
+                if (b.codexPersonality !== undefined || b.codex_personality !== undefined)
+                    fields.codexPersonality = b.codexPersonality ?? b.codex_personality;
+                if (b.codexServiceTier !== undefined || b.codex_service_tier !== undefined)
+                    fields.codexServiceTier = b.codexServiceTier ?? b.codex_service_tier;
+                if (b.codexSandboxPolicy !== undefined || b.codex_sandbox_policy !== undefined)
+                    fields.codexSandboxPolicy = b.codexSandboxPolicy ?? b.codex_sandbox_policy;
+                if (b.codexApprovalPolicy !== undefined || b.codex_approval_policy !== undefined)
+                    fields.codexApprovalPolicy = b.codexApprovalPolicy ?? b.codex_approval_policy;
                 if (isConnectedMode()) {
                     const runtime = (0, server_runtime_1.getRuntimeConnectionConfig)();
                     const auth = await getHydratedDesktopAuth();
@@ -2450,15 +2474,15 @@ function startLocalServer(opts) {
             if (!profile) {
                 return res.status(400).json({ error: 'No bot configured. Create one first.' });
             }
-            const shouldUseOrchestratorMode = orchestrationEnabled !== false && (0, orchestrator_profile_1.isOrchestratorProfile)(profile);
+            const shouldUseOrchestratorMode = orchestrationEnabled !== false && (data.isClerkOrchestratorEnabled() || (0, orchestrator_profile_1.isOrchestratorProfile)(profile));
             if (shouldUseOrchestratorMode) {
                 return res.status(400).json({ error: 'Background chat jobs do not support orchestrator mode yet.' });
             }
             let convId = conversationId ? String(conversationId) : '';
             if (convId) {
-                const latestJob = data.getLatestConversationChatJob(convId);
+                const latestJob = data.getLatestConversationBotChatJob(convId, profile.id);
                 if (latestJob && (latestJob.status === 'queued' || latestJob.status === 'running')) {
-                    return res.status(409).json({ error: 'This conversation already has a pending response.' });
+                    return res.status(409).json({ error: 'This bot already has a pending response in this conversation.' });
                 }
             }
             if (!convId) {
@@ -2554,7 +2578,10 @@ function startLocalServer(opts) {
     // ─── Chat (SSE streaming) ──────────────────────────────────
     app.post('/api/conversations/:id/chat-job/cancel', async (req, res) => {
         try {
-            const latestJob = data.getLatestConversationChatJob(req.params.id);
+            const requestedBotId = String(req.body?.botId || '').trim();
+            const latestJob = requestedBotId
+                ? data.getLatestConversationBotChatJob(req.params.id, requestedBotId)
+                : data.getLatestConversationChatJob(req.params.id);
             if (!latestJob)
                 return res.status(404).json({ error: 'Chat job not found' });
             if (latestJob.status === 'completed' || latestJob.status === 'failed' || latestJob.status === 'cancelled') {
@@ -2590,6 +2617,7 @@ function startLocalServer(opts) {
             routeAbortController.abort();
         };
         req.on('close', abortOnClientClose);
+        res.on('close', abortOnClientClose);
         try {
             let { conversationId, message, botId, skipUserMessage, pinnedMessageIds, topicId, projectId, workflowTemplateId, orchestrationEnabled, chatJobId, assistantMessageId, persistAssistantPlaceholder, } = req.body;
             if (!message)
@@ -2734,19 +2762,22 @@ function startLocalServer(opts) {
                 assistantMessageId = placeholder.id;
             }
             // ─── Orchestrator Mode Branch ─────────────────────────
-            const shouldUseOrchestratorMode = orchestrationEnabled !== false && (0, orchestrator_profile_1.isOrchestratorProfile)(profile);
+            const shouldUseOrchestratorMode = orchestrationEnabled !== false && (data.isClerkOrchestratorEnabled() || (0, orchestrator_profile_1.isOrchestratorProfile)(profile));
             if (shouldUseOrchestratorMode) {
-                const clerk = (0, clerk_model_1.getClerk)({ runtimeMode: 'local_desktop' });
-                if (!clerk) {
-                    // Fix #2: Do not silently fall through to direct chat — return a clear error
-                    return res.status(400).json({
-                        error: 'Orchestrator mode requires a clerk model to be configured. Please add a provider connection in Settings.',
-                    });
-                }
                 const { OrchestratorAgent } = require('./orchestrator');
+                const { buildLocalDesktopOrchestratorRuntime } = require('./orchestrator');
                 const { getWorkflowEngine } = require('./workflow-engine');
                 const workflowEngine = getWorkflowEngine(opts.projectDir, 'local_desktop');
-                const orchestrator = new OrchestratorAgent(clerk, workflowEngine);
+                let orchestratorRuntime;
+                try {
+                    orchestratorRuntime = buildLocalDesktopOrchestratorRuntime(profile);
+                }
+                catch (runtimeErr) {
+                    return res.status(400).json({
+                        error: runtimeErr?.message || 'Orchestrator mode is not configured correctly.',
+                    });
+                }
+                const orchestrator = new OrchestratorAgent(orchestratorRuntime, workflowEngine);
                 // Resolve effective project ID from request or existing conversation
                 const conv = data.getConversation(convId);
                 const effectiveProjectId = projectId ? String(projectId) : (conv?.project_id || undefined);
@@ -2769,13 +2800,34 @@ function startLocalServer(opts) {
                 };
                 let orchestratorRuntimeLabel = '';
                 let orchestratorRuntimePayload;
+                const clerkSelectedAsOrchestrator = data.isClerkOrchestratorEnabled();
                 try {
-                    const orchestratorRuntime = await buildChatRuntime(profile);
-                    orchestratorRuntimeLabel = [
-                        orchestratorRuntime.model || profile.model || '',
-                        runtimeModeLabel(orchestratorRuntime.runtimeMode, orchestratorRuntime.runtimeSource),
-                    ].filter(Boolean).join(' | ');
-                    orchestratorRuntimePayload = runtimePayloadForDisplay(profile.provider, orchestratorRuntime.model || profile.model || null, orchestratorRuntime.runtimeMode, orchestratorRuntime.runtimeSource || null);
+                    if (clerkSelectedAsOrchestrator) {
+                        const clerkProvider = data.getSetting('clerk_provider') || profile.provider;
+                        const clerkModel = data.getSetting('clerk_model') || profile.model || null;
+                        const clerkConnection = data.findProviderConnection(clerkProvider);
+                        const clerkRuntimeMode = clerkProvider === 'claude-cli' || clerkProvider === 'codex-cli'
+                            ? 'subscription-cli'
+                            : 'api-key';
+                        const clerkRuntimeSource = clerkConnection?.access_mode === 'oauth'
+                            ? 'oauth-token'
+                            : clerkConnection?.access_mode === 'cli'
+                                ? 'cli-direct'
+                                : 'api-key';
+                        orchestratorRuntimeLabel = [
+                            clerkModel || '',
+                            runtimeModeLabel(clerkRuntimeMode, clerkRuntimeSource),
+                        ].filter(Boolean).join(' | ');
+                        orchestratorRuntimePayload = runtimePayloadForDisplay(clerkProvider, clerkModel, clerkRuntimeMode, clerkRuntimeSource);
+                    }
+                    else {
+                        const orchestratorRuntime = await buildChatRuntime(profile);
+                        orchestratorRuntimeLabel = [
+                            orchestratorRuntime.model || profile.model || '',
+                            runtimeModeLabel(orchestratorRuntime.runtimeMode, orchestratorRuntime.runtimeSource),
+                        ].filter(Boolean).join(' | ');
+                        orchestratorRuntimePayload = runtimePayloadForDisplay(profile.provider, orchestratorRuntime.model || profile.model || null, orchestratorRuntime.runtimeMode, orchestratorRuntime.runtimeSource || null);
+                    }
                 }
                 catch {
                     orchestratorRuntimeLabel = buildConfiguredMessageModel(profile);
@@ -2836,6 +2888,18 @@ function startLocalServer(opts) {
                                     text: event.text,
                                 });
                             }
+                            else if (event.type === 'worker_terminal_chunk') {
+                                hasWorkerActivity = true;
+                                sendEvent('worker_terminal_chunk', {
+                                    stepId: event.stepId,
+                                    botId: resolveWorkerBotId(event.agentName),
+                                    agentName: event.agentName,
+                                    description: event.description,
+                                    stepIndex: event.stepIndex,
+                                    totalSteps: event.totalSteps,
+                                    text: event.rawText,
+                                });
+                            }
                             else if (event.type === 'worker_tool_call') {
                                 hasWorkerActivity = true;
                                 recordWorkerActivity('worker_tool_call', event, {
@@ -3027,9 +3091,6 @@ function startLocalServer(opts) {
                 }
                 return;
             }
-            // Prompt Contract v1: system carries summary + last 5 turns.
-            // Send only the current user request as the primary user message.
-            const llmMessages = [{ role: 'user', content: message }];
             const configuredTz = (data.getSetting('timezone') || '').trim();
             const effectiveTimezone = configuredTz && configuredTz.toLowerCase() !== 'system'
                 ? configuredTz
@@ -3042,101 +3103,16 @@ function startLocalServer(opts) {
                 ? new Set(allToolDefs.map((tool) => tool.name))
                 : expandAllowedToolNames(allToolDefs, configuredBuiltinTools, configuredMcpTools);
             const toolDefs = allToolDefs.filter((tool) => allowedToolNames.has(tool.name));
-            // Build system prompt via clerk (token-budgeted context injection)
-            let systemPrompt;
+            const conversation = data.getConversation(convId);
+            const topicTitle = topicId ? data.getTopic(topicId)?.title : undefined;
+            const project = conversation?.project_id ? data.getProject(conversation.project_id) : undefined;
+            const workspacePath = project?.folder?.trim() || undefined;
             let llmSpawnCwd = opts.projectDir;
-            const clerk = (0, clerk_model_1.getClerk)({ runtimeMode: 'local_desktop' });
-            if (clerk) {
-                const conv = data.getConversation(convId);
-                const topicTitle = topicId ? data.getTopic(topicId)?.title : undefined;
-                const project = conv?.project_id ? data.getProject(conv.project_id) : undefined;
-                const workspacePath = project?.folder?.trim() || undefined;
-                if (workspacePath && fs.existsSync(workspacePath)) {
-                    llmSpawnCwd = workspacePath;
-                }
-                const built = clerk.buildPrompt(message, profile.id, profile, {
-                    targetModel: profile.model,
-                    conversationId: convId,
-                    projectName: conv?.project_name || undefined,
-                    projectId: conv?.project_id || undefined,
-                    topicTitle: topicTitle || undefined,
-                    workspacePath,
-                    timezone: effectiveTimezone,
-                    includeKeyDecisions: false,
-                    availableTools: toolDefs.map((tool) => ({ name: tool.name, description: tool.description })),
-                });
-                systemPrompt = built.systemPrompt;
-                console.log(chalk_1.default.gray(`  [clerk] Context: ${built.injectedSummaries} summaries (${built.contextTokensUsed} tokens)`));
+            if (workspacePath && fs.existsSync(workspacePath)) {
+                llmSpawnCwd = workspacePath;
             }
-            else {
-                // Fallback: manual prompt building
-                systemPrompt = '[Bot Identity]\n' + (profile.soul_md
-                    || 'You are an AI assistant running locally. You have access to project files and can execute code.');
-                systemPrompt += '\n\nDo not end with a deferred promise (for example: "Let me check..."). Return a final answer in this turn, or state exactly what is unavailable.';
-                systemPrompt += '\n\nWhen [Project Overview] is present, treat Project/Topic/Workspace values there as authoritative for the current turn and override stale prior-chat claims.';
-                systemPrompt += '\n\n[Response Style]\nWrite in short readable paragraphs. Put a blank line between distinct ideas. Use bullets when listing findings, steps, or issues. Do not return one dense wall of text. For progress updates, keep them compact and clearly separate what you checked, what you found, and what you are doing next.';
-                const convForFallback = data.getConversation(convId);
-                const projectForFallback = convForFallback?.project_id ? data.getProject(convForFallback.project_id) : undefined;
-                const workspaceForFallback = projectForFallback?.folder?.trim();
-                if (workspaceForFallback && fs.existsSync(workspaceForFallback)) {
-                    llmSpawnCwd = workspaceForFallback;
-                }
-                const fallbackMeta = [];
-                if (convForFallback?.project_name)
-                    fallbackMeta.push(`Project: ${convForFallback.project_name}`);
-                if (topicId) {
-                    const fallbackTopic = data.getTopic(topicId);
-                    if (fallbackTopic?.title)
-                        fallbackMeta.push(`Topic: ${fallbackTopic.title}`);
-                }
-                if (convForFallback?.project_id) {
-                    fallbackMeta.push(`Workspace: ${workspaceForFallback || '(project folder not configured)'}`);
-                }
-                if (fallbackMeta.length > 0) {
-                    systemPrompt += '\n\n[Project Overview]\n' + fallbackMeta.join('\n');
-                }
-                const effectivePolicy = data.getEffectiveOrchestrationPolicy(convForFallback?.project_id || undefined);
-                systemPrompt += '\n\n' + (0, policy_prompt_1.buildEffectivePolicyPromptSection)(effectivePolicy, {
-                    heading: '[Effective Policy]',
-                    defaultLine: 'No confirmed special policy is set.',
-                });
-                try {
-                    const todoStatus = data.getTodoStatusMarker(convForFallback?.project_id ?? undefined);
-                    systemPrompt += `\n\n[TODO Coordination]\nTODO STATUS: ${todoStatus}`;
-                }
-                catch { /* best-effort */ }
-                systemPrompt += '\n\n' + (0, clerk_model_1.buildTodoInstructions)(profile?.name || profile?.id || 'LLM');
-                let hasSummary = false;
-                try {
-                    const summaryContext = (0, context_window_1.getPromptContextWindow)(convId, safeguards_1.SAFEGUARDS.CONTEXT_WINDOW_TURNS);
-                    if (summaryContext.summary?.summary_text) {
-                        const summaryHeader = summaryContext.carriedForward
-                            ? '[Context Summary (Carried Forward from Previous Conversation in This Topic)]'
-                            : '[Context Summary]';
-                        systemPrompt += `\n\n${summaryHeader}\n` + summaryContext.summary.summary_text;
-                        hasSummary = true;
-                    }
-                }
-                catch { /* best-effort */ }
-                try {
-                    const turnWindow = hasSummary
-                        ? safeguards_1.SAFEGUARDS.CONTEXT_WINDOW_TURNS
-                        : safeguards_1.SAFEGUARDS.NO_SUMMARY_CONTEXT_WINDOW_TURNS;
-                    const promptContext = (0, context_window_1.getPromptContextWindow)(convId, turnWindow);
-                    if (promptContext.turns.length > 0) {
-                        const turnsHeader = promptContext.carriedForward
-                            ? `[Recent Messages (Last ${promptContext.turns.length} Turns from Previous Conversation in This Topic)]`
-                            : `[Recent Messages (Last ${promptContext.turns.length} Turns)]`;
-                        systemPrompt += `\n\n${turnsHeader}\n` + (0, context_window_1.formatTurnsForPrompt)(promptContext.turns);
-                    }
-                }
-                catch { /* best-effort */ }
-            }
-            // Resolve LLM runtime.
-            // Desktop local mode intentionally supports only:
-            // - Subscription CLI
-            // - API Key
-            // We do not use subscription-token API routing for local CLI bots.
+            // Resolve LLM runtime early so the local desktop prompt contract can differ
+            // between API/fresh CLI and recurring CLI sessions without affecting server paths.
             const runtime = await buildChatRuntime(profile);
             let activeProviderName = runtime.providerName;
             let activeModelName = runtime.model;
@@ -3164,6 +3140,33 @@ function startLocalServer(opts) {
             const cliEpochStartedAt = cliSessionEpochPlan.resumeSessionId
                 ? (cliSessionEpochPlan.existing?.epoch_started_at || localTimestamp())
                 : localTimestamp();
+            const primaryTopicId = topicId || data.getPrimaryTopicIdForConversation(convId) || undefined;
+            const cliHistoryFilePath = activeIsCliProvider && !cliSessionEpochPlan.resumeSessionId
+                ? writeCliBootstrapHistoryFile({
+                    conversationId: convId,
+                    botId: profile.id,
+                    projectPath: llmSpawnCwd,
+                    topicId: primaryTopicId,
+                })
+                : null;
+            const directPrompt = buildLocalDesktopDirectPrompt({
+                conversationId: convId,
+                currentBotId: profile.id,
+                currentBotName: profile.name,
+                currentProvider: activeProviderName,
+                userPrompt: message,
+                soulMd: profile.soul_md || 'You are an AI assistant running locally. You have access to project files and can execute code.',
+                projectName: conversation?.project_name || undefined,
+                topicTitle: topicTitle || undefined,
+                workspacePath,
+                timezone: effectiveTimezone,
+                availableTools: toolDefs.map((tool) => ({ name: tool.name, description: tool.description })),
+                isCliRecurring: !!cliSessionEpochPlan.resumeSessionId,
+                cliHistoryFilePath,
+                useCompletionSentinel: resolveDirectCliSessionTransport(activeProviderName, enableCliSessionEpoch, (0, storage_mode_1.isLocalStorageMode)()) === 'pty',
+            });
+            const llmMessages = [{ role: 'user', content: directPrompt.userPrompt }];
+            let systemPrompt = directPrompt.systemPrompt;
             if (!activeApiKey) {
                 return res.status(400).json({ error: `No API key for provider ${profile.provider}. Configure one in Settings.` });
             }
@@ -3175,14 +3178,6 @@ function startLocalServer(opts) {
                 restrictFileAccessToProject: unrestrictedCliProfile ? false : undefined,
                 abortSignal: routeAbortController.signal,
             });
-            const toolManifest = toolDefs
-                .map(t => `- ${t.name}: ${t.description}`)
-                .join('\n');
-            if (toolManifest.trim()) {
-                systemPrompt += unrestrictedCliProfile
-                    ? '\n\n[Available Tools]\nThe following tools are available in the current runtime:\n' + toolManifest
-                    : '\n\n[Available Tools]\nOnly the following tools are enabled for this bot in the current runtime:\n' + toolManifest;
-            }
             // Inject pinned messages as context (user-selected cross-bot references)
             if (pinnedMessageIds && Array.isArray(pinnedMessageIds) && pinnedMessageIds.length > 0) {
                 const pinnedLines = [];
@@ -3240,33 +3235,6 @@ function startLocalServer(opts) {
                     isApproximate: true,
                 },
             });
-            sendEvent('status', {
-                phase: 'thinking',
-                detail: `Sending request to ${activeProviderName}...`,
-                runtime: runtimePayload(),
-            });
-            recordActivity('status', {
-                phase: 'thinking',
-                detail: `Sending request to ${activeProviderName}...`,
-                runtime: runtimePayload(),
-            }, `Sending request to ${activeProviderName}...`);
-            if (cliSessionEpochPlan.resetReason && enableCliSessionEpoch) {
-                const resetDetail = cliSessionEpochPlan.resetReason === 'turn_limit'
-                    ? 'Resetting CLI session after reaching the turn limit.'
-                    : cliSessionEpochPlan.resetReason === 'token_limit'
-                        ? 'Resetting CLI session after reaching the context budget.'
-                        : 'Resetting CLI session because the runtime changed.';
-                sendEvent('status', {
-                    phase: 'thinking',
-                    detail: resetDetail,
-                    runtime: runtimePayload(),
-                });
-                recordActivity('status', {
-                    phase: 'thinking',
-                    detail: resetDetail,
-                    runtime: runtimePayload(),
-                }, resetDetail);
-            }
             let partialPersistedContent = '';
             let partialPersistedAt = 0;
             const throwIfChatJobCancelled = () => {
@@ -3306,6 +3274,7 @@ function startLocalServer(opts) {
             let fullContent = '';
             let streamedContent = '';
             let streamedAnyChunk = false;
+            let rawCliTranscript = '';
             let iteration = 0;
             const MAX_ITERATIONS = 10; // Phase 1d: reduced from 20
             let totalInputTokens = 0;
@@ -3316,31 +3285,141 @@ function startLocalServer(opts) {
             let accumulatedThinking = '';
             const thinkingEnabled = !!profile?.show_thinking;
             let useInteractiveCliSession = enableCliSessionEpoch;
-            if (useInteractiveCliSession) {
+            const directCliSessionTransport = resolveDirectCliSessionTransport(activeProviderName, useInteractiveCliSession, (0, storage_mode_1.isLocalStorageMode)());
+            const useCodexAppServerInteractive = directCliSessionTransport === 'codex-app-server';
+            const usePtyInteractiveCliSession = directCliSessionTransport === 'pty';
+            const startDetail = `Started response via ${runtimeModeLabel(activeRuntimeMode, activeRuntimeSource) || activeProviderName}`;
+            sendEvent('status', { phase: 'thinking', detail: startDetail });
+            recordActivity('status', { phase: 'thinking', detail: startDetail }, startDetail);
+            if (useCodexAppServerInteractive) {
+                const codexAppServerManager = (0, codex_app_server_manager_1.getCodexAppServerManager)();
+                let appServerAttempt = 0;
+                let forceFreshInteractiveCliSession = false;
+                while (true) {
+                    appServerAttempt++;
+                    try {
+                        const isFreshSession = forceFreshInteractiveCliSession || !cliSessionEpochPlan.resumeSessionId;
+                        const result = await codexAppServerManager.runTurn({
+                            runtimeMode: 'local_desktop',
+                            conversationId: convId,
+                            botId: profile.id,
+                            botName: profile.name,
+                            cwd: llmSpawnCwd,
+                            systemPrompt,
+                            messages: llmMessages,
+                            forceFreshSession: isFreshSession,
+                            resumeSessionId: cliSessionEpochPlan.resumeSessionId || undefined,
+                            model: activeModelName || profile.model || null,
+                            projectId: conversation?.project_id ?? null,
+                            codexSettings: {
+                                reasoningEffort: profile.codex_reasoning_effort,
+                                reasoningSummary: profile.codex_reasoning_summary,
+                                personality: profile.codex_personality,
+                                serviceTier: profile.codex_service_tier,
+                                sandboxPolicy: profile.codex_sandbox_policy,
+                                approvalPolicy: profile.codex_approval_policy,
+                            },
+                            abortSignal: routeAbortController.signal,
+                            onChunk: async (chunk) => {
+                                streamedAnyChunk = true;
+                                streamedContent += chunk;
+                                persistAssistantPartial(false);
+                                sendEvent('chunk', { text: chunk });
+                            },
+                            onDetail: async (detail) => {
+                                const text = String(detail || '').trim();
+                                if (!text)
+                                    return;
+                                sendEvent('status', { phase: 'thinking', detail: text });
+                                recordActivity('status', { phase: 'thinking', detail: text }, text);
+                            },
+                        });
+                        if (result.sessionId) {
+                            activeCliSessionId = result.sessionId;
+                        }
+                        if (result.usage) {
+                            totalInputTokens += result.usage.inputTokens || 0;
+                            totalOutputTokens += result.usage.outputTokens || 0;
+                            hasExactUsage = true;
+                        }
+                        rawCliTranscript = result.rawOutput || '';
+                        fullContent = (0, completion_marker_1.stripCompletionSentinel)((result.content || '').trim()).text.trim();
+                        if (!fullContent && appServerAttempt < LOCAL_RUNTIME_RETRY_LIMIT) {
+                            forceFreshInteractiveCliSession = true;
+                            codexAppServerManager.closeSessionByConversation(convId, profile.id);
+                            const retryDetail = `Selected runtime returned an empty response; retrying with a fresh ${activeProviderName} session (${appServerAttempt + 1}/${LOCAL_RUNTIME_RETRY_LIMIT})...`;
+                            console.warn(chalk_1.default.yellow(`  [chat] ${retryDetail}`));
+                            await pauseLocalRuntimeRetry(appServerAttempt);
+                            continue;
+                        }
+                        break;
+                    }
+                    catch (codexErr) {
+                        if (routeAbortController.signal.aborted || codexErr?.name === 'AbortError') {
+                            throw codexErr;
+                        }
+                        if (appServerAttempt >= LOCAL_RUNTIME_RETRY_LIMIT || !shouldRetrySelectedLocalRuntime(codexErr)) {
+                            throw codexErr;
+                        }
+                        forceFreshInteractiveCliSession = true;
+                        codexAppServerManager.closeSessionByConversation(convId, profile.id);
+                        const retryDetail = `Selected runtime failed (${codexErr?.message || codexErr}); retrying with a fresh ${activeProviderName} session (${appServerAttempt + 1}/${LOCAL_RUNTIME_RETRY_LIMIT})...`;
+                        console.warn(chalk_1.default.yellow(`  [chat] ${retryDetail}`));
+                        await pauseLocalRuntimeRetry(appServerAttempt);
+                    }
+                }
+            }
+            if (usePtyInteractiveCliSession) {
+                if (activeProviderName !== 'claude-cli') {
+                    throw new Error(`Legacy PTY interactive sessions are Claude-only in local desktop mode; expected ${activeProviderName} to use Codex app-server.`);
+                }
                 const ptyManager = (0, local_cli_pty_manager_1.getLocalCliPtySessionManager)();
                 let ptyAttempt = 0;
+                let forceFreshInteractiveCliSession = false;
+                let currentAttemptSessionId = null;
+                let currentAttemptWasFreshSession = false;
                 while (true) {
                     ptyAttempt++;
                     try {
+                        // Pattern A (Claude CLI): generate a sequential session ID for new sessions
+                        // Pattern B (Codex CLI): let the CLI generate its own ID
+                        const isFreshSession = forceFreshInteractiveCliSession || !cliSessionEpochPlan.resumeSessionId;
+                        const newSessionId = isFreshSession && activeProviderName === 'claude-cli'
+                            ? data.generateNextSessionId()
+                            : undefined;
+                        currentAttemptWasFreshSession = isFreshSession;
+                        currentAttemptSessionId = newSessionId || cliSessionEpochPlan.resumeSessionId || activeCliSessionId || null;
                         const result = await ptyManager.runTurn({
                             conversationId: convId,
                             botId: profile.id,
-                            provider: activeProviderName,
+                            provider: 'claude-cli',
                             cwd: llmSpawnCwd,
                             systemPrompt,
                             messages: llmMessages,
-                            forceFreshSession: !cliSessionEpochPlan.resumeSessionId,
-                            onDetail: async (detail) => {
-                                sendEvent('status', {
-                                    phase: 'thinking',
-                                    detail,
-                                    runtime: runtimePayload(),
+                            forceFreshSession: isFreshSession,
+                            resumeSessionId: cliSessionEpochPlan.resumeSessionId || undefined,
+                            newSessionId,
+                            abortSignal: routeAbortController.signal,
+                            onRawChunk: async (chunk) => {
+                                sendEvent('terminal_chunk', {
+                                    text: chunk,
+                                    provider: activeProviderName,
+                                    botId: profile?.id || null,
+                                    agentName: profile?.name || null,
                                 });
-                                recordActivity('status', {
-                                    phase: 'thinking',
-                                    detail,
-                                    runtime: runtimePayload(),
-                                }, detail);
+                            },
+                            onChunk: async (chunk) => {
+                                streamedAnyChunk = true;
+                                streamedContent += chunk;
+                                persistAssistantPartial(false);
+                                sendEvent('chunk', { text: chunk });
+                            },
+                            onDetail: async (detail) => {
+                                const text = String(detail || '').trim();
+                                if (!text)
+                                    return;
+                                sendEvent('status', { phase: 'thinking', detail: text });
+                                recordActivity('status', { phase: 'thinking', detail: text }, text);
                             },
                         });
                         if (result.sessionId) {
@@ -3351,25 +3430,36 @@ function startLocalServer(opts) {
                             totalOutputTokens += result.usage.outputTokens || 0;
                             hasExactUsage = true;
                         }
-                        fullContent = (result.content || '').trim();
+                        rawCliTranscript = result.rawOutput || '';
+                        fullContent = (0, completion_marker_1.stripCompletionSentinel)((result.content || '').trim()).text.trim();
+                        if (!fullContent && ptyAttempt < LOCAL_RUNTIME_RETRY_LIMIT) {
+                            forceFreshInteractiveCliSession = true;
+                            ptyManager.closeSessionByConversation(convId, profile.id);
+                            const retryDetail = `Selected runtime returned an empty response; retrying with a fresh ${activeProviderName} session (${ptyAttempt + 1}/${LOCAL_RUNTIME_RETRY_LIMIT})...`;
+                            console.warn(chalk_1.default.yellow(`  [chat] ${retryDetail}`));
+                            await pauseLocalRuntimeRetry(ptyAttempt);
+                            continue;
+                        }
                         break;
                     }
                     catch (ptyErr) {
+                        if (routeAbortController.signal.aborted || ptyErr?.name === 'AbortError') {
+                            throw ptyErr;
+                        }
                         if (ptyAttempt >= LOCAL_RUNTIME_RETRY_LIMIT || !shouldRetrySelectedLocalRuntime(ptyErr)) {
                             throw ptyErr;
                         }
-                        const retryDetail = `Selected runtime failed (${ptyErr?.message || ptyErr}); retrying the same connection (${ptyAttempt + 1}/${LOCAL_RUNTIME_RETRY_LIMIT})...`;
+                        const startupRetry = isClaudeFreshSessionStartupFailure(ptyErr);
+                        if (startupRetry || currentAttemptWasFreshSession) {
+                            forceFreshInteractiveCliSession = true;
+                            ptyManager.closeSessionByConversation(convId, profile.id);
+                        }
+                        const retryDetail = startupRetry
+                            ? `Fresh ${activeProviderName} session ${currentAttemptSessionId || '(unknown)'} did not create a transcript within 7s; killing it and retrying with a new session (${ptyAttempt + 1}/${LOCAL_RUNTIME_RETRY_LIMIT})...`
+                            : currentAttemptWasFreshSession && activeProviderName === 'claude-cli'
+                                ? `Fresh ${activeProviderName} session ${currentAttemptSessionId || '(unknown)'} failed (${ptyErr?.message || ptyErr}); killing it and retrying with a new session (${ptyAttempt + 1}/${LOCAL_RUNTIME_RETRY_LIMIT})...`
+                                : `Selected runtime failed (${ptyErr?.message || ptyErr}); retrying the same connection (${ptyAttempt + 1}/${LOCAL_RUNTIME_RETRY_LIMIT})...`;
                         console.warn(chalk_1.default.yellow(`  [chat] ${retryDetail}`));
-                        sendEvent('status', {
-                            phase: 'thinking',
-                            detail: retryDetail,
-                            runtime: runtimePayload(),
-                        });
-                        recordActivity('status', {
-                            phase: 'thinking',
-                            detail: retryDetail,
-                            runtime: runtimePayload(),
-                        }, retryDetail);
                         await pauseLocalRuntimeRetry(ptyAttempt);
                     }
                 }
@@ -3379,10 +3469,6 @@ function startLocalServer(opts) {
                     iteration++;
                     let iterationFirstChunk = true;
                     throwIfChatJobCancelled();
-                    if (iteration > 1) {
-                        sendEvent('status', { phase: 'thinking', detail: 'Processing tool results...' });
-                        recordActivity('status', { phase: 'thinking', detail: 'Processing tool results...' }, 'Processing tool results...');
-                    }
                     let response;
                     const chatOptions = {
                         messages: llmMessages,
@@ -3398,8 +3484,6 @@ function startLocalServer(opts) {
                             throwIfChatJobCancelled();
                             if (iterationFirstChunk) {
                                 iterationFirstChunk = false;
-                                sendEvent('status', { phase: 'generating' });
-                                recordActivity('status', { phase: 'generating' }, 'Generating response...');
                             }
                             streamedAnyChunk = true;
                             streamedContent += chunk;
@@ -3531,7 +3615,7 @@ function startLocalServer(opts) {
                         continue;
                     }
                     // Final response (guard against defer-only filler)
-                    const candidate = (response.content || '').trim();
+                    const candidate = (0, completion_marker_1.stripCompletionSentinel)((response.content || '').trim()).text.trim();
                     if (!forcedFinalizationPass && (0, response_guard_1.isLikelyDeferredReply)(candidate)) {
                         forcedFinalizationPass = true;
                         llmMessages.push({ role: 'assistant', content: candidate });
@@ -3539,14 +3623,12 @@ function startLocalServer(opts) {
                             role: 'user',
                             content: 'Provide the final answer now. Do not say you will check later. Either provide concrete results or explicitly say what is unavailable.',
                         });
-                        sendEvent('status', { phase: 'thinking', detail: 'Finalizing response...' });
-                        recordActivity('status', { phase: 'thinking', detail: 'Finalizing response...' }, 'Finalizing response...');
                         continue;
                     }
                     fullContent = candidate;
                     break;
                 }
-            const persistedContent = fullContent || streamedContent.trim();
+            const persistedContent = (0, completion_marker_1.stripCompletionSentinel)(fullContent || streamedContent.trim()).text.trim();
             if (!persistedContent) {
                 throw new Error('Assistant returned no final response');
             }
@@ -3594,6 +3676,7 @@ function startLocalServer(opts) {
                     model: modelWithRuntime || null,
                     botId: profile.id,
                     agentName: profile.name,
+                    resultArtifact: useInteractiveCliSession ? (rawCliTranscript || null) : undefined,
                 }) || data.addMessage(convId, 'assistant', persistedContent, modelWithRuntime || undefined, undefined, profile.id, profile.name))
                 : data.addMessage(convId, 'assistant', persistedContent, modelWithRuntime || undefined, undefined, profile.id, profile.name);
             data.attachMessageActivitiesToMessage(activityStreamId, savedMessage.id);
@@ -3606,6 +3689,7 @@ function startLocalServer(opts) {
                 summary: 'Final assistant response',
                 payload: {
                     content: persistedContent,
+                    ...(useInteractiveCliSession && rawCliTranscript ? { rawOutput: rawCliTranscript } : {}),
                     runtime: runtimePayload(),
                 },
                 expiresAt: activityExpiresAt,
@@ -3689,6 +3773,7 @@ function startLocalServer(opts) {
         }
         finally {
             req.off?.('close', abortOnClientClose);
+            res.off?.('close', abortOnClientClose);
         }
     });
     // ─── Memory Facts ───────────────────────────────────────────
@@ -3807,11 +3892,18 @@ function startLocalServer(opts) {
             const clerkProvider = data.getSetting('clerk_provider');
             const clerkModel = data.getSetting('clerk_model');
             const hasKey = !!data.getSetting('clerk_api_key');
+            const currentOrchestrator = data.getCurrentOrchestratorSelection();
+            const currentDefaultBot = data.getDefaultAgentProfile();
             res.json({
                 provider: clerkProvider || null,
                 model: clerkModel || null,
                 hasApiKey: hasKey,
                 configured: !!(clerkProvider && clerkModel && hasKey),
+                isOrchestrator: data.isClerkOrchestratorEnabled(),
+                currentOrchestrator,
+                currentDefaultBot: currentDefaultBot
+                    ? { botId: currentDefaultBot.id, botName: currentDefaultBot.name }
+                    : null,
             });
         }
         catch (err) {
@@ -3820,13 +3912,16 @@ function startLocalServer(opts) {
     });
     app.put('/api/clerk/config', (req, res) => {
         try {
-            const { provider, model, apiKey } = req.body;
+            const { provider, model, apiKey, isOrchestrator } = req.body;
             if (!provider || !model)
                 return res.status(400).json({ error: 'provider and model are required' });
             data.setSetting('clerk_provider', provider);
             data.setSetting('clerk_model', model);
             if (apiKey)
                 data.setSetting('clerk_api_key', apiKey);
+            if (typeof isOrchestrator === 'boolean') {
+                data.setClerkAsOrchestrator(isOrchestrator);
+            }
             // Reset clerk instance so it picks up new config
             const { resetClerk } = require('./clerk-model');
             resetClerk();
@@ -3842,11 +3937,31 @@ function startLocalServer(opts) {
             const { prompt } = req.body;
             if (!prompt)
                 return res.status(400).json({ error: 'prompt is required' });
-            const clerk = (0, clerk_model_1.getClerk)({ runtimeMode: 'local_desktop' });
-            if (!clerk)
-                return res.json({ routing: 'default', reason: 'No clerk configured' });
             const agents = data.listAgentProfiles();
-            const route = await clerk.routeTask(prompt, agents);
+            const normalized = String(prompt || '').toLowerCase();
+            const defaultAgent = data.getDefaultAgentProfile() || agents[0];
+            const namedAgent = agents.find((agent) => normalized.includes(agent.name.toLowerCase()));
+            const roleMatchedAgent = /\b(qa|review|verify|test)\b/i.test(normalized)
+                ? agents.find((agent) => /\bqa|review\b/i.test(String(agent.role_class || agent.role_label || '')))
+                : /\b(research|brainstorm|analy[sz]e|evaluate|investigate)\b/i.test(normalized)
+                    ? agents.find((agent) => /\bresearch|analyst\b/i.test(String(agent.role_class || agent.role_label || '')))
+                    : /\b(build|code|implement|create|fix|write|update)\b/i.test(normalized)
+                        ? agents.find((agent) => /\bcode|coding|developer|builder\b/i.test(String(agent.role_class || agent.role_label || '')))
+                        : undefined;
+            const routeAgent = namedAgent || roleMatchedAgent || defaultAgent;
+            const route = routeAgent
+                ? {
+                    agentId: routeAgent.id,
+                    agentName: routeAgent.name,
+                    provider: routeAgent.provider,
+                    model: routeAgent.model,
+                    reasoning: namedAgent
+                        ? 'Matched the explicitly named bot.'
+                        : roleMatchedAgent
+                            ? 'Matched the prompt to the configured bot role.'
+                            : 'Fell back to the configured default bot.',
+                }
+                : { routing: 'default', reason: 'No bot configured' };
             res.json(route);
         }
         catch (err) {
@@ -4752,6 +4867,13 @@ function runtimeModeLabel(mode, runtimeSource) {
         return (0, subscription_runtime_1.claudeSubscriptionRuntimeLabel)(runtimeSource);
     return 'API Key';
 }
+function resolveDirectCliSessionTransport(providerName, enableCliSessionEpoch, localStorageMode) {
+    if (!enableCliSessionEpoch)
+        return 'none';
+    if (providerName === 'codex-cli' && localStorageMode)
+        return 'codex-app-server';
+    return 'pty';
+}
 function runtimePayloadForDisplay(providerName, model, runtimeMode, runtimeSource) {
     return {
         mode: runtimeMode,
@@ -4783,6 +4905,9 @@ function configuredRuntimeLabelForProfile(profile) {
 async function buildChatRuntimeForTest(profile) {
     return buildChatRuntime(profile);
 }
+function resolveDirectCliSessionTransportForTest(providerName, enableCliSessionEpoch, localStorageMode) {
+    return resolveDirectCliSessionTransport(providerName, enableCliSessionEpoch, localStorageMode);
+}
 function buildConfiguredMessageModel(profile) {
     if (!profile)
         return '';
@@ -4808,100 +4933,231 @@ function hydrateMessageDisplayMetadata(message) {
         model: [modelBase, runtimeLabel].filter(Boolean).join(' | '),
     };
 }
-function classifyOrchestratorProgress(status) {
-    const trimmed = String(status || '').trim();
-    if (!trimmed)
-        return {};
-    const match = trimmed.match(/^([a-z][a-z0-9_ -]{1,48})::\s*(.+)$/i);
-    if (!match) {
-        return {
-            activityText: trimmed.replace(/\*\*/g, '').replace(/\s+/g, ' ').trim(),
-            chatText: trimmed,
-        };
+function buildLocalDesktopDirectPrompt(input) {
+    const isCliProvider = index_1.CLI_PROVIDERS.has(input.currentProvider);
+    const useCompletionSentinel = !!input.useCompletionSentinel;
+    const useCliHistoryBootstrap = isCliProvider && !input.isCliRecurring;
+    const crossBotReplies = isCliProvider && input.isCliRecurring
+        ? getLatestOtherBotReplies(input.conversationId, input.currentBotId, input.currentBotName)
+        : [];
+    const contract = !isCliProvider || !input.isCliRecurring
+        ? 'api_or_fresh_cli'
+        : crossBotReplies.length > 0
+            ? 'cli_recurring_multibot'
+            : 'cli_recurring_single';
+    const lines = [
+        '[Bot Identity]',
+        input.soulMd.trim(),
+        '',
+        'If the provided context is not enough, use available tools to get what you need.',
+        '',
+        '[Response Style]',
+        'Write in short readable paragraphs.',
+        'Put a blank line between distinct ideas.',
+        'Use bullets when listing findings, steps, or issues.',
+        'Do not return one dense wall of text.',
+        'Keep progress updates compact and factual.',
+        'Do not mention bootstrap files, history files, file paths, or that you loaded context unless the user explicitly asks about them.',
+    ];
+    if (useCompletionSentinel) {
+        lines.push(completion_marker_1.CLI_COMPLETION_INSTRUCTION);
     }
-    const roleName = match[1].trim().toLowerCase();
-    const detail = match[2].trim();
-    if (roleName === 'intent_classifier') {
-        if (/decomposing request|classifying request/i.test(detail)) {
-            return { activityText: 'Classifying request', chatText: 'Classifying request..' };
+    const projectLines = [];
+    if (input.projectName)
+        projectLines.push(`Project: ${input.projectName}`);
+    if (input.topicTitle)
+        projectLines.push(`Topic: ${input.topicTitle}`);
+    projectLines.push(`Workspace: ${input.workspacePath || '(project folder not configured)'}`);
+    if (input.timezone)
+        projectLines.push(`Timezone: ${input.timezone}`);
+    lines.push('', '[Project Overview]', ...projectLines);
+    const toolManifest = isCliProvider ? '' : buildLocalDesktopToolManifest(input.availableTools, contract);
+    if (toolManifest) {
+        lines.push('', '[Available Tools]', toolManifest);
+        if (/\bsearch_local_memory\b|\bsearch_memory\b/i.test(toolManifest)) {
+            lines.push('If the user refers to prior project or conversation context that is not included here, search with these tools first.');
         }
-        if (/routed single intent as (.+)$/i.test(detail)) {
-            const classifiedAs = detail.replace(/^routed single intent as\s+/i, '').trim();
-            return { activityText: `Classified as ${classifiedAs}`, chatText: `Classified as ${classifiedAs}..` };
+    }
+    if (contract === 'api_or_fresh_cli' && !useCliHistoryBootstrap) {
+        const summaryWindow = (0, context_window_1.getPromptContextWindow)(input.conversationId, safeguards_1.SAFEGUARDS.CONTEXT_WINDOW_TURNS);
+        if (summaryWindow.summary?.summary_text?.trim()) {
+            lines.push('', '[Context Summary]', summaryWindow.summary.summary_text.trim());
         }
-        const orderedCount = detail.match(/decomposed request into (\d+) ordered intents/i);
-        if (orderedCount) {
-            return { activityText: `${orderedCount[1]} ordered steps established` };
+        const recentTurnsWindow = (0, context_window_1.getPromptContextWindow)(input.conversationId, summaryWindow.summary?.summary_text?.trim()
+            ? safeguards_1.SAFEGUARDS.CONTEXT_WINDOW_TURNS
+            : safeguards_1.SAFEGUARDS.NO_SUMMARY_CONTEXT_WINDOW_TURNS);
+        if (recentTurnsWindow.turns.length > 0) {
+            lines.push('', '[Recent Messages]', (0, context_window_1.formatTurnsForPrompt)(recentTurnsWindow.turns));
         }
-        return {};
     }
-    if (roleName === 'orchestration_planner') {
-        if (/planning multi-step workflow/i.test(detail)) {
-            return { activityText: 'Planning multi-step workflow', chatText: 'Planning multi-step workflow' };
-        }
-        const prepared = detail.match(/prepared (\d+) workflow steps/i);
-        if (prepared) {
-            return {
-                activityText: `${prepared[1]} workflow steps established`,
-                chatText: `${prepared[1]} workflow steps established`,
-            };
-        }
-        return {};
+    let effectiveUserPrompt = input.userPrompt;
+    if (useCliHistoryBootstrap && input.cliHistoryFilePath) {
+        effectiveUserPrompt = [
+            `Please read the history file at: ${input.cliHistoryFilePath}`,
+            'Use it for context only.',
+            'There is no need to mention the file, its path, or that you loaded context unless the user explicitly asks about it.',
+            'Then respond to the user request below.',
+            '',
+            'Current user request:',
+            input.userPrompt,
+        ].join('\n');
     }
-    if (roleName === 'dispatch_controller') {
-        if (/still working:/i.test(detail))
-            return {};
-        if (/locked .* execution/i.test(detail))
-            return {};
-        return { activityText: detail };
+    if (contract === 'cli_recurring_multibot' && crossBotReplies.length > 0) {
+        effectiveUserPrompt = [
+            '[Cross-Bot Context]',
+            ...crossBotReplies.map((line) => `- ${line}`),
+            '',
+            'Current user request:',
+            input.userPrompt,
+        ].join('\n');
     }
-    if (roleName === 'orchestrator') {
-        return {
-            activityText: detail,
-        };
+    if (useCompletionSentinel) {
+        effectiveUserPrompt = [
+            effectiveUserPrompt,
+            '',
+            `Required final line when the response is fully complete: ${completion_marker_1.CLI_COMPLETION_SENTINEL}`,
+            'Do not mention or explain the tag.',
+        ].join('\n');
     }
-    if (roleName === 'policy_interpreter' || roleName === 'verifier') {
-        return { activityText: detail };
+    return {
+        systemPrompt: lines.join('\n').trim(),
+        userPrompt: effectiveUserPrompt,
+    };
+}
+function buildLocalDesktopDirectPromptForTest(input) {
+    return buildLocalDesktopDirectPrompt(input);
+}
+function writeCliBootstrapHistoryFile(input) {
+    const historyDir = path.join(input.projectPath, 'history');
+    const filename = `${input.conversationId}--${input.botId}.txt`;
+    const historyFilePath = path.join(historyDir, filename);
+    const historyContent = buildCliBootstrapHistoryContent(input.conversationId, input.topicId);
+    try {
+        fs.mkdirSync(historyDir, { recursive: true });
+        cleanupStaleCliHistoryFiles(historyDir);
+        fs.writeFileSync(historyFilePath, historyContent, 'utf8');
+        return historyFilePath;
+    }
+    catch (err) {
+        console.warn(chalk_1.default.yellow(`  [cli-history] Failed to write bootstrap history file: ${err instanceof Error ? err.message : String(err)}`));
+        return null;
     }
-    return {};
 }
-/** Derive user-visible interim messages from orchestrator progress for key transitions */
-function deriveOrchestratorInterimMessage(status) {
+function buildCliBootstrapHistoryContent(conversationId, topicId) {
+    const lines = [];
+    const previousConversationId = topicId ? data.getPreviousConversationInTopic(conversationId)?.id || null : null;
+    lines.push('[Bootstrap History]');
+    if (!topicId) {
+        lines.push('No prior topic history is available for this conversation.');
+        return lines.join('\n').trim();
+    }
+    if (!previousConversationId) {
+        lines.push('No prior topic history is available for this conversation.');
+        return lines.join('\n').trim();
+    }
+    const rollingSummary = (0, context_window_1.getLatestRollingSummary)(previousConversationId);
+    const recentTurns = (0, context_window_1.getRecentTurns)(previousConversationId, 5);
+    if (rollingSummary?.summary_text?.trim()) {
+        lines.push('', '[Running Summary]', rollingSummary.summary_text.trim());
+    }
+    if (recentTurns.length > 0) {
+        lines.push('', '[Last 5 Turns]', (0, context_window_1.formatTurnsForPrompt)(recentTurns));
+    }
+    else {
+        lines.push('', '[Last 5 Turns]', '(no recent topic turns)');
+    }
+    return lines.join('\n').trim();
+}
+function cleanupStaleCliHistoryFiles(historyDir) {
+    const maxAgeMs = 14 * 24 * 60 * 60 * 1000;
+    const now = Date.now();
+    try {
+        const files = fs.readdirSync(historyDir);
+        for (const file of files) {
+            if (!file.toLowerCase().endsWith('.txt'))
+                continue;
+            const fullPath = path.join(historyDir, file);
+            try {
+                const stat = fs.statSync(fullPath);
+                if (now - stat.mtimeMs > maxAgeMs) {
+                    fs.unlinkSync(fullPath);
+                }
+            }
+            catch {
+                // best effort cleanup only
+            }
+        }
+    }
+    catch {
+        // best effort cleanup only
+    }
+}
+function buildLocalDesktopToolManifest(availableTools, contract) {
+    const selectedTools = contract === 'api_or_fresh_cli'
+        ? availableTools
+        : availableTools.filter((tool) => ['search_local_memory', 'search_memory'].includes(tool.name));
+    return selectedTools
+        .map((tool) => `- ${tool.name}: ${tool.description}`)
+        .join('\n')
+        .trim();
+}
+function getLatestOtherBotReplies(conversationId, currentBotId, currentBotName) {
+    const turns = (0, context_window_1.getPromptContextWindow)(conversationId, safeguards_1.SAFEGUARDS.NO_SUMMARY_CONTEXT_WINDOW_TURNS).turns;
+    const seen = new Set();
+    const replies = [];
+    for (let turnIndex = turns.length - 1; turnIndex >= 0; turnIndex -= 1) {
+        const turn = turns[turnIndex];
+        for (let responseIndex = turn.responses.length - 1; responseIndex >= 0; responseIndex -= 1) {
+            const response = turn.responses[responseIndex];
+            if (response.role !== 'assistant')
+                continue;
+            const identity = String(response.bot_id || response.agent_name || '').trim();
+            if (!identity)
+                continue;
+            const sameBot = (response.bot_id && response.bot_id === currentBotId)
+                || (response.agent_name && response.agent_name === currentBotName);
+            if (sameBot || seen.has(identity))
+                continue;
+            const content = String(response.content || '').trim();
+            if (!content)
+                continue;
+            seen.add(identity);
+            replies.unshift(`${response.agent_name || 'Assistant'} (${response.created_at}): ${content}`);
+        }
+    }
+    return replies;
+}
+function classifyOrchestratorProgress(status) {
     const trimmed = String(status || '').trim();
+    if (!trimmed)
+        return {};
     const match = trimmed.match(/^([a-z][a-z0-9_ -]{1,48})::\s*(.+)$/i);
     if (!match)
-        return null;
+        return {};
     const roleName = match[1].trim().toLowerCase();
     const detail = match[2].trim();
-    // Intent classification → "I'll analyze this request..."
-    if (roleName === 'intent_classifier') {
-        if (/classif/i.test(detail))
-            return null; // skip classification (too early)
-        if (/decomposed request into (\d+)/i.test(detail)) {
-            const m = detail.match(/(\d+)/);
-            return `I've broken this down into ${m?.[1] || 'multiple'} steps. Let me work through them...`;
-        }
-        if (/routed single intent/i.test(detail))
-            return null; // handled by dispatch
+    if (/(intent_classifier|orchestration_planner|dispatch_controller|policy_interpreter|verifier)/i.test(roleName)) {
+        return {};
     }
-    // Dispatch → "I'm sending this to [Bot Name]..."
-    if (roleName === 'dispatch_controller') {
-        const routingMatch = detail.match(/routing (?:direct )?request to (.+)/i);
-        if (routingMatch) {
-            return `Sending this to ${routingMatch[1]}...`;
+    if (roleName === 'orchestrator') {
+        if (/^understanding request$/i.test(detail)
+            || /^still understanding the request$/i.test(detail)
+            || /is working on the request/i.test(detail)
+            || /completed the request/i.test(detail)) {
+            return {};
         }
-        const connectMatch = detail.match(/connecting request to (.+)/i);
-        if (connectMatch) {
-            return `Connecting to ${connectMatch[1]}...`;
+        if (/hit an issue while working/i.test(detail)) {
+            return { activityText: detail };
         }
     }
+    return {};
+}
+/** Derive user-visible interim messages from orchestrator progress for key transitions */
+function deriveOrchestratorInterimMessage(status) {
+    void status;
+    // Intent classification → "I'll analyze this request..."
+    // Dispatch → "I'm sending this to [Bot Name]..."
     // Orchestration planner → workflow planning
-    if (roleName === 'orchestration_planner') {
-        const stepsMatch = detail.match(/prepared (\d+) workflow steps/i);
-        if (stepsMatch) {
-            return `I've prepared a ${stepsMatch[1]}-step workflow. Starting execution...`;
-        }
-    }
     return null;
 }
 function resolveCliNameForProvider(providerName) {
@@ -4931,6 +5187,11 @@ function detectInteractiveAuthFailure(text, activeProviderName, configuredProvid
     };
 }
 const LOCAL_RUNTIME_RETRY_LIMIT = 2;
+function isClaudeFreshSessionStartupFailure(err) {
+    return err?.code === 'CLAUDE_FRESH_SESSION_STARTUP_TIMEOUT'
+        || err?.name === 'ClaudeFreshSessionStartupTimeoutError'
+        || /fresh session startup timed out/i.test(String(err?.message || err || ''));
+}
 function shouldRetrySelectedLocalRuntime(err) {
     const text = String(err?.message || err || '').toLowerCase();
     if (!text)