@kenkaiiii/ggcoder 4.3.216 → 4.3.218

package/dist/ui/App.js

@@ -4,7 +4,6 @@ import { Box, Text, useStdout } from "ink";
 import { useTerminalSize } from "./hooks/useTerminalSize.js";
 import { useDoublePress } from "./hooks/useDoublePress.js";
 import { useTaskBarStore, useTaskBarPolling, focusTaskBar, exitTaskBar, expandTaskBar, collapseTaskBar, navigateTaskBar, killTask, } from "./stores/taskbar-store.js";
-import { writeFileSync } from "node:fs";
 import { playNotificationSound } from "../utils/sound.js";
 import { formatError, } from "@kenkaiiii/gg-ai";
 import { extractImagePaths } from "../utils/image.js";
@@ -30,14 +29,14 @@ import { PlanOverlay } from "./components/PlanOverlay.js";
 import { ModelSelector } from "./components/ModelSelector.js";
 import { GoalOverlay } from "./components/GoalOverlay.js";
 import { PixelOverlay } from "./components/PixelOverlay.js";
-import { buildGoalFinalSummarySections, buildGoalSummaryRows, goalPassedDetail, } from "./goal-summary.js";
 import { SkillsOverlay } from "./components/SkillsOverlay.js";
 import { ThemeSelector } from "./components/ThemeSelector.js";
 import { BackgroundTasksBar, getFooterStatusLayoutDecision, } from "./components/BackgroundTasksBar.js";
 import { useTheme, useSetTheme } from "./theme/theme.js";
 import { useTerminalTitle } from "./hooks/useTerminalTitle.js";
 import { getGitBranch } from "../utils/git.js";
-import { getModel, getContextWindow, getMaxThinkingLevel } from "../core/model-registry.js";
+import { getModel, getContextWindow } from "../core/model-registry.js";
+import { BLACK_CIRCLE } from "./constants/figures.js";
 import { SessionManager } from "../core/session-manager.js";
 import { appendMessagesToSession as appendSessionMessages, createCompactedSessionCheckpoint, } from "../core/session-compaction.js";
 import { log } from "../core/logger.js";
@@ -52,18 +51,29 @@ import { loadCustomCommands } from "../core/custom-commands.js";
 import { buildSystemPrompt } from "../system-prompt.js";
 import { detectLanguages, LANGUAGE_DISPLAY_NAMES, } from "../core/language-detector.js";
 import { detectVerifyCommands } from "../core/verify-commands.js";
-import { FOCUSED_REPO_MAP_MAX_CHARS, FIRST_TURN_REPO_MAP_MAX_CHARS, buildRepoMap, createRepoMapCache, } from "../core/repomap.js";
+import { buildRepoMap, createRepoMapCache, } from "../core/repomap.js";
+import { getRepoMapBudgetForContext } from "../core/repomap-budget.js";
 import { getLatestUserText, injectRepoMapContextMessages, stripRepoMapContextMessages, } from "../core/repomap-context.js";
 import { extractPlanSteps, findCompletedMarkers, markStepsCompleted, segmentDisplayText, stripDoneMarkers, } from "../utils/plan-steps.js";
 import { getMCPServers } from "../core/mcp/index.js";
 import { trimFlushedItems, flushOnTurnText, flushOnTurnEnd, flushOverflow, } from "./live-item-flush.js";
 import { splitAssistantStreamingText } from "./utils/assistant-stream-split.js";
 import { appendGoalDecision, appendGoalEvidence, formatGoalBlockingPrerequisites, goalHasBlockingPrerequisites, loadGoalRuns, reconcileActiveGoalRuns, updateGoalTask, upsertGoalRun, } from "../core/goal-store.js";
-import { canCompleteGoalRun, decideGoalNextAction, } from "../core/goal-controller.js";
+import { canCompleteGoalRun, decideGoalNextAction } from "../core/goal-controller.js";
 import { runGoalPrerequisiteChecks } from "../core/goal-prerequisites.js";
 import { runGoalVerifierCommand } from "../core/goal-verifier.js";
 import { listGoalWorkers, startGoalWorker, stopGoalWorker, subscribeGoalWorkerCompletions, } from "../core/goal-worker.js";
 import { formatGoalVerifierCompletionEvent, formatGoalWorkerCompletionEvent, isGoalSyntheticEvent, parseGoalSyntheticEvent, } from "./goal-events.js";
+import { buildUserContentWithAttachments, isGoalPromptCommandName, routePromptCommandInput, runGoalPromptSetupSequence, } from "./prompt-routing.js";
+import { getNextThinkingLevel, isThinkingLevelSupported } from "./thinking-level.js";
+import { appendGoalProgressDraft, completedItemsWithDurableGoalTerminalProgress, formatGoalTerminalProgress, formatGoalWorkerFinishedTitle, getGoalContinuationChoiceKey, goalTerminalProgressId, routeGoalSyntheticEvent, summarizeGoalCompletion, truncateGoalProgressText, } from "./goal-progress.js";
+import { getChatControlsLayoutDecision, getDoneFlushDecision, getGoalActivationPaneTransition, getGoalSetupFinishedPaneTransition, getGoalSetupPaneTransitionAfterRun, isAgentSpacingItem, MIN_LIVE_AREA_ROWS, nextGoalModeAfterAgentDone, shouldResetUIForGoalSetupPaneTransition, shouldTopSpaceAfterPrintedAgentBoundary, shouldTopSpaceAssistantAfterToolBoundary, shouldTopSpaceStreamingAssistant, } from "./layout-decisions.js";
+import { compactHistory, getNextGeneratedItemId, isActiveItem, isSameAssistantText, normalizeAssistantText, partitionCompleted, pinStreamingTextBeforeToolBoundary, } from "./item-helpers.js";
+export { buildGoalSetupPromptFromPlanner, buildUserContentWithAttachments, collectAssistantTextSince, isGoalPromptCommandName, routePromptCommandInput, runGoalPromptSetupSequence, } from "./prompt-routing.js";
+export { getNextThinkingLevel } from "./thinking-level.js";
+export { appendGoalProgressDraft, completedItemsWithDurableGoalTerminalProgress, formatGoalTerminalProgress, getGoalContinuationChoiceKey, routeGoalSyntheticEvent, truncateGoalProgressText, } from "./goal-progress.js";
+export { getChatControlsLayoutDecision, getDoneFlushDecision, getGoalActivationPaneTransition, getGoalSetupFinishedPaneTransition, getGoalSetupPaneTransitionAfterRun, getScrollStabilizationDecision, getStaticHistoryKey, hasParagraphBreakLiveUserMessage, isTallLiveUserMessage, nextGoalModeAfterAgentDone, shouldHideHistoryForOverlayView, shouldHideStaticItemsForOverlayView, shouldResetUIForGoalSetupPaneTransition, shouldStabilizeOverlayPaneRerender, shouldTopSpaceAfterPrintedAgentBoundary, shouldTopSpaceAssistantAfterToolBoundary, shouldTopSpaceStreamingAssistant, } from "./layout-decisions.js";
+export { getNextGeneratedItemId, isActiveItem, partitionCompleted, pinStreamingTextBeforeToolBoundary, } from "./item-helpers.js";
 /** Where ggcoder bugs should be reported. Surfaced in the guidance line. */
 const GGCODER_BUG_REPORT_URL = "github.com/kenkaiiii/gg-framework/issues";
 /**
@@ -97,161 +107,27 @@ function toErrorItem(err, id, contextPrefix) {
         id,
     };
 }
-export function routePromptCommandInput(input, promptCommands = PROMPT_COMMANDS, customCommands = []) {
-    const trimmed = input.trim();
-    if (!trimmed.startsWith("/"))
-        return null;
-    const parts = trimmed.slice(1).split(" ");
-    const cmdName = parts[0];
-    const cmdArgs = parts.slice(1).join(" ").trim();
-    const builtinCmd = promptCommands.find((c) => c.name === cmdName || c.aliases.includes(cmdName));
-    const customCmd = !builtinCmd ? customCommands.find((c) => c.name === cmdName) : undefined;
-    const promptText = builtinCmd?.prompt ?? customCmd?.prompt;
-    if (!promptText)
-        return null;
-    return {
-        cmdName,
-        cmdArgs,
-        promptText,
-        fullPrompt: cmdArgs ? `${promptText}\n\n## User Instructions\n\n${cmdArgs}` : promptText,
-    };
-}
-const GOAL_PLANNER_OUTPUT_MAX_CHARS = 2400;
-function messageTextContent(message) {
-    if (typeof message.content === "string")
-        return message.content;
-    return message.content
-        .filter((part) => part.type === "text")
-        .map((part) => part.text)
-        .join("\n");
-}
-export function collectAssistantTextSince(messages, startIndex, maxChars = GOAL_PLANNER_OUTPUT_MAX_CHARS) {
-    const text = messages
-        .slice(startIndex)
-        .filter((message) => message.role === "assistant")
-        .map(messageTextContent)
-        .join("\n")
-        .trim();
-    if (text.length <= maxChars)
-        return text;
-    return text.slice(0, maxChars).trimEnd() + "\n[planner output truncated]";
-}
-export function buildGoalSetupPromptFromPlanner({ originalGoalPrompt, plannerOutput, }) {
-    const compactPlannerOutput = plannerOutput.trim() || "GOAL_PLAN\nresearch=none\nEND_GOAL_PLAN";
-    return (`${originalGoalPrompt.trim()}\n\n` +
-        `## Goal Planner Output\n\n${compactPlannerOutput}\n\n` +
-        `Use the original objective plus this planner output to create durable Goal setup only. ` +
-        `Do not redo planner research unless the planner output is unusable.`);
-}
-export function isGoalPromptCommandName(cmdName) {
-    return getPromptCommand(cmdName)?.name === "goal";
-}
-export async function runGoalPromptSetupSequence({ userContent, fullPrompt, messagesRef, setGoalModeAndPrompt, runAgent, onStage, }) {
-    onStage?.("Planning Goal setup");
-    await setGoalModeAndPrompt("planner");
-    const plannerStartIndex = messagesRef.current.length;
-    await runAgent(userContent);
-    const plannerOutput = collectAssistantTextSince(messagesRef.current, plannerStartIndex);
-    const setupPrompt = buildGoalSetupPromptFromPlanner({
-        originalGoalPrompt: fullPrompt,
-        plannerOutput,
-    });
-    await setGoalModeAndPrompt("setup");
-    onStage?.("Creating Goal run");
-    await runAgent(setupPrompt);
-}
+/** Tools that get aggregated into a single compact group when possible. */
+const AGGREGATABLE_TOOLS = new Set([
+    "read",
+    "grep",
+    "find",
+    "ls",
+    "mcp__kencode-search__searchCode",
+    "mcp__kencode-search__referenceSources",
+    "mcp__kencode-search__discoverRepos",
+]);
+const RUNNING_INDICATOR_ANIMATION_MS = 1_200;
 function buildGoalTaskPromptWithReferences(run, taskPrompt) {
     if (taskPrompt.includes("## Goal References (MANDATORY)"))
         return taskPrompt;
     const references = formatGoalReferencesForPrompt(run.references ?? []);
     return references ? `${references}\n\n${taskPrompt}` : taskPrompt;
 }
-export function buildUserContentWithAttachments(text, inputImages, modelSupportsImages) {
-    if (inputImages.length === 0)
-        return text;
-    const parts = [];
-    if (text) {
-        parts.push({ type: "text", text });
-    }
-    for (const img of inputImages) {
-        if (img.kind === "text") {
-            parts.push({
-                type: "text",
-                text: `<file name="${img.fileName}">\n${img.data}\n</file>`,
-            });
-        }
-        else if (modelSupportsImages) {
-            parts.push({ type: "image", mediaType: img.mediaType, data: img.data });
-        }
-        else {
-            // GLM models: save image to temp file and instruct model to use vision MCP tool
-            const ext = img.mediaType.split("/")[1] ?? "png";
-            const tmpPath = `/tmp/ggcoder-img-${Date.now()}.${ext}`;
-            try {
-                writeFileSync(tmpPath, Buffer.from(img.data, "base64"));
-                parts.push({
-                    type: "text",
-                    text: `[User attached an image saved at: ${tmpPath} — use the image_analysis tool to view and analyze it]`,
-                });
-            }
-            catch {
-                parts.push({
-                    type: "text",
-                    text: `[User attached an image but it could not be saved for analysis]`,
-                });
-            }
-        }
-    }
-    // If only text parts remain after stripping images, simplify to plain string
-    return parts.length === 1 && parts[0].type === "text" ? parts[0].text : parts;
-}
-/** Tools that get aggregated into a single compact group when possible. */
-const AGGREGATABLE_TOOLS = new Set(["read", "grep", "find", "ls"]);
-const RUNNING_INDICATOR_ANIMATION_MS = 1_200;
-/**
- * Cap memory by replacing old finalized rows with tiny tombstones. The full
- * transcript is already printed into terminal scrollback, so the in-memory copy
- * only needs enough recent structure to survive remounts and session mirroring.
- */
-const MAX_LIVE_HISTORY = 200;
-function compactHistory(items) {
-    if (items.length <= MAX_LIVE_HISTORY)
-        return items;
-    const cutoff = items.length - MAX_LIVE_HISTORY;
-    const compacted = new Array(items.length);
-    for (let i = 0; i < cutoff; i++) {
-        const it = items[i];
-        compacted[i] = it.kind === "tombstone" ? it : { kind: "tombstone", id: it.id };
-    }
-    for (let i = cutoff; i < items.length; i++) {
-        compacted[i] = items[i];
-    }
-    return compacted;
-}
-function summarizeGoalCompletion(summary) {
-    const lines = summary
-        .split("\n")
-        .map((line) => line.trim())
-        .filter((line) => line.length > 0 && line !== "[agent_done]");
-    const statusLine = lines.find((line) => /^Status:/i.test(line));
-    const changedLine = lines.find((line) => /^(Changed|Implemented|Fixed|Added|Key findings|Full verifier)/i.test(line));
-    const verificationLine = lines.find((line) => /^(Verification|Verified|Result):/i.test(line));
-    return statusLine ?? changedLine ?? verificationLine ?? lines[0];
-}
-const GOAL_PROGRESS_TEXT_LIMIT = 72;
-export function truncateGoalProgressText(text) {
-    const normalized = text.replace(/\s+/g, " ").trim();
-    if (normalized.length <= GOAL_PROGRESS_TEXT_LIMIT)
-        return normalized;
-    return `${normalized.slice(0, GOAL_PROGRESS_TEXT_LIMIT - 1).trimEnd()}…`;
-}
-function formatGoalWorkerFinishedTitle(taskTitle, status) {
-    const prefix = status === "done" ? "Done" : "Failed";
-    return truncateGoalProgressText(`${prefix}: ${taskTitle}`);
-}
 function goalProgressLoaderStatus(item) {
-    if (item.status === "failed" || item.status === "fail" || item.status === "blocked")
+    if (item.status === "failed" || item.status === "fail" || item.status === "blocked") {
         return "error";
+    }
     if (item.phase === "worker_finished" ||
         item.phase === "verifier_finished" ||
         item.phase === "terminal") {
@@ -274,371 +150,6 @@ function goalProgressColor(item, theme) {
         return theme.warning;
     return theme.primary;
 }
-function goalTerminalProgressId(run) {
-    return `goal-terminal-${run.id}`;
-}
-function goalTerminalRunIdFromItem(item) {
-    if (item.kind !== "goal_progress" || item.phase !== "terminal")
-        return undefined;
-    if (!item.id.startsWith("goal-terminal-"))
-        return undefined;
-    return item.id.slice("goal-terminal-".length);
-}
-function goalProgressMatchesDraft(item, draft) {
-    return (item.phase === draft.phase &&
-        item.title === draft.title &&
-        item.detail === draft.detail &&
-        item.workerId === draft.workerId &&
-        item.status === draft.status &&
-        JSON.stringify(item.summaryRows ?? []) === JSON.stringify(draft.summaryRows ?? []) &&
-        JSON.stringify(item.summarySections ?? []) === JSON.stringify(draft.summarySections ?? []));
-}
-export function appendGoalProgressDraft(items, draft, makeId) {
-    const previous = items.at(-1);
-    if (previous?.kind === "goal_progress" && goalProgressMatchesDraft(previous, draft)) {
-        return items;
-    }
-    return [...items, { ...draft, id: makeId() }];
-}
-/**
- * Reconcile terminal Goal cards that are already visible in this UI session.
- *
- * This intentionally does not synthesize missing cards from durable GoalRun
- * state. Goal terminal cards are event notifications: they should appear when
- * the terminal event happens in the current UI, not whenever a fresh session
- * polls old Goal runs from the Goal pane. Callers that just observed a terminal
- * event append that card first, then use this helper to tombstone stale older
- * cards for the same run.
- */
-export function getNextGeneratedItemId(items) {
-    let max = -1;
-    for (const item of items) {
-        const raw = item.id.startsWith("ui-") ? item.id.slice(3) : item.id;
-        const n = Number(raw);
-        if (Number.isInteger(n) && n >= 0 && n > max)
-            max = n;
-    }
-    return max + 1;
-}
-export function completedItemsWithDurableGoalTerminalProgress(items, runs) {
-    const runIds = new Set(runs.map((run) => run.id));
-    const terminalByRun = new Map(runs
-        .map((run) => [run.id, formatGoalTerminalProgress(run)])
-        .filter((entry) => entry[1] !== null));
-    if (runIds.size === 0)
-        return items;
-    let changed = false;
-    const reconciled = items.map((item, index) => {
-        const runId = goalTerminalRunIdFromItem(item);
-        if (!runId || !runIds.has(runId))
-            return item;
-        const draft = terminalByRun.get(runId);
-        if (draft && goalProgressMatchesDraft(item, draft))
-            return item;
-        changed = true;
-        return { kind: "tombstone", id: `tombstone-${item.id}-${index}` };
-    });
-    return changed ? reconciled : items;
-}
-export function formatGoalTerminalProgress(run) {
-    switch (run.status) {
-        case "passed":
-            return {
-                kind: "goal_progress",
-                phase: "terminal",
-                title: `Goal passed: ${run.title}`,
-                detail: goalPassedDetail(run),
-                summaryRows: buildGoalSummaryRows(run),
-                summarySections: buildGoalFinalSummarySections(run),
-                status: run.status,
-            };
-        case "failed":
-            return {
-                kind: "goal_progress",
-                phase: "terminal",
-                title: `Goal failed: ${run.title}`,
-                detail: "Auto-continuation stopped. Check Goal tasks for the failing step.",
-                summaryRows: buildGoalSummaryRows(run),
-                status: run.status,
-            };
-        case "blocked":
-            return {
-                kind: "goal_progress",
-                phase: "terminal",
-                title: `Goal blocked: ${run.title}`,
-                detail: goalHasBlockingPrerequisites(run)
-                    ? formatGoalBlockingPrerequisites(run)
-                    : (run.blockers[0] ?? "A prerequisite or missing verifier blocked progress."),
-                summaryRows: buildGoalSummaryRows(run),
-                status: run.status,
-            };
-        case "paused":
-            return {
-                kind: "goal_progress",
-                phase: "terminal",
-                title: `Goal paused: ${run.title}`,
-                detail: run.blockers[0] ?? "Auto-continuation paused.",
-                summaryRows: buildGoalSummaryRows(run),
-                status: run.status,
-            };
-        case "draft":
-        case "ready":
-        case "running":
-        case "verifying":
-            return null;
-    }
-}
-export function shouldHideHistoryForOverlayView(isOverlayView, _isAgentRunning) {
-    // Overlay panes are standalone full-screen states. Finalized chat rows are
-    // printed outside Ink, so overlays should never replay transcript UI behind them.
-    return isOverlayView;
-}
-export function shouldStabilizeOverlayPaneRerender({ overlayPane, isAgentRunning, }) {
-    return isAgentRunning && overlayPane === "goal";
-}
-export function shouldHideStaticItemsForOverlayView({ shouldHideHistoryForOverlay, stabilizeOverlayPaneRerender: _stabilizeOverlayPaneRerender, }) {
-    return shouldHideHistoryForOverlay;
-}
-export function getDoneFlushDecision({ planOverlayPending, goalMode, goalAutoExpand, }) {
-    return {
-        showDoneStatus: !(planOverlayPending ||
-            goalMode === "planner" ||
-            goalMode === "setup" ||
-            goalAutoExpand),
-        flushLiveItems: true,
-    };
-}
-export function getGoalSetupFinishedPaneTransition() {
-    return {
-        overlay: "goal",
-        goalAutoExpand: true,
-        planAutoExpand: false,
-        suppressDoneStatus: true,
-    };
-}
-export function getGoalSetupPaneTransitionAfterRun({ isGoalSetupCommand, setupPanePending, }) {
-    return isGoalSetupCommand && setupPanePending ? getGoalSetupFinishedPaneTransition() : null;
-}
-export function shouldResetUIForSetupPaneTransition({ hasResetUI, hasSessionStore, }) {
-    // Opening a review pane is a full-screen state transition. A bare React state
-    // flip hides history in the virtual tree, but it does not reset Ink/log-update's
-    // already-written terminal frame, so the pane can render below prior chat.
-    return hasResetUI && hasSessionStore;
-}
-export const shouldResetUIForGoalSetupPaneTransition = shouldResetUIForSetupPaneTransition;
-export function getGoalActivationPaneTransition() {
-    return { overlay: null, goalAutoExpand: false, planAutoExpand: false, resetReviewScreen: true };
-}
-export function getGoalContinuationChoiceKey({ runId, decision, }) {
-    switch (decision.kind) {
-        case "create_task":
-            return `${runId}:create_task:${decision.title}:${decision.prompt}`;
-        case "start_worker":
-        case "pause":
-            return `${runId}:${decision.kind}:${decision.task.id}:${decision.attempts}`;
-        case "run_verifier":
-            return `${runId}:run_verifier:${decision.command}`;
-        case "blocked":
-        case "complete":
-        case "terminal":
-        case "wait":
-            return `${runId}:${decision.kind}:${decision.reason}`;
-    }
-}
-export function getScrollStabilizationDecision({ isUserScrolled, hasNewOutput, hasTallLiveUserMessage = false, hasParagraphBreakLiveUserMessage = false, }) {
-    const shouldPreserveStatic = isUserScrolled || hasTallLiveUserMessage || hasParagraphBreakLiveUserMessage;
-    const shouldAutoFollow = !(isUserScrolled || hasTallLiveUserMessage);
-    return {
-        preserveStatic: shouldPreserveStatic && hasNewOutput,
-        autoFollow: shouldAutoFollow,
-    };
-}
-export function nextGoalModeAfterAgentDone({ currentMode, runningGoalIds, queuedSyntheticEvents, activeContinuationFlights = 0, wasGoalSetupTurn, }) {
-    if (wasGoalSetupTurn)
-        return "off";
-    if (currentMode === "planner" || currentMode === "setup")
-        return currentMode;
-    if (queuedSyntheticEvents > 0)
-        return "coordinator";
-    if (activeContinuationFlights > 0)
-        return "coordinator";
-    if (currentMode === "coordinator" && runningGoalIds > 0)
-        return "coordinator";
-    return "off";
-}
-export function hasParagraphBreakLiveUserMessage(text) {
-    return /\n[ \t]*\n/.test(text);
-}
-export function isTallLiveUserMessage(text, rows) {
-    return text.split("\n").length > Math.max(8, Math.floor(rows * 0.6));
-}
-export function getStaticHistoryKey({ resizeKey }) {
-    return `${resizeKey}`;
-}
-const MIN_LIVE_AREA_ROWS = 3;
-const INPUT_AREA_ROWS = 3;
-const STATUS_SLOT_ROWS = 2;
-const FOOTER_ONE_LINE_ROWS = 1;
-const FOOTER_TWO_LINE_ROWS = 2;
-const GOAL_STATUS_ROWS = 1;
-const COLLAPSED_FOOTER_STATUS_ROWS = 1;
-const MAX_EXPANDED_BACKGROUND_TASK_ROWS = 7;
-function isAgentSpacingKind(kind) {
-    return [
-        "assistant",
-        "queued",
-        "goal_progress",
-        "tool_start",
-        "tool_done",
-        "tool_group",
-        "server_tool_start",
-        "server_tool_done",
-        "subagent_group",
-        "info",
-        "error",
-        "stopped",
-        "plan_transition",
-        "goal_agent_transition",
-        "thinking_transition",
-        "model_transition",
-        "theme_transition",
-        "plan_event",
-        "update_notice",
-        "compacting",
-        "compacted",
-        "style_pack",
-        "setup_hint",
-    ].includes(kind);
-}
-function isToolBoundaryKind(kind) {
-    return [
-        "goal_progress",
-        "tool_start",
-        "tool_done",
-        "tool_group",
-        "server_tool_start",
-        "server_tool_done",
-        "subagent_group",
-    ].includes(kind);
-}
-function isAgentSpacingItem(item) {
-    return isAgentSpacingKind(item.kind);
-}
-export function shouldTopSpaceAfterPrintedAgentBoundary({ currentKind, previousLiveItem, lastPendingHistoryItem, lastHistoryItem, }) {
-    const needsExternalSpacing = isAgentSpacingKind(currentKind);
-    if (!needsExternalSpacing)
-        return false;
-    if (previousLiveItem !== undefined)
-        return false;
-    const previousKind = lastPendingHistoryItem?.kind ?? lastHistoryItem?.kind;
-    return previousKind !== undefined && isAgentSpacingKind(previousKind);
-}
-export function shouldTopSpaceAssistantAfterToolBoundary({ text, previousLiveItem, lastPendingHistoryItem, lastHistoryItem, }) {
-    if (text.trim().length === 0)
-        return false;
-    if (shouldTopSpaceAfterPrintedAgentBoundary({
-        currentKind: "assistant",
-        previousLiveItem,
-        lastPendingHistoryItem,
-        lastHistoryItem,
-    })) {
-        return true;
-    }
-    const previousKind = previousLiveItem?.kind;
-    return previousKind !== undefined && isToolBoundaryKind(previousKind);
-}
-export function shouldTopSpaceStreamingAssistant({ visibleStreamingText, lastLiveItem, lastPendingHistoryItem, lastHistoryItem, }) {
-    return shouldTopSpaceAssistantAfterToolBoundary({
-        text: visibleStreamingText,
-        previousLiveItem: lastLiveItem,
-        lastPendingHistoryItem,
-        lastHistoryItem,
-    });
-}
-export function getChatControlsLayoutDecision({ rows, agentRunning, activityVisible, doneStatusVisible, stallStatusVisible, exitPending, footerStatusLayout, taskBarExpanded, goalStatusEntryCount, footerFitsOnOneLine, }) {
-    const statusRows = activityVisible || stallStatusVisible || doneStatusVisible || agentRunning
-        ? STATUS_SLOT_ROWS
-        : 0;
-    const footerRows = exitPending || footerFitsOnOneLine ? FOOTER_ONE_LINE_ROWS : FOOTER_TWO_LINE_ROWS;
-    const goalRows = !exitPending && goalStatusEntryCount > 0 ? GOAL_STATUS_ROWS : 0;
-    const footerStatusRows = footerStatusLayout.stack
-        ? Number(footerStatusLayout.hasBackgroundTasks) + Number(footerStatusLayout.hasUpdateNotice)
-        : footerStatusLayout.hasBackgroundTasks || footerStatusLayout.hasUpdateNotice
-            ? COLLAPSED_FOOTER_STATUS_ROWS
-            : 0;
-    const expandedTaskRows = taskBarExpanded && footerStatusLayout.hasBackgroundTasks
-        ? MAX_EXPANDED_BACKGROUND_TASK_ROWS - COLLAPSED_FOOTER_STATUS_ROWS
-        : 0;
-    const controlsRows = statusRows + INPUT_AREA_ROWS + footerRows + goalRows + footerStatusRows + expandedTaskRows;
-    const maxControlsRows = Math.max(1, rows - MIN_LIVE_AREA_ROWS);
-    const boundedControlsRows = Math.min(controlsRows, maxControlsRows);
-    return {
-        controlsRows: boundedControlsRows,
-        liveAreaRows: Math.max(MIN_LIVE_AREA_ROWS, rows - boundedControlsRows),
-    };
-}
-// flushOnTurnText, flushOnTurnEnd are imported from ./live-item-flush.ts
-/** Check whether an item is still active (running spinner, pending result). */
-export function isActiveItem(item) {
-    switch (item.kind) {
-        case "tool_start":
-        case "server_tool_start":
-        case "queued":
-        case "compacting":
-            return true;
-        case "tool_group":
-            return item.tools.some((t) => t.status === "running");
-        case "subagent_group":
-            return item.agents.some((a) => a.status === "running");
-        default:
-            return false;
-    }
-}
-/**
- * Partition live items into completed (flushable to finalized history) and still-active.
- * Completed items precede active ones — we flush the longest contiguous prefix
- * of completed items to keep ordering stable.
- */
-export function partitionCompleted(items) {
-    // Find the first active item — everything before it is safe to flush as a
-    // single chronological prefix. Splitting assistant text out of that prefix
-    // lets later tool rows print to scrollback above the message that introduced
-    // them, so keep the prefix intact.
-    const firstActiveIdx = items.findIndex(isActiveItem);
-    if (firstActiveIdx === -1) {
-        return { flushed: items, remaining: [] };
-    }
-    if (firstActiveIdx === 0) {
-        return { flushed: [], remaining: items };
-    }
-    return {
-        flushed: items.slice(0, firstActiveIdx),
-        remaining: items.slice(firstActiveIdx),
-    };
-}
-function normalizeAssistantText(text) {
-    return stripDoneMarkers(text).trim();
-}
-function isSameAssistantText(item, text) {
-    return item.kind === "assistant" && normalizeAssistantText(item.text) === text;
-}
-export function pinStreamingTextBeforeToolBoundary({ items, visibleStreamingText, thinking, thinkingMs, makeId, }) {
-    const text = normalizeAssistantText(visibleStreamingText);
-    if (text.length === 0)
-        return items;
-    if (items.some((item) => item.kind === "assistant"))
-        return items;
-    return [
-        ...items,
-        {
-            kind: "assistant",
-            text,
-            thinking: thinking.length > 0 ? thinking : undefined,
-            thinkingMs: thinking.length > 0 ? thinkingMs : undefined,
-            id: makeId(),
-        },
-    ];
-}
 // ── Duration summary ─────────────────────────────────────
 function formatDuration(ms) {
     const totalSec = Math.round(ms / 1000);
@@ -777,7 +288,7 @@ export function App(props) {
     const [currentProvider, setCurrentProvider] = useState(props.provider);
     const [currentTools, setCurrentTools] = useState(props.tools);
     const currentToolsRef = useRef(props.tools);
-    const [thinkingEnabled, setThinkingEnabled] = useState(!!props.thinking);
+    const [thinkingLevel, setThinkingLevel] = useState(props.thinking);
     const [renderMarkdown, setRenderMarkdown] = useState(true);
     const messagesRef = useRef(props.sessionStore?.messages ?? props.messages);
     const repoMapInjectionEnabledRef = useRef(true);
@@ -923,11 +434,16 @@ export function App(props) {
     useEffect(() => {
         onRuntimeStateChange?.({ provider: currentProvider });
     }, [currentProvider, onRuntimeStateChange]);
+    useEffect(() => {
+        if (thinkingLevel && !isThinkingLevelSupported(currentProvider, currentModel, thinkingLevel)) {
+            setThinkingLevel(getNextThinkingLevel(currentProvider, currentModel, undefined));
+        }
+    }, [currentProvider, currentModel, thinkingLevel]);
     useEffect(() => {
         onRuntimeStateChange?.({
-            thinking: thinkingEnabled ? getMaxThinkingLevel(currentModel) : undefined,
+            thinking: thinkingLevel,
         });
-    }, [thinkingEnabled, currentModel, onRuntimeStateChange]);
+    }, [thinkingLevel, onRuntimeStateChange]);
     useEffect(() => {
         printHistoryItems(history);
     }, [history, printHistoryItems]);
@@ -1081,6 +597,29 @@ export function App(props) {
         }
         return newPrompt;
     }, [rebuildSystemPrompt]);
+    useEffect(() => {
+        if (!props.connectInitialMcpTools)
+            return;
+        let cancelled = false;
+        void props
+            .connectInitialMcpTools()
+            .then((mcpTools) => {
+            if (cancelled || mcpTools.length === 0)
+                return;
+            setCurrentTools((prev) => {
+                const next = [...prev.filter((tool) => !tool.name.startsWith("mcp__")), ...mcpTools];
+                currentToolsRef.current = next;
+                void replaceSystemPrompt({ tools: next });
+                return next;
+            });
+        })
+            .catch((err) => {
+            log("WARN", "mcp", `MCP initialization failed: ${err instanceof Error ? err.message : String(err)}`);
+        });
+        return () => {
+            cancelled = true;
+        };
+    }, [props.connectInitialMcpTools, replaceSystemPrompt]);
     const setGoalModeAndPrompt = useCallback(async (nextMode, options) => {
         goalModeStateRef.current = nextMode;
         if (props.goalModeRef)
@@ -1345,13 +884,10 @@ export function App(props) {
             (props.repoMapReadFilesRef?.current.size ?? 0));
     }, [props.repoMapChangedFilesRef, props.repoMapReadFilesRef]);
     const getRepoMapBudget = useCallback(() => {
-        const userTurns = messagesRef.current.filter((message) => message.role === "user").length;
-        const readCount = props.repoMapReadFilesRef?.current.size ?? 0;
-        if (userTurns <= 1 && readCount === 0)
-            return FIRST_TURN_REPO_MAP_MAX_CHARS;
-        if (readCount > 0)
-            return FOCUSED_REPO_MAP_MAX_CHARS;
-        return FOCUSED_REPO_MAP_MAX_CHARS + 1000;
+        return getRepoMapBudgetForContext({
+            messages: messagesRef.current,
+            readFileCount: props.repoMapReadFilesRef?.current.size ?? 0,
+        });
     }, [props.repoMapReadFilesRef]);
     const refreshRepoMap = useCallback(async (latestUserPrompt) => {
         const rendered = await buildRepoMap({
@@ -1471,7 +1007,7 @@ export function App(props) {
         tools: currentTools,
         webSearch: props.webSearch,
         maxTokens: props.maxTokens,
-        thinking: thinkingEnabled ? getMaxThinkingLevel(currentModel) : undefined,
+        thinking: thinkingLevel,
         apiKey: activeApiKey,
         baseUrl: activeBaseUrl,
         accountId: activeAccountId,
@@ -2636,20 +2172,20 @@ export function App(props) {
         }
     }, [agentLoop, handleDoubleExit]);
     const handleToggleThinking = useCallback(() => {
-        setThinkingEnabled((prev) => {
-            const next = !prev;
-            log("INFO", "thinking", `Thinking ${next ? "enabled" : "disabled"}`);
-            setLiveItems((items) => [
-                ...items,
-                { kind: "thinking_transition", active: next, id: getId() },
-            ]);
+        setThinkingLevel((prev) => {
+            const next = getNextThinkingLevel(currentProvider, currentModel, prev);
+            log("INFO", "thinking", next ? `Thinking ${next}` : "Thinking disabled");
             if (props.settingsFile) {
                 const sm = new SettingsManager(props.settingsFile);
-                sm.load().then(() => sm.set("thinkingEnabled", next));
+                void sm.load().then(async () => {
+                    await sm.set("thinkingEnabled", !!next);
+                    if (next)
+                        await sm.set("thinkingLevel", next);
+                });
             }
             return next;
         });
-    }, [props.settingsFile]);
+    }, [currentProvider, currentModel, props.settingsFile]);
     const handleModelSelect = useCallback((value) => {
         setOverlay(null);
         const colonIdx = value.indexOf(":");
@@ -2838,7 +2374,7 @@ export function App(props) {
             case "user":
                 return (_jsx(UserMessage, { text: item.text, imageCount: item.imageCount, pasteInfo: item.pasteInfo }, item.id));
             case "goal":
-                return (_jsx(Box, { marginTop: 1, children: _jsxs(Text, { wrap: "wrap", children: [_jsx(Text, { color: theme.success, bold: true, children: "▶ " }), _jsx(Text, { color: theme.textDim, children: "Goal: " }), _jsx(Text, { color: theme.success, children: truncateGoalProgressText(item.title) }), item.workerId ? _jsxs(Text, { color: theme.textDim, children: [" \u00B7 worker ", item.workerId] }) : null] }) }, item.id));
+                return (_jsx(Box, { paddingLeft: 1, marginTop: 1, children: _jsxs(Text, { wrap: "wrap", children: [_jsx(Text, { color: theme.success, bold: true, children: "▶ " }), _jsx(Text, { color: theme.textDim, children: "Goal: " }), _jsx(Text, { color: theme.success, children: truncateGoalProgressText(item.title) }), item.workerId ? _jsxs(Text, { color: theme.textDim, children: [" \u00B7 worker ", item.workerId] }) : null] }) }, item.id));
             case "goal_progress": {
                 const color = goalProgressColor(item, theme);
                 const loaderStatus = goalProgressLoaderStatus(item);
@@ -2846,15 +2382,15 @@ export function App(props) {
                     (item.summaryRows !== undefined && item.summaryRows.length > 0) ||
                     (item.summarySections !== undefined && item.summarySections.length > 0);
                 const headerContentWidth = Math.max(10, columns - 3);
-                return withPrintedBoundarySpacing(_jsxs(Box, { flexDirection: "column", paddingLeft: 1, marginTop: 1, flexShrink: 1, children: [_jsxs(Box, { flexDirection: "row", children: [_jsx(ToolUseLoader, { status: loaderStatus, staticDisplay: true }), _jsx(Box, { flexGrow: 1, width: headerContentWidth, children: _jsxs(Text, { wrap: "wrap", children: [_jsx(Text, { color: color, bold: true, children: truncateGoalProgressText(item.title) }), item.workerId ? (_jsxs(Text, { color: theme.textDim, children: [" \u00B7 worker ", item.workerId] })) : null] }) })] }), hasBody ? (_jsx(MessageResponse, { children: _jsxs(Box, { flexDirection: "column", flexShrink: 1, children: [item.detail ? (_jsx(Text, { color: theme.textDim, wrap: "wrap", children: truncateGoalProgressText(item.detail) })) : null, item.summaryRows?.map((row) => (_jsxs(Text, { wrap: "truncate", children: [_jsx(Text, { color: theme.textDim, children: row.label.padEnd(12) }), _jsx(Text, { color: theme.text, children: truncateGoalProgressText(row.value) }), row.detail ? (_jsxs(Text, { color: theme.textDim, children: [" \u00B7 ", truncateGoalProgressText(row.detail)] })) : null] }, row.label))), item.summarySections?.map((section) => (_jsxs(Box, { flexDirection: "column", marginTop: 1, flexShrink: 1, children: [_jsx(Text, { color: theme.textDim, bold: true, children: section.title }), section.lines.map((line, sectionLineIndex) => (_jsx(Text, { color: theme.text, wrap: "wrap", children: `• ${truncateGoalProgressText(line)}` }, `${section.title}-${sectionLineIndex}`)))] }, section.title)))] }) })) : null] }, item.id));
+                return withPrintedBoundarySpacing(_jsxs(Box, { flexDirection: "column", paddingLeft: 1, marginTop: 1, flexShrink: 1, children: [_jsxs(Box, { flexDirection: "row", children: [_jsx(ToolUseLoader, { status: loaderStatus, staticDisplay: true, color: color }), _jsx(Box, { flexGrow: 1, width: headerContentWidth, children: _jsxs(Text, { wrap: "wrap", children: [_jsx(Text, { color: color, bold: true, children: truncateGoalProgressText(item.title) }), item.workerId ? (_jsxs(Text, { color: theme.textDim, children: [" \u00B7 worker ", item.workerId] })) : null] }) })] }), hasBody ? (_jsx(MessageResponse, { children: _jsxs(Box, { flexDirection: "column", flexShrink: 1, children: [item.detail ? (_jsx(Text, { color: theme.textDim, wrap: "wrap", children: truncateGoalProgressText(item.detail) })) : null, item.summaryRows?.map((row) => (_jsxs(Text, { wrap: "truncate", children: [_jsx(Text, { color: theme.textDim, children: row.label.padEnd(12) }), _jsx(Text, { color: theme.text, children: truncateGoalProgressText(row.value) }), row.detail ? (_jsxs(Text, { color: theme.textDim, children: [" \u00B7 ", truncateGoalProgressText(row.detail)] })) : null] }, row.label))), item.summarySections?.map((section) => (_jsxs(Box, { flexDirection: "column", marginTop: 1, flexShrink: 1, children: [_jsx(Text, { color: theme.textDim, bold: true, children: section.title }), section.lines.map((line, sectionLineIndex) => (_jsx(Text, { color: theme.text, wrap: "wrap", children: `• ${truncateGoalProgressText(line)}` }, `${section.title}-${sectionLineIndex}`)))] }, section.title)))] }) })) : null] }, item.id));
             }
             case "style_pack": {
                 const names = item.added.map((id) => LANGUAGE_DISPLAY_NAMES[id]);
                 const headerLabel = item.added.length > 1 ? "STYLE PACKS ACTIVE" : "STYLE PACK ACTIVE";
-                return (_jsxs(Box, { marginTop: 1, flexShrink: 1, flexDirection: "column", borderStyle: "round", borderColor: theme.language, paddingX: 1, children: [_jsxs(Text, { wrap: "wrap", children: [_jsx(Text, { color: theme.language, bold: true, children: "◆ " }), _jsx(Text, { color: theme.language, bold: true, children: headerLabel })] }), _jsx(Text, { color: theme.text, bold: true, wrap: "wrap", children: names.join(", ") }), item.showSetupHint && (_jsx(Box, { marginTop: 1, children: _jsxs(Text, { wrap: "wrap", children: [_jsx(Text, { color: theme.textMuted, children: "Tip: run " }), _jsx(Text, { color: theme.language, bold: true, children: "/setup" }), _jsx(Text, { color: theme.textMuted, children: " to audit this project against the active pack(s)" })] }) }))] }, item.id));
+                return (_jsx(Box, { paddingLeft: 1, marginTop: 1, flexShrink: 1, children: _jsxs(Box, { flexShrink: 1, flexDirection: "column", borderStyle: "round", borderColor: theme.language, paddingX: 1, children: [_jsxs(Text, { wrap: "wrap", children: [_jsx(Text, { color: theme.language, bold: true, children: "◆ " }), _jsx(Text, { color: theme.language, bold: true, children: headerLabel })] }), _jsx(Text, { color: theme.text, bold: true, wrap: "wrap", children: names.join(", ") }), item.showSetupHint && (_jsx(Box, { marginTop: 1, children: _jsxs(Text, { wrap: "wrap", children: [_jsx(Text, { color: theme.textMuted, children: "Tip: run " }), _jsx(Text, { color: theme.language, bold: true, children: "/setup" }), _jsx(Text, { color: theme.textMuted, children: " to audit this project against the active pack(s)" })] }) }))] }) }, item.id));
             }
             case "setup_hint":
-                return (_jsxs(Box, { marginTop: 1, flexShrink: 1, flexDirection: "column", borderStyle: "round", borderColor: theme.language, paddingX: 1, children: [_jsxs(Text, { wrap: "wrap", children: [_jsx(Text, { color: theme.language, bold: true, children: "◆ " }), _jsx(Text, { color: theme.language, bold: true, children: "NO STYLE PACKS DETECTED" })] }), _jsx(Text, { color: theme.textMuted, wrap: "wrap", children: "This directory has no recognized language manifest at its root." }), _jsx(Box, { marginTop: 1, children: _jsxs(Text, { wrap: "wrap", children: [_jsx(Text, { color: theme.textMuted, children: "Tip: run " }), _jsx(Text, { color: theme.language, bold: true, children: "/setup" }), _jsx(Text, { color: theme.textMuted, children: " to audit project hygiene or bootstrap a new project from scratch" })] }) })] }, item.id));
+                return (_jsx(Box, { paddingLeft: 1, marginTop: 1, flexShrink: 1, children: _jsxs(Box, { flexShrink: 1, flexDirection: "column", borderStyle: "round", borderColor: theme.language, paddingX: 1, children: [_jsxs(Text, { wrap: "wrap", children: [_jsx(Text, { color: theme.language, bold: true, children: "◆ " }), _jsx(Text, { color: theme.language, bold: true, children: "NO STYLE PACKS DETECTED" })] }), _jsx(Text, { color: theme.textMuted, wrap: "wrap", children: "This directory has no recognized language manifest at its root." }), _jsx(Box, { marginTop: 1, children: _jsxs(Text, { wrap: "wrap", children: [_jsx(Text, { color: theme.textMuted, children: "Tip: run " }), _jsx(Text, { color: theme.language, bold: true, children: "/setup" }), _jsx(Text, { color: theme.textMuted, children: " to audit project hygiene or bootstrap a new project from scratch" })] }) })] }) }, item.id));
             case "assistant":
                 return (_jsx(AssistantMessage, { text: item.text, thinking: item.thinking, thinkingMs: item.thinkingMs, renderMarkdown: renderMarkdown, availableTerminalHeight: measuredLiveAreaRows, marginTop: assistantMarginTop }, item.id));
             case "tool_start":
@@ -2874,15 +2410,11 @@ export function App(props) {
             case "info":
                 return renderStatusMessage(item.id, "○ ", item.text, theme.commandColor, { muted: true });
             case "update_notice":
-                return (_jsx(Box, { marginTop: 1, flexShrink: 1, borderStyle: "round", borderColor: theme.commandColor, paddingX: 1, children: _jsxs(Text, { color: theme.commandColor, bold: true, wrap: "wrap", children: ["✨ ", item.text] }) }, item.id));
+                return (_jsx(Box, { paddingLeft: 1, marginTop: 1, flexShrink: 1, children: _jsx(Box, { flexShrink: 1, borderStyle: "round", borderColor: theme.commandColor, paddingX: 1, children: _jsxs(Text, { color: theme.commandColor, bold: true, wrap: "wrap", children: ["✨ ", item.text] }) }) }, item.id));
             case "plan_transition":
-                return renderStatusMessage(item.id, "● ", normalizeStatusText(item.text), theme.commandColor, { bold: true });
+                return renderStatusMessage(item.id, `${BLACK_CIRCLE} `, normalizeStatusText(item.text), theme.commandColor, { bold: true });
             case "goal_agent_transition":
-                return renderStatusMessage(item.id, "● ", normalizeStatusText(item.text), theme.commandColor, { bold: true });
-            case "thinking_transition": {
-                const glyphColor = item.active ? theme.commandColor : theme.textDim;
-                return renderStatusMessage(item.id, "✻ ", item.active ? "Thinking ON" : "Thinking OFF", glyphColor, { bold: true, muted: !item.active });
-            }
+                return renderStatusMessage(item.id, `${BLACK_CIRCLE} `, normalizeStatusText(item.text), theme.commandColor, { bold: true });
             case "model_transition":
                 return renderStatusMessage(item.id, "▸ ", _jsxs(_Fragment, { children: [_jsx(Text, { color: theme.textDim, children: "Switched to " }), _jsx(Text, { color: theme.commandColor, bold: true, children: item.modelName })] }), theme.commandColor, { bold: true });
             case "theme_transition":
@@ -2903,7 +2435,7 @@ export function App(props) {
                 // gradient. Glyph `⊘` reads as "stop" without being alarming.
                 return renderStatusMessage(item.id, "⊘ ", normalizeStatusText(item.text), theme.commandColor, { bold: true });
             case "step_done":
-                return (_jsx(Box, { marginTop: 1, flexShrink: 1, children: _jsxs(Text, { wrap: "wrap", children: [_jsx(Text, { color: theme.success, bold: true, children: "✓ " }), _jsx(Text, { color: theme.success, bold: true, children: `Step ${item.stepNum} done` }), item.description ? (_jsx(Text, { color: theme.textDim, children: ` — ${item.description}` })) : null] }) }, item.id));
+                return (_jsx(Box, { paddingLeft: 1, marginTop: 1, flexShrink: 1, children: _jsxs(Text, { wrap: "wrap", children: [_jsx(Text, { color: theme.success, bold: true, children: "✓ " }), _jsx(Text, { color: theme.success, bold: true, children: `Step ${item.stepNum} done` }), item.description ? (_jsx(Text, { color: theme.textDim, children: ` — ${item.description}` })) : null] }) }, item.id));
             case "queued": {
                 const suffix = item.imageCount
                     ? ` (+${item.imageCount} image${item.imageCount > 1 ? "s" : ""})`
@@ -2915,7 +2447,7 @@ export function App(props) {
             case "compacted":
                 return (_jsx(CompactionDone, { originalCount: item.originalCount, newCount: item.newCount, tokensBefore: item.tokensBefore, tokensAfter: item.tokensAfter }, item.id));
             case "duration":
-                return (_jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: theme.textDim, children: ["✻ ", item.verb, " ", formatDuration(item.durationMs)] }) }, item.id));
+                return (_jsx(Box, { paddingLeft: 1, marginTop: 1, children: _jsxs(Text, { color: theme.textDim, children: ["✻ ", item.verb, " ", formatDuration(item.durationMs)] }) }, item.id));
             case "subagent_group":
                 return withPrintedBoundarySpacing(_jsx(SubAgentPanel, { agents: item.agents, aborted: item.aborted }, item.id));
         }
@@ -2964,9 +2496,13 @@ export function App(props) {
         const detail = eventInfo?.kind === "worker"
             ? `Inspecting worker result${eventInfo.task ? ` for ${eventInfo.task}` : ""}.`
             : `Inspecting verifier result${eventInfo?.status ? ` (${eventInfo.status})` : ""}.`;
-        if (agentRunningRef.current) {
-            queuedGoalSyntheticEventsRef.current += 1;
-            void setGoalModeAndPrompt("coordinator");
+        const route = routeGoalSyntheticEvent({
+            agentRunning: agentRunningRef.current,
+            queuedSyntheticEvents: queuedGoalSyntheticEventsRef.current,
+        });
+        if (route.action === "queue") {
+            queuedGoalSyntheticEventsRef.current = route.nextQueuedSyntheticEvents;
+            void setGoalModeAndPrompt(route.nextGoalMode);
             appendGoalProgress({
                 kind: "goal_progress",
                 phase: "orchestrator_reviewing",
@@ -3315,6 +2851,7 @@ export function App(props) {
                 cwd: props.cwd,
                 provider: currentProvider,
                 model: currentModel,
+                thinkingLevel,
                 goalRunId: checkedRun.id,
                 goalTaskId: decision.task.id,
                 taskTitle: decision.task.title,
@@ -3358,6 +2895,7 @@ export function App(props) {
         props.cwd,
         currentProvider,
         currentModel,
+        thinkingLevel,
         appendGoalProgress,
         clearGoalModeIfIdle,
         clearGoalStatusEntry,
@@ -3667,7 +3205,7 @@ export function App(props) {
         contextWindowOptions,
         cwd: displayedCwd,
         gitBranch,
-        thinkingLevel: thinkingEnabled ? getMaxThinkingLevel(currentModel) : undefined,
+        thinkingLevel,
         goalMode,
     });
     const chatControlsLayout = getChatControlsLayoutDecision({
@@ -3722,12 +3260,24 @@ export function App(props) {
     const shouldReserveStreamingSpacing = agentLoop.isRunning &&
         !hasLiveAssistantItem &&
         (visibleStreamingText.trim().length > 0 || liveItems.some(isAgentSpacingItem));
+    const lastLiveItem = liveItems.at(-1);
+    const lastPendingHistoryItem = pendingHistoryFlushRef.current.at(-1);
+    const lastHistoryItem = history.at(-1);
     const shouldTopSpaceStreamingText = shouldTopSpaceStreamingAssistant({
         visibleStreamingText,
-        lastLiveItem: liveItems.at(-1),
-        lastPendingHistoryItem: pendingHistoryFlushRef.current.at(-1),
-        lastHistoryItem: history.at(-1),
+        lastLiveItem,
+        lastPendingHistoryItem,
+        lastHistoryItem,
     });
+    const visibleQueuedCount = liveItems.filter((item) => item.kind === "queued").length;
+    const hiddenQueuedCount = Math.max(0, agentLoop.queuedCount - visibleQueuedCount);
+    const shouldTopSpaceQueueIndicator = hiddenQueuedCount > 0 &&
+        shouldTopSpaceAfterPrintedAgentBoundary({
+            currentKind: "queued",
+            previousLiveItem: lastLiveItem,
+            lastPendingHistoryItem,
+            lastHistoryItem,
+        });
     return (_jsx(Box, { flexDirection: "column", width: columns, flexShrink: 0, flexGrow: 0, children: isGoalView ? (_jsx(GoalOverlay, { cwd: props.cwd, agentRunning: agentLoop.isRunning, autoExpandNewest: goalAutoExpand, onClose: () => {
                 goalAutoExpandRef.current = false;
                 setGoalAutoExpand(false);
@@ -3946,7 +3496,7 @@ export function App(props) {
                     log("ERROR", "error", errMsg);
                     setLiveItems((prev) => [...prev, toErrorItem(err, getId())]);
                 });
-            } })) : (_jsxs(Box, { flexDirection: "column", width: columns, flexShrink: 0, flexGrow: 0, children: [_jsxs(Box, { flexDirection: "column", flexGrow: 0, flexShrink: 1, overflowY: "hidden", children: [liveItems.map((item, index, items) => renderItem(item, index, items)), _jsx(StreamingArea, { isRunning: agentLoop.isRunning, streamingText: visibleStreamingText, streamingThinking: agentLoop.streamingThinking, thinkingMs: agentLoop.thinkingMs, reserveSpacing: shouldReserveStreamingSpacing, renderMarkdown: renderMarkdown, availableTerminalHeight: measuredLiveAreaRows, assistantMarginTop: shouldTopSpaceStreamingText ? 1 : 0, continuation: streamedAssistantFlushRef.current.flushedChars > 0 })] }), _jsxs(Box, { ref: mainControlsRef, flexDirection: "column", flexShrink: 0, flexGrow: 0, children: [agentLoop.queuedCount > 0 && (_jsxs(Box, { marginTop: 1, children: [_jsx(Text, { color: theme.warning, bold: true, children: "• " }), _jsxs(Text, { color: theme.textDim, children: [agentLoop.queuedCount, " message", agentLoop.queuedCount > 1 ? "s" : "", " queued"] })] })), _jsxs(Box, { flexDirection: "column", width: columns, children: [_jsx(Box, { borderStyle: "single", borderTop: true, borderBottom: false, borderLeft: false, borderRight: false, borderColor: theme.textDim, width: columns, height: 0 }), _jsx(Box, { paddingLeft: 1, paddingRight: 1, width: columns, children: statusSlotVisible ? (activityVisible ? (_jsx(ActivityIndicator, { phase: agentLoop.activityPhase, elapsedMs: agentLoop.elapsedMs, runStartRef: agentLoop.runStartRef, thinkingMs: agentLoop.thinkingMs, isThinking: agentLoop.isThinking, thinkingEnabled: thinkingEnabled, tokenEstimate: agentLoop.streamedTokenEstimate, charCountRef: agentLoop.charCountRef, realTokensAccumRef: agentLoop.realTokensAccumRef, userMessage: lastUserMessage, activeToolNames: agentLoop.activeToolCalls.map((tc) => tc.name), retryInfo: agentLoop.retryInfo, planDone: planSteps.filter((s) => s.completed).length, planTotal: planSteps.length, staticDisplay: true })) : stallStatusVisible ? (_jsx(Text, { color: theme.warning, wrap: "truncate", children: "⚠ API provider stream interrupted — retries exhausted. Your conversation is preserved." })) : doneStatus ? (_jsxs(Text, { color: theme.success, children: ["✻ ", doneStatus.verb, " ", formatDuration(doneStatus.durationMs)] })) : (_jsxs(Text, { children: [_jsx(Text, { color: theme.commandColor, children: "⠿ " }), _jsx(Text, { color: theme.textDim, children: "Ready to go.." }), !renderMarkdown && (_jsx(Text, { color: theme.warning, children: " · raw markdown mode" }))] }))) : (_jsxs(Text, { children: [_jsx(Text, { color: theme.commandColor, children: "⠿ " }), _jsx(Text, { color: theme.textDim, children: "Ready to go.." })] })) })] }), _jsx(InputArea, { onSubmit: handleSubmit, onAbort: handleAbort, disabled: agentLoop.isRunning, isActive: !taskBarFocused && !overlay, onDownAtEnd: handleFocusTaskBar, onShiftTab: handleToggleThinking, onToggleGoal: () => {
+            } })) : (_jsxs(Box, { flexDirection: "column", width: columns, flexShrink: 0, flexGrow: 0, children: [_jsxs(Box, { flexDirection: "column", flexGrow: 0, flexShrink: 1, overflowY: "hidden", children: [liveItems.map((item, index, items) => renderItem(item, index, items)), _jsx(StreamingArea, { isRunning: agentLoop.isRunning, streamingText: visibleStreamingText, streamingThinking: agentLoop.streamingThinking, thinkingMs: agentLoop.thinkingMs, reserveSpacing: shouldReserveStreamingSpacing, renderMarkdown: renderMarkdown, availableTerminalHeight: measuredLiveAreaRows, assistantMarginTop: shouldTopSpaceStreamingText ? 1 : 0, continuation: streamedAssistantFlushRef.current.flushedChars > 0 })] }), _jsxs(Box, { ref: mainControlsRef, flexDirection: "column", flexShrink: 0, flexGrow: 0, children: [hiddenQueuedCount > 0 && (_jsxs(Box, { flexDirection: "row", paddingLeft: 1, marginTop: shouldTopSpaceQueueIndicator ? 2 : 1, flexShrink: 0, children: [_jsx(Box, { width: 2, flexShrink: 0, children: _jsx(Text, { color: theme.warning, bold: true, children: "• " }) }), _jsxs(Text, { color: theme.textDim, children: [hiddenQueuedCount, " message", hiddenQueuedCount > 1 ? "s" : "", " queued"] })] })), _jsxs(Box, { flexDirection: "column", width: columns, children: [_jsx(Box, { borderStyle: "single", borderTop: true, borderBottom: false, borderLeft: false, borderRight: false, borderColor: theme.textDim, width: columns, height: 0 }), _jsx(Box, { paddingLeft: 1, paddingRight: 1, width: columns, children: statusSlotVisible ? (activityVisible ? (_jsx(ActivityIndicator, { phase: agentLoop.activityPhase, elapsedMs: agentLoop.elapsedMs, runStartRef: agentLoop.runStartRef, thinkingMs: agentLoop.thinkingMs, isThinking: agentLoop.isThinking, thinkingEnabled: !!thinkingLevel, tokenEstimate: agentLoop.streamedTokenEstimate, charCountRef: agentLoop.charCountRef, realTokensAccumRef: agentLoop.realTokensAccumRef, userMessage: lastUserMessage, activeToolNames: agentLoop.activeToolCalls.map((tc) => tc.name), retryInfo: agentLoop.retryInfo, planDone: planSteps.filter((s) => s.completed).length, planTotal: planSteps.length, staticDisplay: true })) : stallStatusVisible ? (_jsx(Text, { color: theme.warning, wrap: "truncate", children: "⚠ API provider stream interrupted — retries exhausted. Your conversation is preserved." })) : doneStatus ? (_jsxs(Text, { color: theme.success, children: ["✻ ", doneStatus.verb, " ", formatDuration(doneStatus.durationMs)] })) : (_jsxs(Text, { children: [_jsx(Text, { color: theme.commandColor, children: "⠿ " }), _jsx(Text, { color: theme.textDim, children: "Ready to go.." }), !renderMarkdown && (_jsx(Text, { color: theme.warning, children: " · raw markdown mode" }))] }))) : (_jsxs(Text, { children: [_jsx(Text, { color: theme.commandColor, children: "⠿ " }), _jsx(Text, { color: theme.textDim, children: "Ready to go.." })] })) })] }), _jsx(InputArea, { onSubmit: handleSubmit, onAbort: handleAbort, disabled: agentLoop.isRunning, isActive: !taskBarFocused && !overlay, onDownAtEnd: handleFocusTaskBar, onShiftTab: handleToggleThinking, onToggleGoal: () => {
                                 openOverlay("goal");
                             }, onToggleSkills: () => {
                                 openOverlay("skills");
@@ -3954,7 +3504,7 @@ export function App(props) {
                                 openOverlay("pixel");
                             }, onToggleMarkdown: () => {
                                 setRenderMarkdown((prev) => !prev);
-                            }, cwd: props.cwd, commands: allCommands }), overlay === "model" ? (_jsx(ModelSelector, { onSelect: handleModelSelect, onCancel: () => setOverlay(null), loggedInProviders: props.loggedInProviders ?? [currentProvider], currentModel: currentModel, currentProvider: currentProvider })) : overlay === "theme" ? (_jsx(ThemeSelector, { onSelect: handleThemeSelect, onCancel: () => setOverlay(null), currentTheme: theme.name })) : (_jsxs(_Fragment, { children: [_jsx(Footer, { model: currentModel, tokensIn: agentLoop.contextUsed, contextWindowOptions: contextWindowOptions, cwd: displayedCwd, gitBranch: gitBranch, thinkingLevel: thinkingEnabled ? getMaxThinkingLevel(currentModel) : undefined, goalMode: goalMode, exitPending: exitPending, renderMarkdown: renderMarkdown }), !exitPending && _jsx(GoalStatusBar, { entries: goalStatusEntries })] })), (footerStatusLayout.hasBackgroundTasks || footerStatusLayout.hasUpdateNotice) && (_jsxs(Box, { flexDirection: footerStatusLayout.stack ? "column" : "row", width: columns, children: [footerStatusLayout.hasBackgroundTasks && (_jsx(BackgroundTasksBar, { tasks: bgTasks, focused: taskBarFocused, expanded: taskBarExpanded, selectedIndex: selectedTaskIndex, onExpand: handleTaskBarExpand, onCollapse: handleTaskBarCollapse, onKill: handleTaskKill, onExit: handleTaskBarExit, onNavigate: handleTaskNavigate, compact: footerStatusLayout.compactBackgroundTasks })), footerStatusLayout.hasUpdateNotice && (_jsx(Box, { paddingLeft: footerStatusLayout.stack || !footerStatusLayout.hasBackgroundTasks ? 1 : 2, paddingRight: 1, children: _jsx(Text, { color: theme.success, bold: true, wrap: "truncate", children: "\u2728 Update ready \u00B7 restart to apply" }) }))] }))] })] })) }));
+                            }, cwd: props.cwd, commands: allCommands }), overlay === "model" ? (_jsx(ModelSelector, { onSelect: handleModelSelect, onCancel: () => setOverlay(null), loggedInProviders: props.loggedInProviders ?? [currentProvider], currentModel: currentModel, currentProvider: currentProvider })) : overlay === "theme" ? (_jsx(ThemeSelector, { onSelect: handleThemeSelect, onCancel: () => setOverlay(null), currentTheme: theme.name })) : (_jsxs(_Fragment, { children: [_jsx(Footer, { model: currentModel, tokensIn: agentLoop.contextUsed, contextWindowOptions: contextWindowOptions, cwd: displayedCwd, gitBranch: gitBranch, thinkingLevel: thinkingLevel, goalMode: goalMode, exitPending: exitPending, renderMarkdown: renderMarkdown }), !exitPending && _jsx(GoalStatusBar, { entries: goalStatusEntries })] })), (footerStatusLayout.hasBackgroundTasks || footerStatusLayout.hasUpdateNotice) && (_jsxs(Box, { flexDirection: footerStatusLayout.stack ? "column" : "row", width: columns, children: [footerStatusLayout.hasBackgroundTasks && (_jsx(BackgroundTasksBar, { tasks: bgTasks, focused: taskBarFocused, expanded: taskBarExpanded, selectedIndex: selectedTaskIndex, onExpand: handleTaskBarExpand, onCollapse: handleTaskBarCollapse, onKill: handleTaskKill, onExit: handleTaskBarExit, onNavigate: handleTaskNavigate, compact: footerStatusLayout.compactBackgroundTasks })), footerStatusLayout.hasUpdateNotice && (_jsx(Box, { paddingLeft: footerStatusLayout.stack || !footerStatusLayout.hasBackgroundTasks ? 1 : 2, paddingRight: 1, children: _jsx(Text, { color: theme.success, bold: true, wrap: "truncate", children: "\u2728 Update ready \u00B7 restart to apply" }) }))] }))] })] })) }));
 }
 function formatRepoMapCommandOutput(enabled, markdown, refreshed) {
     const status = enabled ? "on" : "off";